From 96b113d7069383c1ae7ea6b006f2ef80e0b368b4 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Wed, 10 May 2023 11:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=B2=BB=E7=96=97=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=A1=A8=E5=8D=95=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                                   |  4 ++--
 src/components/360View/medicalRecord/index.vue      | 13 +++++++++++--
 .../medicalRecord/outPatientRecord/leftFormList.vue |  2 +-
 .../views/modules/formList/mraForm.vue              |  2 +-
 .../views/modules/formList/reportForm.vue           |  1 -
 .../nurseManagement/reservation/subList/index.vue   |  1 +
 6 files changed, 16 insertions(+), 7 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/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index 0ade447..2297e51 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -165,13 +165,21 @@ export default {
         this.isPlatform = this.isSearch === item.platform
         return
       }
-      this.confirmChange().finally(() => {
+      if (this.name === '门急诊电子病历') {
         this.curIndex = index
         this.id = item.id
         this.name = item.name
         this.caseId = item.id
         this.isPlatform = this.isSearch === item.platform
-      })
+      } else {
+        this.confirmChange().finally(() => {
+          this.curIndex = index
+          this.id = item.id
+          this.name = item.name
+          this.caseId = item.id
+          this.isPlatform = this.isSearch === item.platform
+        })
+      }
     },
     // 切换保存
     confirmChange() {
@@ -210,6 +218,7 @@ export default {
       })
     },
     updateForm() {
+      this.$message.success('保存成功')
       this.getFormList('update')
     },
     addRecord(name) {
diff --git a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
index aace3c1..f2a1cd5 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue
@@ -8,7 +8,7 @@
             {{ item.name }}
           </p>
         </div>
-        <i v-if="index === curIndex && !onlyRead" style="margin-top: 28px;color: rgb(199,5,5)" class="el-icon-delete" @click.stop="deleteForm()" />
+        <i v-if="index === curIndex && !onlyRead && item.name !== '门急诊电子病历'" style="margin-top: 28px;color: rgb(199,5,5)" class="el-icon-delete" @click.stop="deleteForm()" />
       </div>
       <img v-if="!formList.length" src="@/assets/img/nodata.png" alt="" class="nodata">
       <!-- <div class="button"><i class="el-icon-plus" /> 新建表单</div> -->
diff --git a/src/page-subspecialty/views/modules/formList/mraForm.vue b/src/page-subspecialty/views/modules/formList/mraForm.vue
index 0d8932b..8cc538b 100644
--- a/src/page-subspecialty/views/modules/formList/mraForm.vue
+++ b/src/page-subspecialty/views/modules/formList/mraForm.vue
@@ -110,7 +110,7 @@ export default {
   },
   methods: {
     handleSaveTable() {
-      this.$emit('handleSaveTable', this.formData)
+      this.$emit('handleSaveTable')
     },
     formDelete() {
       this.$confirmFun('确定删除吗？').then(() => {
diff --git a/src/page-subspecialty/views/modules/formList/reportForm.vue b/src/page-subspecialty/views/modules/formList/reportForm.vue
index 48ba259..ec89493 100644
--- a/src/page-subspecialty/views/modules/formList/reportForm.vue
+++ b/src/page-subspecialty/views/modules/formList/reportForm.vue
@@ -194,7 +194,6 @@ export default {
         ...this.confirmData
       }).then(() => {
         this.getReportInfo()
-        this.$message.success('保存成功')
         this.$emit('handleSaveTable')
       })
     },
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
index c0d7597..d968a1c 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
@@ -90,6 +90,7 @@
     <add-patient-order
       v-if="addPatientVisible"
       ref="addPatientOrder"
+      :project="curPatient"
       :patient-detail="curPatient"
       :title="addTitle"
       :is-edit="isEdit"