Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

.env.development

@@ -10,7 +10,7 @@ VITE_PUBLIC_PATH = /
 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
 # 可以有多个，注意多个不能换行，否则代理将会失效
 #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY=[["/api","http://127.0.0.1:8090"]]
+VITE_PROXY=[["/api","http://10.10.2.102:9500"]]
 #VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
 #VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
 #VITE_PROXY=[["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api","http://10.10.2.102:9500"]]

src/views/system/department/components/DeptDrawer.vue

@@ -295,23 +295,7 @@
     ];
     const departmentSchema: FormSchema[] = [
         {
-            field: 'departmentNature',
+            title: '基础信息',
-            label: '部门性质',
-            component: 'ApiSelect',
-            colProps: { lg: 12, md: 12 },
-            componentProps: {
-                placeholder: '请选择部门性质',
-                api: getDicDetailList,
-                labelField: 'name',
-                valueField: 'id',
-                showSearch: true,
-                params: {
-                    itemId: '1739893799685373953'
-                },
-                getPopupContainer: () => document.body
-            }
-        },
-        {
             field: 'custodian',
             label: '负责人',
             component: 'Input',
@@ -408,6 +392,28 @@
         }
     ];
 
+    const systemSchema: FormSchema[] = [
+        {
+            title: '关联系统信息',
+            field: 'suCode',
+            label: '供应商编码',
+            component: 'Input',
+            colProps: { lg: 12, md: 12 },
+        },
+        {
+            field: 'cuCode',
+            label: '客户编码',
+            component: 'Input',
+            colProps: { lg: 12, md: 12 },
+        },
+        {
+            field: 'staCode',
+            label: '接收站编码',
+            component: 'Input',
+            colProps: { lg: 12, md: 12 },
+        },
+    ]
+
     const emit = defineEmits(['success', 'register']);
     const isUpdate = ref(true);
     const { notification } = useMessage();
@@ -415,7 +421,7 @@
 
     const [registerForm, { resetFields, setFieldsValue, updateSchema, validate, resetSchema }] = useForm({
         labelWidth: 100,
-        schemas: [...schema, ...companySchema],
+        schemas: [...schema, ...companySchema,...systemSchema],
         showActionButtonGroup: false,
         baseColProps: { lg: 12, md: 24 }
     });
@@ -434,7 +440,7 @@
             rowId.value = data.record.id;
             const info = await getDepartment(rowId.value);
             info.departmentLabel = info.departmentLabel?.split(',');
-            resetSchema(info.departmentType ? [...schema, ...companySchema] : [...schema, ...departmentSchema]);
+            resetSchema(info.departmentType ? [...schema, ...companySchema, ...systemSchema] : [...schema, ...departmentSchema, ...systemSchema]);
             setFieldsValue({
                 ...info
             });