Renxy 2 лет назад
Родитель
Сommit
979832fd90

+ 4 - 2
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>
   );
 };

+ 57 - 34
src/pages/ContractManager/component/Modal.jsx

@@ -60,6 +60,8 @@ export const Status = {
   CalCheckSuccess: 6,
 };
 
+let isInLine = location.host.includes('120.55.44.4');
+
 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: 'TextField_f73531d8-c2c0-4769-a8ef-68b2eae2dc3a',
+          type: 'TextField',
+          value: ['1'],
+        },
+        {
+          name: '是否本部',
+          id: 'DDSelectField_4ad8bda8-60ce-428b-88a3-bf1a18c24a50',
+          type: 'DDSelectField',
+          value: ['是'],
+        },
+        {
+          name: '合同归档部门',
+          id: 'DDSelectField_3b661423-9fb8-4498-9eda-bcadf2d98473',
+          type: 'DDSelectField',
+          value: ['财务部'],
+        },
+        {
+          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) {

+ 0 - 1
src/pages/ContractManager/index.jsx

@@ -566,7 +566,6 @@ const ConteactManager = (props) => {
             setDetail({});
             setVisible(true);
           }}
-          disabled
         >
           新增
         </Button>