From 32472073d74347c90928f3eaea52fb8c5fda9fdc Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 14 二月 2025 18:15:41 +0800
Subject: [PATCH] qx

---
 src/views/system/tijian/index.vue |  274 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 164 insertions(+), 110 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 7e99913..fc71db1 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -303,14 +303,9 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="缁勫悎" name="third">
-          <!-- <div class="tab3"> -->
           <el-row :gutter="20" style="width: 100%">
-            <el-col :span="6">
-              <div style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                ">
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
                 椤圭洰鍒楄〃
               </div>
               <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
@@ -322,12 +317,8 @@
                 </el-tree>
               </div>
             </el-col>
-            <el-col :span="6">
-              <div style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                ">
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
                 鏄庣粏椤圭洰鍒楄〃
               </div>
               <div class="tab3">
@@ -345,11 +336,14 @@
                     margin-top: 10px;
                   ">
                   宸查�夐」鐩垪琛�
+                  
                 </div>
                 <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
                   <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
                   </el-table-column>
                   <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+                  </el-table-column>
+                  <el-table-column prop="sl" label="鏁伴噺" width="56px">
                   </el-table-column>
 
                   <el-table-column prop="proPrice" label="鍘熶环" width="56px">
@@ -368,76 +362,60 @@
               </div>
             </el-col>
           </el-row>
-          <!-- </div> -->
         </el-tab-pane>
         <el-tab-pane label="鍗曢」" name="second">
-          <div class="tab8">
-            <el-row :gutter="20">
-              <el-col :span="6">
-                <div style="
-                    text-align: center;
-                    margin-bottom: 10px;
-                    margin-top: 10px;
-                  ">
-                  椤圭洰鍒楄〃
+          <el-row :gutter="20" style="width: 100%">
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+                椤圭洰鍒楄〃
+              </div>
+              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px;">
+              </el-input>
+              <div class="tab3">
+                <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+                  node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+                  :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
+                </el-tree>
+              </div>
+            </el-col>
+            <el-col :span="6" style="min-width: 200px">
+              <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+                鏄庣粏椤圭洰鍒楄〃
+              </div>
+              <div class="tab3">
+                <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+                  :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+                  @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+                  :render-content="renderContent">
+                </el-tree>
+              </div>
+            </el-col>
+            <el-col :span="11">
+              <div class="grid-content bg-purple">
+                <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+                  宸查�夐」鐩垪琛�
                 </div>
-                <!-- @input="gaibian" -->
-                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
-                </el-input>
-                <div class="tab3">
-                  <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
-                    node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
-                    :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="6">
-                <div style="
-                    text-align: center;
-                    margin-bottom: 10px;
-                    margin-top: 10px;
-                  ">
-                  鏄庣粏椤圭洰鍒楄〃
-                </div>
-                <div class="tab3">
-                  <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
-                    :props="defaultProps" :filter-node-method="filterNode" show-checkbox
-                    @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
-                    :render-content="renderContent">
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="11">
-                <div class="grid-content bg-purple">
-                  <div style="
-                      text-align: center;
-                      margin-bottom: 10px;
-                      margin-top: 10px;
-                    ">
-                    宸查�夐」鐩垪琛�
-                  </div>
-                  <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
-                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
-                    </el-table-column>
-                    <el-table-column prop="sl" label="鏁伴噺" width="56px">
-                    </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 label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
-                      width="50px">
-                      <template slot-scope="scope">
-                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                          title="鍒犻櫎"></el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
-                </div>
-              </el-col>
-            </el-row>
-          </div>
+                <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
+                  <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+                  </el-table-column>
+                  <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+                  </el-table-column>
+                  <el-table-column prop="sl" label="鏁伴噺" width="56px">
+                  </el-table-column>
+                  <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+                  </el-table-column>
+                  <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+                    width="50px">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        title="鍒犻櫎"></el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
+              </div>
+            </el-col>
+          </el-row>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
@@ -1091,8 +1069,11 @@
 
     // this.getData();
   },
-  mounted() { },
-
+  mounted() {
+    this.TreedataList = [];
+    this.DataList = [];
+    this.marryall = 0;
+  },
   methods: {
     debounceNumberChange(currentValue, oldValue) {
       clearTimeout(this.debounceTimer);
@@ -1839,6 +1820,7 @@
         let configKey = "getInfoFromSqlData";
         getconfigKey(configKey).then((res) => {
           if (res.code == 200) {
+            console.log(res.msg, 'res.msg');
             if (res.msg == "N") {
               var websocket = null;
               var url = this.valueUrl;
@@ -1878,12 +1860,11 @@
 
               //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
               websocket.onmessage = (event) => {
-                var resultObj = eval("(" + event.data + ")");
+                var resultObj = eval("(" + event.data + ")");  // 娉ㄦ剰锛歟val瀛樺湪瀹夊叏闅愭偅锛屽缓璁敤JSON.parse
                 this.readCardWebSocket(resultObj);
+               
               };
-              websocket.onclose = function () {
-                alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
-              };
+          
             } else if (res.msg == "Y") {
               /* this.$refs.aaa.open = true;
               this.$refs.aaa.getAllList();
@@ -1902,8 +1883,8 @@
     // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
     readCardWebSocket(resultObj) {
       let _this = this;
-
-      if (resultObj.code === 200 && resultObj.data.name != null) {
+      console.log(resultObj, 'resultObj');
+      if (resultObj.code === 200 && resultObj.data.name && resultObj.data.name != null) {
         //鍥炴樉鐩稿叧鏁版嵁
         _this.form.cusName = resultObj.data.name;
         _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
@@ -2047,9 +2028,9 @@
             }
           }
         };
-        websocket.onclose = function () {
-          alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
-        };
+        // websocket.onclose = function () {
+        //   alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+        // };
         websocket.onmessage = function (event) {
           var resultObj = JSON.parse(event.data);
           _this.form.cusName = resultObj.data.name;
@@ -2141,9 +2122,9 @@
             }
           }
         };
-        websocket.onclose = function () {
-          alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
-        };
+        // websocket.onclose = function () {
+        //   alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+        // };
         websocket.onmessage = function (event) {
           var resultObj = JSON.parse(event.data);
           _this.form.cusName = resultObj.data.name;
@@ -2230,11 +2211,15 @@
 
     // 鍙栨秷鎸夐挳
     cancel() {
+      this.TreedataList = [];
+      this.DataList = [];
+      this.marryall = 0; // 閲嶇疆鍚堣
       this.Seachopen = false;
       this.taocan = false;
       this.malldisble = false;
       this.defaultKeys = [];
       this.DataLists = [];
+      
     },
 
     cancell() {
@@ -2492,10 +2477,14 @@
       if (this.activeNames == "second") {
         this.DataList = [];
         this.checkedkey = [];
+        this.TreedataList = [];
+        this.marryall = 0; // 閲嶇疆鍚堣
         this.getDataList();
       } else if (this.activeNames == "third") {
         this.DataLists = [];
         this.checkedkeys = [];
+        this.TreedataList = [];
+        this.marryall = 0; // 閲嶇疆鍚堣
         getZhList().then((response) => {
           if (response.data) {
             this.packageList = response.data;
@@ -2514,6 +2503,17 @@
       this.loading = true;
       getProParentIdDxList().then((response) => {
         this.Treedata = response.data.list;
+
+        // 鍥炴樉 TreedataList 鍒� DataList
+        if (this.TreedataList && this.TreedataList.length > 0) {
+          this.DataList = this.TreedataList;
+          this.marryall = this.DataList.reduce((sum, item) => sum + (item.proPrice || 0) * (item.sl || 1), 0);
+          this.checkedListkey = this.DataList.map(item => item.proId);
+          this.$nextTick(() => {
+            this.$refs.tree.setCheckedKeys(this.checkedListkey);
+          });
+        }
+
         if (this.tableData[0]) {
           this.tableData[0].tjProjectList.forEach((selectionitem) => {
             this.Treedata.forEach((item) => {
@@ -2523,8 +2523,63 @@
             });
           });
         }
+
+        // 鍥炴樉 packageList 鐨勯�変腑鎬�
+        this.handlePackageSelection();
+
         this.loading = false;
       });
+    },
+
+    handlePackageSelection() {
+      // 鍋囪浣犳湁涔嬪墠淇濆瓨鐨勯�変腑鐘舵�佹垨浠庢煇涓湴鏂硅幏鍙栬繖浜涙暟鎹�
+      let selectedPackageIds = this.getPreviouslySelectedPackages(); // 杩欐槸涓�涓亣璁剧殑鍑芥暟锛屽疄闄呬娇鐢ㄦ椂鏇挎崲涓哄疄闄呯殑閫昏緫
+
+      // 璁剧疆 packageList 鐨勯�変腑鐘舵��
+      this.$nextTick(() => {
+        if (this.$refs.treas) { // 纭繚 treas 寮曠敤宸茬粡瀛樺湪
+          this.$refs.treas.setCheckedKeys(selectedPackageIds, true);
+        }
+        // 鏇存柊 checkedkeys 浠ュ弽鏄犲綋鍓嶉�変腑鐨勫寘
+        this.checkedkeys = selectedPackageIds;
+      });
+
+      // 鏍规嵁閫変腑鐘舵�佹洿鏂� DataLists 鎴栧叾浠栭渶瑕佹洿鏂扮殑鍐呭
+      this.updateDataListsBasedOnSelection(selectedPackageIds);
+    },
+
+    getPreviouslySelectedPackages() {
+      // 杩斿洖涔嬪墠淇濆瓨鐨勯�変腑鍖匢D鏁扮粍
+      // 渚嬪锛屼粠 localStorage 鎴栬�� Vuex store 鑾峰彇
+      return []; // 杩欓噷鏄ず渚嬶紝鏇挎崲涓哄疄闄呰幏鍙栨暟鎹殑閫昏緫
+    },
+
+    updateDataListsBasedOnSelection(selectedPackageIds) {
+      // 鏍规嵁閫変腑鐨勫寘ID鏇存柊 DataLists
+      this.DataLists = [];
+      selectedPackageIds.forEach(id => {
+        let packageItem = this.packageList.find(item => item.id === id);
+        if (packageItem) {
+          // 杩欓噷鍋囪姣忎釜鍖呴」鐩兘鏈変竴涓� proId 鏁扮粍鎴栬�呯被浼肩殑缁撴瀯锛岀敤鏉ヨ幏鍙栧寘涓殑椤圭洰
+          if (packageItem.proIds) { // 鍋囪 packageItem 鍖呭惈涓�涓� proId 鏁扮粍
+            packageItem.proIds.forEach(proId => {
+              let project = this.findProjectById(proId); // 鍋囪鏈変竴涓嚱鏁版潵鎵惧埌椤圭洰
+              if (project) {
+                this.DataLists.push(project);
+              }
+            });
+          }
+        }
+      });
+
+      // 璁$畻鍚堣
+      this.marryalls = this.DataLists.reduce((sum, item) => sum + item.proPrice, 0);
+    },
+
+    findProjectById(proId) {
+      // 姝ゅ嚱鏁板亣璁句綘鏈変竴涓叏灞�鐨勯」鐩垪琛ㄦ垨鑰呭彲浠ヤ粠鏌愪釜API鑾峰彇
+      // 杩欓噷鍙槸涓�涓ず渚嬶紝瀹為檯搴旂敤涓簲璇ユ牴鎹綘鐨勬暟鎹粨鏋勬潵瀹炵幇
+      return this.allpackageList.find(item => item.proId === proId) || null;
     },
 
     handlepackage(data, checked, checkedNodes) {
@@ -2554,7 +2609,7 @@
                 if (this.DataLists.length >= 1) {
                   this.marryalls = 0;
                   this.DataLists.forEach((item1) => {
-                    this.marryalls += item1.proPrice;
+                    this.marryalls += item1.proPrice * item1.sl;
 
                     this.packagedataList.forEach((item3) => {
                       if (item1.proParentId == item3.proId) {
@@ -2592,16 +2647,6 @@
           }
         }
       }
-
-      // if (columnIndex == 3) {
-      //   let rowspan = 0;
-      //   this.DataLists.forEach((element) => {
-      //     if (element.propinName === row.propinName) {
-      //       rowspan++;
-      //     }
-      //   });
-      //   return [rowspan, 1];
-      // }
     },
     handlePackageChecked(data, checked, checkedNodes) {
       if (checked == false) {
@@ -3279,11 +3324,8 @@
 }
 
 .filter-tree {
-  /* max-height: 360px;
-  overflow-y: auto;
-  border: 1px solid #d9d9d9; */
-  overflow: auto;
-  flex: 1;
+  overflow-y: auto; /* 淇濈暀绾靛悜婊氬姩鏉� */
+  overflow-x: hidden; /* 闅愯棌妯悜婊氬姩鏉� */
   height: 350px;
 }
 
@@ -3394,4 +3436,16 @@
   width: 100%;
   display: flex;
 }
+/* .tab3 {
+  overflow-y: auto;
+}
+
+.tab3::-webkit-scrollbar {
+  width: 0px;
+  background: transparent;
+}
+
+.tab3::-webkit-scrollbar-thumb {
+  background: transparent;
+} */
 </style>

--
Gitblit v1.8.0