view

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>
@@ -212,6 +226,8 @@ export default {
       discountFoucs: false, //总折扣是否获取焦点
 
       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
+        })
+
     },
 
     // 设置颜色 
@@ -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}`
+    }
   },
 
   //监听事件
@@ -1210,5 +1244,6 @@ export default {
 
 .disTotal {
   margin-left: 10px;
-}</style>
+}
+</style>
 

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
         }

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) => {

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>
@@ -90,15 +91,6 @@ export default {
     };
   },
   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
-    }    
     this.LocalConfigInit = deepCopy(this.LocalConfig)
     let LocalConfig = window.localStorage.getItem("LocalConfig") || null
     try {
@@ -108,6 +100,17 @@ export default {
     }
   },
   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: {