Renxy 2 vuotta sitten
vanhempi
commit
7cbf2a6d0c

+ 0 - 1
src/pages/PurchaseAdmin/PurchaseList/Detail/AuditFlow.js

@@ -34,7 +34,6 @@ function AuditFlow(props) {
     activityId,
     direction,
   } = props;
-  console.log('------------------------------', props);
   const [flow, setFlow] = useState({ workflowActivityRules: [] });
   const timerRef = useRef({
     id: '',

+ 1 - 0
src/pages/PurchaseAdmin/PurchaseList/Detail/CommitAuditModal.js

@@ -210,6 +210,7 @@ function CommitAuditModal(props) {
         processCode: approvalNode.process_code,
         originatorUserId: '16569001414345099',
         deptId: '14169890',
+        template_node_id: `${approvalNode.Id}`,
         formComponentValues: data[approvalNode.Id],
       };
       result.push(JSON.stringify(formItem));

+ 4 - 3
src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

@@ -81,20 +81,21 @@ function Detail(props) {
   const templateId = parseInt(params.templateId);
 
   const auditDetail = useMemo(() => {
-    const { tasks, form_component_values } = instanceDetail;
     let data = {
       processCode: '',
       deptId: '14169890',
       userId: '16569001414345099',
-      formComponentValues: form_component_values?.filter(item => item.name),
+      formComponentValues: [],
       activityId: '',
       status: version.active_audit,
     };
-    if (version?.flow_id && tasks?.length > 0) {
+    if (version?.flow_id && instanceDetail.tasks && instanceDetail.tasks?.length > 0) {
       let item = flowDetail.nodes.find(item => item.Id == version.template_node_id);
       if (!item) return data;
+      const { tasks, form_component_values } = instanceDetail;
       data.processCode = item.process_code;
       data.activityId = tasks[tasks.length - 1]?.activity_id;
+      data.formComponentValues = form_component_values?.filter(item => item.name);
     }
     console.log('====================auditDetail ', data);
     return data;

+ 1 - 1
src/pages/PurchaseAdmin/PurchaseList/Detail/models/detail.js

@@ -75,7 +75,7 @@ export default {
     authority: [],
     versionTree: [],
     auditExcel: [],
-    dingInstanceDetail: [],
+    dingInstanceDetail: {},
   },
 
   effects: {