钉钉审批功能完善、混炼示方新增是否附加料

jeecgboot-vue3/src/views/xslmes/mesXslFormulaSpec/MesXslFormulaSpec.data.ts

@@ -445,7 +445,14 @@ function sectionTitle(label: string, field: string): FormSchema {
 }
 
 const hasWorkflowInfo = ({ values }) =>
-  !!(values.proofreadBy || values.proofreadTime || values.auditBy || values.auditTime || values.approveBy || values.approveTime);
+  !!(
+    values.traceProofreadBy ||
+    values.traceProofreadTime ||
+    values.traceAuditBy ||
+    values.traceAuditTime ||
+    values.traceApproveBy ||
+    values.traceApproveTime
+  );
 
 export const columns: BasicColumn[] = [
   { title: '示方编号', align: 'center', dataIndex: 'specCode', width: 150, fixed: 'left' },
@@ -468,8 +475,7 @@ export const columns: BasicColumn[] = [
     width: 100,
     customRender: ({ record }) => record?.createBy_dictText || record?.createBy || '',
   },
-  { title: '审核人', align: 'center', dataIndex: 'auditBy', width: 100, defaultHidden: true },
-  { title: '批准人', align: 'center', dataIndex: 'approveBy', width: 100, defaultHidden: true },
+  // 审批痕迹 6 列（校对人/校对时间/审核人/审核时间/批准人/批准时间）由 useListPage 统一从 traceColumns 追加，勿在此手写 trace* 列
   { title: '状态', align: 'center', dataIndex: 'status_dictText', width: 120 },
   { title: '混合段数', align: 'center', dataIndex: 'mixingStages', width: 90, defaultHidden: true },
   { title: 'TOTAL PHR', align: 'center', dataIndex: 'totalPhr', width: 100, defaultHidden: true },
@@ -617,51 +623,51 @@ export const workflowFormSchema: FormSchema[] = [
   sectionTitle('审批记录', 'dividerWorkflow'),
   {
     label: '校对人',
-    field: 'proofreadBy',
+    field: 'traceProofreadBy',
     component: 'Input',
     componentProps: { disabled: true, bordered: false },
     colProps: colHalf,
-    ifShow: ({ values }) => !!values.proofreadBy,
+    ifShow: ({ values }) => !!values.traceProofreadBy,
   },
   {
     label: '校对时间',
-    field: 'proofreadTime',
+    field: 'traceProofreadTime',
     component: 'Input',
     componentProps: { disabled: true, bordered: false },
     colProps: colHalf,
-    ifShow: ({ values }) => !!values.proofreadTime,
+    ifShow: ({ values }) => !!values.traceProofreadTime,
   },
   {
     label: '审核人',
-    field: 'auditBy',
+    field: 'traceAuditBy',
     component: 'Input',
     componentProps: { disabled: true, bordered: false },
     colProps: colHalf,
-    ifShow: ({ values }) => !!values.auditBy,
+    ifShow: ({ values }) => !!values.traceAuditBy,
   },
   {
     label: '审核时间',
-    field: 'auditTime',
+    field: 'traceAuditTime',
     component: 'Input',
     componentProps: { disabled: true, bordered: false },
     colProps: colHalf,
-    ifShow: ({ values }) => !!values.auditTime,
+    ifShow: ({ values }) => !!values.traceAuditTime,
   },
   {
     label: '批准人',
-    field: 'approveBy',
+    field: 'traceApproveBy',
     component: 'Input',
     componentProps: { disabled: true, bordered: false },
     colProps: colHalf,
-    ifShow: ({ values }) => !!values.approveBy,
+    ifShow: ({ values }) => !!values.traceApproveBy,
   },
   {
     label: '批准时间',
-    field: 'approveTime',
+    field: 'traceApproveTime',
     component: 'Input',
     componentProps: { disabled: true, bordered: false },
     colProps: colHalf,
-    ifShow: ({ values }) => !!values.approveTime,
+    ifShow: ({ values }) => !!values.traceApproveTime,
   },
 ];