fix: 资源路径调整

hx-op/src/view/organizationManage/enterpriseManage/config.ts

@@ -9,7 +9,13 @@ import { enterPrise } from '/@/api/origanizemanage';
 type status = 'NORMAL' | 'FREEZE';
 export const formConfig = [
   {
-    field: 'projectId',
+    field: 'orgId',
+    label: '企业ID',
+    component: 'NsInput',
+    show: false,
+  },
+  {
+    field: 'orgCode',
     label: '组织ID',
     component: 'NsInput',
     componentProps: {
@@ -18,29 +24,21 @@ export const formConfig = [
     rules: [
       {
         required: true,
-        message: '请输入组织编号',
-        trigger: 'blur',
       },
     ],
   },
   {
-    field: 'jituanname',
+    field: 'orgName',
     label: '企业名称',
     component: 'NsInput',
     componentProps: {
-      placeholder: '请输入企业名称',
+      placeholder: '请输入',
       maxLength: 20,
     },
-    rules: [
-      {
-        required: true,
-        message: '请输入企业名称',
-        trigger: 'blur',
-      },
-    ],
+    rules: [{ required: true }],
   },
   {
-    field: 'jituanname',
+    field: 'cliqueName',
     label: '集团名称',
     component: 'NsInput',
     componentProps: {
@@ -52,10 +50,11 @@ export const formConfig = [
     field: 'cityName',
     label: '省市区',
     component: 'NsCascader',
+    fieldMap: ['province', 'city', 'county'],
     componentProps: {
       placeholder: '请选择',
       api: enterPrise.getArea,
-      fieldNames: { label: 'regionName', value: 'regionCode' },
+      fieldNames: { label: 'regionName', value: 'regionName' },
       showSearch: true,
     },
     rules: [
@@ -104,11 +103,24 @@ export const formConfig = [
         message: '请输入联系电话',
         trigger: 'blur',
       },
+      {
+        pattern: /^1[3-9]\d{9}$/,
+        message: '请输入正确的联系电话',
+        trigger: 'blur',
+      },
     ],
   },
 ];
 
-export const tableConfig = (visible) => {
+export const tableConfig = ({
+  visible,
+  formData,
+  opType,
+  getOrgRandomCode,
+  borderVisible,
+  serviceVisible,
+  server: { getTree },
+}: any) => {
   return {
     // title: '企业管理',
     api: enterPrise.list,
@@ -118,6 +130,9 @@ export const tableConfig = (visible) => {
         name: 'RoleTypeAdd',
         type: 'primary',
         handle: () => {
+          formData.value = {};
+          opType.value = 'add';
+          getOrgRandomCode && getOrgRandomCode();
           visible.value = true;
         },
       },
@@ -135,15 +150,19 @@ export const tableConfig = (visible) => {
       },
       {
         title: '组织ID',
-        dataIndex: 'projectId',
+        dataIndex: 'orgCode',
       },
       {
         title: '集团名称',
         dataIndex: 'cliqueName',
+        textNumber: 8,
+        textEllipsis: true,
       },
       {
         title: '组织名称',
         dataIndex: 'orgName',
+        textNumber: 8,
+        textEllipsis: true,
       },
       {
         title: '状态',
@@ -157,12 +176,16 @@ export const tableConfig = (visible) => {
         dataIndex: 'area',
         customRender: ({ record }) => {
           const { province = '', city = '', county = '' } = record;
-          return `${province}/${city}/${county}`;
+          const result = [province, city];
+          county && result.push(county);
+          return result.join('/');
         },
       },
       {
         title: '地址',
         dataIndex: 'address',
+        textNumber: 8,
+        textEllipsis: true,
       },
       {
         title: '联系人',
@@ -181,12 +204,11 @@ export const tableConfig = (visible) => {
           label: '编辑',
           name: 'RoleTypeEdit',
           handle: (record: any) => {
-            console.log(record, 'record');
+            const { province, city, county } = record;
             formData.value = record;
-            opMap.type = 'edit';
-            opMap.fuc = (formData: any) => {
-              Object.assign(mockData.value.filter((item) => item.id === record.id)[0], formData);
-            };
+            formData.value.cityName = [province, city];
+            county && formData.value.cityName.push(county);
+            opType.value = 'edit';
             visible.value = true;
           },
         },
@@ -201,6 +223,8 @@ export const tableConfig = (visible) => {
           label: '服务',
           handle: (record: any) => {
             console.log(record, 'record');
+            const { projectId } = record;
+            getTree({ projectId: 'beijingDQ' });
             serviceVisible.value = true;
           },
         },
@@ -278,28 +302,19 @@ export const tableConfig = (visible) => {
     formConfig: {
       schemas: [
         {
-          field: 'zuzhibianhao',
+          field: 'orgCode',
           label: '组织ID',
           component: 'NsInput',
-          componentProps: {
-            maxLength: 20,
-          },
         },
         {
-          field: 'jituanname',
+          field: 'cliqueName',
           label: '集团名称',
           component: 'NsInput',
-          componentProps: {
-            maxLength: 20,
-          },
         },
         {
-          field: 'zuzhiname',
+          field: 'orgName',
           label: '组织名称',
           component: 'NsInput',
-          componentProps: {
-            maxLength: 20,
-          },
         },
         {
           field: 'status',