From 79a9d8883cb6272bf04674fe2c5db2dcb29f2d0f Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期一, 24 六月 2024 16:44:24 +0800
Subject: [PATCH] su

---
 src/views/system/tijianall/index.vue |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index bee40f1..a85cbf4 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -297,15 +297,16 @@
     <el-dialog
       title="閫夋嫨濂楅"
       :visible.sync="taocan"
-      width="59%"
+      width="80%"
       height="700px"
     >
       <el-tabs
         type="border-card"
         style="height: 538px; margin: 0 10px; width: 100%"
         @tab-click="handleClick"
+        v-model="activeNames" 
       >
-        <el-tab-pane label="濂楅">
+        <el-tab-pane label="濂楅" name="first">
           <el-form
             :model="queryParam"
             ref="queryForm"
@@ -391,8 +392,8 @@
                   class="el-icon-d-arrow-right"></i></el-button> -->
           </div>
         </el-tab-pane>
-        <el-tab-pane label="鍗曢」">
-          <div class="tab8">
+        <el-tab-pane label="鍗曢」" name="second" >
+          <div class="tab8" >
             <!-- <div class="tab7">
               <v-tree-transfer
                 :treeData="treedataList"
@@ -405,8 +406,8 @@
                 @check-change="handleCurrentChecked">
               </el-tree> -->
             <!-- </div> -->
-            <el-row :gutter="20">
-              <el-col :span="6">
+            <el-row :gutter="20" style="width:100%">
+              <el-col :span="8">
                 <div
                   style="
                     text-align: center;
@@ -430,6 +431,7 @@
                     :default-checked-keys="checkedkey"
                     :filter-node-method="filterNode"
                     ref="tree"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -455,6 +457,7 @@
                     show-checkbox
                     @check-change="handleCurrentChecked1"
                     :default-checked-keys="checkedListkey"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -506,6 +509,7 @@
                       </template>
                     </el-table-column>
                   </el-table>
+                  
                   <el-collapse v-model="activeName" accordion v-if="list1">
                     <div>
                       <el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -528,6 +532,7 @@
                       </el-collapse-item>
                     </div>
                   </el-collapse>
+                  <h3 v-else style="font-weight: 600;">鍚堣锛歿{ marryall }}鍏�</h3>
                 </div>
               </el-col>
             </el-row>
@@ -896,6 +901,7 @@
     //   }
     // };
     return {
+      marryall: 0,
       filterText: "",
       proIdList: [],
       tableDatas: [],
@@ -928,6 +934,7 @@
       /** 鐓х浉鏈哄脊绐楁ā鍧�-start */
       videoWidth: 200,
       videoHeight: 200,
+      activeNames: 'first',
       // canvasWidth:300,
       // canvasHeight:300,
       imgSrc: "",
@@ -1152,7 +1159,12 @@
 
     filterNode(value, data) {
       if (!value) return true;
-      return data.proName.indexOf(value) !== -1;
+      // return data.proName.indexOf(value) !== -1;
+      if(value == data.proName){
+        return data.proName.indexOf(value) !== -1;
+      }else{
+        return data.proEngName.indexOf(value) !== -1;
+      }
     },
     cope() {
       let cusIdCard = this.form.cusIdcard;
@@ -1473,6 +1485,7 @@
     Package() {
       this.taocan = true;
       let cusSex = this.form.cusSex;
+       this.activeNames="first"
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
       this.loading = true;
@@ -1595,6 +1608,14 @@
         this.getDataList();
       }
     },
+    renderContent(h, { node, data, store }) {
+      return (
+        <span class="custom-tree-node">
+          <span>{node.label}</span>
+          <span>({data.proPrice}鍏�)</span>
+        </span>
+      );
+    },
     getDataList() {
       this.loading = true;
       getProParentIdDxList().then((response) => {
@@ -1620,11 +1641,12 @@
             });
           });
           this.TotalPrice1 = 0;
-
+           this.marryall = 0;
           if (this.DataList.length != 0) {
             this.list1 = false;
             this.DataList.forEach((item) => {
               this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+              this.marryall += item.proPrice;
             });
           }
         });
@@ -1651,10 +1673,12 @@
             });
           });
           this.TotalPrice1 = 0;
+          this.marryall = 0;
           if (this.DataList.length != 0) {
             this.list1 = false;
             this.DataList.forEach((item) => {
               this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+               this.marryall += item.proPrice;
             });
           }
         });
@@ -1687,8 +1711,10 @@
           if (item.proId == data.proId) {
             this.DataList.splice(index, 1);
             this.TotalPrice1 = 0;
+            this.marryall = 0;
             this.DataList.forEach((item1) => {
               this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+              this.marryall += item1.proPrice;
             });
           }
         });
@@ -1701,8 +1727,10 @@
         });
         this.spliceData();
         this.TotalPrice1 = 0;
+        this.marryall = 0;
         this.DataList.forEach((item1) => {
           this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+          this.marryall += item1.proPrice;
         });
       }
     },
@@ -1712,9 +1740,11 @@
       this.DataList.forEach((item, index) => {
         if (item.proId == row.proId) {
           this.DataList.splice(index, 1);
+          this.marryall = 0;
           this.TotalPrice1 = 0;
           this.DataList.forEach((item1) => {
             this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+            this.marryall += item1.proPrice;
           });
         }
       });

--
Gitblit v1.8.0