소스 검색

修改统一用47

Renxy 1 년 전
부모
커밋
d527e2d6b0
2개의 변경된 파일37개의 추가작업 그리고 66개의 파일을 삭제
  1. 29 60
      src/pages/ContractManager/component/Modal.jsx
  2. 8 6
      src/pages/ContractManager/index.jsx

+ 29 - 60
src/pages/ContractManager/component/Modal.jsx

@@ -61,14 +61,10 @@ export const Status = {
   CalCheckSuccess: 6,
 };
 
-let isInLine = location.host.includes('work.greentech.com');
-
 const ContractModal = (props) => {
   const [form] = Form.useForm();
-  const {
-    initialState,
-  } = useModel('@@initialState');
-  const user = initialState?.user || {}
+  const { initialState } = useModel('@@initialState');
+  const user = initialState?.user || {};
   const { userList, run: userListRun } = useModel('userList');
   const { depList, run: depListRun } = useModel('depList');
   const [auditList, setAuditList] = useState([]);
@@ -118,63 +114,36 @@ const ContractModal = (props) => {
   const parent_code = Form.useWatch('parent_code', form);
 
   //审批流拼接
-  const formData = isInLine
-    ? [
-        {
-          name: '是否本部',
-          id: 'DDSelectField_4ad8bda8-60ce-428b-88a3-bf1a18c24a50',
-          type: 'DDSelectField',
-          value: ['是'],
-        },
-        {
-          name: '合同归档部门',
-          id: 'DDSelectField_3b661423-9fb8-4498-9eda-bcadf2d98473',
-          type: 'DDSelectField',
-          value: ['财务部'],
-        },
-        {
-          name: '合同编码',
-          id: 'TextField_f73531d8-c2c0-4769-a8ef-68b2eae2dc3a',
-          type: 'TextField',
-          value: ['1'],
-        },
-        {
-          name: '提审类型',
-          id: 'DDSelectField_bed77d5f-d02c-4f1d-98bf-0638245a3331',
-          type: 'DDSelectField',
-          value: ['1'],
-        },
-      ]
-    : [
-        {
-          name: '是否本部',
-          id: 'DDSelectField_4fbddb04-9b4f-4281-991b-5047f835fb9d',
-          type: 'DDSelectField',
-          value: ['是'],
-        },
-        {
-          name: '合同归档部门',
-          id: 'DDSelectField_1235c6b9-9d74-4856-a62d-6ca1bb9716a6',
-          type: 'DDSelectField',
-          value: ['财务部'],
-        },
-        {
-          name: '合同编码',
-          id: 'TextField_1a01000b-4458-4dfb-bd13-74a74e7a33e5',
-          type: 'TextField',
-          value: ['1'],
-        },
-        {
-          name: '提审类型',
-          id: 'DDSelectField_c79e124c-c933-4ea1-b799-faceaf830a9b',
-          type: 'DDSelectField',
-          value: ['1'],
-        },
-      ];
+  const formData = [
+    {
+      name: '是否本部',
+      id: 'DDSelectField_4ad8bda8-60ce-428b-88a3-bf1a18c24a50',
+      type: 'DDSelectField',
+      value: ['是'],
+    },
+    {
+      name: '合同归档部门',
+      id: 'DDSelectField_3b661423-9fb8-4498-9eda-bcadf2d98473',
+      type: 'DDSelectField',
+      value: ['财务部'],
+    },
+    {
+      name: '合同编码',
+      id: 'TextField_f73531d8-c2c0-4769-a8ef-68b2eae2dc3a',
+      type: 'TextField',
+      value: ['1'],
+    },
+    {
+      name: '提审类型',
+      id: 'DDSelectField_bed77d5f-d02c-4f1d-98bf-0638245a3331',
+      type: 'DDSelectField',
+      value: ['1'],
+    },
+  ];
 
   //计算审批流数据
   const advance = {
-    flow_id: isInLine ? 47 : 40,
+    flow_id: 47,
     form_list: null,
     // node_level_id:0,
     // id:0,

+ 8 - 6
src/pages/ContractManager/index.jsx

@@ -44,10 +44,8 @@ const ConteactManager = (props) => {
     current: 1,
     name: '',
   });
-  const {
-    initialState,
-  } = useModel('@@initialState');
-  const user = initialState?.user || {}
+  const { initialState } = useModel('@@initialState');
+  const user = initialState?.user || {};
   const [visible, setVisible] = useState(false);
   const [detail, setDetail] = useState({});
   const [data, setData] = useState([]);
@@ -345,7 +343,7 @@ const ConteactManager = (props) => {
 
   //发起OA审批
   const { run: createRun } = useRequest(
-    (data) => createAduit({ ...data, flow_id: 40, cc_list: [], files: '' }),
+    (data) => createAduit({ ...data, flow_id: 47, cc_list: [], files: '' }),
     {
       manual: true,
     },
@@ -569,7 +567,11 @@ const ConteactManager = (props) => {
           console.log(expanded, record);
           if (expanded) handleQueryChildren({ is_parent: record.id });
         }}
-        pagination={{ ...pagination, showSizeChanger: false, onChange: onPageChange }}
+        pagination={{
+          ...pagination,
+          showSizeChanger: false,
+          onChange: onPageChange,
+        }}
       />
       <ContractModal
         detail={detail}