From 1b97dd371a5d7966490f0e6ab29b3782348329f7 Mon Sep 17 00:00:00 2001
From: lizhi <1370025557@qq.com>
Date: Thu, 7 Jul 2022 08:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/institution/doctor/doctor.data.ts | 59 +++++++++++++--------
 src/views/institution/office/office.data.ts | 59 +++++++++++++--------
 2 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/src/views/institution/doctor/doctor.data.ts b/src/views/institution/doctor/doctor.data.ts
index 86d0b94..dc9a0f5 100644
--- a/src/views/institution/doctor/doctor.data.ts
+++ b/src/views/institution/doctor/doctor.data.ts
@@ -117,6 +117,19 @@ export const searchFormSchema: FormSchema[] = [
         },
         colProps: { span: 5 },
     },
+    {
+        field: 'organType',
+        label: '组织类型',
+        component: 'Select',
+
+        componentProps: {
+            options: [
+                {label: '医院',value: '1'},
+                {label: '医检',value: '2'}
+            ]
+        },
+        colProps: {span: 5}
+    },
     {
         field: 'dateRange',
         label: '创建时间',
@@ -199,29 +212,29 @@ export const doctorFormSchema: FormSchema[] = [
         },
         required: true,
     },
-    {
-        field: 'organId',
-        label: '所属组织',
-        component: 'ApiSelect',
-        required: true,
-        renderComponentContent: ({ schema, values, model, field }) => {
-            const organType = model.organType;
-            watch(organType,
-                () => {
-                    const dataApi = organType=='1' ? hospitalList :  institutionList;
-                    console.log(schema);
-                    schema.componentProps = deepMerge({
-                        api: dataApi,
-                        labelField: 'name',
-                        valueField: 'id'
-                    });
-                },
-                {
-                    immediate: true,
-                }
-            );
-        }
-    },
+    // {
+    //     field: 'organId',
+    //     label: '所属组织',
+    //     component: 'ApiSelect',
+    //     required: true,
+    //     renderComponentContent: ({ schema, values, model, field }) => {
+    //         const organType = model.organType;
+    //         watch(organType,
+    //             () => {
+    //                 const dataApi = organType=='1' ? hospitalList :  institutionList;
+    //                 console.log(schema);
+    //                 schema.componentProps = deepMerge({
+    //                     api: dataApi,
+    //                     labelField: 'name',
+    //                     valueField: 'id'
+    //                 });
+    //             },
+    //             {
+    //                 immediate: true,
+    //             }
+    //         );
+    //     }
+    // },
     // {
     //     field: 'officeId',
     //     label: '所属科室',
diff --git a/src/views/institution/office/office.data.ts b/src/views/institution/office/office.data.ts
index 9eea258..da596c1 100644
--- a/src/views/institution/office/office.data.ts
+++ b/src/views/institution/office/office.data.ts
@@ -97,6 +97,19 @@ export const searchFormSchema: FormSchema[] = [
         },
         colProps: { span: 5 },
     },
+    {
+        field: 'organType',
+        label: '组织类型',
+        component: 'Select',
+
+        componentProps: {
+            options: [
+                {label: '医院',value: '1'},
+                {label: '医检',value: '2'}
+            ]
+        },
+        colProps: {span: 5}
+    },
     {
         field: 'dateRange',
         label: '创建时间',
@@ -135,29 +148,29 @@ export const officeFormSchema: FormSchema[] = [
         },
         required: true,
     },
-    {
-        field: 'organId',
-        label: '所属组织',
-        component: 'ApiSelect',
-        required: true,
-        renderComponentContent: ({ schema, values, model, field }) => {
-            const organType = model.organType;
-            watch(organType,
-              () => {
-                  const dataApi = organType=='1' ? hospitalList :  institutionList;
-                  console.log(schema);
-                  schema.componentProps = deepMerge({
-                      api: dataApi,
-                      labelField: 'name',
-                      valueField: 'id'
-                  });
-              },
-              {
-                  immediate: true,
-              }
-            );
-        },
-    },
+    // {
+    //     field: 'organId',
+    //     label: '所属组织',
+    //     component: 'ApiSelect',
+    //     required: true,
+    //     renderComponentContent: ({ schema, values, model, field }) => {
+    //         const organType = model.organType;
+    //         watch(organType,
+    //           () => {
+    //               const dataApi = organType=='1' ? hospitalList :  institutionList;
+    //               console.log(schema);
+    //               schema.componentProps = deepMerge({
+    //                   api: dataApi,
+    //                   labelField: 'name',
+    //                   valueField: 'id'
+    //               });
+    //           },
+    //           {
+    //               immediate: true,
+    //           }
+    //         );
+    //     },
+    // },
     {
         field: 'directorTel',
         label: '主任电话',