From 29b97d342cb26248cafd5ab26842c70c11e89714 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Mon, 10 Apr 2023 20:04:54 +0800
Subject: [PATCH] =?UTF-8?q?his=E6=9F=A5=E8=AF=A2=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                                  |  4 ++--
 .../optometryManagement/dioptric/HIS-add.vue       | 14 ++++++--------
 .../modules/outpatientManagement/call/HIS-add.vue  | 13 ++++++-------
 .../modules/outpatientManagement/treat/HIS-add.vue |  9 +++++----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/public/index.html b/public/index.html
index 6f52be6..f449c2f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -39,8 +39,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 测试环境 -->
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
index a582c01..89d97dc 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
@@ -7,13 +7,13 @@
   >
     <el-form ref="dataFormHis" :inline="true" :model="dataFormHis" class="demo-form-inline" :rules="dataRule" @keyup.enter.native="findHandle(2)">
       <el-form-item prop="patientId">
-        <el-input v-model="dataFormHis.patientId" placeholder="请输入登记号" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientId" placeholder="请输入登记号" clearable />
       </el-form-item>
       <el-form-item prop="patientName">
-        <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable />
       </el-form-item>
       <el-form-item prop="patientIdNumber">
-        <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable />
       </el-form-item>
       <el-col :span="6">
         <el-form-item>
@@ -60,9 +60,7 @@ export default {
       dataFormHis: {
         patientId: '',
         patientName: '',
-        patientIdNumber: '',
-        mzDoctorId: '',
-        region: ''
+        patientIdNumber: ''
       },
       dataForm: {},
       tableData: [],
@@ -96,10 +94,10 @@ export default {
     },
     // His查询按钮
     async findHandle(flag) {
-      this.loading = true
       if (flag === 2 && !this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) {
         return this.$message.error('搜索内容不能为空')
       }
+      this.loading = true
       const { data: res } = await this.$http.get('/patient/getHisPatient', {
         params: this.dataFormHis
       })
@@ -119,7 +117,7 @@ export default {
     },
     // 点击引入按钮
     async introduceHandle(scopwRow) {
-      console.log(scopwRow)
+      this.visible = false
       this.$parent.addOrUpdateHandle('', scopwRow, 'HIS引入')
     }
   }
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
index 6067d7b..02a2b39 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
@@ -7,13 +7,13 @@
   >
     <el-form ref="dataFormHis" :inline="true" :model="dataFormHis" class="demo-form-inline" :rules="dataRule" @keyup.enter.native="findHandle(2)">
       <el-form-item prop="patientId">
-        <el-input v-model="dataFormHis.patientId" placeholder="请输入登记号" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientId" placeholder="请输入登记号" clearable />
       </el-form-item>
       <el-form-item prop="patientName">
-        <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable />
       </el-form-item>
       <el-form-item prop="patientIdNumber">
-        <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable />
       </el-form-item>
       <el-col :span="6">
         <el-form-item>
@@ -60,9 +60,7 @@ export default {
       dataFormHis: {
         patientId: '',
         patientName: '',
-        patientIdNumber: '',
-        mzDoctorId: '',
-        region: ''
+        patientIdNumber: ''
       },
       dataForm: {},
       tableData: [],
@@ -96,10 +94,10 @@ export default {
     },
     // His查询按钮
     async findHandle(flag) {
-      this.loading = true
       if (flag === 2 && !this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) {
         return this.$message.error('搜索内容不能为空')
       }
+      this.loading = true
       const { data: res } = await this.$http.get('/patient/getHisPatient', {
         params: this.dataFormHis
       })
@@ -119,6 +117,7 @@ export default {
     },
     // 点击引入按钮
     introduceHandle(item) {
+      this.visible = false
       this.$emit('openAdd', item)
     }
   }
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
index 6e2b2ae..198fecb 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/HIS-add.vue
@@ -7,13 +7,13 @@
   >
     <el-form ref="dataFormHis" :inline="true" :model="dataFormHis" class="demo-form-inline" :rules="dataRule" @keyup.enter.native="findHandle(2)">
       <el-form-item prop="patientId">
-        <el-input v-model="dataFormHis.patientId" placeholder="请输入登记号" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientId" placeholder="请输入登记号" clearable />
       </el-form-item>
       <el-form-item prop="patientName">
-        <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientName" placeholder="请输入姓名" clearable />
       </el-form-item>
       <el-form-item prop="patientIdNumber">
-        <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable @clear="findHandle(1)" />
+        <el-input v-model="dataFormHis.patientIdNumber" placeholder="请输入身份证号" clearable />
       </el-form-item>
       <el-col :span="6">
         <el-form-item>
@@ -93,10 +93,10 @@ export default {
     },
     // His查询按钮
     async findHandle(flag) {
-      this.loading = true
       if (flag === 2 && !this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) {
         return this.$message.error('搜索内容不能为空')
       }
+      this.loading = true
       const { data: res } = await this.$http.get('/patient/getHisPatient', {
         params: this.dataFormHis
       })
@@ -116,6 +116,7 @@ export default {
     },
     // 点击引入按钮
     introduceHandle(item) {
+      this.visible = false
       this.$emit('openAdd', item)
     }
   }