From aa4451fa555c7d86502c0416a5cf3be343acb67c Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 08 一月 2025 15:09:31 +0800
Subject: [PATCH] 1

---
 src/views/system/package/index.vue |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index f7284cb..4c7277b 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -432,6 +432,22 @@
             style="width: 150px"
           />
         </el-form-item>
+        <el-form-item label="浣撴绫诲埆" prop="tjCategory">
+          <el-select
+            v-model="form.tjCategory"
+            placeholder="璇烽�夋嫨浣撴绫诲埆"
+            style="width: 150px"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="dict in dict.type.dict_tjtype"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 
         <div v-if="!isCollapsed" style="display: flex">
           <div>
@@ -499,8 +515,8 @@
         </el-table-column>
       </el-table> -->
 
-      <el-row :gutter="20">
-        <el-col :span="7">
+      <el-row :gutter="11">
+        <el-col :span="11">
           <div
             style="text-align: center; margin-bottom: 10px; margin-top: 10px"
           >
@@ -525,7 +541,7 @@
             </el-tree>
           </div>
         </el-col>
-        <el-col :span="6">
+       <!--  <el-col :span="6">
           <div
             style="text-align: center; margin-bottom: 10px; margin-top: 10px"
           >
@@ -547,27 +563,27 @@
             >
             </el-tree>
           </div>
-        </el-col>
+        </el-col> -->
         <el-col :span="11">
           <div class="grid-content bg-purple">
             <div
-              style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+              style="text-align: center; margin-bottom: 10px; margin-top: 10px; margin-left: 16%;"
             >
               宸查�夐」鐩垪琛�
             </div>
             <el-table
               :data="DataList"
               border
-              style="width: 100%"
+              style="width: 80%; margin-left: 18%;"
               height="400"
               :span-method="objectSpanMethod"
             >
-              <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+              <el-table-column prop="propinName" label="妫�鏌ラ」鐩�" >
               </el-table-column>
-              <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+              <el-table-column prop="proPrice" label="鍘熶环" align="center" >
               </el-table-column>
-              <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
-              </el-table-column>
+              <!-- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+              </el-table-column> -->
 
               <!-- <el-table-column
                 label="鎿嶄綔"
@@ -587,7 +603,7 @@
                 </template> 
               </el-table-column>-->
             </el-table>
-            <div>鍚堣锛歿{ pics }}鍏�</div>
+            <h3 style="font-weight: 600">鍚堣锛歿{ pics }}鍏�</h3>
           </div>
         </el-col>
       </el-row>
@@ -640,7 +656,7 @@
 import { Message } from "element-ui";
 export default {
   name: "Package",
-  dicts: ["sys_normal_disable", "sys_yes_no"],
+  dicts: ["sys_normal_disable", "sys_yes_no", "dict_tjtype"],
   components: { Packages },
   data() {
     let checkPhoneNum = (rule, value, callback) => {
@@ -765,7 +781,12 @@
     },
     filterNode(value, data) {
       if (!value) return true;
-      return data.proName.indexOf(value) !== -1;
+      // return data.proName.indexOf(value) !== -1;
+      if(data.proName.indexOf(value) !== -1){
+        return data.proName.indexOf(value) !== -1;
+      }else{
+        return data.proEngName.indexOf(value) !== -1;
+      }
     },
     /** 鏌ヨ浣撴濂楅鍒楄〃 */
     getList() {
@@ -935,6 +956,7 @@
         this.form.keywords = this.form.keywords.slice(0, -1);
         this.form.keywords = this.form.keywords.split(",");
         this.DataList = [];
+        // this.pics = 0;
         this.checkedkey = [];
         this.checkedListkey = [];
         this.getDataList();
@@ -1077,15 +1099,14 @@
                     item2.disabled = true;
                     this.checkedListkey.push(item2.proId);
                     this.DataList.push(item2);
-                    this.pics = 0;
                     if (this.DataList.length != 0) {
                       this.DataList.forEach((item) => {
-                        this.pics += item.proPrice;
                         if (item.proParentId == item1.proId) {
                           item.propinName = item1.proName;
                           item.propinPrice = item1.proPrice;
                         }
                       });
+                      this.pics = 0;
                       this.DataList.forEach((item) => {
                         this.pics += item.proPrice;
                       });
@@ -1108,6 +1129,7 @@
                 item.propinName = this.Treedata[0].proName;
                 item.propinPrice = this.Treedata[0].proPrice;
               });
+              this.pics = 0;
               this.DataList.forEach((item) => {
                 this.pics += item.proPrice;
               });

--
Gitblit v1.8.0