Procházet zdrojové kódy

Squashed commit of the following:
merge devlop_audit_flow
commit 69a66acf5daa1cf9fb163906c05f590de1577065
Author: Renxy <18510891294@163.com>
Date: Wed Sep 14 18:10:28 2022 +0800

修改绑定的审批流没有表单审批人不显示

commit 2052d5e7a99cb8f88e65801c83822d151786283a
Author: Renxy <18510891294@163.com>
Date: Tue Sep 13 14:26:58 2022 +0800

删除log

commit 1874ce7eb618d4dd2ee2a0985b3a3cc63c8c9715
Author: Renxy <18510891294@163.com>
Date: Tue Sep 13 14:24:54 2022 +0800

修复发起人选技术一部时由于id和某个人人的id相同导致的显示不对问题

commit ffc6ceb0e3c1ff4477fd10c29dce34d994be2e9d
Author: Renxy <18510891294@163.com>
Date: Thu Sep 8 17:03:10 2022 +0800

优化审批表单计算流程样式

Renxy před 2 roky
rodič
revize
83407d56b0

+ 2 - 2
src/components/Flow/node/auditNode/index.tsx

@@ -26,7 +26,7 @@ const CustomRect = props => {
       let name = '';
       for (let i = 0; i < data.length; i++) {
         let item = data[i];
-        if (item.ID == id) {
+        if (item.id == id) {
           return item.title;
         } else if (item.children?.length > 0) {
           let title = getName(id, item.children);
@@ -39,7 +39,7 @@ const CustomRect = props => {
       if (initiator?.length > 0) {
         const list = initiator
           .map(item => {
-            return getName(item.value, depUserTree);
+            return getName(item.origin, depUserTree);
           })
           .filter(item => item);
         return list.join(',');

+ 3 - 21
src/pages/PurchaseAdmin/PurchaseList/Detail/CommitAuditModal.js

@@ -198,25 +198,6 @@ function CommitAuditModal(props) {
       next_template_id: version.template_id,
       form_list: formList,
     };
-
-    const ddd = {
-      '778': [
-        { type: 'user', value: 448, origin: 0 },
-        { type: 'role', value: 82, origin: 0 },
-        { type: 'role', value: 61, origin: 0 },
-      ],
-      '791': [
-        { type: 'user', value: 448, origin: 0 },
-        { type: 'role', value: 82, origin: 0 },
-        { type: 'role', value: 61, origin: 0 },
-      ],
-      '792': [
-        { type: 'user', value: 448, origin: 0 },
-        { type: 'role', value: 82, origin: 0 },
-        { type: 'role', value: 29, origin: 0 },
-      ],
-    };
-
     dispatch({
       type: 'detail/advanceSubmitNextNode',
       payload: params, //values,
@@ -283,13 +264,14 @@ function CommitAuditModal(props) {
             })
             .filter(item => item);
           if (getReComputeAudit(items, changedValues)) advanceSubmit();
-          console.log('==================================', { ...formComponentValues });
+          // console.log('==================================', { ...formComponentValues });
           setFormComponentValues({ ...formComponentValues });
         },
       })(AuditDetailed);
       item.FormComponents = <Components items={item.items} />;
     });
     setAuditList(addAuditList);
+    advanceSubmit();
   };
 
   const getFromData = async idList => {
@@ -528,7 +510,7 @@ function CommitAuditModal(props) {
             <Row>
               <Col span={17}>{item.FormComponents}</Col>
               <Col offset={1} span={4}>
-                {!formComponentValues[item.nodeId] || !approvalProcess[item.nodeId] ? (
+                {!approvalProcess[item.nodeId] ? ( //!formComponentValues[item.nodeId] ||
                   <Empty description="请先填写表单" />
                 ) : (
                   <ApprovalProcess