Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/qms/inspectionRecord/inspectionRecordMain.data.ts

@@ -380,6 +380,7 @@ export const InspectionRecordMain = useCrudSchemas(
       sort: 'custom',
       formatter: dateFormatter,
       isSearch: false,
+      isForm: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -389,7 +390,6 @@ export const InspectionRecordMain = useCrudSchemas(
         }
       },
       form: {
-        component: 'DatePicker',
         componentProps: {
           type: 'datetime',
           valueFormat: 'x'
@@ -434,6 +434,17 @@ export const InspectionRecordMain = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '执行结果',
+      field: 'estimateCode',
+      dictType: DICT_TYPE.EVALUATION_CODE,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      table: {
+        width: 150
+      }
+    },
     {
       label: '创建时间',
       field: 'createTime',