Ver Fonte

Squashed commit of the following:
merge
commit 268df583cd9a3da2590d6bc3474c2c6539d51a84
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 16:54:09 2023 +0800

修改项目接口

commit e52c9a5f2d65695e78b62ef288bde6b67845c9b3
Merge: bc4916b 949eef2
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 15:55:35 2023 +0800

Merge branch 'master' into develop
解决冲突
# Conflicts:
# src/pages/Cad/components/CadOADetail.js

commit bc4916bbb2c50bcc02a1468dc6992fc248e92ca9
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 15:12:37 2023 +0800

修改url

commit 04540d19c6cdd277570ff1d3c72e0d1678d915d3
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 15:06:47 2023 +0800

修改url

commit b633368b1438411d08ec3ed2c79ceb0df8caff8c
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 14:51:08 2023 +0800

Squashed commit of the following:
merge
commit 67c1c249be25266e723c85d0528c4a763faa9cd7
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 14:49:14 2023 +0800

修改路由

commit 15967b6a4cf9296166be9d7db40292a111b1b18d
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 14:25:48 2023 +0800

修改域名

commit ba0dd0d66eea0b451a292c64480cfa31ef2c2fa5
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 09:22:21 2023 +0800

Squashed commit of the following:
cad
commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
Author: Renxy <18510891294@163.com>
Date: Wed Dec 13 09:58:52 2023 +0800

上传图纸添加path字段

commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:34:30 2023 +0800

修改bug

commit 44539389d68a26a8e5484d403694d8d1ccd30093
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:02:44 2023 +0800

修改bug

commit b4798de286df4e15cd179483a1595282e48b468f
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 16:36:31 2023 +0800

修改cadbug

commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 14:13:24 2023 +0800

创建子审批

commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 17:16:32 2023 +0800

update

commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
Merge: b2ba74b 879f068
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:17:58 2023 +0800

Merge branch 'cad' into develop
解决冲突
# Conflicts:
# src/pages/Home/index.js

commit 879f068f14d5e4fa58cb677a86a7b27021247882
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:15:05 2023 +0800

修改cad修改antd前缀

commit a63c9413d969e359e621ff32ccb5246b0e574416
Author: Renxy <18510891294@163.com>
Date: Thu Dec 7 17:48:01 2023 +0800

cad审批

# Conflicts:
# src/pages/Cad/components/CreateChildrenModal.js
# src/pages/Cad/components/CreateModal.js

commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
Author: Renxy <18510891294@163.com>
Date: Wed Dec 13 09:58:52 2023 +0800

上传图纸添加path字段

commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:34:30 2023 +0800

修改bug

commit 44539389d68a26a8e5484d403694d8d1ccd30093
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:02:44 2023 +0800

修改bug

commit b4798de286df4e15cd179483a1595282e48b468f
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 16:36:31 2023 +0800

修改cadbug

commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 14:13:24 2023 +0800

创建子审批

commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 17:16:32 2023 +0800

update

commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
Merge: b2ba74b 879f068
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:17:58 2023 +0800

Merge branch 'cad' into develop
解决冲突
# Conflicts:
# src/pages/Home/index.js

commit 879f068f14d5e4fa58cb677a86a7b27021247882
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:15:05 2023 +0800

修改cad修改antd前缀

commit a63c9413d969e359e621ff32ccb5246b0e574416
Author: Renxy <18510891294@163.com>
Date: Thu Dec 7 17:48:01 2023 +0800

cad审批

Renxy há 1 ano atrás
pai
commit
8dcd6fc3fe
3 ficheiros alterados com 17 adições e 26 exclusões
  1. 11 23
      src/pages/Cad/components/CreateModal.js
  2. 2 0
      src/pages/Cad/detail.js
  3. 4 3
      src/pages/Cad/index.js

+ 11 - 23
src/pages/Cad/components/CreateModal.js

@@ -24,7 +24,7 @@ const advance = {
 };
 const formItemValues = [
   {
-    name: '是否PID图平面图',
+    name: '是否PID图平面图',
     id: 'DDSelectField_b8169258-d569-442e-a7b0-e2bd171aaac2',
     type: 'DDSelectField',
     value: [],
@@ -85,27 +85,6 @@ const CreateModal = ({
     },
   );
 
-  // function dwgUpload() {
-  //   let uploadDwg = document.getElementById('uploadDwg');
-  //   uploadDwg.click();
-  // }
-
-  // function uploadDwg(event) {
-  //   const selectedFile = event.target.files[0];
-  //   if (selectedFile) {
-  //     setUpLoading(true);
-  //     ZwCloud2D.ZwDataProcessor.uploadDwg(selectedFile).then((res) => {
-  //       if (res.code == 200) {
-  //         const oldPath = form.getFieldValue('cad_path');
-  //         const cad_path = oldPath
-  //           ? oldPath + ',' + res.data.path
-  //           : res.data.path;
-  //         form.setFieldsValue({ cad_path });
-  //       }
-  //       setUpLoading(false);
-  //     });
-  //   }
-  // }
   const UploadProps = {
     action: `https://cad.greentech.com.cn/sdk/doc/upload`,
     multiple: true,
@@ -171,7 +150,16 @@ const CreateModal = ({
               label="所属项目:"
               rules={[{ required: true }]}
             >
-              <Select options={projectList} />
+              <Select
+                showSearch
+                allowClear
+                options={projectList}
+                filterOption={(input, option) =>
+                  (option?.label ?? '')
+                    .toLowerCase()
+                    .includes(input.toLowerCase())
+                }
+              />
             </Form.Item>
             <Form.Item
               name="dir_id"

+ 2 - 0
src/pages/Cad/detail.js

@@ -9,6 +9,8 @@ const CadDeTail = () => {
     state: { path },
   } = location;
 
+  console.log('-----path-------', path);
+
   useEffect(() => {
     const content = document.getElementById('container');
     ZwCloud2D.ZwEditor.ZwInit(content);

+ 4 - 3
src/pages/Cad/index.js

@@ -12,6 +12,7 @@ import CreateModal from './components/CreateModal';
 import { createAduit } from '@/services/boom';
 import CreateChildrenModal from './components/CreateChildrenModal';
 import { queryCreateCadVer } from '../../services/cad';
+import { queryApprovalProject } from '@/services/contract';
 
 const CadDemo = () => {
   let navigate = useNavigate();
@@ -100,10 +101,10 @@ const CadDemo = () => {
     },
   ];
 
-  const { data: projectList } = useRequest(queryProject, {
+  const { data: projectList } = useRequest(queryApprovalProject, {
     formatResult: (res) => {
-      return res?.data?.list?.map((item) => {
-        return { label: item.Name, value: item.ID };
+      return res?.data?.map((item) => {
+        return { label: item.project_name, value: item.project_full_code };
       });
     },
   });