提交流转添加字段audit_series，添加loading

config/config.js

@@ -140,10 +140,10 @@ export default {
   chainWebpack: webpackPlugin,
   proxy: {
     '/api': {
-      // target: 'http://192.168.20.152:8888/',
-      target: 'http://120.55.44.4:8896/',
+      // target: 'http://192.168.20.53:8888/',
+      // target: 'http://120.55.44.4:8896/',
       // target: 'http://47.96.12.136:8888/',
-      // target: 'http://47.96.12.136:8896/',
+      target: 'http://47.96.12.136:8896/',
       // target: 'http://oraysmart.com:8889/',
       // target: 'http://oraysmart.com:8888/api',
       // changeOrigin: true,

src/pages/Detail/CommitAuditModal.js

@@ -33,6 +33,7 @@ import { getCurrentUser } from '@/utils/authority';
 import DDCode from '@/components/DDComponents/DDCode';
 import { uploadFile, queryUserListByRoleID } from '@/services/boom';
 import ApprovalProcess from './ApprovalProcess';
+import { uuidv4 } from '@antv/xflow';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -68,31 +69,32 @@ function CommitAuditModal(props) {
   useEffect(() => {
     if (!visible) return;
     const { edges, nodes } = flowDetail;
-    initFormList().then(approvalProcess => {
-      let Id = version.template_node_id;
-      const currentId = flowDetail.nodes.find?.(item => item.Id == Id)?.node_id;
-      const data = treeData(currentId);
-      if (data.length <= 0) {
-        setAuditId(currentId);
+    // initFormList().then(approvalProcess => {
+    let Id = version.template_node_id;
+    const currentId = flowDetail.nodes.find?.(item => item.Id == Id)?.node_id;
+    const data = treeData(currentId);
+    if (data.length <= 0) {
+      setAuditId(currentId);
+    } else {
+      let defaultValues = {};
+      if (data.length == 1) {
+        let value = getDataValue(data[0]);
+        defaultValues[`circle`] = value;
       } else {
-        let defaultValues = {};
-        if (data.length == 1) {
-          let value = getDataValue(data[0]);
-          defaultValues[`circle`] = value;
-        } else {
-          data.forEach((item, index) => {
-            let value = getDataValue(item);
-            defaultValues[`circle${index}`] = value;
-          });
-        }
-        // 设置延迟，等待组件渲染
-        setTimeout(() => {
-          form.setFieldsValue(defaultValues);
-          Object.values(defaultValues).forEach(value => onChange(value, approvalProcess || {}));
-        }, 200);
+        data.forEach((item, index) => {
+          let value = getDataValue(item);
+          defaultValues[`circle${index}`] = value;
+        });
       }
-      setData(data);
-    });
+      // 设置延迟，等待组件渲染
+      setTimeout(async () => {
+        form.setFieldsValue(defaultValues);
+        const approvalProcess = await initFormList();
+        Object.values(defaultValues).forEach(value => onChange(value, approvalProcess || {}));
+      }, 200);
+    }
+    setData(data);
+    // });
   }, [version.template_node_id, visible]);
 
   useEffect(() => {
@@ -107,22 +109,6 @@ function CommitAuditModal(props) {
     });
     if (res.data) {
       const formList = JSON.parse(res.data.json);
-
-      // const defaultApproval = {};
-      // formList.forEach(item => {
-      //   const curItem = JSON.parse(item);
-      //   const audit_list = curItem.audit_list.map(audit => {
-      //     return [{ type: 'user', value: audit, name: null }];
-      //   });
-      //   defaultApproval[curItem.template_node_id] = audit_list;
-      // });
-      // const defaultFormData = {};
-      // formList.forEach(item => {
-      //   const curItem = JSON.parse(item);
-      //   defaultFormData[curItem.template_node_id] = curItem.formComponentValues;
-      // });
-      // console.log('========defaultApproval==============', defaultApproval);
-      // console.log('========defaultFormData==============', defaultFormData);
       setApprovalProcess(formList.approvalProcess || {});
       return formList.approvalProcess;
       // setFormComponentValues(defaultFormData);
@@ -488,8 +474,9 @@ function CommitAuditModal(props) {
     await querySaveBomForm({
       project_id: version.project_id,
       node_id: version.template_node_id,
-      json: JSON.stringify({approvalProcess}),
+      json: JSON.stringify({ approvalProcess }),
     });
+    params.audit_series = uuidv4();
     onOk(params);
   };
   const CascaderNode = index => {

src/pages/Flow/Audit.js

@@ -23,6 +23,7 @@ function Audit(props) {
     flowDetail,
     simpleFlowDteail,
     currentUser,
+    loading,
   } = props;
   const ref = useRef();
   const permission = currentUser.Permission;
@@ -111,6 +112,7 @@ function Audit(props) {
         </TabPane>
       </Tabs>
       <Button
+        loading={loading['flow/saveAuditFlowInfo']}
         type="primary"
         onClick={handleSaveClick}
         style={{ position: 'absolute', right: 0, top: 0 }}
@@ -123,7 +125,7 @@ function Audit(props) {
 export default connect(({ flow, loading, user, xflow }) => ({
   roleList: flow.roleList,
   currentItem: flow.current,
-  loading: loading.models.purchaseList2,
+  loading: loading.effects,
   formItems: xflow.formData,
   flowDetail: flow.flowDetail,
   formData: flow.formData,

src/pages/Flow/AuditList.js

@@ -9,7 +9,7 @@ import router from 'umi/router';
 const { Option } = Select;
 
 function Audit(props) {
-  const { userList, list = [], dispatch } = props;
+  const { userList, list = [], dispatch, loading } = props;
   const [form] = Form.useForm();
   const [visible, setVisible] = useState({
     audit: false,
@@ -81,8 +81,14 @@ function Audit(props) {
         </Form>
       </div>
 
-      <Table rowKey="id" dataSource={list} columns={columns} />
+      <Table
+        loading={loading['flow/queryAuditList']}
+        rowKey="id"
+        dataSource={list}
+        columns={columns}
+      />
       <AuditModal
+        loading={loading['flow/addAudit']}
         visible={visible.audit}
         onOk={handleAuditOk}
         onCancel={() => changeVisible('audit', false)}
@@ -93,5 +99,5 @@ function Audit(props) {
 export default connect(({ user, flow, loading }) => ({
   userList: user.list,
   list: flow.auditList,
-  loading: loading.models.purchaseList2,
+  loading: loading.effects,
 }))(Audit);

src/pages/Flow/List.js

@@ -8,7 +8,7 @@ import Link from 'umi/link';
 const { Option } = Select;
 
 function List(props) {
-  const { userList, list, dispatch, projectList, permission, currentUser } = props;
+  const { userList, list, dispatch, projectList, permission, currentUser, loading } = props;
   const [visible, setVisible] = useState(false);
   const columns = [
     {
@@ -82,6 +82,7 @@ function List(props) {
       <Table rowKey="Id" dataSource={list} columns={columns} />
 
       <FlowModal
+        loading={loading['flow/addFlow']}
         visible={visible}
         projectList={projectList}
         onCancel={() => setVisible(false)}
@@ -96,5 +97,5 @@ export default connect(({ user, flow, loading }) => ({
   currentUser: user.currentUser,
   list: flow.flowList,
   projectList: flow.projectList,
-  loading: loading.models.purchaseList2,
+  loading: loading.effects,
 }))(List);