刘洋 1 an în urmă
părinte
comite
f44ff9ee1a

+ 3 - 1
src/views/resource-guard/person-guard/person-files/add-person-file-dialog.vue

@@ -391,7 +391,9 @@ const dialogOpened = async () => {
     formData.code = undefined;
   } else {
     areaInfo.value = [formData.province, formData.city, formData.area];
-    photos.value = [{ url: props.curRow.basePhotoPreviewPath }];
+    photos.value = props.curRow.basePhotoPreviewPath
+      ? [{ url: props.curRow.basePhotoPreviewPath }]
+      : [];
   }
   getRoleList();
 };

+ 10 - 8
src/views/resource-guard/person-guard/person-files/index.vue

@@ -120,10 +120,12 @@
         </template>
         <template #photo="{ col, row }">
           <t-image
+            v-if="row[col.colKey]"
             :src="row[col.colKey]"
             fit="contain"
-            :style="{ width: '100px', height: '100px' }"
+            :style="{ width: '80px', height: '80px' }"
           ></t-image>
+          <span v-else>-</span>
         </template>
         <template #roles="{ col, row }">
           {{ row[col.colKey].map((item) => item.roleName).join(',') }}
@@ -295,16 +297,16 @@ const columns = [
     fixed: 'left',
   },
   { colKey: 'code', title: '档案流水号', width: 200 },
-  { colKey: 'name', title: '姓名', width: 120 },
+  { colKey: 'name', title: '姓名', width: 80 },
   { colKey: 'province', title: '省份' },
   { colKey: 'city', title: '城市' },
   { colKey: 'area', title: '区县' },
   { colKey: 'gender', title: '性别', cell: 'gender', width: 70 },
   { colKey: 'age', title: '年龄', width: 70 },
-  { colKey: 'identity', title: '身份证号', width: 160 },
-  { colKey: 'education', title: '学历', cell: 'education' },
-  { colKey: 'mobileNumber', title: '手机号', width: 120 },
-  { colKey: 'email', title: '电子邮箱' },
+  { colKey: 'identity', title: '身份证号', width: 190 },
+  { colKey: 'education', title: '学历', cell: 'education', width: 110 },
+  { colKey: 'mobileNumber', title: '手机号', width: 140 },
+  { colKey: 'email', title: '电子邮箱', minWidth: 200 },
   { colKey: 'basePhotoPreviewPath', title: '底照', cell: 'photo', width: 120 },
   { colKey: 'supplierName', title: '供应商' },
   {
@@ -324,13 +326,13 @@ const columns = [
     colKey: 'authenticationValidTime',
     title: '认证有效期',
     cell: 'valid-time',
-    width: 180,
+    width: 170,
   },
   {
     colKey: 'remainValidDay',
     title: '剩余有效天数',
     cell: 'remain-day',
-    width: 80,
+    width: 120,
   },
   { colKey: 'authenticationStatus', title: '认证状态', cell: 'status' },
   { colKey: 'remark', title: '备注' },

+ 3 - 1
src/views/sop/components/select-filter/config.js

@@ -153,7 +153,9 @@ export const staticMetadata = [
     code: 'SINGLE_SELECT',
     fieldId: 'status',
     fieldTitle: '流程状态',
-    options: dictToOptionList(FLOW_STATUS),
+    options: dictToOptionList(FLOW_STATUS).filter(
+      (item) => item.value !== 'END'
+    ),
   },
   {
     code: 'TEXT',

+ 3 - 1
src/views/sop/sop-manage/office-sop/index.vue

@@ -335,7 +335,9 @@ const filterConfirm = (data, formWidgetMetadataOperation) => {
     return {
       fieldId: item.fieldId,
       operator: item.operator,
-      fieldValue: item.fieldValue,
+      fieldValue: Array.isArray(item.fieldValue)
+        ? JSON.stringify(item.fieldValue)
+        : item.fieldValue,
     };
   });
   params.formWidgetMetadataOperation = formWidgetMetadataOperation;

+ 3 - 1
src/views/sop/sop-manage/student-sop/index.vue

@@ -333,7 +333,9 @@ const filterConfirm = (data, formWidgetMetadataOperation) => {
     return {
       fieldId: item.fieldId,
       operator: item.operator,
-      fieldValue: item.fieldValue,
+      fieldValue: Array.isArray(item.fieldValue)
+        ? JSON.stringify(item.fieldValue)
+        : item.fieldValue,
     };
   });
   params.formWidgetMetadataOperation = formWidgetMetadataOperation;

+ 10 - 10
src/views/system/config-manage/customer-manage/index.vue

@@ -123,14 +123,14 @@ const fields = ref([
     colSpan: 5,
     options: dictToOptionList(CUSTOMER_TYPE),
   },
-  {
-    prop: 'managerId',
-    cell: 'manager',
-    label: '客户经理',
-    type: 'select',
-    labelWidth: 80,
-    colSpan: 5,
-  },
+  // {
+  //   prop: 'managerId',
+  //   cell: 'manager',
+  //   label: '客户经理',
+  //   type: 'select',
+  //   labelWidth: 80,
+  //   colSpan: 5,
+  // },
   {
     prop: 'name',
     label: '客户名称',
@@ -165,7 +165,7 @@ const fields = ref([
 ]);
 const params = reactive({
   type: '',
-  managerId: '',
+  // managerId: '',
   name: '',
   levelId: '',
 });
@@ -180,7 +180,7 @@ const columns = [
   { colKey: 'city', title: '城市', width: 100 },
   { colKey: 'area', title: '县区', width: 100 },
   { colKey: 'address', title: '地址', minWidth: 160 },
-  { colKey: 'managerName', title: '客户经理', width: 120 },
+  // { colKey: 'managerName', title: '客户经理', width: 120 },
   { colKey: 'level', title: '服务档位名称', width: 120 },
   {
     colKey: 'roleList',

+ 6 - 1
src/views/work-hours/work-hours-manage/work-attendance-detail/index.vue

@@ -52,6 +52,11 @@
         <template #type="{ col, row }">
           {{ attendanceTypeFilter(row[col.colKey]) }}
         </template>
+        <template #address="{ col, row }">
+          <t-link theme="primary" hover="color">
+            {{ row[col.colKey] }}
+          </t-link>
+        </template>
       </t-table>
     </div>
   </div>
@@ -208,7 +213,7 @@ const columns = [
   { colKey: 'signDate', title: '考勤日期', width: 180 },
   { colKey: 'type', title: '考勤类型', cell: 'type', width: 100 },
   { colKey: 'signTime', title: '打卡时间', cell: 'sign-time', width: 180 },
-  { colKey: 'address', title: '打卡地址', minWidth: 200 },
+  { colKey: 'address', title: '打卡地址', cell: 'address', minWidth: 200 },
   { colKey: 'status', title: '考勤结果', fixed: 'right', width: 100 },
 ];
 const { pagination, tableData, search, onChange } = useFetchTable(