From 2ee7cd0c527b5b5c920c81f52b5ddb9ef9714ba6 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 2 May 2024 00:06:10 +0800
Subject: [PATCH] view

---
 .../patientRegister/PatientRegisterItem.vue   | 63 ++++++++++++++-----
 src/components/sumDoctorCheck/SumSug.vue      |  5 +-
 src/views/doctorCheck/sumDoctorCheck.vue      | 15 ++---
 src/views/login/Login.vue                     | 39 ++++++------
 4 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index f87ec22..07d1d65 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -17,7 +17,17 @@
           <!--
           <el-table-column type="selection" align="center" width="40" />
           -->
-          <el-table-column prop="displayName" label="未选组合项目" />
+          <el-table-column prop="displayName" label="未选组合项目">
+            <template slot-scope="scope">
+              <div>
+                <el-popover placement="top-start" :title="scope.row.displayName + '：'" width="300" trigger="hover"
+                  :content="getAsbItems(scope.row.id)">
+                  <i class="el-icon-view" slot="reference" style="font-size: 14px;color: black;" />
+                </el-popover>
+                {{ scope.row.displayName }}
+              </div>
+            </template>
+          </el-table-column>
           <!--
           <el-table-column prop="price" label="标准价格" width="70">
             <template slot-scope="scope">
@@ -100,9 +110,13 @@
           <el-table-column label="已选组合项目" min-width="150" prop="asbitemName">
             <template slot-scope="scope">
               <div>
+                <el-popover placement="top-start" :title="scope.row.asbitemName + '：'" width="300" trigger="hover"
+                  :content="getAsbItems(scope.row.asbitemId)">
+                  <i class="el-icon-view" slot="reference" style="font-size: 14px;color: black;cursor: pointer;" />
+                </el-popover>
                 <el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="top">
                   <i v-if="scope.row.isBelongGroupPackage == 'Y'" class="el-icon-star-on"
-                    style="font-size: 14px;color: purple;"></i>
+                    style="font-size: 14px;color: purple;" />
                 </el-tooltip>
                 {{ scope.row.asbitemName }}
               </div>
@@ -211,7 +225,9 @@ export default {
       totalFoucs: false,    //总价是否获取焦点
       discountFoucs: false, //总折扣是否获取焦点
 
-      asbDesc:'', //所选套餐描述
+      asbDesc: '', //所选套餐描述
+
+      asbItems: [], // 组合项目包含明细（全）
     };
   },
   computed: {
@@ -264,6 +280,13 @@ export default {
           this.quickAsb = res.data
         }
       });
+
+      // 获取组合项目包含的明细
+      postapi('/api/app/Asbitem/GetSimpleAsbitemWithDetails')
+        .then(res => {
+          if (res.code > -1) this.asbItems = res.data
+        })
+
     },
 
     // 设置颜色 
@@ -503,7 +526,7 @@ export default {
       //勾选时不需要此操作  end 
 
       if (asbItemChoosed.length < 1) {
-        this.$message.warning({ showClose: true, message: "请选择要添加的组合项目"})
+        this.$message.warning({ showClose: true, message: "请选择要添加的组合项目" })
         return
       }
 
@@ -518,7 +541,7 @@ export default {
         if (this.prForm.sexId == 'U') break //未选性别时，无需判断组合项目性别限制
         if (asbItemChoosed[i].forSexId == 'A') continue
         if (asbItemChoosed[i].forSexId != this.prForm.sexId) {
-          this.$message.warning({ showClose: true, message: `所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别`})
+          this.$message.warning({ showClose: true, message: `所选项目：${asbItemChoosed[i].displayName}，不适合当前人员性别` })
           checked = false
           break
         }
@@ -558,7 +581,7 @@ export default {
       let ret = false
       let patientRegisterId = this.prForm.id || this.prAsbOpraOpts.formId
       if (!patientRegisterId) {
-        this.$message.warning({ showClose: true, message: "人员基本信息未保存"});
+        this.$message.warning({ showClose: true, message: "人员基本信息未保存" });
         return ret
       }
 
@@ -674,7 +697,7 @@ export default {
       //勾选时不需要此操作  end 
 
       if (absForDel.length < 1) {
-        this.$message.warning({ showClose: true, message: "请选择要移除的组合项目"})
+        this.$message.warning({ showClose: true, message: "请选择要移除的组合项目" })
         return
       }
 
@@ -703,7 +726,7 @@ export default {
     //双击删除已选项目
     removeAbs(row) {
       if (this.isComplete) {
-        this.$message.info({ showClose: true, message: '人员已总检，不可 添加/删除 组合项目'})
+        this.$message.info({ showClose: true, message: '人员已总检，不可 添加/删除 组合项目' })
         return
       }
       this.delAbs([row]);
@@ -822,7 +845,7 @@ export default {
         // }else{
         tempRd = {
           groupPackageId: newId,
-          isBelongGroupPackage:'Y',
+          isBelongGroupPackage: 'Y',
           asbitemId: e.asbitemId,
           asbitemName: e.displayName,
           patientRegisterId: this.prForm.id,
@@ -929,7 +952,7 @@ export default {
     //双击选择组合项目
     dbClickChoosedAsb(row) {
       if (this.isComplete) {
-        this.$message.info({ showClose: true, message: '人员已总检，不可 添加/删除 组合项目'})
+        this.$message.info({ showClose: true, message: '人员已总检，不可 添加/删除 组合项目' })
         return
       }
       this.addAbs([row]);
@@ -1053,7 +1076,7 @@ export default {
       const sums = [];
 
       let count = this.dataTransOpts.tableM.register_check_asbitem.length
-      let pack = this.dataTransOpts.tableM.register_check_asbitem.filter(e => { return e.isBelongGroupPackage == 'Y'}).length
+      let pack = this.dataTransOpts.tableM.register_check_asbitem.filter(e => { return e.isBelongGroupPackage == 'Y' }).length
 
       this.asbDesc = `共选 ${count} 个项目，其中套餐/分组 ${pack} 个，加做 ${count - pack} 个`
 
@@ -1106,6 +1129,17 @@ export default {
       if (!this.discountFoucs) this.discount = Math.round(this.total * 10000 / this.totalStand) / 100;
       return sums;
     },
+
+    // 通过组合项目，获取包含明细
+    getAsbItems(asbId) {
+      let asbItems = this.asbItems.filter(e => { return e.asbitemId == asbId })
+      console.log(asbId,asbItems)
+      let ret = []
+      asbItems.forEach(e => {
+        ret.push(' ' + e.itemName)
+      });
+      return `${ret}`
+    }
   },
 
   //监听事件
@@ -1135,7 +1169,7 @@ export default {
     //     }
     //   }
     // },
-    
+
     // 查询人员登记项目
     "dataTransOpts.refresh.register_check_asbitem.D": {
       // immediate: true, // 立即执行
@@ -1146,7 +1180,7 @@ export default {
       }
     },
 
-     //更换分组
+    //更换分组
     "prAsbOpraOpts.prAsbGroup": {
       // immediate: true, // 立即执行
       // deep: true, // 深度监听复杂类型内变化
@@ -1210,5 +1244,6 @@ export default {
 
 .disTotal {
   margin-left: 10px;
-}</style>
+}
+</style>
 
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 64f6a8b..48777d0 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -292,8 +292,9 @@ export default {
     // },
     // 获取诊断数据
     dictInit() {
-      // 获取诊断
-      postapi('/api/app/diagnosis/getlistinsuggestion', {}).then(res => {
+
+      // 获取诊断  /api/app/diagnosis/getlistinsuggestion , {}
+      postapi('/api/app/Diagnosis/GetSimpleDiagnosisWithSuggestions').then(res => {
         if (res.code > -1) {
           this.diagnosises = res.data
         }
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 03ef9c1..31de42e 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -17,10 +17,11 @@
                   <div :style="'width:' + (window.pageWidth - 110 - 15) + 'px;'">
                     <SumSug :patientRegisterId="dataTransOpts.tableS.patient_register.id"/>
                   </div>
-                  <!-- 诊断 width:200px; -->
-                  <div v-show="false" style="width:200px;">
+                  <!-- 诊断 width:200px; 
+                  <div v-if="false" style="width:200px;">
                     <SumDiagnosis :patientRegisterId="dataTransOpts.tableS.patient_register.id" />
                   </div>
+                  -->
                 </div>
                 <div>
                   <!-- 总检状态 -->
@@ -196,11 +197,11 @@ export default {
       // });
 
       //支付方式
-      getapi("/api/app/pay-mode").then((res) => {
-        if (res.code == 1) {
-          this.dict.payMode = res.data;
-        }
-      });
+      // getapi("/api/app/pay-mode").then((res) => {
+      //   if (res.code == 1) {
+      //     this.dict.payMode = res.data;
+      //   }
+      // });
 
       //体检类别 树结构
       getapi("/api/app/item-type/by-code-all").then((res) => {
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index a2d7749..01dcbfc 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -3,7 +3,8 @@
     <div style="display: flex;justify-content: space-between;padding-top: 5px;">
       <div></div>
       <div style="display: flex;">
-        <i class="el-icon-setting" v-if="LocalConfig.normal.isDevTool" @click="toggleDevTools" style="padding-right: 5px;font-size: 22px;cursor:pointer;"></i>
+        <i class="el-icon-setting" v-if="LocalConfig.normal.isDevTool" @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>
@@ -86,36 +87,38 @@ export default {
           isDevTool: false, // 壳端是否显示打开调试工具的按钮
         }
       },
-      LocalConfigInit:{}
+      LocalConfigInit: {}
     };
   },
-  created() {
-    if (this.$peisAPI) {
-        this.$peisAPI.lazyLoadMenuContrl()
-        .then(res =>{
-          console.log('this.$peisAPI.lazyLoadMenuContrl',res)
-        })
-        .catch(err => {
-          console.log('this.$peisAPI.lazyLoadMenuContrl err',err)
-        }); // 加载窗口按钮 dll
-    }    
+  created() {    
     this.LocalConfigInit = deepCopy(this.LocalConfig)
     let LocalConfig = window.localStorage.getItem("LocalConfig") || null
     try {
-      this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})      
+      this.LocalConfig = Object.assign({}, this.LocalConfig, JSON.parse(LocalConfig) || {})
     } catch (error) {
       console.log('window.localStorage.getItem("LocalConfig")', error)
     }
   },
-  async mounted() {    
-    await this.getSysConfig()    
+  async mounted() {
+    if (this.$peisAPI) {
+      this.$peisAPI.lazyLoadMenuContrl()
+        .then(res => {
+          console.log('this.$peisAPI.lazyLoadMenuContrl', res)
+        })
+        .catch(err => {
+          console.log('this.$peisAPI.lazyLoadMenuContrl err', err)
+        }); // 加载窗口按钮 dll
+    } else {
+      console.log('this.$peisAPI undefind')
+    }
+    await this.getSysConfig()
   },
   methods: {
     async getSysConfig() {
       try {
         let res = await axios.get('/sysConfig.json', { timeout: 50000 }) // , { timeout: 50000 }
-        console.log('axios.get /sysConfig.json',res)
-        if(!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误，请重新刷新本页面！` })        
+        console.log('axios.get /sysConfig.json', res)
+        if (!res.data.apiurl) this.$message.error({ showClose: true, message: `获取配置参数错误，请重新刷新本页面！` })
         this.sysConfig = res.data
         window.sessionStorage.setItem('sysConfig', JSON.stringify(res.data))
       } catch (error) {
@@ -123,7 +126,7 @@ export default {
       }
     },
 
-    //打开客户端调试工具
+     //打开客户端调试工具
     toggleDevTools() {
       if (!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")