From 54e5737ddd4febc3cfd8e26699d71436d1da75df Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 20 六月 2024 16:31:16 +0800
Subject: [PATCH] qxtj

---
 src/views/system/tijian/index.vue |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 446548c..974257c 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -424,15 +424,17 @@
     <el-dialog
       title="閫夋嫨濂楅"
       :visible.sync="taocan"
-      width="50%"
+      width="70%"
       height="700px"
+      :close-on-click-modal="false"
     >
       <el-tabs
         type="border-card"
         style="height: 560px; margin: 0 10px; width: 100%"
+        v-model="activeNames" 
         @tab-click="handleClick"
       >
-        <el-tab-pane label="濂楅">
+        <el-tab-pane label="濂楅" name="first">
           <el-form
             :model="queryParam"
             ref="queryForm"
@@ -474,7 +476,7 @@
                 @selection-change="handleSelectionChange"
                 height="450px"
                 ref="tb"
-                style="width: 850px"
+             
               >
                 <el-table-column
                   type="selection"
@@ -525,7 +527,7 @@
               ></el-button> -->
           </div>
         </el-tab-pane>
-        <el-tab-pane label="鍗曢」">
+        <el-tab-pane label="鍗曢」" name="second">
           <div class="tab8">
             <!-- <div class="tab7">
               <v-tree-transfer
@@ -564,6 +566,7 @@
                     :default-checked-keys="checkedkey"
                     :filter-node-method="filterNode"
                     ref="tree"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -589,6 +592,7 @@
                     show-checkbox
                     @check-change="handleCurrentChecked1"
                     :default-checked-keys="checkedListkey"
+                    :render-content="renderContent"
                   >
                   </el-tree>
                 </div>
@@ -612,14 +616,14 @@
                     :span-method="objectSpanMethod"
                   >
                     <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+                     
                     </el-table-column>
+                    <el-table-column prop="proPrice" label="鍘熶环" width="56px"></el-table-column>
                     <el-table-column
                       prop="proName"
                       label="鏄庣粏椤圭洰"
                       width="260px"
                     >
-                    </el-table-column>
-                    <el-table-column prop="proPrice" label="鍘熶环" width="56px">
                     </el-table-column>
 
                     <el-table-column
@@ -640,6 +644,7 @@
                       </template>
                     </el-table-column>
                   </el-table>
+                  <div>鍚堣锛歿{ marryall }}鍏�</div>
                   <el-collapse v-model="activeName" accordion v-if="list1">
                     <div>
                       <el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -1317,6 +1322,7 @@
         },
       ],
       isNow: 1,
+      marryall:0,
       treeId: [],
       treeList: [],
       defaultKeys: [],
@@ -1421,6 +1427,7 @@
       proIds: [],
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
+       activeNames: 'first',
       // 鏍戠姸褰㈢姸
       Treedata: [],
       TreedataList: [],
@@ -2002,7 +2009,6 @@
                       this.TotalPrice1 = 0;
                       this.tableData1.forEach((item) => {
                         this.TotalPrice1 += item.nowPrice;
-                        console.log(this.TotalPrice1);
                         this.TotalPrice = (
                           this.TotalPrice1 *
                           (this.discount / 10)
@@ -2310,13 +2316,13 @@
 
     Package() {
       this.taocan = true;
+      this.activeNames="first"
       let cusSex = this.form.cusSex;
       this.datekey = Date.now();
       //鍏ㄩ儴濂楅
       this.loading = true;
       deptTreeSelect(cusSex).then((response) => {
         this.newpacName = response.rows;
-
         try {
           if (this.tableData1.length >= 1) {
             this.newpacName.forEach((item3) => {
@@ -2385,6 +2391,7 @@
       }
     },
     handleClick(tab, event) {
+      console.log(tab, event);
       if (tab.label == "鍗曢」") {
         this.DataList = [];
         this.getDataList();
@@ -2415,11 +2422,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 
             });
           }
         });
@@ -2446,10 +2454,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.TotalPrice1 = item.proPrice + this.TotalPrice1;
+              this.marryall += item.proPrice 
             });
           }
         });
@@ -2475,15 +2485,24 @@
       return this.DataList;
     },
 
+    renderContent(h, { node, data, store }) {
+        return (
+          <span class="custom-tree-node">
+             聽 <span>{node.label}</span>
+
+            <span>({data.proPrice}鍏�)</span>
+           
+          </span>);
+      },
     // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
     handleCurrentChecked1(data, checked, checkedNodes) {
       if (checked == false) {
         this.DataList.forEach((item, index) => {
           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;
             });
           }
         });
@@ -2495,9 +2514,9 @@
           }
         });
         this.spliceData();
-        this.TotalPrice1 = 0;
+        this.marryall = 0;
         this.DataList.forEach((item1) => {
-          this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+          this.marryall += item1.proPrice 
         });
       }
     },
@@ -2507,9 +2526,9 @@
       this.DataList.forEach((item, index) => {
         if (item.proId == row.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 
           });
         }
       });
@@ -3004,7 +3023,7 @@
 }
 
 .tab3 {
-  max-height: 400px;
+  max-height: 390px;
   overflow-y: auto;
   border: 1px solid #d9d9d9;
 }

--
Gitblit v1.8.0