From cb1f69717eed3b6a61b6c61a8934bac752782b2d Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 05 三月 2025 17:00:38 +0800
Subject: [PATCH] 1

---
 src/views/system/packages/index.vue |   61 +++++++++++++++++-------------
 1 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/views/system/packages/index.vue b/src/views/system/packages/index.vue
index 4f1f125..c427a25 100644
--- a/src/views/system/packages/index.vue
+++ b/src/views/system/packages/index.vue
@@ -8,10 +8,10 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="濂楅鍚嶇О" prop="zhmc">
+      <el-form-item label="缁勫悎鍚嶇О" prop="zhmc">
         <el-input
           v-model="queryParams.zhmc"
-          placeholder="璇疯緭鍏ュ椁愬悕绉�"
+          placeholder="璇疯緭鍏ョ粍鍚堝悕绉�"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -94,7 +94,7 @@
       >
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column
-          label="濂楅鍚嶇О"
+          label="缁勫悎鍚嶇О"
           align="center"
           prop="zhmc"
           width="150px"
@@ -150,7 +150,7 @@
       </div>
     </template>
 
-    <!-- 淇敼浣撴濂楅瀵硅瘽妗� -->
+    <!-- 淇敼浣撴缁勫悎瀵硅瘽妗� -->
     <el-dialog
       :title="title"
       :visible.sync="open"
@@ -167,17 +167,17 @@
       >
         <!-- <div class="dialo">
         <div class="dialo1"> -->
-        <el-form-item label="濂楅鍚嶇О" prop="zhmc">
+        <el-form-item label="缁勫悎鍚嶇О" prop="zhmc">
           <span
             slot="label"
             style="display: inline-block; border-bottom: 2px solid blue"
             @click="handlePackage"
           >
-            濂楅鍚嶇О
+            缁勫悎鍚嶇О
           </span>
           <el-input
             v-model="form.zhmc"
-            placeholder="璇疯緭鍏ュ椁愬悕绉�"
+            placeholder="璇疯緭鍏ョ粍鍚堝悕绉�"
             style="width: 150px"
           />
         </el-form-item>
@@ -263,6 +263,8 @@
             >
               <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">
@@ -346,16 +348,16 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
-      // 浣撴濂楅琛ㄦ牸鏁版嵁
+      // 浣撴缁勫悎琛ㄦ牸鏁版嵁
       packageList: [],
-      // 濂楅閫変腑鐨勭埗椤�
+      // 缁勫悎閫変腑鐨勭埗椤�
       allpackageList: [],
       // 宸查��
       newproName: [],
       // 鎵�鏈変綋妫�椤圭洰路
       allList: [],
       treeList: [],
-      // 鎵�鏈夊椁愭暟鎹�
+      // 鎵�鏈夌粍鍚堟暟鎹�
       // allpackage:[],
       // 寮瑰嚭灞傛爣棰�
       title: "",
@@ -420,7 +422,7 @@
         return data.proEngName.indexOf(value) !== -1;
       }
     },
-    /** 鏌ヨ浣撴濂楅鍒楄〃 */
+    /** 鏌ヨ浣撴缁勫悎鍒楄〃 */
     getList() {
       this.loading = true;
       getZhList(this.queryParams).then((response) => {
@@ -470,7 +472,7 @@
     handlePackage() {
       this.$refs.aaa.open = true;
       this.$refs.aaa.getList();
-      this.$refs.aaa.title = "濂楅瀛楀吀";
+      this.$refs.aaa.title = "缁勫悎瀛楀吀";
     },
     handleChanges(param1) {
       this.form.pacName = param1[0].pacName;
@@ -499,7 +501,7 @@
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "浣撴濂楅淇℃伅缁存姢";
+      this.title = "浣撴缁勫悎淇℃伅缁存姢";
       this.DataList = [];
       this.checkedkey = [];
       this.checkedListkey = [];
@@ -507,7 +509,7 @@
     },
 
     handleUp() {
-      this.title = "浣撴濂楅淇℃伅缁存姢";
+      this.title = "浣撴缁勫悎淇℃伅缁存姢";
       this.open = true;
       // getPacTjProjectList().then((response) => {
       //   this.allList = response.data;
@@ -523,7 +525,7 @@
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
-      this.title = "浣撴濂楅淇℃伅缁存姢";
+      this.title = "浣撴缁勫悎淇℃伅缁存姢";
       this.open = true;
       this.form = row;
       this.DataList = [];
@@ -589,7 +591,10 @@
                       });
                       this.pics = 0;
                       this.DataList.forEach((item) => {
-                        this.pics += item.proPrice;
+                        console.log(this.DataList,8888);
+                        
+                        this.pics += item.proPrice * item.sl;
+                        // this.pics += item.proPrice;
                       });
                     }
                   });
@@ -612,7 +617,7 @@
               });
               this.pics = 0;
               this.DataList.forEach((item) => {
-                this.pics += item.proPrice;
+                this.pics += item.proPrice * item.sl;
               });
             });
           });
@@ -623,6 +628,8 @@
     handleCurrentChecked(data, checked, checkedNodes) {
       this.dataObj = data;
       this.checkedObj = checked;
+      console.log(checked,555);
+      
       if (checked == true) {
         // this.$refs.tree.setCheckedKeys([data.proId]);
         let proId = data.proId;
@@ -635,7 +642,7 @@
             this.spliceData();
             this.pics = 0;
             this.DataList.forEach((item1) => {
-              this.pics += item1.proPrice;
+              this.pics += item1.proPrice * item1.sl;
               if (item1.proParentId == data.proId) {
                 item1.propinName = data.proName;
                 item1.propinPrice = this.dataObj.proPrice;
@@ -648,7 +655,7 @@
             this.list1 = false;
             this.DataList.forEach((item) => {
               this.TotalPrice1 = item.proPrice + this.TotalPrice1;
-              this.pics += item.proPrice;
+              this.pics += item.proPrice * item.sl;
             });
           }
         });
@@ -667,7 +674,7 @@
           });
           this.pics = 0;
           this.DataList.forEach((item, index) => {
-            this.pics += item.proPrice;
+            this.pics += item.proPrice * item.sl;
           });
         });
       }
@@ -695,7 +702,7 @@
             this.TotalPrice1 = 0;
             this.pics = 0;
             this.DataList.forEach((item1) => {
-              this.pics += item1.proPrice;
+              this.pics + item1.proPrice * item1.sl;
               // this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
             });
           }
@@ -704,7 +711,7 @@
         this.DataList.push(data);
         this.pics = 0;
         this.DataList.forEach((item1) => {
-          this.pics += item1.proPrice;
+          this.pics += item1.proPrice * item1.sl;
           if (item1.proParentId == this.dataObj.proId) {
             item1.propinName = this.dataObj.proName;
             item1.propinPrice = this.dataObj.proPrice;
@@ -715,7 +722,7 @@
         this.pics = 0;
         this.DataList.forEach((item1) => {
           // this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
-          this.pics += item1.proPrice;
+          this.pics += item1.proPrice * item1.sl;
         });
       }
     },
@@ -780,14 +787,14 @@
           }
         });
       } else {
-        Message.warning("璇峰厛濉啓濂楅鍚嶇О");
+        Message.warning("璇峰厛濉啓缁勫悎鍚嶇О");
       }
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const pacIds = row.id || this.ids;
       this.$modal
-        .confirm('鏄惁纭鍒犻櫎浣撴濂楅缂栧彿涓�"' + pacIds + '"鐨勬暟鎹」锛�')
+        .confirm('鏄惁纭鍒犻櫎浣撴缁勫悎缂栧彿涓�"' + pacIds + '"鐨勬暟鎹」锛�')
         .then(function () {
           return delzhxm(pacIds);
         })
@@ -798,7 +805,7 @@
         .catch(() => {});
     },
 
-    /** 鍒嗛厤濂楅鍐呴」鐩搷浣� */
+    /** 鍒嗛厤缁勫悎鍐呴」鐩搷浣� */
     handleProject: function (row) {
       const pacId = row.pacId;
       this.$router.push("/system/user-auth/role/" + pacId);
@@ -814,7 +821,7 @@
         `package_${new Date().getTime()}.xlsx`
       );
     },
-    // 濂楅璇︽儏
+    // 缁勫悎璇︽儏
     // handleSeach(row) {
     //   this.Seachopen = true;
     //   this.loading = true;

--
Gitblit v1.8.0