From ce2b82430e4cd98a7dcea950ebe381fc7f4828f9 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 17 Apr 2024 22:04:35 +0800
Subject: [PATCH] dj

---
 .../doctorCheck/PatientRegisterList.vue           |  6 +++---
 .../patientRegister/PatientRegisterList.vue       | 15 +++++++--------
 src/views/login/Login.vue                         | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index a8d71dd..a5e0ac0 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
     <!-- 查询条件 -->
-    <div style="display: flex; flex-wrap: wrap; width: 100%;height:140px; " >
+    <div style="display: flex; flex-wrap: wrap; width: 100%;height:142px; " >
       <div v-if="winAbsolute" style="position: absolute;top:3px;right:0px;">
         <el-tooltip content="关闭人员列表窗口" placement="bottom" effect="light">
           <i class="el-icon-close" @click="doctorCheck.doctorCheckDialogVisible = false;sumDoctorCheck.sumDoctorCheckDialogVisible = false;"
             style="font-size: 24px;color: red;cursor:pointer;"></i>
         </el-tooltip>
       </div>
-      <div class="query" style="display: flex;">
+      <div class="query" style="display: flex;padding-top: 2px;">
         <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:238px;" size="small" disabled>
         </el-input>
         <el-button icon="el-icon-search" @click="report.dialogCusOrgOCX = true" style="font-size: 20px;height:30px;min-width:30px; padding: 5px 5px;" size="small"></el-button>
@@ -56,7 +56,7 @@
     </div>
 
     <!-- 人员列表 -->    
-    <el-table :data="dataList" border width="100%" :height="winAbsolute ? (window.pageHeight - 42 - 120 - 30) : (window.pageHeight - 42 - 120)" row-key="id" size="small"      
+    <el-table :data="dataList" border width="100%" :height="winAbsolute ? (window.pageHeight - 44 - 120 - 30) : (window.pageHeight - 44 - 120)" row-key="id" size="small"      
       highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" ref="dataList" style="border-radius:10px;">     
       
       <el-table-column prop="customerOrgParentName" label="单位" width="120">
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index a90a658..9730f20 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -405,7 +405,6 @@ export default {
       if (isPreview) {
         //
         //this.multipleSelection.forEach((item,index) =>{
-
         postapi(
           `/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[0].id}`
         )
@@ -426,7 +425,8 @@ export default {
             }
           })
           .catch((err) => {
-            this.$message.warning(err);
+            console.log('打印指引单', err)
+            this.$message.warning({ showClose: true, message: err });
           });
         // });
       } else {
@@ -441,22 +441,21 @@ export default {
             if (resPrintData.code == -1) continue
             toOutShell.ReportTable = resPrintData.data
             resPeisAPI = await this.$peisAPI.print(JSON.stringify(toOutShell));
+            console.log('壳返回结果',resPeisAPI)
             if (JSON.parse(resPeisAPI).code < 0) continue
-            resPrintTimes = postapi("api/app/patientregister/updatepatientregisterguideprinttimesmany", [this.multipleSelection[i].id]);
+            resPrintTimes = await postapi("/api/app/patientregister/updatepatientregisterguideprinttimesmany", [this.multipleSelection[i].id]);
             if (resPrintTimes.code == -1) continue
             lfind = arrayExistObj(this.tableData, "id", this.multipleSelection[i].id);
             if (lfind > -1) {
               if (this.tableData[lfind].guidePrintTimes) {
-                this.tableData[lfind].guidePrintTimes =
-                  Number(
-                    this.tableData[lfind].guidePrintTimes
-                  ) + 1;
+                this.tableData[lfind].guidePrintTimes = Number(this.tableData[lfind].guidePrintTimes) + 1;
               } else {
                 this.tableData[lfind].guidePrintTimes = 1;
               }
             }
           } catch (error) {
-            this.$message.error(error)
+            console.log('打印指引单', `${error}`)
+            this.$message.warning({ showClose: true, message: error });
           }
 
           this.elProgress.percentage = Math.floor(
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index ca9e21a..1bf42b6 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -3,9 +3,10 @@
     <div style="display: flex;justify-content: space-between;padding-top: 5px;">
       <div></div>
       <div style="display: flex;">
-        <i class="el-icon-minus" @click="btnMin" style="padding-right: 5px;"></i>
-        <i class="el-icon-copy-document" @click="btnMax" style="padding-right: 5px;"></i>
-        <i class="el-icon-close"  @click="btnClose" style="padding-right: 5px;"></i>
+        <i class="el-icon-setting" @click="toggleDevTools" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+        <i class="el-icon-minus" @click="btnMin" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+        <i class="el-icon-copy-document" @click="btnMax" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+        <i class="el-icon-close"  @click="btnClose" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
       </div>      
     </div>
     <div class="box">
@@ -91,6 +92,14 @@ export default {
     }
   },
   methods: {
+    //打开客户端调试工具
+    toggleDevTools() {
+      if (!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return
+      }
+      this.$peisAPI.toggleDevTools();
+    },
     btnMin(){
       if(!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")