From 319cf42af7648e99693f6eabfec4f842a40ed340 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 13 三月 2025 16:16:27 +0800
Subject: [PATCH] 1

---
 src/views/system/package/index.vue | 2376 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1,365 insertions(+), 1,011 deletions(-)

diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 839dfd1..42c549d 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -103,10 +103,6 @@
       ></right-toolbar>
     </el-row>
 
-    <!-- 
-    element-loading-background="rgba(0, 0, 0, 0.1)"
-    element-loading-spinner="el-icon-loading"
-        element-loading-text="姝e湪鍔犺浇涓�..." -->
     <template>
       <el-table
         v-loading="loading"
@@ -129,7 +125,6 @@
           prop="newID"
           fixed
         />
-        <!-- <el-table-column label="缂栧彿" align="center" prop="pacId" /> -->
         <el-table-column
           label="浣撴绫诲埆"
           width="100px"
@@ -166,7 +161,7 @@
           fixed
         ></el-table-column>
         <el-table-column
-          label="浼樻儬浠�"
+          label="鐜颁环"
           width="80px"
           align="center"
           prop="newPrice"
@@ -180,13 +175,6 @@
           width="1200px"
         >
         </el-table-column>
-        <!-- <el-table-column
-          label="椤圭洰鏄庣粏"
-          align="center"
-          prop="allSonName"
-          :show-overflow-tooltip="true"
-        > 
-        </el-table-column>-->
         <el-table-column
           label="濂楅鎻忚堪"
           align="center"
@@ -197,18 +185,6 @@
             <div class="showInline">{{ scope.row.pacRemark }}</div>
           </template>
         </el-table-column>
-        <!-- <el-table-column
-          label="鍥剧墖"
-          align="center"
-          prop="pacPhone"
-          width="100"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <image-preview :src="scope.row.pacPhone" :width="50" :height="50" />
-          </template>
-        </el-table-column> -->
-
         <el-table-column
           label="鍏抽敭瀛�"
           width="110px"
@@ -228,13 +204,6 @@
             />
           </template>
         </el-table-column>
-        <!-- <el-table-column
-          label="璇︾粏浠嬬粛"
-          :show-overflow-tooltip="true"
-          width="100px"
-          align="center"
-          prop="detail"
-        ></el-table-column> -->
         <el-table-column
           label="鎺掑簭"
           width="50px"
@@ -247,12 +216,6 @@
           align="center"
           prop="retailPrice"
         ></el-table-column>
-        <!-- <el-table-column
-          label="鍘熶环"
-          width="90px"
-          align="center"
-          prop="counterPrice"
-        ></el-table-column> -->
         <el-table-column
           label="宸插敭鏁伴噺"
           width="90px"
@@ -299,8 +262,6 @@
               v-hasPermi="['system:package:remove']"
               title="鍒犻櫎"
             ></el-button>
-            <!-- <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleSeach(scope.row)"
-              v-hasPermi="['system:package:Seach']" title="濂楅璇︽儏"></el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -333,8 +294,6 @@
         label-width="100px"
         :inline="true"
       >
-        <!-- <div class="dialo">
-        <div class="dialo1"> -->
         <el-form-item label="濂楅鍚嶇О" prop="pacName">
           <span
             slot="label"
@@ -350,10 +309,6 @@
           />
         </el-form-item>
         <el-form-item label="濂楅鐘舵��" prop="pacStatus">
-          <!-- <el-radio-group v-model="form.pacStatus">
-              <el-radio :label="0">鍚敤</el-radio>
-              <el-radio :label="1">鍋滅敤</el-radio>
-            </el-radio-group> -->
           <el-select
             v-model="form.pacStatus"
             placeholder="璇烽�夋嫨鐘舵��"
@@ -369,24 +324,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
-        <!--  <el-form-item label="濂楅绫荤洰" prop="categoryId">
-          <el-select
-            v-model="form.categoryId"
-            placeholder="璇烽�夋嫨濂楅绫荤洰"
-            style="width: 150px"
-            @change="shangpin"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="浣撴绫诲埆" prop="tjCategory">
           <el-select
             v-model="form.tjCategory"
@@ -403,12 +340,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="鏄惁涓婃灦" prop="isOnSale">
-          <!-- <el-radio-group v-model="form.pacStatus">
-              <el-radio :label="0">鍚敤</el-radio>
-              <el-radio :label="1">鍋滅敤</el-radio>
-            </el-radio-group> -->
           <el-select
             v-model="form.isOnSale"
             placeholder="璇烽�夋嫨鏄惁涓婃灦"
@@ -424,7 +356,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="鎺掑簭" prop="sort">
           <el-input
             v-model="form.sort"
@@ -458,13 +389,17 @@
             @change="numberChange"
           ></el-input-number>
         </el-form-item>
-        <el-form-item label="浼樻儬浠�">
+        <el-form-item label="鐜颁环1">
           <el-input
             ref="inputName"
             v-model="form.xianprice"
-            placeholder="浼樻儬浠�"
+            placeholder="璇疯緭鍏ョ幇浠�"
             clearable
             style="width: 140px"
+            type="number"
+            :min="0"
+            @change="handleXianPriceChange"
+            @input="handleXianPriceInput"
           />
         </el-form-item>
         <el-form-item label="鍏抽敭瀛�" prop="keywords">
@@ -498,11 +433,6 @@
               ></el-input>
             </el-form-item>
             <el-form-item label="璇︾粏浠嬬粛" prop="detail">
-              <!-- <el-input
-            v-model="form.detail"
-            placeholder="璇疯緭鍏ヨ缁嗕粙缁�"
-            style="width: 200px"
-          /> -->
               <editor
                 v-model="form.detail"
                 :min-height="192"
@@ -510,47 +440,16 @@
               />
             </el-form-item>
           </div>
-          <!-- </div> -->
           <div class="dialo2">
             <el-form-item label="鍥剧墖">
               <image-upload v-model="form.pacPhone" />
             </el-form-item>
           </div>
-          <!-- </div> -->
         </div>
       </el-form>
       <el-button type="primary" plain size="mini" @click="toggleCollapse">{{
         isCollapsed ? "灞曞紑" : "鏀惰捣"
       }}</el-button>
-      <!-- <el-button type="primary" plain size="mini" icon="el-icon-plus" @click="addmembers()">鏂板鍗曢」</el-button>
-      <el-table v-loading="loading" :data="form.tjProjectList" @selection-change="handleSelectionChange" border
-        max-height="275" style="margin: 10px 0">
-        <el-table-column label="搴忓彿" align="center" type="index" />
-        <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="180px">
-          <template slot-scope="scope">
-            <el-select filterable v-model="scope.row.proName" placeholder="璇烽�夋嫨椤圭洰鍚嶇О" @change="getSelectValue">
-              <el-option v-for="(item, index) in allList" :key="index" :label="item.proName" :value="item.proName">
-              </el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="椤圭洰鏄庣粏" align="center" prop="allSonProName" width="400px" :show-overflow-tooltip="true">
-        </el-table-column>
-        <el-table-column label="鍘熶环(鍏�)" align="center" prop="proPrice" width="80px" />
-        <el-table-column label="鐜颁环(鍏�)" align="center" prop="priceNow" width="80px">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.priceNow" autocomplete="off" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-circle-plus-outline" @click="addmembers(scope.row)"
-              v-hasPermi="['system:package:edit']" title="鏂板琛�"></el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click.native.prevent="Delete(scope.$index)"
-              v-hasPermi="['hosp:consumables:remove']" title="鍒犻櫎"></el-button>
-          </template>
-        </el-table-column>
-      </el-table> -->
 
       <el-row style="display: flex; width: 1300px">
         <el-col>
@@ -590,29 +489,6 @@
             />
           </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"
-              ref="trees"
-              :render-content="renderContent"
-            >
-            </el-tree>
-          </div>
-        </el-col> -->
         <el-col>
           <div class="grid-content bg-purple">
             <div
@@ -630,11 +506,9 @@
               border
               style="width: 90%; margin-left: 20px"
               height="400"
-              :span-method="objectSpanMethod"
             >
               <el-table-column prop="proName" label="妫�鏌ラ」鐩�">
               </el-table-column>
-
               <el-table-column
                 prop="priceOrd"
                 label="鍘熶环"
@@ -644,7 +518,6 @@
               </el-table-column>
               <el-table-column label="鎶樻墸" width="100px">
                 <template slot-scope="scope">
-                  <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
                   <el-input
                     v-model.number="scope.row.limits"
                     @input="calculateDiscount(scope.row)"
@@ -654,13 +527,12 @@
                     min="0"
                     step="0.1"
                     max="10"
-                  >
-                  </el-input>
+                  />
                 </template>
               </el-table-column>
               <el-table-column
                 prop="priceNow"
-                label="浼樻儬浠�"
+                label="鐜颁环"
                 width="80px"
                 align="center"
               >
@@ -677,28 +549,7 @@
                   </el-button>
                 </template>
               </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="handleDeletes(scope.row)"
-                    title="鍒犻櫎"
-                  ></el-button>
-                </template> 
-              </el-table-column>-->
             </el-table>
-            <!-- <h3 style="font-weight: 600">鍚堣锛歿{ pics }}鍏�</h3> -->
           </div>
         </el-col>
       </el-row>
@@ -709,985 +560,454 @@
       </div>
     </el-dialog>
 
-    <!-- 濂楅璇︽儏 -->
-    <!-- <el-dialog :title="title" :visible.sync="Seachopen" width="500px" append-to-body>
-      <template>
-        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
-        <div style="margin: 15px 0px; width: 60px"></div>
-        <el-checkbox-group v-model="newproName" @change="handleCheckedCitiesChange">
-          <el-checkbox style="margin: 15px 0px; width: 180px" v-for="item in allList" :label="item.proName"
-            :key="item.proId">{{ item.proName }}</el-checkbox>
-        </el-checkbox-group>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitcheckbox">纭� 瀹�</el-button>
-          <el-button @click="cancel">鍙� 娑�</el-button>
-        </div>
-      </template>
-    </el-dialog> -->
     <Packages ref="aaa" @add="handleChanges" />
   </div>
 </template>
 
 <script>
-import Packages from "@/components/Packages";
-import { listCategory } from "@/api/mall/category";
-import { listKeyword } from "@/api/mall/keyword";
-// import { getProParentIdDxList, getProSonDxList } from "@/api/system/tijian";
-import {
-  getProParentIdDxList,
-  search,
-  getProSonDxList,
-} from "@/api/system/package";
+import { Big } from 'big.js'
+import Packages from "@/components/Packages"
+import { listCategory } from "@/api/mall/category"
+import { listKeyword } from "@/api/mall/keyword"
+import { search } from "@/api/system/package"
 import {
   getPacList,
   getPacInFo,
-  listPackage,
-  getPackage,
   delPackage,
-  addPackage,
-  updatePackage,
-  getAllPackage,
   updateStatus,
-  getAllList,
-  updateProject,
   getPacTjProjectList,
   saveOreditTjPacNew,
-} from "@/api/system/package";
-import { Message } from "element-ui";
-import Big from "big.js";
+} from "@/api/system/package"
+import { Message } from "element-ui"
+
 export default {
   name: "Package",
   dicts: ["sys_normal_disable", "sys_yes_no", "dict_tjtype"],
   components: { Packages },
   data() {
-    let checkPhoneNum = (rule, value, callback) => {
-      let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
-      if (value == "" && value == undefined && !value) {
-        return callback("");
-      } else if (value != undefined && value != "") {
-        return callback();
-      } else if (!patter.test(value)) {
-        return callback("");
-      }
-    };
     return {
-      pics: 0,
-      filterText: "",
-      DataList: [],
-      list1: true,
-      activeName: "1",
-      num: 1,
-      checkedObj: {},
-      dataObj: {},
-      Treedata: [],
-      TreedataList: [],
-      treedataList: [],
-      checkedkey: [],
-      checkedListkey: [],
-      defaultProps: {
-        children: [],
-        label: "proName",
-      },
-      isCollapsed: true, // 榛樿涓烘姌鍙犵姸鎬�
-      categoryList: [],
-      keys: "",
-      keywordList: [],
-      dataListAll: [],
-      // 澶氶�夋
-      priceNow: "",
-      checkAll: false,
-      isIndeterminate: true,
-      // 閬僵灞�
-      loading: false,
-      radio: 3,
-      // 閫変腑鏁扮粍
-      ids: [],
-      // 闈炲崟涓鐢�
-      single: true,
-      // 闈炲涓鐢�
-      multiple: true,
-      // 鏄剧ず鎼滅储鏉′欢
-      showSearch: true,
-      // 浣撴濂楅琛ㄦ牸鏁版嵁
-      packageList: [],
-      // 濂楅閫変腑鐨勭埗椤�
-      allpackageList: [],
-      // 宸查��
-      newproName: [],
-      // 鎵�鏈変綋妫�椤圭洰路
-      allList: [],
-      treeList: [],
-      // 鎵�鏈夊椁愭暟鎹�
-      // allpackage:[],
-      // 寮瑰嚭灞傛爣棰�
-      title: "",
-      // 鏄惁鏄剧ず寮瑰嚭灞�
-      open: false,
-      Seachopen: false,
-      checkedNodes: [],
-      pacId: "",
-      // 鎬绘潯鏁�
-      total: 0,
-      total1: 0,
-      // 鏌ヨ鍙傛暟
+      pics: 0, // 鍘熶环鎬诲拰
+      DataList: [], // 宸查�夐」鐩垪琛�
+      Treedata: [], // 椤圭洰鏍戞暟鎹�
+      checkedkey: [], // 鏍戦粯璁ら�変腑椤�
+      checkedNodes: [], // 璁板綍閫変腑鐨勮妭鐐�
+      isCollapsed: true, // 鎶樺彔鐘舵��
+      categoryList: [], // 濂楅绫荤洰
+      keywordList: [], // 鍏抽敭瀛楀垪琛�
+      keys: "", // 鍏抽敭瀛楀瓧绗︿覆
+      loading: false, // 鍔犺浇鐘舵��
+      single: true, // 鏄惁鍗曢�夌鐢�
+      multiple: true, // 鏄惁澶氶�夌鐢�
+      showSearch: true, // 鏄剧ず鎼滅储鏉′欢
+      packageList: [], // 濂楅鍒楄〃
+      allList: [], // 鎵�鏈変綋妫�椤圭洰
+      title: "", // 寮瑰嚭灞傛爣棰�
+      open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
+      total: 0, // 涓昏〃鏍兼�绘潯鏁�
+      total1: 0, // 椤圭洰鏍戞�绘潯鏁�
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         pacName: null,
         pacRemark: null,
+        tjCategory: null,
       },
       queryParams1: {
         page: 1,
         pageSize: 30,
         nr: "",
       },
-      // 琛ㄥ崟鍙傛暟
       form: {
-        xianprice: null, // 浼樻儬浠�
-        counterPrice: null, //鍘熶环
-        limits: 10,
+        xianprice: 0, // 鐜颁环鎬诲拰锛屽彲鎵嬪姩淇敼
+        limits: 10, // 鎬绘姌鎵�
+        pacName: "",
+        pacStatus: "",
+        tjCategory: "",
+        isOnSale: "",
+        sort: null,
+        retailPrice: null,
+        keywords: [],
       },
-      forms: {},
-      youhui: 10,
-      // 琛ㄥ崟鏍¢獙
+      youhui: 10, // 涓婃柟鎶樻墸
+      defaultProps: {
+        children: [],
+        label: "proName",
+      },
       rules: {
-        deleted: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
-        ],
-        pacName: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
-        ],
+        pacName: [{ required: true, message: "濂楅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
         pacStatus: [
-          { required: true, validator: checkPhoneNum, trigger: "change" },
+          { required: true, message: "璇烽�夋嫨濂楅鐘舵��", trigger: "change" },
         ],
-        // categoryId: [
-        //   { required: true, validator: checkPhoneNum, trigger: "change" },
-        // ],
-        /*  keywords: [
-          { required: true, validator: checkPhoneNum, trigger: "change" },
-        ], */
         isOnSale: [
-          { required: true, validator: checkPhoneNum, trigger: "change" },
+          { required: true, message: "璇烽�夋嫨鏄惁涓婃灦", trigger: "change" },
         ],
-        sort: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+        sort: [{ required: true, message: "鎺掑簭涓嶈兘涓虹┖", trigger: "blur" }],
         retailPrice: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
-        ],
-        counterPrice: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "灏忕▼搴忎环鏍间笉鑳戒负绌�", trigger: "blur" },
         ],
         tjCategory: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "璇烽�夋嫨浣撴绫诲埆", trigger: "change" },
         ],
       },
-    };
+    }
   },
-  // watch: {
-  //   filterText(val) {
-  //     this.$refs.tree.filter(val);
-  //   },
-  // },
-
   created() {
-    this.getList();
-    this.getKeyword();
-    this.getCategory();
+    this.getList()
+    this.getKeyword()
+    this.getCategory()
   },
   methods: {
     toggleCollapse() {
-      this.isCollapsed = !this.isCollapsed; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+      this.isCollapsed = !this.isCollapsed
     },
     filterNode(value, data) {
-      if (!value) return true;
-      // 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;
-      }
+      if (!value) return true
+      return (
+        data.proName.indexOf(value) !== -1 ||
+        (data.proEngName && data.proEngName.indexOf(value) !== -1)
+      )
     },
-    /** 鏌ヨ浣撴濂楅鍒楄〃 */
     getList() {
-      this.loading = true;
+      this.loading = true
       getPacTjProjectList().then((response) => {
-        this.allList = response.data;
-        if (this.allList.proStatus === 0) {
-          this.allList.proStatus = "鍚敤";
-        } else {
-          this.allList.proStatus = "鍋滅敤";
-        }
-        this.loading = false;
-      });
+        this.allList = response.data
+        this.loading = false
+      })
       getPacList(this.queryParams).then((response) => {
         response.rows.forEach((item, index) => {
           item.newID =
             (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
             index +
-            1;
-        });
-        this.total = response.total;
-        this.packageList = response.rows;
-        this.loading = false;
-      });
+            1
+        })
+        this.total = response.total
+        this.packageList = response.rows
+        this.loading = false
+      })
     },
-
-    /** 鏌ヨ鍏抽敭瀛楀垪琛� */
     getKeyword() {
-      this.loading = true;
       listKeyword(this.queryParams).then((response) => {
-        this.keywordList = response.rows;
-      });
+        this.keywordList = response.rows
+      })
     },
     sel(val) {
-      let id = val;
-      this.keys = "";
-      id.forEach((item) => {
-        this.keys += item + ",";
-      });
+      this.keys = val.join(",")
     },
-    /** 鏌ヨ绫荤洰鍒楄〃 */
     getCategory() {
-      this.loading = true;
       listCategory(this.queryParams).then((response) => {
-        this.categoryList = response.rows;
-        console.log(this.categoryList, 9988);
-      });
+        this.categoryList = response.rows
+      })
     },
-    shangpin(vals) {},
-    // 鍙栨秷鎸夐挳
     cancel() {
-      this.open = false;
-      this.Seachopen = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
-    // 琛ㄥ崟閲嶇疆
     reset() {
       this.form = {
         pacId: null,
-        pacName: null,
-        pacRemark: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        deleted: null,
-        allSonName: null,
-        allProName: null,
-        priceNow: null,
-        proId: null,
-        // pacStatus: "鍚敤",
-      };
-      this.resetForm("form");
+        pacName: "",
+        pacRemark: "",
+        pacStatus: "",
+        tjCategory: "",
+        isOnSale: "",
+        sort: null,
+        retailPrice: null,
+        xianprice: 0,
+        limits: 10,
+        keywords: [],
+      }
+      this.DataList = []
+      this.checkedkey = []
+      this.checkedNodes = []
+      this.youhui = 10
+      this.pics = 0
+      this.resetForm("form")
     },
-    /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
-
     handlePackage() {
-      this.$refs.aaa.open = true;
-      this.$refs.aaa.getList();
-      this.$refs.aaa.title = "濂楅瀛楀吀";
+      this.$refs.aaa.open = true
+      this.$refs.aaa.getList()
+      this.$refs.aaa.title = "濂楅瀛楀吀"
     },
     handleChanges(param1) {
-      this.form.pacName = param1[0].pacName;
-      this.form.hisPacId = param1[0].pacId;
+      this.form.pacName = param1[0].pacName
+      this.form.hisPacId = param1[0].pacId
       if (param1[0].price) {
-        this.form.counterPrice = param1[0].price;
-        this.form.retailPrice = param1[0].price;
+        this.form.counterPrice = param1[0].price
+        this.form.retailPrice = param1[0].price
       }
     },
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm("queryForm")
+      this.handleQuery()
     },
-    // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
-      if (!selection[0]) {
-        return;
+      if (!selection.length) {
+        this.forms = null
+        this.ids = []
+        this.single = true
+        this.multiple = true
+        return
       }
-      this.forms = selection[0];
-      this.ids = selection.map((item) => item.pacId);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
+      this.forms = selection[0]
+      this.ids = selection.map((item) => item.pacId)
+      this.single = selection.length !== 1
+      this.multiple = false
     },
-    /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "浣撴濂楅淇℃伅缁存姢";
-      this.DataList = [];
-      this.checkedkey = [];
-      this.checkedListkey = [];
-      this.getDataList();
-      // getAllList().then((response) => {
-      //   this.allList = response.data;
-      //   if (this.allList.proStatus === 0) {
-      //     this.allList.proStatus = "鍚敤";
-      //   } else {
-      //     this.allList.proStatus = "鍋滅敤";
-      //   }
-      //   this.loading = false;
-      // });
-      // if (!this.form.tjProjectList) {
-      //     this.form.tjProjectList = []
-      //     this.form.tjProjectList.push({
-      //       id: parseInt(length),
-      //       proName: "",
-      //       allSonProName: "",
-      //       proPrice: "",
-      //       priceNow: "",
-      //       proId: "",
-      //       Selection,
-      //     });
-      //   }
+      this.reset()
+      this.open = true
+      this.title = "浣撴濂楅淇℃伅缁存姢"
+      this.getDataList()
     },
-
-    // 鏄惁鍚敤
     handleStatusChange(row) {
-      let data = {
-        pacId: row.pacId,
-        pacStatus: row.pacStatus,
-      };
-      let text = row.pacStatus === "0" ? "鍚敤" : "鍋滅敤";
-      this.$confirm("纭瑕�" + text + row.pacName + "濂楅鍚楋紵")
-        .then(function () {
-          return updateStatus(data);
-        })
-        .then(() => {
-          this.msgSuccess(text + "鎴愬姛");
-        })
-        .catch(function () {
-          row.pacStatus = row.pacStatus === "0" ? "0" : "1";
-        });
-    },
-
-    handleUp() {
-      this.title = "浣撴濂楅淇℃伅缁存姢";
-      this.open = true;
-      // getPacTjProjectList().then((response) => {
-      //   this.allList = response.data;
-      //   this.loading = false;
-      // });
-      getPacInFo(this.forms.pacId).then((response) => {
-        this.form = response.data;
-        console.log(this.form, 2233);
-
-        this.form.keywords = this.form.keywords.slice(0, -1);
-        this.form.keywords = this.form.keywords.split(",");
-        // this.DataList = [];
-
-        // this.pics = 0;
-        this.DataList = [];
-        this.checkedkey = [];
-        this.checkedListkey = [];
-        this.DataList = response.data.packageProjects;
-        this.DataList.forEach((item) => {
-          this.checkedkey.push(item.proId);
-          this.checkedListkey.push(item.proId);
-        });
-
-        // 鑾峰彇鏂扮殑鏁版嵁鍒楄〃锛堝鏋滈渶瑕侊級
-        this.getDataList();
-      });
-    },
-
-    /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
-      this.title = "浣撴濂楅淇℃伅缁存姢";
-      this.open = true;
-      getPacInFo(row.pacId).then((response) => {
-        this.form = response.data;
-        console.log(this.form, 445);
-
-        this.form.keywords = this.form.keywords.slice(0, -1);
-        this.form.keywords = this.form.keywords.split(",");
-        this.DataList = [];
-        this.checkedkey = [];
-        this.checkedListkey = [];
-        this.DataList = response.data.packageProjects;
-        this.DataList.forEach((item) => {
-          this.checkedkey.push(item.proId);
-          this.checkedListkey.push(item.proId);
-        });
-
-        // 鑾峰彇鏂扮殑鏁版嵁鍒楄〃锛堝鏋滈渶瑕侊級
-        this.getDataList();
-      });
-    },
-
-    // 鏂板琛�
-    addmembers() {
-      if (this.form.pacName) {
-        if (!this.form.tjProjectList) {
-          this.form.tjProjectList = [];
-          this.form.tjProjectList.push({
-            id: parseInt(length),
-            proName: "",
-            allSonProName: "",
-            proPrice: "",
-            priceNow: "",
-            proId: "",
-            Selection,
-          });
-        } else {
-          this.form.tjProjectList.push({
-            id: parseInt(length),
-            proName: "",
-            allSonProName: "",
-            proPrice: "",
-            priceNow: "",
-            proId: "",
-            Selection,
-          });
-        }
-      } else {
-        Message.warning("璇峰厛濉啓濂楅鍚嶇О");
-      }
-      this.$forceUpdate();
-    },
-
-    // 鍒犻櫎琛�
-    Delete(index) {
-      if (this.form.tjProjectList.length == 0) {
-        this.$alert("璇峰厛閫夋嫨瑕佸垹闄ょ殑鏁版嵁", "鎻愮ず", {
-          confirmButtonText: "纭畾",
-        });
-      } else {
-        this.form.tjProjectList.splice(index, 1);
-      }
-    },
-
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete1(row) {
-      this.DataList = this.DataList.filter((item) => item.proId !== row.proId);
-      // 浠� checkedNodes 涓Щ闄�
-      const index = this.checkedNodes.indexOf(row.proId);
-      if (index > -1) {
-        this.checkedNodes.splice(index, 1);
-      }
-      const tree = this.$refs.tree;
-      const node = tree.getNode(row.proId);
-      if (node) {
-        node.setChecked(false);
-      }
-      this.updateTotalPrice();
-    },
-    getSelectValue(val) {
-      this.form.tjProjectList.forEach((formitem) => {
-        if (formitem.proName == val) {
-          formitem.allSonProName = "";
-          this.allList.find((item) => {
-            if (item.proName == val) {
-              formitem.proId = item.proId;
-              formitem.proPrice = item.proPrice;
-              formitem.priceNow = item.proPrice;
-              formitem.allSonProName = item.allSonProName;
-              // item.tjProjectList.forEach((item1) => {
-              //   this.$nextTick(() => {
-              //     formitem.allSonProName =
-              //       formitem.allSonProName + "," + item1.proName;
-              //   });
-              //   // this.form.tjProjectList.allSonProName = this.form.tjProjectList.allSonProName+','+item1.proName
-              // });
-            }
-          });
-        }
-      });
-
-      for (let i = 0; i < this.form.tjProjectList.length; i++) {
-        for (let j = i + 1; j < this.form.tjProjectList.length; j++) {
-          if (
-            this.form.tjProjectList[i].proId == this.form.tjProjectList[j].proId
-          ) {
-            this.form.tjProjectList.splice(j, 1);
-            j--;
-            this.$modal.msgError("姝ら」鐩凡褰曞叆锛屼笉鍙噸澶嶅綍鍏�");
-          }
-        }
-      }
-
-      return this.form.tjProjectList;
-    },
-
-    numberChange(currentValue, oldValue) {
-      this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
-        confirmButtonText: "纭畾",
-        cancelButtonText: "鍙栨秷",
-        type: "warning",
-      })
-        .then(() => {
-          this.youhui = currentValue;
-          this.DataList.forEach((item) => {
-            item.limits = this.youhui;
-            const proPrice = new Big(item.priceOrd);
-            const limits = new Big(item.limits);
-            const result = proPrice.times(limits.div(10));
-            item.priceNow = result.toNumber();
-            this.form.xianprice = this.DataList.reduce((sum, item) => {
-              return sum.plus(new Big(item.priceNow || "0"));
-            }, new Big(0));
-          });
-        })
+      let data = { pacId: row.pacId, pacStatus: row.pacStatus }
+      let text = row.pacStatus === "0" ? "鍚敤" : "鍋滅敤"
+      this.$confirm(`纭瑕�${text}${row.pacName}濂楅鍚楋紵`)
+        .then(() => updateStatus(data))
+        .then(() => this.msgSuccess(`${text}鎴愬姛`))
         .catch(() => {
-          this.youhui = oldValue;
-        });
+          row.pacStatus = row.pacStatus === "0" ? "1" : "0"
+        })
     },
+    handleUp() {
+      this.title = "浣撴濂楅淇℃伅缁存姢"
+      this.open = true
+      getPacInFo(this.forms.pacId).then((response) => {
+        this.form = response.data
+        this.form.keywords = this.form.keywords
+          ? this.form.keywords.slice(0, -1).split(",")
+          : []
+        this.DataList = response.data.packageProjects || []
+        this.checkedkey = this.DataList.map((item) => item.proId)
+        this.checkedNodes = [...this.checkedkey]
+        this.updateTotalPrice()
+        this.updateYouhui()
+        this.getDataList()
+      })
+    },
+    handleUpdate(row) {
+      this.title = "浣撴濂楅淇℃伅缁存姢"
+      this.open = true
+      getPacInFo(row.pacId).then((response) => {
+        this.form = response.data
+        this.form.keywords = this.form.keywords
+          ? this.form.keywords.slice(0, -1).split(",")
+          : []
+        this.DataList = response.data.packageProjects || []
+        this.checkedkey = this.DataList.map((item) => item.proId)
+        this.checkedNodes = [...this.checkedkey]
+        this.updateTotalPrice()
+        this.updateYouhui()
+        this.getDataList()
+      })
+    },
+    handleDelete1(row) {
+      this.DataList = this.DataList.filter((item) => item.proId !== row.proId)
+      const index = this.checkedNodes.indexOf(row.proId)
+      if (index > -1) this.checkedNodes.splice(index, 1)
+      const tree = this.$refs.tree
+      const node = tree.getNode(row.proId)
+      if (node) node.setChecked(false)
+      this.updateTotalPrice()
+      this.updateYouhui()
+    },
+    numberChange(currentValue) {
+      this.youhui = currentValue
+      this.DataList.forEach((item) => {
+        item.limits = this.youhui
+        this.updateProPrice(item)
+      })
+      this.updateTotalPrice()
+    },
+    handleXianPriceInput(value) {
+      const numValue = Math.max(0, Number(value) || 0)
+      console.log("123")
+      this.form.xianprice = numValue
+    },
+    handleXianPriceChange(newValue) {
+      const value = Math.max(0, Number(newValue) || 0)
+      
+      if (this.DataList.length === 0 || this.pics === 0) {
+        this.form.xianprice = 0
+        this.youhui = 10
+        return
+      }
 
+      // 浣跨敤Big.js澶勭悊绮惧害
+      const totalOriginalPrice = new Big(this.pics)
+      const totalCurrentPrice = new Big(value)
+      let newYouhui = totalCurrentPrice
+        .div(totalOriginalPrice)
+        .times(10)
+        .toNumber()
+
+      // 闄愬埗鎶樻墸鑼冨洿
+      newYouhui = Math.min(10, Math.max(0, newYouhui))
+      this.youhui = Number(newYouhui.toFixed(1))
+
+      // 鏇存柊鎵�鏈夐」鐩殑鎶樻墸鍜岀幇浠�
+      this.DataList.forEach((item) => {
+        item.limits = this.youhui
+        this.updateProPrice(item)
+      })
+      
+      // 閲嶆柊璁$畻纭繚绮惧害
+      this.updateTotalPrice(true)
+    },
     updateProPrice(row) {
-      const proPrice = new Big(row.priceOrd);
-      const limits = new Big(row.limits);
-      const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
-      row.priceNow = result.toNumber();
-      this.form.xianprice = this.DataList.reduce((sum, item) => {
-        return sum.plus(new Big(item.priceNow || "0"));
-      }, new Big(0)).toNumber();
-      this.youhui =
-        (Math.floor((this.form.xianprice / this.pics) * 100) / 100) * 10;
-      // console.log(this.youhui, 1212);
+      if (!row.priceOrd) return
+      const proPrice = new Big(row.priceOrd)
+      const limits = new Big(row.limits || 10)
+      row.priceNow = parseFloat(proPrice.times(limits.div(10)).toFixed(2))
     },
     calculateDiscount(row) {
-      if (row.limits > 10) {
-        row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
-      } else if (row.limits < 0) {
-        row.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
-      }
-      this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
+      row.limits = Math.min(10, Math.max(0, row.limits))
+      this.updateProPrice(row)
+      this.updateTotalPrice()
+      this.updateYouhui()
     },
-    // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      let fields = ["propinName"];
-      let cellValue = row[column.property];
-      if (cellValue && fields.includes(column.property)) {
-        let prevRow = this.DataList[rowIndex - 1];
-        let nextRow = this.DataList[rowIndex + 1];
-        if (prevRow && prevRow[column.property] === cellValue) {
-          return { rowspan: 0, colspan: 0 };
-        } else {
-          let countRowspan = 1;
-          while (nextRow && nextRow[column.property] === cellValue) {
-            nextRow = this.DataList[++countRowspan + rowIndex];
-          }
-          if (countRowspan > 1) {
-            return { rowspan: countRowspan, colspan: 1 };
-          }
-        }
+    updateTotalPrice(skipXianPrice = false) {
+      // 璁$畻鍘熶环鎬诲拰
+      this.pics = this.DataList.reduce(
+        (sum, item) => sum + (Number(item.priceOrd) || 0),
+        0
+      )
+      
+      // 璁$畻鐜颁环鎬诲拰
+      if (!skipXianPrice) {
+        const totalCurrent = this.DataList.reduce(
+          (sum, item) => sum + (Number(item.priceNow) || 0),
+          0
+        )
+      console.log("1231")
+
+        this.form.xianprice = parseFloat(totalCurrent).toFixed(2)
       }
     },
-    renderContent(h, { node, data, store }) {
+    updateYouhui() {
+      if (this.DataList.length === 0 || this.pics === 0) {
+        this.youhui = 10
+        return
+      }
+      const totalOriginal = new Big(this.pics)
+      const totalCurrent = new Big(this.form.xianprice || 0)
+      this.youhui = parseFloat(
+        totalCurrent
+          .div(totalOriginal)
+          .times(10)
+          .toFixed(1)
+      )
+    },
+    renderContent(h, { node, data }) {
       return (
         <span class="custom-tree-node">
           <span>{node.label}</span>
           <span>({data.proPrice}鍏�)</span>
         </span>
-      );
+      )
     },
     getDataList() {
-      this.loading = true;
+      this.loading = true
       search(this.queryParams1).then((response) => {
-        this.Treedata = response.data.list; // 鏇存柊鏍戝舰鏁版嵁
-        this.total1 = response.data.total; // 鏇存柊鎬绘潯鏁�
-        this.pics = this.DataList.reduce(
-          (total, item) => total + item.priceOrd,
-          0
-        );
-
-        // 纭繚鍦ㄦ暟鎹姞杞藉悗淇濇寔閫変腑鐘舵��
+        this.Treedata = response.data.list
+        this.total1 = response.data.total
         this.$nextTick(() => {
-          this.$refs.tree.setCheckedKeys(this.checkedNodes);
-        });
-      });
-      this.loading = false;
+          this.$refs.tree.setCheckedKeys(this.checkedNodes)
+        })
+        this.loading = false
+      })
     },
-    // getDataList() {
-    //   this.loading = true;
-
-    //   getProParentIdDxList(this.queryParams).then((response) => {
-    //     this.Treedata = response.data.list;
-    //     /*  if (this.form.tjProjectList) {
-    //       this.form.tjProjectList.forEach((item) => {
-    //         this.Treedata.forEach((item1) => {
-    //           if (item.proId == item1.proId) {
-    //             this.checkedkey.push(item1.proId);
-
-    //             this.DataList.push(item1);
-
-    //             this.DataList.forEach((item1) => {
-    //               item1.limits = 10;
-    //               if (item1.limits > 10) {
-    //                 item1.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
-    //               } else if (item1.limits < 0) {
-    //                 item1.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
-    //               }
-    //               this.updateProPrice(item1); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
-    //             });
-
-    //           }
-    //         });
-    //       });
-    //     }  */ /* else {
-    //       this.checkedkey.push(this.Treedata[0].proId);
-    //       let proId = this.Treedata[0].proId;
-    //       this.TreedataList = this.Treedata.filter(
-    //         (item) => item.proId == proId
-    //       ); */
-
-    //     // 灏嗙涓�涓」鐩坊鍔犲埌 DataList
-    //     // this.TreedataList.forEach((item) => {
-    //     //   this.checkedListkey.push(item.proId);
-    //     //   this.DataList.push(item);
-    //     // });
-    //     /*  getProSonDxList(proId).then((res) => {
-    //         this.TreedataList = res.data.list;
-    //         this.TreedataList.forEach((item) => {
-    //           item.disabled = true;
-    //           this.checkedListkey.push(item.proId);
-    //           this.DataList.push(item);
-    //           this.DataList.forEach((item) => {
-    //             item.propinName = this.Treedata[0].proName;
-    //             item.propinPrice = this.Treedata[0].proPrice;
-    //           });
-    //           this.pics = 0;
-    //           this.DataList.forEach((item) => {
-    //             this.pics += item.proPrice;
-    //           });
-    //         });
-    //       }); */
-    //     // }
-    //     this.pics = this.DataList.reduce(
-    //       (total, item) => total + item.priceOrd,
-    //       0
-    //     );
-    //     this.loading = false;
-    //   });
-    // },
     handleFilterInput() {
-      this.queryParams1.page = 1; // 鎼滅储鏃堕噸缃负绗竴椤�
-      this.getDataList(); // 璋冪敤鎺ュ彛鑾峰彇鏁版嵁
-      // 鍦ㄨ繃婊ゅ悗锛岄噸鏂拌缃�変腑鐘舵��
-      this.$nextTick(() => {
-        this.$refs.tree.setCheckedKeys(this.checkedNodes);
-      });
+      this.queryParams1.page = 1
+      this.getDataList()
     },
-
-    // 鍒嗛〉浜嬩欢
-    handlePageChange({ page, pageSize }) {
-      this.queryParams.page = page; // 鏇存柊褰撳墠椤�
-      this.queryParams.pageSize = pageSize; // 鏇存柊姣忛〉鏉℃暟
-      this.getDataList(); // 璋冪敤鎺ュ彛鑾峰彇鏁版嵁
-    },
-
-    handleCurrentChecked(data, checked, indeterminate) {
+    handleCurrentChecked(data, checked) {
       if (checked) {
-        // 濡傛灉宸查�夊垪琛ㄤ腑涓嶅瓨鍦ㄦ椤圭洰锛屽垯娣诲姞
         if (!this.DataList.some((item) => item.proId === data.proId)) {
-          this.DataList.push({
+          const newItem = {
             proId: data.proId,
             proName: data.proName,
             priceOrd: data.proPrice,
-            limits: 10,
-            priceNow: data.proPrice,
-          });
-        }
-        // 娣诲姞鍒� checkedNodes 鏁扮粍
-        if (!this.checkedNodes.includes(data.proId)) {
-          this.checkedNodes.push(data.proId);
+            limits: this.youhui,
+            priceNow: 0,
+          }
+          this.updateProPrice(newItem)
+          this.DataList.push(newItem)
+          this.checkedNodes.push(data.proId)
         }
       } else {
-        // 鍙栨秷閫変腑鏃讹紝浠嶥ataList涓Щ闄�
-        this.DataList = this.DataList.filter(
-          (item) => item.proId !== data.proId
-        );
-        // 浠� checkedNodes 涓Щ闄�
-        const index = this.checkedNodes.indexOf(data.proId);
-        if (index > -1) {
-          this.checkedNodes.splice(index, 1);
-        }
+        this.DataList = this.DataList.filter((item) => item.proId !== data.proId)
+        const index = this.checkedNodes.indexOf(data.proId)
+        if (index > -1) this.checkedNodes.splice(index, 1)
       }
-
-      // 鏇存柊浼樻儬浠峰拰鎬讳环
-      this.updateTotalPrice();
+      this.updateTotalPrice()
+      this.updateYouhui()
     },
-    updateTotalPrice() {
-      // 璁$畻鎵�鏈夐」鐩殑鎬讳紭鎯犱环
-      this.form.xianprice = this.DataList.reduce((sum, item) => {
-        return sum.plus(new Big(item.priceNow || "0"));
-      }, new Big(0)).toNumber();
-
-      // 璁$畻鍘熶环鎬诲拰
-      this.pics = this.DataList.reduce(
-        (total, item) => total + item.priceOrd,
-        0
-      );
-    },
-    spliceData() {
-      for (var i = 0; i < this.DataList.length; i++) {
-        for (var j = i + 1; j < this.DataList.length; j++) {
-          if (this.DataList[i].proId == this.DataList[j].proId) {
-            //濡傛灉绗竴涓瓑浜庣浜屼釜锛宻plice鏂规硶鍒犻櫎绗簩涓�
-            this.DataList.splice(j, 1);
-            j--;
-          }
-        }
-      }
-      return this.DataList;
-    },
-
-    // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
-    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.pics = 0;
-            this.DataList.forEach((item1) => {
-              this.pics += item1.priceOrd;
-              // this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
-            });
-          }
-        });
-      } else if (checked == true) {
-        this.DataList.push(data);
-        this.pics = 0;
-        this.DataList.forEach((item1) => {
-          this.pics += item1.priceOrd;
-          if (item1.proParentId == this.dataObj.proId) {
-            item1.propinName = this.dataObj.proName;
-            item1.propinPrice = this.dataObj.proPrice;
-          }
-        });
-        this.spliceData();
-        this.TotalPrice1 = 0;
-        this.pics = 0;
-        this.DataList.forEach((item1) => {
-          // this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
-          this.pics += item1.priceOrd;
-        });
-      }
-    },
-
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDeletes(row) {
-      this.DataList.forEach((item, index) => {
-        if (item.proParentId == row.proParentId) {
-          this.DataList.splice(index, 1);
-          this.TotalPrice1 = 0;
-          this.DataList.forEach((item1) => {
-            this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
-          });
-        }
-      });
-
-      // this.$refs.trees.setCheckedKeys([]);
-    },
-
-    /** 鎻愪氦鎸夐挳 */
     submitForm() {
-      this.form.limits = this.youhui;
-      this.form.price = this.pics;
-      this.form.priceNow = this.queryParams.xianprice;
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.form.limits = this.youhui
+          this.form.price = this.pics
+          this.form.newPrice = this.form.xianprice
 
-      if (this.keys) {
-        this.form.keywords = this.keys; // 濡傛灉鏈� this.keys锛屽垯鐩存帴璧嬪��
-      } else {
-        // this.form.keywords = this.form.keywords; // 濡傛灉娌℃湁锛屽垯灏� this.form.keywords 杞垚瀛楃涓�
-      }
+          const packageProjects = this.DataList.map((item) => ({
+            proName: item.proName,
+            proId: item.proId,
+            priceNow: item.priceNow,
+            limits: item.limits,
+            priceOrd: item.priceOrd,
+          }))
 
-      let packageProjects = []; // 瀹氫箟涓�涓┖鏁扮粍
-
-      this.DataList.forEach((item) => {
-        packageProjects.push({
-          proName: item.proName,
-          proId: item.proId,
-          priceNow: item.priceNow,
-          limits: item.limits,
-          priceOrd: item.priceOrd,
-        });
-      });
-      let data = {
-        pacName: this.form.pacName,
-        limits: this.form.limits,
-        pacStatus: this.form.pacStatus,
-        packageProjects: packageProjects,
-        newPrice: this.form.xianprice,
-        price: this.pics,
-        pacId: this.form.pacId || null,
-        isOnSale: this.form.isOnSale,
-        // keywords: this.form.keywords,
-        sort: this.form.sort,
-        retailPrice: this.form.retailPrice,
-        tjCategory: this.form.tjCategory,
-        pacRemark: this.form.pacRemark,
-        detail: this.form.detail,
-      };
-
-      saveOreditTjPacNew(data).then((res) => {
-        console.log(res, 555);
-        this.open = false;
-        this.getList();
-      });
-    },
-    /* submitForm() {
-      if (this.form.pacName) {
-        this.form.tjProjectList = [];
-        if (this.DataList.length != 0) {
-          this.treeList = JSON.parse(JSON.stringify(this.DataList));
-          for (var i = 0; i < this.treeList.length; i++) {
-            for (var j = i + 1; j < this.treeList.length; j++) {
-              if (
-                this.treeList[i].proParentId == this.treeList[j].proParentId
-              ) {
-                this.treeList.splice(j, 1);
-                j--;
-              }
-            }
+          const data = {
+            pacName: this.form.pacName,
+            limits: this.form.limits,
+            pacStatus: this.form.pacStatus,
+            packageProjects,
+            newPrice: this.form.xianprice,
+            price: this.pics,
+            pacId: this.form.pacId || null,
+            isOnSale: this.form.isOnSale,
+            sort: this.form.sort,
+            retailPrice: this.form.retailPrice,
+            tjCategory: this.form.tjCategory,
+            pacRemark: this.form.pacRemark,
+            detail: this.form.detail,
+            keywords: this.keys,
           }
-          this.treeList.forEach((item) => {
-            this.form.tjProjectList.push({
-              // id: 0,
-              proName: item.propinName,
-              // allSonProName: item.proName + ",",
-              proPrice: item.propinPrice,
-              priceNow: item.propinPrice,
-              proId: item.proParentId,
-            });
-          });
+
+          saveOreditTjPacNew(data).then(() => {
+            this.open = false
+            this.getList()
+            this.$modal.msgSuccess("淇濆瓨鎴愬姛")
+          })
         }
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            if (this.form.pacId != null) {
-              // if (this.form.pacStatus === "鍚敤") {
-              //   this.form.pacStatus = 0;
-              // } else {
-              //   this.form.pacStatus = 1;
-              // }
-              if (this.keys) {
-                this.form.keywords = this.keys;
-              } else {
-                this.form.keywords = this.form.keywords.toString();
-              }
-
-              updatePackage(this.form).then((response) => {
-                this.$modal.msgSuccess("淇敼鎴愬姛");
-                this.open = false;
-                this.getList();
-              });
-            } else {
-              this.form.keywords = this.keys;
-              // if (this.form.pacStatus === "鍚敤") {
-              //   this.form.pacStatus = 0;
-              // } else {
-              //   this.form.pacStatus = 1;
-              // }
-              // return;
-              addPackage(this.form).then((response) => {
-                this.$modal.msgSuccess("鏂板鎴愬姛");
-                this.open = false;
-                this.getList();
-              });
-            }
-          }
-        });
-      } else {
-        Message.warning("璇峰厛濉啓濂楅鍚嶇О");
-      }
-    }, */
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+      })
+    },
     handleDelete(row) {
-      const pacIds = row.pacId || this.ids;
+      const pacIds = row.pacId || this.ids
       this.$modal
-        .confirm('鏄惁纭鍒犻櫎浣撴濂楅缂栧彿涓�"' + pacIds + '"鐨勬暟鎹」锛�')
-        .then(function () {
-          return delPackage(pacIds);
-        })
+        .confirm(`鏄惁纭鍒犻櫎浣撴濂楅缂栧彿涓�"${pacIds}"鐨勬暟鎹」锛焋)
+        .then(() => delPackage(pacIds))
         .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          this.getList()
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
         })
-        .catch(() => {});
+        .catch(() => {})
     },
-
-    /** 鍒嗛厤濂楅鍐呴」鐩搷浣� */
-    handleProject: function (row) {
-      const pacId = row.pacId;
-      this.$router.push("/system/user-auth/role/" + pacId);
-    },
-
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       this.download(
         "system/package/export",
-        {
-          ...this.queryParams,
-        },
+        { ...this.queryParams },
         `package_${new Date().getTime()}.xlsx`
-      );
-    },
-    // 濂楅璇︽儏
-    // handleSeach(row) {
-    //   this.Seachopen = true;
-    //   this.loading = true;
-    //   const pacId = row.pacId;
-    //   this.pacId = row.pacId
-    //   let data = {
-    //     pacId: pacId,
-    //   };
-    //   getAllPackage(data).then((response) => {
-    //     this.allpackageList = response.data.tjProjectList;
-    //     this.loading = false;
-    //     let arr = [];
-    //     this.allpackageList.forEach((item) => {
-    //       arr.push(item.proName);
-    //     });
-    //     this.newproName = arr;
-    //   });
-
-    //   getAllPackageList().then((response) => {
-    //     this.allList = response.data;
-    //     this.loading = false;
-    //   });
-    // },
-    // // 鍏ㄩ��
-    // handleCheckAllChange(val) {
-    //   this.newproName = val ? this.allList : [];
-    //   this.isIndeterminate = false;
-    // },
-
-    // handleCheckedCitiesChange(value) {
-    //   let checkedCount = value.length;
-    //   this.checkAll = checkedCount === this.allList.length;
-    //   this.isIndeterminate =
-    //     checkedCount > 0 && checkedCount < this.allList.length;
-    // },
-
-    submitcheckbox() {
-      let _this = this;
-      let proIds = [];
-      this.allList.forEach((item) => {
-        _this.newproName.forEach((item1) => {
-          if (item.proName == item1) {
-            proIds.push(item.proId);
-          }
-        });
-      });
-      let data = {
-        pacid: Number(this.pacId),
-        proIds: proIds.toString(),
-      };
-
-      updateProject(data).then((response) => {
-        this.$modal.msgSuccess("鎴愬姛");
-        this.Seachopen = false;
-      });
+      )
     },
   },
-};
+}
 </script>
-
 
 <style>
 .el-tooltip__popper {
@@ -1723,12 +1043,1046 @@
   overflow-y: auto;
   border: 1px solid #d9d9d9;
 }
-/* .custom-tree-node {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    padding-right: 8px;
-  } */
+</style><template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="濂楅鍚嶇О" prop="pacName">
+        <el-input
+          v-model="queryParams.pacName"
+          placeholder="璇疯緭鍏ュ椁愬悕绉�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="濂楅鎻忚堪" prop="pacRemark">
+        <el-input
+          v-model="queryParams.pacRemark"
+          placeholder="璇疯緭鍏ュ椁愭弿杩�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="浣撴绫诲埆" prop="tjCategory">
+        <el-select
+          v-model="queryParams.tjCategory"
+          placeholder="璇烽�夋嫨鐘舵��"
+          style="width: 200px"
+          filterable
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.dict_tjtype"
+            :key="dict.id"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >鎼滅储</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >閲嶇疆</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:package:add']"
+          >鏂板</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUp"
+          v-hasPermi="['system:package:edit']"
+          >淇敼</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:package:remove']"
+          >鍒犻櫎</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:package:export']"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <template>
+      <el-table
+        v-loading="loading"
+        style="width: 100%"
+        :data="packageList"
+        @selection-change="handleSelectionChange"
+        border
+      >
+        <el-table-column
+          fixed
+          type="selection"
+          width="40"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="搴忓彿"
+          align="center"
+          width="50"
+          prop="newID"
+          fixed
+        />
+        <el-table-column
+          label="浣撴绫诲埆"
+          width="100px"
+          align="center"
+          prop="categoryNames"
+          fixed
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.dict_tjtype"
+              :value="scope.row.tjCategory"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="濂楅鍚嶇О"
+          align="center"
+          prop="pacName"
+          width="150px"
+          fixed
+        />
+        <el-table-column
+          label="鍘熶环"
+          width="80px"
+          align="center"
+          prop="price"
+          fixed
+        ></el-table-column>
+        <el-table-column
+          label="鎶樻墸"
+          width="80px"
+          align="center"
+          prop="limits"
+          fixed
+        ></el-table-column>
+        <el-table-column
+          label="鐜颁环"
+          width="80px"
+          align="center"
+          prop="newPrice"
+          fixed
+        >
+        </el-table-column>
+        <el-table-column
+          label="鍗曢」鍒楄〃"
+          align="center"
+          prop="allProName"
+          width="1200px"
+        >
+        </el-table-column>
+        <el-table-column
+          label="濂楅鎻忚堪"
+          align="center"
+          :show-overflow-tooltip="true"
+          width="120px"
+        >
+          <template slot-scope="scope">
+            <div class="showInline">{{ scope.row.pacRemark }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鍏抽敭瀛�"
+          width="110px"
+          align="center"
+          prop="keyNames"
+        ></el-table-column>
+        <el-table-column
+          label="鏄惁涓婃灦"
+          width="94px"
+          align="center"
+          prop="isOnSale"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.sys_yes_no"
+              :value="scope.row.isOnSale"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鎺掑簭"
+          width="50px"
+          align="center"
+          prop="sort"
+        ></el-table-column>
+        <el-table-column
+          label="灏忕▼搴忎环鏍�"
+          width="90px"
+          align="center"
+          prop="retailPrice"
+        ></el-table-column>
+        <el-table-column
+          label="宸插敭鏁伴噺"
+          width="90px"
+          align="center"
+          prop="saleNum"
+        ></el-table-column>
+        <el-table-column
+          label="鐘舵��"
+          align="center"
+          prop="pacStatus"
+          fixed="right"
+          width="100px"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.pacStatus"
+              active-value="0"
+              inactive-value="1"
+              @change="handleStatusChange(scope.row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鎿嶄綔"
+          align="center"
+          width="80px"
+          fixed="right"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:package:edit']"
+              title="淇敼"
+            ></el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:package:remove']"
+              title="鍒犻櫎"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="pag">
+        <div class="pag1">
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
+      </div>
+    </template>
+
+    <!-- 淇敼浣撴濂楅瀵硅瘽妗� -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1400px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
+        <el-form-item label="濂楅鍚嶇О" prop="pacName">
+          <span
+            slot="label"
+            style="display: inline-block; border-bottom: 2px solid blue"
+            @click="handlePackage"
+          >
+            濂楅鍚嶇О
+          </span>
+          <el-input
+            v-model="form.pacName"
+            placeholder="璇疯緭鍏ュ椁愬悕绉�"
+            style="width: 150px"
+          />
+        </el-form-item>
+        <el-form-item label="濂楅鐘舵��" prop="pacStatus">
+          <el-select
+            v-model="form.pacStatus"
+            placeholder="璇烽�夋嫨鐘舵��"
+            style="width: 150px"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </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>
+        <el-form-item label="鏄惁涓婃灦" prop="isOnSale">
+          <el-select
+            v-model="form.isOnSale"
+            placeholder="璇烽�夋嫨鏄惁涓婃灦"
+            style="width: 140px"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鎺掑簭" prop="sort">
+          <el-input
+            v-model="form.sort"
+            placeholder="璇疯緭鍏ユ帓搴�"
+            style="width: 150px"
+          />
+        </el-form-item>
+        <el-form-item label="灏忕▼搴忎环鏍�" prop="retailPrice">
+          <el-input
+            v-model="form.retailPrice"
+            placeholder="璇疯緭鍏ュ皬绋嬪簭浠锋牸"
+            style="width: 150px"
+          />
+        </el-form-item>
+        <el-form-item label="鍘熶环" prop="pics">
+          <el-input
+            v-model="pics"
+            placeholder="璇疯緭鍏ュ師浠�"
+            style="width: 150px"
+          />
+        </el-form-item>
+        <el-form-item label="鎶樻墸">
+          <el-input-number
+            ref="inputNumber"
+            style="width: 150px"
+            v-model="youhui"
+            :precision="2"
+            :step="0.1"
+            :max="10"
+            :min="1"
+            @change="numberChange"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="鐜颁环">
+          <el-input
+            ref="inputName"
+            v-model="form.xianprice"
+            placeholder="璇疯緭鍏ョ幇浠�"
+            clearable
+            style="width: 140px"
+            type="number"
+            :min="0"
+            @change="handleXianPriceChange"
+            @input="handleXianPriceInput"
+          />
+        </el-form-item>
+        <el-form-item label="鍏抽敭瀛�" prop="keywords">
+          <el-select
+            multiple
+            v-model="form.keywords"
+            placeholder="璇烽�夋嫨鍏抽敭瀛�"
+            style="width: 160px"
+            @change="sel"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in keywordList"
+              :key="item.id"
+              :label="item.keyword"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <div v-if="!isCollapsed" style="display: flex">
+          <div>
+            <el-form-item label="濂楅鎻忚堪" prop="pacRemark">
+              <el-input
+                type="textarea"
+                v-model="form.pacRemark"
+                placeholder="璇疯緭鍏ュ椁愭弿杩�"
+                style="width: 670px"
+                rows="2"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="璇︾粏浠嬬粛" prop="detail">
+              <editor
+                v-model="form.detail"
+                :min-height="192"
+                style="width: 670px"
+              />
+            </el-form-item>
+          </div>
+          <div class="dialo2">
+            <el-form-item label="鍥剧墖">
+              <image-upload v-model="form.pacPhone" />
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+      <el-button type="primary" plain size="mini" @click="toggleCollapse">{{
+        isCollapsed ? "灞曞紑" : "鏀惰捣"
+      }}</el-button>
+
+      <el-row style="display: flex; width: 1300px">
+        <el-col>
+          <div
+            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+          >
+            椤圭洰鍒楄〃
+          </div>
+          <el-input
+            placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+            @input="handleFilterInput"
+            v-model="queryParams1.nr"
+            clearable
+          />
+          <div class="tab3" style="height: 365px">
+            <el-tree
+              class="filter-tree"
+              v-loading="loading"
+              :data="Treedata"
+              :props="defaultProps"
+              show-checkbox
+              node-key="proId"
+              @check-change="handleCurrentChecked"
+              :default-checked-keys="checkedkey"
+              :filter-node-method="filterNode"
+              ref="tree"
+              :render-content="renderContent"
+            >
+            </el-tree>
+            <pagination
+              small
+              v-show="total1 > 0"
+              :total="total1"
+              :page.sync="queryParams1.page"
+              :limit.sync="queryParams1.pageSize"
+              @pagination="getDataList"
+            />
+          </div>
+        </el-col>
+        <el-col>
+          <div class="grid-content bg-purple">
+            <div
+              style="
+                text-align: center;
+                margin-bottom: 10px;
+                margin-top: 10px;
+                margin-left: 8%;
+              "
+            >
+              宸查�夐」鐩垪琛�
+            </div>
+            <el-table
+              :data="DataList"
+              border
+              style="width: 90%; margin-left: 20px"
+              height="400"
+            >
+              <el-table-column prop="proName" label="妫�鏌ラ」鐩�">
+              </el-table-column>
+              <el-table-column
+                prop="priceOrd"
+                label="鍘熶环"
+                align="center"
+                width="80px"
+              >
+              </el-table-column>
+              <el-table-column label="鎶樻墸" width="100px">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model.number="scope.row.limits"
+                    @input="calculateDiscount(scope.row)"
+                    placeholder="杈撳叆鎶樻墸"
+                    size="small"
+                    type="number"
+                    min="0"
+                    step="0.1"
+                    max="10"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="priceNow"
+                label="鐜颁环"
+                width="80px"
+                align="center"
+              >
+              </el-table-column>
+              <el-table-column label="鎿嶄綔" align="center" width="80px">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete1(scope.row)"
+                    title="鍒犻櫎"
+                  >
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-col>
+      </el-row>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+    <Packages ref="aaa" @add="handleChanges" />
+  </div>
+</template>
+
+<script>
+import { Big } from 'big.js'
+import Packages from "@/components/Packages"
+import { listCategory } from "@/api/mall/category"
+import { listKeyword } from "@/api/mall/keyword"
+import { search } from "@/api/system/package"
+import {
+  getPacList,
+  getPacInFo,
+  delPackage,
+  updateStatus,
+  getPacTjProjectList,
+  saveOreditTjPacNew,
+} from "@/api/system/package"
+import { Message } from "element-ui"
+
+export default {
+  name: "Package",
+  dicts: ["sys_normal_disable", "sys_yes_no", "dict_tjtype"],
+  components: { Packages },
+  data() {
+    return {
+      pics: 0, // 鍘熶环鎬诲拰
+      DataList: [], // 宸查�夐」鐩垪琛�
+      Treedata: [], // 椤圭洰鏍戞暟鎹�
+      checkedkey: [], // 鏍戦粯璁ら�変腑椤�
+      checkedNodes: [], // 璁板綍閫変腑鐨勮妭鐐�
+      isCollapsed: true, // 鎶樺彔鐘舵��
+      categoryList: [], // 濂楅绫荤洰
+      keywordList: [], // 鍏抽敭瀛楀垪琛�
+      keys: "", // 鍏抽敭瀛楀瓧绗︿覆
+      loading: false, // 鍔犺浇鐘舵��
+      single: true, // 鏄惁鍗曢�夌鐢�
+      multiple: true, // 鏄惁澶氶�夌鐢�
+      showSearch: true, // 鏄剧ず鎼滅储鏉′欢
+      packageList: [], // 濂楅鍒楄〃
+      allList: [], // 鎵�鏈変綋妫�椤圭洰
+      title: "", // 寮瑰嚭灞傛爣棰�
+      open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
+      total: 0, // 涓昏〃鏍兼�绘潯鏁�
+      total1: 0, // 椤圭洰鏍戞�绘潯鏁�
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pacName: null,
+        pacRemark: null,
+        tjCategory: null,
+      },
+      queryParams1: {
+        page: 1,
+        pageSize: 30,
+        nr: "",
+      },
+      form: {
+        xianprice: 0, // 鐜颁环鎬诲拰锛屽彲鎵嬪姩淇敼
+        limits: 10, // 鎬绘姌鎵�
+        pacName: "",
+        pacStatus: "",
+        tjCategory: "",
+        isOnSale: "",
+        sort: null,
+        retailPrice: null,
+        keywords: [],
+      },
+      youhui: 10, // 涓婃柟鎶樻墸
+      defaultProps: {
+        children: [],
+        label: "proName",
+      },
+      rules: {
+        pacName: [{ required: true, message: "濂楅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+        pacStatus: [
+          { required: true, message: "璇烽�夋嫨濂楅鐘舵��", trigger: "change" },
+        ],
+        isOnSale: [
+          { required: true, message: "璇烽�夋嫨鏄惁涓婃灦", trigger: "change" },
+        ],
+        sort: [{ required: true, message: "鎺掑簭涓嶈兘涓虹┖", trigger: "blur" }],
+        retailPrice: [
+          { required: true, message: "灏忕▼搴忎环鏍间笉鑳戒负绌�", trigger: "blur" },
+        ],
+        tjCategory: [
+          { required: true, message: "璇烽�夋嫨浣撴绫诲埆", trigger: "change" },
+        ],
+      },
+    }
+  },
+  created() {
+    this.getList()
+    this.getKeyword()
+    this.getCategory()
+  },
+  methods: {
+    toggleCollapse() {
+      this.isCollapsed = !this.isCollapsed
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return (
+        data.proName.indexOf(value) !== -1 ||
+        (data.proEngName && data.proEngName.indexOf(value) !== -1)
+      )
+    },
+    getList() {
+      this.loading = true
+      getPacTjProjectList().then((response) => {
+        this.allList = response.data
+        this.loading = false
+      })
+      getPacList(this.queryParams).then((response) => {
+        response.rows.forEach((item, index) => {
+          item.newID =
+            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+            index +
+            1
+        })
+        this.total = response.total
+        this.packageList = response.rows
+        this.loading = false
+      })
+    },
+    getKeyword() {
+      listKeyword(this.queryParams).then((response) => {
+        this.keywordList = response.rows
+      })
+    },
+    sel(val) {
+      this.keys = val.join(",")
+    },
+    getCategory() {
+      listCategory(this.queryParams).then((response) => {
+        this.categoryList = response.rows
+      })
+    },
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    reset() {
+      this.form = {
+        pacId: null,
+        pacName: "",
+        pacRemark: "",
+        pacStatus: "",
+        tjCategory: "",
+        isOnSale: "",
+        sort: null,
+        retailPrice: null,
+        xianprice: 0,
+        limits: 10,
+        keywords: [],
+      }
+      this.DataList = []
+      this.checkedkey = []
+      this.checkedNodes = []
+      this.youhui = 10
+      this.pics = 0
+      this.resetForm("form")
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    handlePackage() {
+      this.$refs.aaa.open = true
+      this.$refs.aaa.getList()
+      this.$refs.aaa.title = "濂楅瀛楀吀"
+    },
+    handleChanges(param1) {
+      this.form.pacName = param1[0].pacName
+      this.form.hisPacId = param1[0].pacId
+      if (param1[0].price) {
+        this.form.counterPrice = param1[0].price
+        this.form.retailPrice = param1[0].price
+      }
+    },
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    handleSelectionChange(selection) {
+      if (!selection.length) {
+        this.forms = null
+        this.ids = []
+        this.single = true
+        this.multiple = true
+        return
+      }
+      this.forms = selection[0]
+      this.ids = selection.map((item) => item.pacId)
+      this.single = selection.length !== 1
+      this.multiple = false
+    },
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "浣撴濂楅淇℃伅缁存姢"
+      this.getDataList()
+    },
+    handleStatusChange(row) {
+      let data = { pacId: row.pacId, pacStatus: row.pacStatus }
+      let text = row.pacStatus === "0" ? "鍚敤" : "鍋滅敤"
+      this.$confirm(`纭瑕�${text}${row.pacName}濂楅鍚楋紵`)
+        .then(() => updateStatus(data))
+        .then(() => this.msgSuccess(`${text}鎴愬姛`))
+        .catch(() => {
+          row.pacStatus = row.pacStatus === "0" ? "1" : "0"
+        })
+    },
+    handleUp() {
+      this.title = "浣撴濂楅淇℃伅缁存姢"
+      this.open = true
+      getPacInFo(this.forms.pacId).then((response) => {
+        this.form = response.data
+        this.form.keywords = this.form.keywords
+          ? this.form.keywords.slice(0, -1).split(",")
+          : []
+        this.DataList = response.data.packageProjects || []
+        this.checkedkey = this.DataList.map((item) => item.proId)
+        this.checkedNodes = [...this.checkedkey]
+        this.updateTotalPrice()
+        this.updateYouhui()
+        this.getDataList()
+      })
+    },
+    handleUpdate(row) {
+      this.title = "浣撴濂楅淇℃伅缁存姢"
+      this.open = true
+      getPacInFo(row.pacId).then((response) => {
+        this.form = response.data
+        this.form.keywords = this.form.keywords
+          ? this.form.keywords.slice(0, -1).split(",")
+          : []
+        this.DataList = response.data.packageProjects || []
+        this.checkedkey = this.DataList.map((item) => item.proId)
+        this.checkedNodes = [...this.checkedkey]
+        this.updateTotalPrice()
+        this.updateYouhui()
+        this.getDataList()
+      })
+    },
+    handleDelete1(row) {
+      this.DataList = this.DataList.filter((item) => item.proId !== row.proId)
+      const index = this.checkedNodes.indexOf(row.proId)
+      if (index > -1) this.checkedNodes.splice(index, 1)
+      const tree = this.$refs.tree
+      const node = tree.getNode(row.proId)
+      if (node) node.setChecked(false)
+      this.updateTotalPrice()
+      this.updateYouhui()
+    },
+    numberChange(currentValue) {
+      this.youhui = currentValue
+      this.DataList.forEach((item) => {
+        item.limits = this.youhui
+        this.updateProPrice(item)
+      })
+      this.updateTotalPrice()
+    },
+    handleXianPriceInput(value) {
+      const numValue = Math.max(0, Number(value) || 0)
+      this.form.xianprice = numValue
+    },
+    handleXianPriceChange(newValue) {
+      const value = Math.max(0, Number(newValue) || 0)
+      
+      if (this.DataList.length === 0 || this.pics === 0) {
+        this.form.xianprice = 0
+        this.youhui = 10
+        return
+      }
+
+      // 浣跨敤Big.js澶勭悊绮惧害
+      const totalOriginalPrice = new Big(this.pics)
+      const totalCurrentPrice = new Big(value)
+      let newYouhui = totalCurrentPrice
+        .div(totalOriginalPrice)
+        .times(10)
+        .toNumber()
+
+      // 闄愬埗鎶樻墸鑼冨洿
+      newYouhui = Math.min(10, Math.max(0, newYouhui))
+      this.youhui = Number(newYouhui.toFixed(1))
+
+      // 鏇存柊鎵�鏈夐」鐩殑鎶樻墸鍜岀幇浠�
+      this.DataList.forEach((item) => {
+        item.limits = this.youhui
+        this.updateProPrice(item)
+      })
+      
+      // 閲嶆柊璁$畻纭繚绮惧害
+      this.updateTotalPrice(true)
+    },
+    updateProPrice(row) {
+      if (!row.priceOrd) return
+      const proPrice = new Big(row.priceOrd)
+      const limits = new Big(row.limits || 10)
+      row.priceNow = parseFloat(proPrice.times(limits.div(10)).toFixed(2))
+    },
+    calculateDiscount(row) {
+      row.limits = Math.min(10, Math.max(0, row.limits))
+      this.updateProPrice(row)
+      this.updateTotalPrice()
+      this.updateYouhui()
+    },
+    updateTotalPrice(skipXianPrice = false) {
+      // 璁$畻鍘熶环鎬诲拰
+      this.pics = this.DataList.reduce(
+        (sum, item) => sum + (Number(item.priceOrd) || 0),
+        0
+      )
+      
+      // 璁$畻鐜颁环鎬诲拰
+      if (!skipXianPrice) {
+        const totalCurrent = this.DataList.reduce(
+          (sum, item) => sum + (Number(item.priceNow) || 0),
+          0
+        )
+        this.form.xianprice = parseFloat(totalCurrent).toFixed(2)
+      }
+    },
+    updateYouhui() {
+      if (this.DataList.length === 0 || this.pics === 0) {
+        this.youhui = 10
+        return
+      }
+      const totalOriginal = new Big(this.pics)
+      const totalCurrent = new Big(this.form.xianprice || 0)
+      this.youhui = parseFloat(
+        totalCurrent
+          .div(totalOriginal)
+          .times(10)
+          .toFixed(1)
+      )
+    },
+    renderContent(h, { node, data }) {
+      return (
+        <span class="custom-tree-node">
+          <span>{node.label}</span>
+          <span>({data.proPrice}鍏�)</span>
+        </span>
+      )
+    },
+    getDataList() {
+      this.loading = true
+      search(this.queryParams1).then((response) => {
+        this.Treedata = response.data.list
+        this.total1 = response.data.total
+        this.$nextTick(() => {
+          this.$refs.tree.setCheckedKeys(this.checkedNodes)
+        })
+        this.loading = false
+      })
+    },
+    handleFilterInput() {
+      this.queryParams1.page = 1
+      this.getDataList()
+    },
+    handleCurrentChecked(data, checked) {
+      if (checked) {
+        if (!this.DataList.some((item) => item.proId === data.proId)) {
+          const newItem = {
+            proId: data.proId,
+            proName: data.proName,
+            priceOrd: data.proPrice,
+            limits: this.youhui,
+            priceNow: 0,
+          }
+          this.updateProPrice(newItem)
+          this.DataList.push(newItem)
+          this.checkedNodes.push(data.proId)
+        }
+      } else {
+        this.DataList = this.DataList.filter((item) => item.proId !== data.proId)
+        const index = this.checkedNodes.indexOf(data.proId)
+        if (index > -1) this.checkedNodes.splice(index, 1)
+      }
+      this.updateTotalPrice()
+      this.updateYouhui()
+    },
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.form.limits = this.youhui
+          this.form.price = this.pics
+          this.form.newPrice = this.form.xianprice
+
+          const packageProjects = this.DataList.map((item) => ({
+            proName: item.proName,
+            proId: item.proId,
+            priceNow: item.priceNow,
+            limits: item.limits,
+            priceOrd: item.priceOrd,
+          }))
+
+          const data = {
+            pacName: this.form.pacName,
+            limits: this.form.limits,
+            pacStatus: this.form.pacStatus,
+            packageProjects,
+            newPrice: this.form.xianprice,
+            price: this.pics,
+            pacId: this.form.pacId || null,
+            isOnSale: this.form.isOnSale,
+            sort: this.form.sort,
+            retailPrice: this.form.retailPrice,
+            tjCategory: this.form.tjCategory,
+            pacRemark: this.form.pacRemark,
+            detail: this.form.detail,
+            keywords: this.keys,
+          }
+
+          saveOreditTjPacNew(data).then(() => {
+            this.open = false
+            this.getList()
+            this.$modal.msgSuccess("淇濆瓨鎴愬姛")
+          })
+        }
+      })
+    },
+    handleDelete(row) {
+      const pacIds = row.pacId || this.ids
+      this.$modal
+        .confirm(`鏄惁纭鍒犻櫎浣撴濂楅缂栧彿涓�"${pacIds}"鐨勬暟鎹」锛焋)
+        .then(() => delPackage(pacIds))
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+        })
+        .catch(() => {})
+    },
+    handleExport() {
+      this.download(
+        "system/package/export",
+        { ...this.queryParams },
+        `package_${new Date().getTime()}.xlsx`
+      )
+    },
+  },
+}
+</script>
+
+<style>
+.el-tooltip__popper {
+  max-width: 800px;
+}
+
+.showInline {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+.pag {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+
+.pag1 {
+  width: 30%;
+}
+
+.dialog-footer {
+  position: absolute;
+  left: 40%;
+  bottom: 2%;
+}
+.tab3 {
+  max-height: 400px;
+  overflow-y: auto;
+  border: 1px solid #d9d9d9;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0