From c77ab4039b6955b66a8cce9e4287629bfd3cddc0 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 6 May 2024 16:46:06 +0800
Subject: [PATCH] dj seo

---
 .../patientRegister/PatientRegisterEdit.vue   |  2 +-
 .../patientRegister/PatientRegisterItem.vue   | 32 ++++++++---------
 .../patientRegisterAsbItem.vue                | 35 ++++++++++---------
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 7f17052..dcb8176 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1019,7 +1019,7 @@ export default {
         customerOrgId = v[v.length - 1]
         this.form.customerOrgParentId = v[0]
       } else {
-        customerOrgId = v  // s
+        customerOrgId = v  // 后台顶级单位ID未获取正确（再获取一次）
         let pids = getTreePids(this.patientRegister.customerOrgTreeAll,"treeChildren","parentId","id",customerOrgId)
         if(Array.isArray(pids) && pids.length > 0) this.form.customerOrgParentId = pids[1]
       }
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 630c503..1ff51ab 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -19,10 +19,7 @@
           <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>
+                <i class="el-icon-view" style="font-size: 14px;color: black;cursor: pointer;" @click="getAsbItems({asbitemName:scope.row.displayName,asbitemId:scope.row.id})" />
                 {{ scope.row.displayName }}
               </div>
             </template>
@@ -108,13 +105,10 @@
           <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>
+                <i class="el-icon-view" style="font-size: 14px;color: black;cursor: pointer;" @click="getAsbItems(scope.row)" />
                 <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;" />
+                    style="padding: 3px; font-size: 14px;color: purple;" />
                 </el-tooltip>
                 {{ scope.row.asbitemName }}
               </div>
@@ -1162,16 +1156,20 @@ export default {
       return sums;
     },
 
-    // 通过组合项目，获取包含明细
-    getAsbItems(asbId) {
-      let asbItems = this.asbItems.filter(e => { return e.asbitemId == asbId })
-      // console.log(asbId,asbItems)
-      let ret = []
+    // 弹出组合项目明细
+    getAsbItems(row) {
+      let asbItems = this.asbItems.filter(e => { return e.asbitemId == row.asbitemId })
+
+      let content = ""
       asbItems.forEach(e => {
-        ret.push(' ' + e.itemName)
+        content += '<p>' + e.itemName + '</p>'
       });
-      return `${ret}`
-    }
+
+      this.$alert(content, `${row.asbitemName}`, {
+        dangerouslyUseHTMLString: true,
+        showClose: false
+      });
+    },
   },
 
   //监听事件
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index 2777c8e..6179015 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -3,22 +3,19 @@
     <el-table :data="dataTransOpts.tableM.register_check_asbitem" border
       :height="window.pageHeight < 600 ? 124 : Math.floor((window.pageHeight - 228) / 3)" size="small"
       highlight-current-row :summary-method="getSummaries" show-summary ref="patientRegister.patientRegisterAbs">
-      <el-table-column label="序号" width="50" align="center">
-        <template slot-scope="scope">
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="asbitemName" label="已选组合项目" width="120">
+        <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>
+            <i class="el-icon-view" style="font-size: 14px;color: black;cursor: pointer;" @click="getAsbItems(scope.row)" />
             <el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="left">
               <i v-if="scope.row.isBelongGroupPackage == 'Y'" class="el-icon-star-on"
-                style="font-size: 16px;color: purple;" />
+                style="padding: 3px; font-size: 16px;color: purple;" />
             </el-tooltip>
-            {{ scope.$index + 1 }}
+            {{ scope.row.asbitemName }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="asbitemName" label="已选组合项目" width="120" />
       <el-table-column prop="standardPrice" label="标准价" align="center" />
       <el-table-column prop="discount" label="折扣" align="center" />
       <el-table-column prop="amount" label="数量" width="50" align="center" />
@@ -99,17 +96,23 @@ export default {
         })
     },
 
-    // 通过组合项目，获取包含明细
-    getAsbItems(asbId) {
-      let asbItems = this.asbItems.filter(e => { return e.asbitemId == asbId })
-      console.log('getAsbItems',asbId,asbItems)
-      let ret = []
+
+    // 弹出组合项目明细
+    getAsbItems(row) {
+      let asbItems = this.asbItems.filter(e => { return e.asbitemId == row.asbitemId })
+
+      let content = ""
       asbItems.forEach(e => {
-        ret.push(' ' + e.itemName)
+        content += '<p>' + e.itemName + '</p>'
+      });
+
+      this.$alert(content, `${row.asbitemName}`, {
+        dangerouslyUseHTMLString: true,
+        showClose: false
       });
-      return `${ret}`
     },
 
+
     // 设置颜色 
     setColor(checkCompleteFlag) {
       let color = "#52555F"