调整数据源配置、机构管理、服务指令同步机构获取相关逻辑

src/views/monitor/datasource/DataSourceDrawer.vue

@@ -1,13 +1,6 @@
 <template>
-  <BasicDrawer
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" :title="getTitle" :width="adaptiveWidth" @ok="handleSubmit"
-    v-bind="$attrs"
+    :showFooter="showFooter" destroyOnClose>
-    @register="registerDrawer"
-    :title="getTitle"
-    :width="adaptiveWidth"
-    @ok="handleSubmit"
-    :showFooter="showFooter"
-    destroyOnClose
-  >
     <BasicForm @register="registerForm">
       <template #pwd="{ model, field }">
         <a-row :gutter="8">
@@ -20,7 +13,8 @@
         </a-row>
       </template>
       <template #departSelect="{ model, field }">
-        <a-select v-model:value="model[field]" :disabled="model['id']!=null" @change="(value,option) => handleChange(value,model)">
+        <a-select v-model:value="model[field]" :disabled="model['id'] != null"
+          @change="(value, option) => handleChange(value, model)" :allowClear="true">
           <template v-for="item in departOptions" :key="`${item.code}`">
             <a-select-option :value="item.code" :label="item.departName">
               {{ item.departName }}
@@ -139,6 +133,4 @@
 
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/views/monitor/datasource/DataSourceModal.vue

@@ -12,7 +12,8 @@
         </a-row>
       </template>
       <template #departSelect="{ model, field }">
-        <a-select v-model:value="model[field]" :disabled="model['id']!=null" @change="(value,option) => handleChange(value,model)">
+        <a-select v-model:value="model[field]" :disabled="model['id'] != null"
+          @change="(value, option) => handleChange(value, model)" :allowClear="true">
           <template v-for="item in departOptions" :key="`${item.code}`">
             <a-select-option :value="item.code" :label="item.departName">
               {{ item.departName }}

src/views/monitor/datasource/datasource.api.ts

@@ -13,6 +13,7 @@ enum Api {
   getByCode = '/sys/dataSource/queryBySysOrgCode',
   // exportXlsUrl = 'sys/dataSource/exportXls',
   // importExcelUrl = 'sys/dataSource/importExcel',
+  validCode = '/sys/dataSource/validCode',
 }
 // /**
 //  * 导出api
@@ -99,3 +100,8 @@ export const queryDeparts = (params) => {
 export const getDataSourceByCode = (params) => {
   return defHttp.get({ url: Api.getByCode, params });
 };
+
+
+export const validCode = (params) => {
+  return defHttp.get({ url: Api.validCode, params });
+};

src/views/monitor/datasource/datasource.data.ts

@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { validCode } from './datasource.api'
 
 const dbDriverMap = {
   // MySQL 数据库
@@ -69,6 +70,12 @@ const dbUrlMap = {
 };
 
 export const columns: BasicColumn[] = [
+  {
+    title: '数据源名称',
+    dataIndex: 'name',
+    width: 150,
+    align: 'left',
+  },
   {
     title: '所属机构',
     dataIndex: 'sysOrgCode_dictText',
@@ -81,12 +88,6 @@ export const columns: BasicColumn[] = [
     width: 150,
     align: 'left',
   },
-  {
-    title: '数据源名称',
-    dataIndex: 'name',
-    width: 150,
-    align: 'left',
-  },
   {
     title: '数据库类型',
     dataIndex: 'dbType_dictText',
@@ -143,11 +144,17 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     show: false,
   },
+  {
+    field: 'name',
+    label: '数据源名称',
+    component: 'Input',
+    required: true,
+  },
   {
     field: 'sysOrgCode',
     label: '所属机构',
     component: 'Input',
-    required: true,
+    required: false,
     slot: 'departSelect',
   },
   {
@@ -155,13 +162,24 @@ export const formSchema: FormSchema[] = [
     label: '数据源编码',
     component: 'Input',
     required: true,
-    dynamicDisabled: true
+    dynamicDisabled: (val) => {
+      return !!val.model.sysOrgCode;
     },
-  {
+    // dynamicDisabled:true,
-    field: 'name',
+    // rules: [
-    label: '数据源名称',
+    //   {
-    component: 'Input',
+    //     validator: async (_, value) => {
-    required: true,
+    //       if (!value) return Promise.resolve();
+    //       const res = await validCode({code:value}); 
+
+    //       if (res == 'exist') {
+    //         return Promise.reject('编码已存在！');
+    //       }
+    //       return Promise.resolve();
+    //     },
+    //     trigger: 'blur',
+    //   }
+    // ]
   },
   {
     field: 'dbType',
@@ -230,7 +248,7 @@ export function useDataSourceFormSchema() {
       label: '数据源编码',
       component: 'Input',
       // required: true,
-      dynamicDisabled: true
+      dynamicDisabled: true,
     },
     {
       field: 'name',

src/views/synchronization/directive/index.vue

@@ -424,7 +424,7 @@ const handleResetOrg = () => {
 }
 
 onMounted(() => {
-    queryDepartTreeSync().then(res => {
+    queryDepartTreeSync({platType:'ywjg'}).then(res => {
         orgTable.value = res;
     });
 });

src/views/system/depart/components/DepartFormModal.vue

@@ -48,6 +48,10 @@
           treeData: props.rootTreeData,
         },
       },
+      {
+        field: 'platType',
+        show: !isChild
+      },
       {
         field: 'orgCode',
         show: false,

src/views/system/depart/depart.data.ts

@@ -37,10 +37,10 @@ export function useBasicFormSchema() {
       componentProps: { options: [] },
     },
     {
-      field: 'platType_dictText',
+      field: 'platType',
       label: '业务平台类型',
+      defaultValue:'ywjg',
       component: 'JDictSelectTag',
-      defaultValue:"ywjg",
       componentProps: {
         dictCode: 'iz_test_site'
       },