2 年之前 · 3850b3d2fa
--- a/.umirc.ts
+++ b/.umirc.ts
@@ -14,11 +14,18 @@ export default defineConfig({
 
				   },
			
 
				   title: '金科环境数字化管理平台',
			
 
				   publicPath: process.env.NODE_ENV == 'development' ? '/' : '/gt-dig/',
			
 
				+  metas: [
			
 
				+    // 配置html禁止缓存
			
 
				+    { 'http-equiv': 'pragma', content: 'no-cache' },
			
 
				+    { 'http-equiv': 'cache-control', content: 'no-cache' },
			
 
				+    { 'http-equiv': 'expires', content: '0' },
			
 
				+    { 'http-equiv': 'X-UA-Compatible', content: 'IE=EmulateIE9' },
			
 
				+  ],
			
 
				   proxy: {
			
 
				     '/api': {
			
 
				       // target: 'http://47.96.12.136:8888/',
			
 
				       target: 'http://47.96.12.136:8895/',
			
 
				-      // target: 'http://120.55.44.4:8902/',
			
 
				+      // target: 'https://work.greentech.com.cn/',
			
 
				       changeOrigin: true,
			
 
				     },
			
 
				   },
			
--- a/src/components/FileViewerNew/index.js
+++ b/src/components/FileViewerNew/index.js
@@ -7,6 +7,7 @@ import { Modal, Table } from 'antd';
 
				 
			
 
				 const FileViewerModal = ({ data, visible, onCancel, downloadFile }) => {
			
 
				   const [img, setImg] = useState();
			
 
				+  const [open, setOpen] = useState(false);
			
 
				   useEffect(() => {
			
 
				     if (!visible) setImg(null);
			
 
				   }, [visible]);
			
@@ -66,7 +67,7 @@ const FileViewerModal = ({ data, visible, onCancel, downloadFile }) => {
 
				       </>
			
 
				     );
			
 
				   };
			
 
				-
			
 
				+  ////open && renderContent(data) 解决渲染的预览pdf宽高为空问题
			
 
				   return (
			
 
				     <Modal
			
 
				       destroyOnClose
			
@@ -76,8 +77,9 @@ const FileViewerModal = ({ data, visible, onCancel, downloadFile }) => {
 
				       footer={null}
			
 
				       onCancel={onCancel}
			
 
				       bodyStyle={{ height: '680px', overflowY: 'hidden' }}
			
 
				+      afterOpenChange={setOpen} //modal完全渲染完成之后的回调
			
 
				     >
			
 
				-      {Array.isArray(data) ? renderListContent() : renderContent(data)}
			
 
				+      {Array.isArray(data) ? renderListContent() : open && renderContent(data)}
			
 
				     </Modal>
			
 
				   );
			
 
				 };
			
--- a/src/pages/ContractManager/component/Modal.jsx
+++ b/src/pages/ContractManager/component/Modal.jsx
@@ -60,6 +60,8 @@ export const Status = {
 
				   CalCheckSuccess: 6,
			
 
				 };
			
 
				 
			
 
				+let isInLine = location.host.includes('work.greentech.com');
			
 
				+
			
 
				 const ContractModal = (props) => {
			
 
				   const [form] = Form.useForm();
			
 
				   const {
			
@@ -114,36 +116,63 @@ const ContractModal = (props) => {
 
				   const parent_code = Form.useWatch('parent_code', form);
			
 
				 
			
 
				   //审批流拼接
			
 
				-  const formData = [
			
 
				-    {
			
 
				-      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 = 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 advance = {
			
 
				-    flow_id: 40,
			
 
				+    flow_id: isInLine ? 47 : 40,
			
 
				     form_list: null,
			
 
				     // node_level_id:0,
			
 
				     // id:0,
			
@@ -348,13 +377,7 @@ const ContractModal = (props) => {
 
				 
			
 
				   //获取合同编号逻辑 只有新增才请求
			
 
				   useEffect(() => {
			
 
				-    if (
			
 
				-      //&& data?.status !== Status.ReCall
			
 
				-      type !== Type.add ||
			
 
				-      !company ||
			
 
				-      !dep_id
			
 
				-    )
			
 
				-      return;
			
 
				+    if (type !== Type.add || !company || !dep_id) return;
			
 
				     const item = companyData?.find((item) => item.ID == company);
			
 
				     const dep_code = getDepItemById(dep_id)?.Code;
			
 
				     if (item) {
			
@@ -626,7 +649,13 @@ const ContractModal = (props) => {
 
				               <Form.Item
			
 
				                 name="dep_id"
			
 
				                 label="所属部门："
			
 
				-                initialValue={data?.dep_id}
			
 
				+                initialValue={getDepItemById(data?.dep_id)?.Name}
			
 
				+                rules={[
			
 
				+                  {
			
 
				+                    required: true,
			
 
				+                    message: '请选择所属部门',
			
 
				+                  },
			
 
				+                ]}
			
 
				               >
			
 
				                 <TreeSelect
			
 
				                   style={{ width: '100%' }}
			
--- a/src/pages/ContractManager/index.jsx
+++ b/src/pages/ContractManager/index.jsx
@@ -1,4 +1,4 @@
 
				-import React, { useState, useRef, useEffect } from 'react';
			
 
				+import React, { useState, useRef, useEffect, useMemo } from 'react';
			
 
				 import {
			
 
				   Button,
			
 
				   DatePicker,
			
@@ -333,7 +333,7 @@ const ConteactManager = (props) => {
 
				       setVisible(false);
			
 
				       message.success('审核成功');
			
 
				     },
			
 
				-    onErroe: () => {
			
 
				+    onError: () => {
			
 
				       message.error('审核失败');
			
 
				     },
			
 
				   });
			
@@ -485,6 +485,7 @@ const ConteactManager = (props) => {
 
				           <Select
			
 
				             style={{ width: 200 }}
			
 
				             placeholder="请选择"
			
 
				+            allowClear
			
 
				             onChange={(e) => {
			
 
				               setSearchData({
			
 
				                 ...searchData,
			
--- a/src/pages/Profile/approve.js
+++ b/src/pages/Profile/approve.js
@@ -92,10 +92,77 @@ function Approve(props) {
 
				     data: conAuditData,
			
 
				     run: conAuditRun,
			
 
				     loading: conAduitLoading,
			
 
				-  } = useRequest((data) => queryGetContractList(data), {
			
 
				-    // manual: true,
			
 
				-    formatResult: contractResult,
			
 
				-  });
			
 
				+  } = useRequest(
			
 
				+    (data) => queryGetContractList({ ...data, is_parent: -1, page_size: 999 }),
			
 
				+    {
			
 
				+      // manual: true,
			
 
				+      formatResult: contractResult,
			
 
				+    },
			
 
				+  );
			
 
				+
			
 
				+  // //审核合同
			
 
				+  // const { run: runCheck, loading: checkLoading } = useRequest(
			
 
				+  //   (data) => queryContractCheck(data),
			
 
				+  //   {
			
 
				+  //     manual: true,
			
 
				+  //     onSuccess: () => {
			
 
				+  //       conAuditRun({ multi_status: '1,4', current: 1, page_size: 10 });
			
 
				+  //       // conAuditedRun({ check_by: user.CName });
			
 
				+  //       setConVisible(false);
			
 
				+  //       message.success('审核成功');
			
 
				+  //     },
			
 
				+  //     onErroe: () => {
			
 
				+  //       message.error('审核失败');
			
 
				+  //     },
			
 
				+  //   },
			
 
				+  // );
			
 
				+  // //作废审核
			
 
				+  // const { run: calCheckRun } = useRequest(
			
 
				+  //   (data) => queryContractCancelCheck(data),
			
 
				+  //   {
			
 
				+  //     manual: true,
			
 
				+  //     onSuccess: () => {
			
 
				+  //       message.success('审核成功');
			
 
				+  //       setConVisible(false);
			
 
				+  //       conAuditRun({ multi_status: '1,4', current: 1, page_size: 10 });
			
 
				+  //     },
			
 
				+  //     onError: () => {
			
 
				+  //       message.success('审核失败');
			
 
				+  //     },
			
 
				+  //   },
			
 
				+  // );
			
 
				+
			
 
				+  // //审核合同
			
 
				+  // const { run: runCheck, loading: checkLoading } = useRequest(
			
 
				+  //   (data) => queryContractCheck(data),
			
 
				+  //   {
			
 
				+  //     manual: true,
			
 
				+  //     onSuccess: () => {
			
 
				+  //       conAuditRun({ multi_status: '1,4', current: 1, page_size: 10 });
			
 
				+  //       // conAuditedRun({ check_by: user.CName });
			
 
				+  //       setConVisible(false);
			
 
				+  //       message.success('审核成功');
			
 
				+  //     },
			
 
				+  //     onErroe: () => {
			
 
				+  //       message.error('审核失败');
			
 
				+  //     },
			
 
				+  //   },
			
 
				+  // );
			
 
				+  // //作废审核
			
 
				+  // const { run: calCheckRun } = useRequest(
			
 
				+  //   (data) => queryContractCancelCheck(data),
			
 
				+  //   {
			
 
				+  //     manual: true,
			
 
				+  //     onSuccess: () => {
			
 
				+  //       message.success('审核成功');
			
 
				+  //       setConVisible(false);
			
 
				+  //       conAuditRun({ multi_status: '1,4', current: 1, page_size: 10 });
			
 
				+  //     },
			
 
				+  //     onError: () => {
			
 
				+  //       message.success('审核失败');
			
 
				+  //     },
			
 
				+  //   },
			
 
				+  // );
			
 
				 
			
 
				   // //审核合同
			
 
				   // const { run: runCheck, loading: checkLoading } = useRequest(