From 6481be87ea6081a3cb83a4d90096ae62f579fdf2 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 24 Jan 2024 15:41:45 +0800
Subject: [PATCH] doctor

---
 package.json                                  |  1 +
 src/api/api.js                                | 12 +++++-----
 src/api/request.js                            |  1 +
 src/assets/css/global_table.css               |  6 +++--
 src/components/doctorCheck/CheckItemList.vue  | 22 +++++++++++--------
 src/components/doctorCheck/CheckSumSug.vue    | 10 +++++++--
 .../doctorCheck/RegisterCheckList.vue         |  6 ++---
 .../patientRegister/PatientRegisterList.vue   |  2 +-
 src/views/doctorCheck/doctorCheck.vue         | 20 +++++++++--------
 9 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 9122a50..efad5c8 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
     "version": "0.1.0",
     "private": true,
     "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
         "serve": "vue-cli-service serve",
         "build": "vue-cli-service build",
         "lint": "vue-cli-service lint"
diff --git a/src/api/api.js b/src/api/api.js
index 77d393e..ce07197 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -20,14 +20,14 @@ export async function getapi(url, params = {}, config) {
 //axios封装post
 export async function postapi(url, paramsdata = {}, config) {
   return new Promise((resolve, reject) => {
-    request.post(`${mm.apiurl}${url}`, paramsdata, config).then(
-      (res) => {
+    request
+      .post(`${mm.apiurl}${url}`, paramsdata, config)
+      .then((res) => {
         resolve(res);
-      },
-      (err) => {
+      })
+      .catch((err) => {
         reject(err.data);
-      }
-    );
+      });
   });
 }
 //axios封装deleteapi
diff --git a/src/api/request.js b/src/api/request.js
index ff35e15..46f0375 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -9,6 +9,7 @@ import { Message } from "element-ui";
 const instance = axios.create({
   baseURL: mm.apiurl,
   timeout: 500000,
+  withCredentials: true, // 允许跨域
 });
 
 //请求拦截
diff --git a/src/assets/css/global_table.css b/src/assets/css/global_table.css
index 2647748..04142ab 100644
--- a/src/assets/css/global_table.css
+++ b/src/assets/css/global_table.css
@@ -12,7 +12,7 @@
 
 /* 表格 行列间距控制 ，默认 10 px*/
 .el-table--small .el-table__cell {
-  padding: 0 0;  /* 原始 默认值 8px 0 */
+  padding: 0;  /* 原始 默认值 8px 0 */
 }
 .el-table .el-table__cell {
   padding: 2px 0; /* 原始 默认 12px 0 */
@@ -22,11 +22,13 @@
 }
 .el-table .cell {
   padding: 0px 2px;   /* 原始 默认 0px 10px; */
+  line-height: 20px;  /* 表格size="small"时 默认值 23px*/
 }
 
 /* 表格单元格 .el-table .cell ，默认 10 px*/
 .cell {
   padding-left: 2px;
-  padding-right: 2px;
+  padding-right: 2px;  
+  line-height: 20px;  /* 表格size="small"时 默认值 23px*/
 }
 
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index a4b4e5a..5267020 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -8,16 +8,14 @@
           ? Math.floor(((420 - 40 - (isCheckPicture ? 110:0)) * 3) / 5)
           : Math.floor(((window.pageHeight - 260 - 40 - (isCheckPicture ? 110:0)) * 3) / 5)
       "
-      :row-style="{ height: '30px' }"
       border highlight-current-row
-      @row-click="rowClick"
+      @row-click="rowClick" size="small"
     >
       <el-table-column prop="itemName" label="项目" width="180" />
-      <el-table-column prop="result" label="结果" width="500">
+      <el-table-column prop="result" label="结果" min-width="200">
         <template slot-scope="scope">
           <el-autocomplete
-            style="width: 480px"
-            class="inline-input"
+            style="width: 100%"
             type="textarea" 
             v-model="scope.row.result"
             :fetch-suggestions="querySearch"
@@ -32,11 +30,11 @@
           />          
         </template>
       </el-table-column>
-      <el-table-column prop="unit" label="单位" width="80" />
+      <el-table-column prop="unit" label="单位" width="80" align="center"/>
       <el-table-column
         prop="referenceRangeValue"
         label="参考范围"
-        width="120"
+        width="80" align="center"
       />
     </el-table>
   </div>
@@ -105,7 +103,7 @@ export default {
       restaurants.forEach((item) => {
         return (item.value = item.result);
       });
-      console.log("restaurants", restaurants);
+      // console.log("restaurants", restaurants);
       var results = queryString
         ? restaurants.filter(this.createFilter(queryString))
         : restaurants;
@@ -123,7 +121,7 @@ export default {
       };
     },
     handleSelect(item) {
-      console.log(item);
+      console.log('item',item);
     },
 
     //回车替代tab键
@@ -192,6 +190,12 @@ export default {
 .el-table th.el-table__cell.is-leaf {
   padding: 0;
 }
+::v-deep .el-textarea__inner {
+  min-height: 23px;
+  height: 23px;
+  line-height: 1.25;
+  padding: 2px 15px 2px 2px;
+}
 </style>
 
 
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index c16ef55..326ddd1 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -32,7 +32,7 @@
               <el-input type="textarea" v-model="scope.row.summary" :autosize="{ minRows: 1, maxRows: 100 }"
                 :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'" placeholder="请输入小结">
               </el-input>
-              <el-button type="danger" style="min-width:30px;" icon="el-icon-delete" @click="delSum(scope.$index)"
+              <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete" @click="delSum(scope.$index)"
                 :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'"
                 size="small"></el-button> 
             </div>
@@ -50,7 +50,7 @@
               <el-input type="textarea" v-model="scope.row.suggestion" :autosize="{ minRows: 1, maxRows: 100 }"
                 :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'" placeholder="请输入建议">
               </el-input>
-              <el-button type="danger" style="min-width:30px;" icon="el-icon-delete" @click="delSug(scope.$index)"
+              <el-button type="danger" style="min-width:23px;padding:2px;" icon="el-icon-delete" @click="delSug(scope.$index)"
                 :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'"
                 size="small"></el-button>
             </div>
@@ -206,5 +206,11 @@ export default {
     height: 22px;
     padding: 2px 2px; /*原始 默认值 500 */
 }
+::v-deep .el-textarea__inner {
+  min-height: 23px;
+  height: 23px;
+  line-height: 1.25;
+  padding: 1px 15px 1px 2px;
+}
 </style>
   
\ No newline at end of file
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 605c37e..7376fe8 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -9,13 +9,13 @@
         <template slot-scope="scope">
             <div>
               <el-tooltip class="item" effect="dark" content="未检" placement="top">
-                <i v-if="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 16px;color: red;"></i>
+                <i v-show="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 16px;color: red;"></i>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="已检" placement="top">
-                <i v-if="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 16px;color: green;"></i>
+                <i v-show="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 16px;color: green;"></i>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="弃检" placement="top">
-                <i v-if="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 16px;"></i>
+                <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 16px;"></i>
               </el-tooltip>
               {{scope.row.asbitemName}}
             </div>
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 99df35a..dd1697f 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -41,7 +41,7 @@
               <div v-else-if="dropCol[index].prop == 'guidePrintTimes'" >
                 <i class="el-icon-printer"
                   v-if="scope.row.guidePrintTimes > 0"
-                  style="font-size: 24px; color: green" />
+                  style="font-size: 20px; color: green" />
               </div>
               <div v-else-if ="dropCol[index].prop == 'isLock'
                             || dropCol[index].prop == 'isVip'
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index b6cc8e5..85e3fa9 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -70,8 +70,7 @@
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate,photoParse } from "../../utlis/proFunc";
-
+import { arrayExistObj,tcdate,photoParse } from "../../utlis/proFunc";
 
 import PatientRegisterBase from "../../components/doctorCheck/PatientRegisterBase.vue";
 import ButtonList from "../../components/doctorCheck/ButtonList.vue";
@@ -430,9 +429,9 @@ export default {
       this.saveCheckSuggestion(true);
     },
 
-    //更新检查项目与医生
+    //更新检查医生
     updateDoctorCheck(successTip) {
-      let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate||new Date();            
+      let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate||new Date(); 
       checkDate = moment(new Date(checkDate)).format('yyyy-MM-DD'); //yyyy-MM-DD HH:mm:ss
       let checkDoctorId = this.doctorCheck.RegisterCheckEdit.checkDoctorId||window.sessionStorage.getItem("user");
 
@@ -446,6 +445,7 @@ export default {
         .then((res) => {
             console.log("updateDoctorCheck", res.data);
             if (res.code != -1) {
+              console.log("更新检查医生 成功", res.data);
               this.doctorCheck.RegisterCheckEdit.completeFlag = '1';
               //更新组合项目列表记录状态
               let lfind = arrayExistObj(this.doctorCheck.RegisterCheckList,'id',body.registerCheckId)
@@ -454,11 +454,11 @@ export default {
             }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `项目明细保存失败，原因：${err}` });
+          this.$message({ type: "error", message: `更新检查医生失败，原因：${err}` });
         });
     },
 
-    //更新明细
+    //更新检查项目明细
     updateCheckItemList(successTip) {            
       let checkDate = this.doctorCheck.RegisterCheckEdit.checkDate||new Date();            
       checkDate = moment(new Date(checkDate)).format('yyyy-MM-DD'); //yyyy-MM-DD HH:mm:ss
@@ -478,11 +478,12 @@ export default {
         .then((res) => {
           console.log("updateCheckItemList", res.data);
           if (res.code != -1) {
+            console.log("更新检查项目明细成功", res.data);
             if(successTip) console.log("操作成功！")
           }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `项目明细保存失败，原因：${err}` });
+          this.$message({ type: "error", message: `更新检查项目明细失败，原因：${err}` });
         });
     },
 
@@ -506,11 +507,12 @@ export default {
         .then((res) => {
           console.log("saveCheckSummary", res.data);
           if (res.code != -1) {
+            console.log("更新小结 成功", res.data);
             if(successTip) console.log("操作成功！")
           }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `项目明细保存失败，原因：${err}` });
+          this.$message({ type: "error", message: `更新小结失败，原因：${err}` });
         });
 
     },
@@ -540,7 +542,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message({ type: "error", message: `项目明细保存失败，原因：${err}` });
+          this.$message({ type: "error", message: `更新建议失败，原因：${err}` });
         });
 
     },