Merge branch 'develop'

.umirc.ts

@@ -213,18 +213,18 @@ export default defineConfig({
       component: './PSRManage/detail',
       hideInMenu: true,
     },
-    // {
-    //   name: 'CAD实例',
-    //   path: '/cad',
-    //   component: './Cad',
-    //   icon: 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/doc/contract/2023-07-31/3f72fccf-4f9c-4891-a6ec-f04fe4b1d9a2.png',
-    // },
-    // {
-    //   name: 'CAD详情',
-    //   path: '/cad/detail',
-    //   component: './Cad/detail',
-    //   hideInMenu: true,
-    // },
+    {
+      name: 'CAD实例',
+      path: '/cad',
+      component: './Cad',
+      icon: 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/doc/contract/2023-07-31/3f72fccf-4f9c-4891-a6ec-f04fe4b1d9a2.png',
+    },
+    {
+      name: 'CAD详情',
+      path: '/cad/detail',
+      component: './Cad/detail',
+      hideInMenu: true,
+    },
   ],
   npmClient: 'yarn',
 });

src/components/DDComponents/index.js

@@ -137,9 +137,6 @@ export default function DDComponents(props) {
     case 'FormRelateField': //关联控件
       component = '关联控件未渲染!';
       break;
-    case 'CodeField': //合同编号控件
-      component = <CodeField depId={depId} />;
-      break;
   }
 
   return (

src/pages/ContractManager/component/Modal.jsx

@@ -289,7 +289,7 @@ const ContractModal = (props) => {
     //兼容之前选择的所属部门，用的现在的接口匹配不到部门显示数字的问题
     if (data?.company_id) {
       const deps = getDepItemById(data?.company_id)?.children;
-      setCompanyDepList(deps);
+      deps ? setCompanyDepList(deps) : setCompanyDepList([]);
     }
   }, [data, depList]);
 
@@ -625,7 +625,6 @@ const ContractModal = (props) => {
         onCancel={handleCancel}
         destroyOnClose
       >
-        <Divider />
         <Form
           form={form}
           // initialValues={data}

src/pages/Home/index.js

@@ -95,15 +95,15 @@ function HomePage(props) {
       },
       Icon: require('@/assets/UnityMenu/userCenter.png'),
     },
-    // {
-    //   id: 10,
-    //   name: 'cad管理',
-    //   active: true,
-    //   click: () => {
-    //     navigate('/cad');
-    //   },
-    //   Icon: require('@/assets/UnityMenu/cad.png'),
-    // },
+    {
+      id: 10,
+      name: 'cad管理',
+      active: true,
+      click: () => {
+        navigate('/cad');
+      },
+      Icon: require('@/assets/UnityMenu/cad.png'),
+    },
   ];
   return (
     <div className={menuStyle.background}>