1.1.37 客户名称必填、联系人列宽优化

src/views/oa/crm/customerContact/index.vue

@@ -63,45 +63,73 @@
       </template>
 
       <el-table v-loading="loading" border :data="customerContactList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="selection" width="48" align="center" />
-        <el-table-column label="联系人ID" align="center" prop="contactId" v-if="columns[0].visible" />
+        <el-table-column label="联系人ID" align="center" prop="contactId" width="100" v-if="columns[0].visible" />
-        <el-table-column label="所属客户" align="center" prop="customerName" width="120" v-if="columns[2].visible" />
+        <el-table-column
-        <el-table-column label="联系人姓名" align="center" prop="contactName" width="100" v-if="columns[3].visible" />
+          label="所属客户"
-        <el-table-column label="尊称" align="center" prop="sexType" v-if="columns[4].visible">
+          align="center"
+          prop="customerName"
+          min-width="250"
+          show-overflow-tooltip
+          v-if="columns[2].visible"
+        />
+        <el-table-column
+          label="联系人姓名"
+          align="center"
+          prop="contactName"
+          min-width="110"
+          show-overflow-tooltip
+          v-if="columns[3].visible"
+        />
+        <el-table-column label="尊称" align="center" prop="sexType" width="80" v-if="columns[4].visible">
           <template #default="scope">
             <dict-tag :options="sex_type" :value="scope.row.sexType" />
           </template>
         </el-table-column>
-        <el-table-column label="角色" align="center" prop="roleType" v-if="columns[5].visible">
+        <el-table-column label="角色" align="center" prop="roleType" min-width="108" show-overflow-tooltip v-if="columns[5].visible">
           <template #default="scope">
             <dict-tag :options="role_type" :value="scope.row.roleType" />
           </template>
         </el-table-column>
-        <el-table-column label="是否首要联系人" align="center" prop="firstFlag" width="120" v-if="columns[6].visible">
+        <el-table-column label="是否首要联系人" align="center" prop="firstFlag" min-width="130" v-if="columns[6].visible">
           <template #default="scope">
             <dict-tag :options="first_flag" :value="scope.row.firstFlag" />
           </template>
         </el-table-column>
-        <el-table-column label="生日" align="center" prop="birthday" width="100" v-if="columns[7].visible">
+        <el-table-column label="生日" align="center" prop="birthday" width="112" v-if="columns[7].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="部门职务" align="center" prop="departmentPosition" v-if="columns[8].visible" />
+        <el-table-column
-        <el-table-column label="详细地址" align="center" prop="detailedAddress" v-if="columns[9].visible" />
+          label="部门职务"
-        <el-table-column label="手机号码" align="center" prop="phoneNumber" v-if="columns[10].visible" />
+          align="center"
-        <el-table-column label="固定电话" align="center" prop="landlineNumber" v-if="columns[11].visible" />
+          prop="departmentPosition"
-        <el-table-column label="传真号码" align="center" prop="facsimileNumber" v-if="columns[12].visible" />
+          min-width="120"
-        <el-table-column label="电子邮箱" align="center" prop="email" v-if="columns[13].visible" />
+          show-overflow-tooltip
-        <el-table-column label="微信账号" align="center" prop="wechatAccount" v-if="columns[14].visible" />
+          v-if="columns[8].visible"
-        <el-table-column label="QQ号码" align="center" prop="qqNumber" v-if="columns[15].visible" />
+        />
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[16].visible" />
+        <el-table-column
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[17].visible">
+          label="详细地址"
+          align="center"
+          prop="detailedAddress"
+          min-width="160"
+          show-overflow-tooltip
+          v-if="columns[9].visible"
+        />
+        <el-table-column label="手机号码" align="center" prop="phoneNumber" min-width="118" show-overflow-tooltip v-if="columns[10].visible" />
+        <el-table-column label="固定电话" align="center" prop="landlineNumber" min-width="128" show-overflow-tooltip v-if="columns[11].visible" />
+        <el-table-column label="传真号码" align="center" prop="facsimileNumber" min-width="120" show-overflow-tooltip v-if="columns[12].visible" />
+        <el-table-column label="电子邮箱" align="center" prop="email" min-width="180" show-overflow-tooltip v-if="columns[13].visible" />
+        <el-table-column label="微信账号" align="center" prop="wechatAccount" min-width="120" show-overflow-tooltip v-if="columns[14].visible" />
+        <el-table-column label="QQ号码" align="center" prop="qqNumber" min-width="108" show-overflow-tooltip v-if="columns[15].visible" />
+        <el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip v-if="columns[16].visible" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag" width="96" v-if="columns[17].visible">
           <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:customerContact:edit']"></el-button>

src/views/oa/crm/customerInfo/index.vue

@@ -75,7 +75,7 @@
       <el-table v-loading="loading" border :data="customerInfoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="客户ID" align="center" prop="customerId" width="80" v-if="columns[0].visible" />
-        <el-table-column label="客户名称" align="center" prop="customerName" width="200" v-if="columns[2].visible" show-overflow-tooltip>
+        <el-table-column label="客户名称" align="center" prop="customerName" width="250" v-if="columns[2].visible" show-overflow-tooltip>
           <template #default="scope">
             <el-link type="primary" underline @click="handleDetail(scope.row)">
               {{ scope.row.customerName }}
@@ -684,7 +684,9 @@ const data = reactive<PageData<CustomerInfoForm, CustomerInfoQuery>>({
     ourCompanyFlag: '0',
     params: {}
   },
-  rules: {}
+  rules: {
+    customerName: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }]
+  }
 });
 
 const { queryParams, form, rules } = toRefs(data);