schema医院id属性抽出

src/commonSchemaProperty/index.ts

@@ -3,6 +3,7 @@
  */
 import * as DistributorApi from '/@/api/system/distributorApi';
 import get from 'lodash.get';
+import * as HospitalApi from '/@/api/system/hospitalApi';
 
 const getDistributorId = ({ colProps }) => {
   return {
@@ -30,4 +31,30 @@ const getDistributorId = ({ colProps }) => {
   };
 };
 
-export { getDistributorId };
+const getHospitalId = ({ colProps }) => {
+  return {
+    field: 'hospitalId',
+    label: '医院',
+    defaultValue: undefined,
+    form: {
+      componentProps: {
+        labelInValue: true,
+        api: HospitalApi.all,
+        params: {},
+        resultField: 'records',
+        labelField: 'name',
+        valueField: 'id',
+        allowClear: false,
+        placeholder: '医院',
+      },
+      colProps,
+      component: 'ApiSelect',
+      rules: [{ required: true, type: 'object', message: '请输入医院！' }],
+    },
+    table: {
+      customRender: ({ text, record }) => get(record, 'hospital.name') || text,
+    },
+  };
+};
+
+export { getDistributorId, getHospitalId };

src/views/order/operation-order/schema.ts

@@ -8,8 +8,7 @@
 
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import get from 'lodash.get';
-import * as HospitalApi from '/@/api/system/hospitalApi';
+import { getHospitalId } from '/@/commonSchemaProperty';
 
 export enum YesNoEnum {
   YES = '是',
@@ -56,8 +55,7 @@ export const schema = {
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入ID系统自动生成！' }],
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'distributorId',
@@ -72,8 +70,7 @@ export const schema = {
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入经销商id！' }],
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'orderSn',
@@ -88,8 +85,7 @@ export const schema = {
         component: 'Input',
         rules: [{ required: true, message: '请输入订单编号！' }],
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'productLineName',
@@ -103,31 +99,9 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
-    },
-    {
-      field: 'hospitalId',
-      label: '医院id',
-      defaultValue: undefined,
-      form: {
-        componentProps: {
-          labelInValue: true,
-          api: HospitalApi.all,
-          params: {},
-          resultField: 'records',
-          labelField: 'id',
-          valueField: 'id',
-          allowClear: true,
-          placeholder: '医院id',
-        },
-        colProps,
-        component: 'ApiSelect',
-      },
-      table: {
-        customRender: ({ text, record }) => get(record, 'hospital.name') || text,
-      },
+      table: {},
     },
+    getHospitalId({ colProps }),
     {
       field: 'saleUserId',
       label: '业务员id',
@@ -140,8 +114,7 @@ export const schema = {
         colProps,
         component: 'InputNumber',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'saleUserName',
@@ -155,8 +128,7 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'doctorId',
@@ -170,8 +142,7 @@ export const schema = {
         colProps,
         component: 'InputNumber',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'doctorName',
@@ -185,8 +156,7 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'surgicalName',
@@ -200,8 +170,7 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'surgicalTime',
@@ -217,8 +186,7 @@ export const schema = {
           showTime: true,
         },
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'deliveryTime',
@@ -234,8 +202,7 @@ export const schema = {
           showTime: true,
         },
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'needTool',
@@ -252,7 +219,7 @@ export const schema = {
       },
       table: {
         customRender: ({ text }) => {
-          const option = YesNoEnumOptions.find((item) => item.value === text)
+          const option = YesNoEnumOptions.find((item) => item.value === text);
           return option ? option.label : text;
         },
       },
@@ -269,8 +236,7 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'receiveName',
@@ -284,8 +250,7 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'receivePhone',
@@ -299,8 +264,7 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'address',
@@ -314,8 +278,7 @@ export const schema = {
         component: 'InputTextArea',
         colProps: { span: 24 },
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'status',
@@ -333,7 +296,7 @@ export const schema = {
       },
       table: {
         customRender: ({ text }) => {
-          const option = StatusEnumOptions.find((item) => item.value === text)
+          const option = StatusEnumOptions.find((item) => item.value === text);
           return option ? option.label : text;
         },
       },
@@ -354,7 +317,7 @@ export const schema = {
       },
       table: {
         customRender: ({ text }) => {
-          const option = YesNoEnumOptions.find((item) => item.value === text)
+          const option = YesNoEnumOptions.find((item) => item.value === text);
           return option ? option.label : text;
         },
       },
@@ -371,8 +334,7 @@ export const schema = {
         colProps,
         component: 'Input',
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'deleteStatus',
@@ -389,7 +351,7 @@ export const schema = {
       },
       table: {
         customRender: ({ text }) => {
-          const option = YesNoEnumOptions.find((item) => item.value === text)
+          const option = YesNoEnumOptions.find((item) => item.value === text);
           return option ? option.label : text;
         },
       },
@@ -407,8 +369,7 @@ export const schema = {
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入操作人ID！' }],
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'editorName',
@@ -423,8 +384,7 @@ export const schema = {
         component: 'Input',
         rules: [{ required: true, message: '请输入操作人！' }],
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'createTime',
@@ -441,8 +401,7 @@ export const schema = {
         component: 'RangePicker',
         rules: [{ required: true, message: '请输入CreateTime！' }],
       },
-      table: {
-      },
+      table: {},
     },
     {
       field: 'updateTime',
@@ -459,18 +418,116 @@ export const schema = {
         component: 'RangePicker',
         rules: [{ required: true, message: '请输入UpdateTime！' }],
       },
-      table: {
-      },
+      table: {},
     },
   ],
 };
 
-const queryFields = ['id','distributorId','orderSn','productLineName','hospitalId','saleUserId','saleUserName','doctorId','doctorName','surgicalName','surgicalTime','deliveryTime','needTool','logisticsMode','receiveName','receivePhone','status','type','remark','deleteStatus','editorId','editorName','createTime','updateTime'];
-const editFields = ['distributorId','orderSn','productLineName','hospitalId','saleUserId','saleUserName','doctorId','doctorName','surgicalName','surgicalTime','deliveryTime','needTool','logisticsMode','receiveName','receivePhone','address','status','type','remark','deleteStatus'];
-const tableFields = ['id','distributorId','orderSn','productLineName','hospitalId','saleUserId','saleUserName','doctorId','doctorName','surgicalName','surgicalTime','deliveryTime','needTool','logisticsMode','receiveName','receivePhone','address','status','type','remark','deleteStatus','editorId','editorName','createTime','updateTime'];
-const descriptionFields = ['id','distributorId','orderSn','productLineName','hospitalId','saleUserId','saleUserName','doctorId','doctorName','surgicalName','surgicalTime','deliveryTime','needTool','logisticsMode','receiveName','receivePhone','address','status','type','remark','deleteStatus','editorId','editorName','createTime','updateTime'];
+const queryFields = [
+  'id',
+  'distributorId',
+  'orderSn',
+  'productLineName',
+  'hospitalId',
+  'saleUserId',
+  'saleUserName',
+  'doctorId',
+  'doctorName',
+  'surgicalName',
+  'surgicalTime',
+  'deliveryTime',
+  'needTool',
+  'logisticsMode',
+  'receiveName',
+  'receivePhone',
+  'status',
+  'type',
+  'remark',
+  'deleteStatus',
+  'editorId',
+  'editorName',
+  'createTime',
+  'updateTime',
+];
+const editFields = [
+  'distributorId',
+  'orderSn',
+  'productLineName',
+  'hospitalId',
+  'saleUserId',
+  'saleUserName',
+  'doctorId',
+  'doctorName',
+  'surgicalName',
+  'surgicalTime',
+  'deliveryTime',
+  'needTool',
+  'logisticsMode',
+  'receiveName',
+  'receivePhone',
+  'address',
+  'status',
+  'type',
+  'remark',
+  'deleteStatus',
+];
+const tableFields = [
+  'id',
+  'distributorId',
+  'orderSn',
+  'productLineName',
+  'hospitalId',
+  'saleUserId',
+  'saleUserName',
+  'doctorId',
+  'doctorName',
+  'surgicalName',
+  'surgicalTime',
+  'deliveryTime',
+  'needTool',
+  'logisticsMode',
+  'receiveName',
+  'receivePhone',
+  'address',
+  'status',
+  'type',
+  'remark',
+  'deleteStatus',
+  'editorId',
+  'editorName',
+  'createTime',
+  'updateTime',
+];
+const descriptionFields = [
+  'id',
+  'distributorId',
+  'orderSn',
+  'productLineName',
+  'hospitalId',
+  'saleUserId',
+  'saleUserName',
+  'doctorId',
+  'doctorName',
+  'surgicalName',
+  'surgicalTime',
+  'deliveryTime',
+  'needTool',
+  'logisticsMode',
+  'receiveName',
+  'receivePhone',
+  'address',
+  'status',
+  'type',
+  'remark',
+  'deleteStatus',
+  'editorId',
+  'editorName',
+  'createTime',
+  'updateTime',
+];
 
-export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field))
+export const searchFormSchema: FormSchema[] = schema.properties
+  .filter((item) => queryFields.includes(item.field))
   .map(
     ({ field, label, form: { rules = [], ...formProps } }) =>
       ({
@@ -482,7 +539,8 @@ export const searchFormSchema: FormSchema[] = schema.properties.filter(item => q
       } as FormSchema),
   );
 
-export const formSchema: FormSchema[] = schema.properties.filter(item => editFields.includes(item.field))
+export const formSchema: FormSchema[] = schema.properties
+  .filter((item) => editFields.includes(item.field))
   .map(
     ({ field, label, defaultValue, form }) =>
       ({
@@ -494,17 +552,19 @@ export const formSchema: FormSchema[] = schema.properties.filter(item => editFie
       } as FormSchema),
   );
 
-export const columns: BasicColumn[] = schema.properties.filter(item => tableFields.includes(item.field))
+export const columns: BasicColumn[] = schema.properties
+  .filter((item) => tableFields.includes(item.field))
   .map(
     ({ field, label, table }) =>
       ({
         dataIndex: field,
         title: label,
         ...table,
-      } as BasicColumn)
+      } as BasicColumn),
   );
 
-export const descriptionColumns: BasicColumn[] = schema.properties.filter(item => descriptionFields.includes(item.field))
+export const descriptionColumns: BasicColumn[] = schema.properties
+  .filter((item) => descriptionFields.includes(item.field))
   .map(
     ({ field, label, table }) =>
       ({

src/views/system/doctor/schema.ts

@@ -8,9 +8,7 @@
 
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import get from 'lodash.get';
-import * as HospitalApi from '/@/api/system/hospitalApi';
-import { getDistributorId } from '/@/commonSchemaProperty';
+import { getDistributorId, getHospitalId } from '/@/commonSchemaProperty';
 
 export enum SexEnum {
   MALE = '男',
@@ -60,29 +58,7 @@ export const schema = {
       table: {},
     },
     getDistributorId({ colProps }),
-    {
-      field: 'hospitalId',
-      label: '医院id',
-      defaultValue: undefined,
-      form: {
-        componentProps: {
-          labelInValue: true,
-          api: HospitalApi.all,
-          params: {},
-          resultField: 'records',
-          labelField: 'name',
-          valueField: 'id',
-          allowClear: false,
-          placeholder: '医院id',
-        },
-        colProps,
-        component: 'ApiSelect',
-        rules: [{ required: true, type: 'object', message: '请输入医院id！' }],
-      },
-      table: {
-        customRender: ({ text, record }) => get(record, 'hospital.name') || text,
-      },
-    },
+    getHospitalId({ colProps }),
     {
       field: 'name',
       label: '医生名称',

src/views/system/hospital/schema.ts

@@ -303,7 +303,7 @@ export const schema = {
 };
 
 const queryFields = [
-  'distributorId',
+  // 'distributorId',
   'name',
   'abbreviationName',
   'code',
@@ -335,7 +335,7 @@ const editFields = [
   'status',
 ];
 const tableFields = [
-  'distributorId',
+  // 'distributorId',
   'name',
   'abbreviationName',
   'code',
@@ -355,7 +355,7 @@ const tableFields = [
 ];
 const descriptionFields = [
   'id',
-  'distributorId',
+  // 'distributorId',
   'name',
   'abbreviationName',
   'code',