From 26a983e0c22f1fe54c91c66c2b52888858e52cd1 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 31 七月 2025 17:57:28 +0800
Subject: [PATCH] qx

---
 src/views/system/package/index.vue | 1310 +++++++++++++++++++++--------------------------------------
 1 files changed, 462 insertions(+), 848 deletions(-)

diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 771a55a..4984162 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -24,19 +24,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="濂楅鍒嗙被" prop="categoryId">
+      <el-form-item label="浣撴绫诲埆" prop="tjCategory">
         <el-select
-          v-model="queryParams.categoryId"
+          v-model="queryParams.tjCategory"
           placeholder="璇烽�夋嫨鐘舵��"
           style="width: 200px"
           filterable
           clearable
         >
           <el-option
-            v-for="dict in categoryList"
+            v-for="dict in dict.type.dict_tjtype"
             :key="dict.id"
-            :label="dict.name"
-            :value="dict.id"
+            :label="dict.label"
+            :value="dict.value"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -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,14 +125,20 @@
           prop="newID"
           fixed
         />
-        <!-- <el-table-column label="缂栧彿" align="center" prop="pacId" /> -->
         <el-table-column
-          label="濂楅鍒嗙被"
+          label="浣撴绫诲埆"
           width="100px"
           align="center"
           prop="categoryNames"
           fixed
-        ></el-table-column>
+        >
+          <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"
@@ -145,27 +147,32 @@
           fixed
         />
         <el-table-column
-          label="浠锋牸"
+          label="鍘熶环"
           width="80px"
           align="center"
           prop="price"
           fixed
-        >
-        </el-table-column>
+        ></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"
-          prop="allSonName"
-          :show-overflow-tooltip="true"
-        > 
-        </el-table-column>-->
+        ></el-table-column>
         <el-table-column
           label="濂楅鎻忚堪"
           align="center"
@@ -176,18 +183,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"
@@ -207,13 +202,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"
@@ -225,12 +213,6 @@
           width="90px"
           align="center"
           prop="retailPrice"
-        ></el-table-column>
-        <el-table-column
-          label="鍘熶环"
-          width="90px"
-          align="center"
-          prop="counterPrice"
         ></el-table-column>
         <el-table-column
           label="宸插敭鏁伴噺"
@@ -278,8 +260,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>
@@ -301,7 +281,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1500px"
+      width="1400px"
       append-to-body
       :close-on-click-modal="false"
     >
@@ -312,8 +292,6 @@
         label-width="100px"
         :inline="true"
       >
-        <!-- <div class="dialo">
-        <div class="dialo1"> -->
         <el-form-item label="濂楅鍚嶇О" prop="pacName">
           <span
             slot="label"
@@ -329,10 +307,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="璇烽�夋嫨鐘舵��"
@@ -348,57 +322,27 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
-        <el-form-item label="濂楅绫荤洰" prop="categoryId">
-          <!-- <el-input
-            v-model="form.createId"
-            placeholder="璇疯緭鍏ュ晢鍝佺被鐩�"
-            style="width: 200px"
-          /> -->
+        <el-form-item label="浣撴绫诲埆" prop="tjCategory">
           <el-select
-            v-model="form.categoryId"
-            placeholder="璇烽�夋嫨濂楅绫荤洰"
+            v-model="form.tjCategory"
+            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="keywords">
-          <el-select
-            multiple
-            v-model="form.keywords"
-            placeholder="璇烽�夋嫨鍏抽敭瀛�"
-            style="width: 150px"
-            @change="sel"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="item in keywordList"
-              :key="item.id"
-              :label="item.keyword"
-              :value="item.id"
+              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-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="璇烽�夋嫨鏄惁涓婃灦"
-            style="width: 150px"
+            style="width: 140px"
             filterable
             clearable
           >
@@ -410,7 +354,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="鎺掑簭" prop="sort">
           <el-input
             v-model="form.sort"
@@ -430,46 +373,51 @@
             v-model="pics"
             placeholder="璇疯緭鍏ュ師浠�"
             style="width: 150px"
+            type="number"
           />
         </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"
+            :min="0.1"
+            @change="debounceNumberChange"
+            :debounce="3000"
           ></el-input-number>
         </el-form-item>
-        <el-form-item label="浼樻儬浠�">
+        <el-form-item label="鐜颁环" prop="xianprice">
           <el-input
-            ref="inputName"
             v-model="form.xianprice"
-            placeholder="浼樻儬浠�"
+            placeholder="鐜颁环"
             clearable
             style="width: 140px"
+            @input="changeXianjia"
+            type="number"
+            :debounce="3000"
+            min="0"
           />
         </el-form-item>
-        <el-form-item label="浣撴绫诲埆" prop="tjCategory">
+        <el-form-item label="鍏抽敭瀛�" prop="keywords">
           <el-select
-            v-model="form.tjCategory"
-            placeholder="璇烽�夋嫨浣撴绫诲埆"
-            style="width: 150px"
+            multiple
+            v-model="form.keywords"
+            placeholder="璇烽�夋嫨鍏抽敭瀛�"
+            style="width: 160px"
+            @change="sel"
             filterable
             clearable
           >
             <el-option
-              v-for="dict in dict.type.dict_tjtype"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+              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">
@@ -482,11 +430,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"
@@ -494,58 +437,30 @@
               />
             </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 :gutter="11">
-        <el-col :span="11">
+      <el-row style="display: flex; width: 1300px">
+        <el-col>
           <div
             style="text-align: center; margin-bottom: 10px; margin-top: 10px"
           >
             椤圭洰鍒楄〃
           </div>
-          <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
-          </el-input>
-          <div class="tab3">
+          <el-input
+            placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+            @input="handleFilterInput"
+            v-model="queryParams1.nr"
+            clearable
+          />
+          <div class="tab3" style="height: 365px">
             <el-tree
               class="filter-tree"
               v-loading="loading"
@@ -560,39 +475,24 @@
               :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 :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 :span="11">
+        <el-col>
           <div class="grid-content bg-purple">
             <div
               style="
                 text-align: center;
                 margin-bottom: 10px;
                 margin-top: 10px;
-                margin-left: 16%;
+                margin-left: 8%;
               "
             >
               宸查�夐」鐩垪琛�
@@ -600,18 +500,21 @@
             <el-table
               :data="DataList"
               border
-              style="width: 80%; margin-left: 18%"
+              style="width: 90%; margin-left: 20px"
               height="400"
               :span-method="objectSpanMethod"
             >
               <el-table-column prop="proName" label="妫�鏌ラ」鐩�">
               </el-table-column>
-
-              <el-table-column prop="proPrice" label="鍘熶环" align="center">
+              <el-table-column
+                prop="priceOrd"
+                label="鍘熶环"
+                align="center"
+                width="80px"
+              >
               </el-table-column>
-              <el-table-column label="鎶樻墸">
+              <el-table-column label="鎶樻墸" width="100px">
                 <template slot-scope="scope">
-                  <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
                   <el-input
                     v-model.number="scope.row.limits"
                     @input="calculateDiscount(scope.row)"
@@ -625,56 +528,37 @@
                   </el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="priceNow" label="浼樻儬浠�" align="center">
-              </el-table-column>
-              <!-- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
-              </el-table-column> -->
-
-              <!-- <el-table-column
-                label="鎿嶄綔"
+              <el-table-column
+                prop="priceNow"
+                label="鐜颁环"
+                width="80px"
                 align="center"
-                fixed="right"
-                class-name="small-padding fixed-width"
-                width="50px"
               >
+              </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="handleDeletes(scope.row)"
+                    @click="handleDelete1(scope.row)"
                     title="鍒犻櫎"
-                  ></el-button>
-                </template> 
-              </el-table-column>-->
+                  >
+                  </el-button>
+                </template>
+              </el-table-column>
             </el-table>
-            <!-- <h3 style="font-weight: 600">鍚堣锛歿{ pics }}鍏�</h3> -->
+            <h4 style="font-weight: 600; padding-left: 20px">
+              涓�鍏遍�変腑{{ DataList.length }}椤癸紝鍚堣锛歿{ form.xianprice }}鍏�
+            </h4>
           </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>
-
-    <!-- 濂楅璇︽儏 -->
-    <!-- <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>
@@ -683,7 +567,11 @@
 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 {
   getPacList,
   getPacInFo,
@@ -701,21 +589,12 @@
 } from "@/api/system/package";
 import { Message } from "element-ui";
 import Big from "big.js";
+
 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: "",
@@ -734,167 +613,207 @@
         children: [],
         label: "proName",
       },
-      isCollapsed: true, // 榛樿涓烘姌鍙犵姸鎬�
+      isCollapsed: true,
       categoryList: [],
       keys: "",
       keywordList: [],
       dataListAll: [],
-      // 澶氶�夋
       priceNow: "",
       checkAll: false,
       isIndeterminate: true,
-      // 閬僵灞�
       loading: false,
       radio: 3,
-      // 閫変腑鏁扮粍
       ids: [],
-      // 闈炲崟涓鐢�
       single: true,
-      // 闈炲涓鐢�
       multiple: true,
-      // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
-      // 鎬绘潯鏁�
-      total: 0,
-      // 浣撴濂楅琛ㄦ牸鏁版嵁
       packageList: [],
-      // 濂楅閫変腑鐨勭埗椤�
       allpackageList: [],
-      // 宸查��
       newproName: [],
-      // 鎵�鏈変綋妫�椤圭洰路
       allList: [],
       treeList: [],
-      // 鎵�鏈夊椁愭暟鎹�
-      // allpackage:[],
-      // 寮瑰嚭灞傛爣棰�
       title: "",
-      // 鏄惁鏄剧ず寮瑰嚭灞�
+      lastXianPrice: 0,
       open: false,
       Seachopen: false,
+      checkedNodes: [],
       pacId: "",
-      // 鏌ヨ鍙傛暟
+      total: 0,
+      total1: 0,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         pacName: null,
         pacRemark: null,
       },
-      // 琛ㄥ崟鍙傛暟
+      queryParams1: {
+        page: 1,
+        pageSize: 30,
+        nr: "",
+        xb: "",
+      },
       form: {
-        xianprice: null, // 浼樻儬浠�
-        counterPrice: null, //鍘熶环
+        xianprice: null,
+        counterPrice: null,
         limits: 10,
+        keywords: [],
       },
       forms: {},
       youhui: 10,
-      // 琛ㄥ崟鏍¢獙
+      initializing: true,
+      debounceTimer: null,
       rules: {
-        deleted: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
-        ],
         pacName: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ュ椁愬悕绉�", trigger: "blur" },
         ],
-        pacStatus: [
-          { required: true, validator: checkPhoneNum, trigger: "change" },
-        ],
-        // categoryId: [
-        //   { required: true, validator: checkPhoneNum, trigger: "change" },
-        // ],
-        keywords: [
-          { required: true, validator: checkPhoneNum, trigger: "change" },
-        ],
-        isOnSale: [
-          { required: true, validator: checkPhoneNum, trigger: "change" },
-        ],
-        sort: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
-        retailPrice: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
-        ],
-        counterPrice: [
-          { required: true, validator: checkPhoneNum, trigger: "blur" },
-        ],
+        // pics: [{ required: true, message: "璇疯緭鍏ュ師浠�", trigger: "change" }],
+        xianprice: [{ required: true, message: "璇疯緭鍏ョ幇浠�", trigger: "blur" }],
       },
     };
   },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val);
-    },
-  },
-
   created() {
     this.getList();
     this.getKeyword();
     this.getCategory();
   },
   methods: {
+    debounceNumberChange(currentValue, oldValue) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = setTimeout(() => {
+        this.numberChange(currentValue, oldValue);
+      }, 300);
+    },
+    numberChange(currentValue, oldValue) {
+      // 瀹炵幇鎶樻墸鍙樺寲鐨勯�昏緫锛堝鏋滈渶瑕侊級
+    },
+    updateProPrice(row) {
+      const proPrice = new Big(row.priceOrd || 0);
+      const limits = new Big(row.limits || 10);
+      const result = proPrice.times(limits.div(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 = this.pics
+        ? (Math.floor((this.form.xianprice / this.pics) * 100) / 100) * 10
+        : 10;
+    },
+    calculateDiscount(row) {
+      if (row.limits > 10) {
+        row.limits = 10;
+      } else if (row.limits < 0) {
+        row.limits = 0;
+      }
+      this.updateProPrice(row);
+    },
     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;
-      }
+      console.log(value, 6666);
+
+      return (
+        data.proName.indexOf(value) !== -1 ||
+        (data.proEngName && data.proEngName.indexOf(value) !== -1)
+      );
     },
-    /** 鏌ヨ浣撴濂楅鍒楄〃 */
     getList() {
       this.loading = true;
       getPacTjProjectList().then((response) => {
-        this.allList = response.data;
-        if (this.allList.proStatus === 0) {
-          this.allList.proStatus = "鍚敤";
-        } else {
-          this.allList.proStatus = "鍋滅敤";
-        }
+        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;
+      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 || 0;
+          this.packageList = response.rows || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.$message.error("鑾峰彇濂楅鍒楄〃澶辫触");
         });
-        this.total = response.total;
-        this.packageList = response.rows;
-        this.loading = false;
-      });
     },
-    /** 鏌ヨ鍏抽敭瀛楀垪琛� */
     getKeyword() {
       this.loading = true;
-      listKeyword(this.queryParams).then((response) => {
-        this.keywordList = response.rows;
-      });
+      listKeyword(this.queryParams)
+        .then((response) => {
+          this.keywordList = response.rows || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.$message.error("鑾峰彇鍏抽敭瀛楀垪琛ㄥけ璐�");
+        });
     },
     sel(val) {
-      let id = val;
-      this.keys = "";
-      id.forEach((item) => {
-        this.keys += item + ",";
-      });
+      const maleId = "4"; // 鈥滅敺鈥濈殑 ID
+      const femaleId = "5"; // 鈥滃コ鈥濈殑 ID
+      let selectedIds = [...val]; // 澶嶅埗褰撳墠閫変腑鐨� ID 鏁扮粍
+
+      // 瀹炵幇鈥滅敺鈥濆拰鈥滃コ鈥濅簰鏂ラ�昏緫
+      if (selectedIds.includes(maleId) && selectedIds.includes(femaleId)) {
+        selectedIds = selectedIds.slice(-1); // 淇濈暀鏈�鍚庨�変腑鐨勪竴涓�
+        this.$message.warning("鈥滅敺鈥濆拰鈥滃コ鈥濆叧閿瓧浜掓枼锛屽彧鑳介�夋嫨涓�涓紒");
+      }
+
+      // 鏇存柊 form.keywords 鍜� keys
+      this.form.keywords = selectedIds;
+      this.keys = selectedIds.join(",");
+
+      // 璋冪敤 getDataList锛屼紶閫掓墍鏈夐�変腑鐨勫叧閿瓧 ID锛堥�楀彿鍒嗛殧锛�
+      // this.getDataList({ xb: this.keys });
+      this.queryParams1.xb = this.keys; // 馃憟 鏇存柊鏌ヨ鍙傛暟
+      this.queryParams1.page = 1; // 馃憟 鍒囨崲鏉′欢鏃堕噸缃〉鐮�
+      this.getDataList(); // 涓嶉渶瑕佸啀浼犲弬浜�
     },
-    /** 鏌ヨ绫荤洰鍒楄〃 */
     getCategory() {
       this.loading = true;
-      listCategory(this.queryParams).then((response) => {
-        this.categoryList = response.rows;
-      });
+      listCategory(this.queryParams)
+        .then((response) => {
+          this.categoryList = response.rows || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.$message.error("鑾峰彇濂楅绫荤洰澶辫触");
+        });
+    },
+    getDataList(params = {}) {
+      this.loading = true;
+      const query = { ...this.queryParams1, ...params };
+      search(query)
+        .then((response) => {
+          this.Treedata = response.data.list || [];
+          this.total1 = response.data.total || 0;
+          this.pics = this.DataList.reduce(
+            (total, item) => total + (item.priceOrd || 0),
+            0
+          );
+          this.$nextTick(() => {
+            this.$refs.tree.setCheckedKeys(this.checkedNodes);
+            this.initializing = false;
+          });
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.$message.error("鑾峰彇椤圭洰鍒楄〃澶辫触");
+        });
     },
     shangpin(vals) {},
-    // 鍙栨秷鎸夐挳
     cancel() {
       this.open = false;
       this.Seachopen = false;
       this.reset();
     },
-    // 琛ㄥ崟閲嶇疆
     reset() {
       this.form = {
         pacId: null,
@@ -909,16 +828,18 @@
         allProName: null,
         priceNow: null,
         proId: null,
-        // pacStatus: "鍚敤",
+        xianprice: null,
+        counterPrice: null,
+        limits: 10,
+        keywords: [],
       };
+      this.initializing = true;
       this.resetForm("form");
     },
-    /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-
     handlePackage() {
       this.$refs.aaa.open = true;
       this.$refs.aaa.getList();
@@ -932,173 +853,164 @@
         this.form.retailPrice = param1[0].price;
       }
     },
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
-      if (!selection[0]) {
-        return;
-      }
+      if (!selection[0]) return;
       this.forms = selection[0];
       this.ids = selection.map((item) => item.pacId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
-    /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.title = "浣撴濂楅淇℃伅缁存姢";
       this.DataList = [];
       this.checkedkey = [];
+      this.queryParams1.nr = "";
+      this.queryParams1.page = 1;
       this.checkedListkey = [];
+      this.checkedNodes = [];
       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.youhui = 10;
     },
-
-    // 鏄惁鍚敤
     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);
-        })
+      this.$modal
+        .confirm("纭瑕�" + text + row.pacName + "濂楅鍚楋紵")
+        .then(() => updateStatus(data))
         .then(() => {
-          this.msgSuccess(text + "鎴愬姛");
+          this.$modal.msgSuccess(text + "鎴愬姛");
         })
-        .catch(function () {
+        .catch(() => {
           row.pacStatus = row.pacStatus === "0" ? "0" : "1";
         });
     },
-
     handleUp() {
+      this.reset();
       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;
-        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 = [];
+        Object.keys(response.data).forEach((key) => {
+          this.$set(this.form, key, response.data[key]);
+        });
+        this.youhui = response.data.limits || 10;
+        this.pics = response.data.price || 0;
+        this.form.xianprice = response.data.newPrice || 0;
+        this.lastXianPrice = this.form.xianprice;
+        this.form.keywords =
+          response.data.keywords && response.data.keywords.length > 0
+            ? response.data.keywords.slice(0, -1).split(",")
+            : [];
+        this.DataList = response.data.packageProjects || [];
+        this.checkedkey = this.DataList.map((item) => item.proId || "");
+        this.checkedListkey = [...this.checkedkey];
+        this.checkedNodes = [...this.checkedkey];
         this.getDataList();
       });
     },
-    /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
+      this.reset();
       this.title = "浣撴濂楅淇℃伅缁存姢";
       this.open = true;
-      getPacInFo(row.pacId).then((response) => {
-        this.form = response.data;
-        this.form.keywords = this.form.keywords.slice(0, -1);
-        this.form.keywords = this.form.keywords.split(",");
-        this.DataList = [];
-        this.checkedkey = [];
-        this.checkedListkey = [];
-        this.getDataList();
-      });
+      this.loading = true;
+      getPacInFo(row.pacId)
+        .then((response) => {
+          const data = response.data || {};
+          Object.keys(data).forEach((key) => {
+            this.$set(this.form, key, data[key]);
+          });
+          this.youhui = data.limits || 10;
+          this.pics = data.price || 0;
+          this.form.xianprice = data.newPrice || 0;
+          this.lastXianPrice = this.form.xianprice;
+          this.form.keywords =
+            data.keywords && data.keywords.length > 0
+              ? data.keywords.slice(0, -1).split(",")
+              : [];
+          this.DataList = data.packageProjects || [];
+          this.checkedkey = this.DataList.map((item) => item.proId || "");
+          this.checkedListkey = [...this.checkedkey];
+          this.checkedNodes = [...this.checkedkey];
+          return this.getDataList();
+        })
+        .then(() => {
+          this.loading = false;
+          this.$nextTick(() => {
+            this.$refs.form.validate();
+          });
+        })
+        .catch((error) => {
+          this.loading = false;
+          this.$message.error("鍔犺浇鏁版嵁澶辫触");
+        });
     },
-
-    // 鏂板琛�
     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,
-          });
         }
+        this.form.tjProjectList.push({
+          id: this.form.tjProjectList.length + 1,
+          proName: "",
+          allSonProName: "",
+          proPrice: "",
+          priceNow: "",
+          proId: "",
+        });
       } else {
-        Message.warning("璇峰厛濉啓濂楅鍚嶇О");
+        this.$modal.msgWarning("璇峰厛濉啓濂楅鍚嶇О");
       }
       this.$forceUpdate();
     },
-
-    // 鍒犻櫎琛�
     Delete(index) {
-      if (this.form.tjProjectList.length == 0) {
-        this.$alert("璇峰厛閫夋嫨瑕佸垹闄ょ殑鏁版嵁", "鎻愮ず", {
+      if (this.form.tjProjectList.length === 0) {
+        this.$modal.alert("璇峰厛閫夋嫨瑕佸垹闄ょ殑鏁版嵁", "鎻愮ず", {
           confirmButtonText: "纭畾",
         });
       } else {
         this.form.tjProjectList.splice(index, 1);
       }
     },
-
+    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();
+    },
     getSelectValue(val) {
       this.form.tjProjectList.forEach((formitem) => {
-        if (formitem.proName == val) {
+        if (formitem.proName === val) {
           formitem.allSonProName = "";
           this.allList.find((item) => {
-            if (item.proName == val) {
+            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[i].proId ===
+            this.form.tjProjectList[j].proId
           ) {
             this.form.tjProjectList.splice(j, 1);
             j--;
@@ -1106,58 +1018,8 @@
           }
         }
       }
-
       return this.form.tjProjectList;
     },
-
-    numberChange(currentValue, oldValue) {
-      this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
-        confirmButtonText: "纭畾",
-        cancelButtonText: "鍙栨秷",
-        type: "warning",
-      })
-        .then(() => {
-          this.youhui = currentValue;
-          /*    if (this.youhui < 10) {
-            this.youhui = 10;
-            // this.$modal.msgError(`璇ヤ汉鍛樻渶楂樹紭鎯犳潈闄愪负${this.getInfodis}鎶榒);
-          } */
-          this.DataList.forEach((item) => {
-            item.limits = this.youhui;
-            const proPrice = new Big(item.proPrice);
-            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));
-          });
-        })
-        .catch(() => {
-          this.youhui = oldValue;
-        });
-    },
-
-    updateProPrice(row) {
-      const proPrice = new Big(row.proPrice);
-      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;
-    },
-    calculateDiscount(row) {
-      if (row.limits > 10) {
-        row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
-      } else if (row.limits < 0) {
-        row.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
-      }
-      this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
-    },
-    // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       let fields = ["propinName"];
       let cellValue = row[column.property];
@@ -1185,189 +1047,63 @@
         </span>
       );
     },
-    getDataList() {
-      this.loading = true;
-      getProParentIdDxList().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);
+    handleFilterInput() {
+      this.queryParams1.page = 1;
+      this.getDataList();
+      // this.getDataList({ xb: this.keys });
 
-                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); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
-                });
-
-                /* let proId = item1.proId;
-                getProSonDxList(proId).then((res) => {
-                  this.TreedataList = res.data.list;
-                  this.TreedataList.forEach((item2) => {
-                    item2.disabled = true;
-                    this.checkedListkey.push(item2.proId);
-                    this.DataList.push(item2);
-                    if (this.DataList.length != 0) {
-                      this.DataList.forEach((item) => {
-                        if (item.proParentId == item1.proId) {
-                          item.propinName = item1.proName;
-                          item.propinPrice = item1.proPrice;
-                        }
-                      });
-                      this.pics = 0;
-                      this.DataList.forEach((item) => {
-                        this.pics += item.proPrice;
-                      });
-                    }
-                  });
-                }); */
-              }
-            });
-          });
-        } 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.proPrice,
-          0
-        );
-        this.loading = false;
+      this.$nextTick(() => {
+        this.$refs.tree.setCheckedKeys(this.checkedNodes);
       });
     },
-
-    handleCurrentChecked(data, checked, checkedNodes) {
-      this.dataObj = data;
-      this.checkedObj = checked;
-
-      if (checked == true) {
-        // 灏嗛�変腑鐨勯」鐩坊鍔犲埌 DataList
-        this.checkedListkey.push(data.proId);
-        this.DataList.push({
-          proId: data.proId,
-          proName: data.proName,
-          proPrice: data.proPrice, // 鍘熶环
-          limits: 10, // 榛樿鎶樻墸锛�100%锛�
-          priceNow: data.proPrice, // 榛樿浼樻儬浠蜂笌鍘熶环鐩稿悓
-        });
-
-        // 閲嶆柊璁$畻鎬讳环
-        this.pics = 0;
-        this.TotalPrice1 = 0;
-        this.DataList.forEach((item) => {
-          this.pics += item.proPrice;
-          this.form.counterPrice += item.proPrice;
-          this.TotalPrice1 += item.proPrice; // 鍙互鏍规嵁闇�瑕佹敼鎴愪紭鎯犱环 `priceNow`
-        });
-      } else if (checked == false) {
-        // 浠� DataList 涓Щ闄ゅ彇娑堥�変腑鐨勯」鐩�
-        let index = this.DataList.findIndex(
-          (item) => item.proId === data.proId
-        );
-        if (index !== -1) {
-          this.DataList.splice(index, 1);
+    handleCurrentChecked(data, checked, indeterminate) {
+      if (this.initializing) {
+        return;
+      }
+      if (checked) {
+        if (!this.DataList.some((item) => item.proId === data.proId)) {
+          this.DataList.push({
+            proId: data.proId,
+            proName: data.proName,
+            priceOrd: data.proPrice,
+            limits: 10,
+            priceNow: data.proPrice,
+          });
         }
-
-        // 閲嶆柊璁$畻鎬讳环
-        this.pics = 0;
-        this.TotalPrice1 = 0;
-        this.DataList.forEach((item) => {
-          this.pics += item.proPrice;
-          this.form.counterPrice += item.proPrice;
-          this.TotalPrice1 += item.proPrice; // 鍙互鏍规嵁闇�瑕佹敼鎴愪紭鎯犱环 `priceNow`
-        });
+        if (!this.checkedNodes.includes(data.proId)) {
+          this.checkedNodes.push(data.proId);
+        }
+        this.updateTotalPrice();
+      } 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();
       }
     },
-
-    /* handleCurrentChecked(data, checked, checkedNodes) {
-      this.dataObj = data;
-      this.checkedObj = checked;
-      if (checked == true) {
-        // this.$refs.tree.setCheckedKeys([data.proId]);
-        let proId = data.proId;
-        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.spliceData();
-            this.pics = 0;
-            this.DataList.forEach((item1) => {
-              this.pics += item1.proPrice;
-              if (item1.proParentId == data.proId) {
-                item1.propinName = data.proName;
-                item1.propinPrice = this.dataObj.proPrice;
-              }
-            });
-          });
-          this.TotalPrice1 = 0;
-          this.pics = 0;
-          if (this.DataList.length != 0) {
-            this.list1 = false;
-            this.DataList.forEach((item) => {
-              this.TotalPrice1 = item.proPrice + this.TotalPrice1;
-              this.pics += item.proPrice;
-            });
-          }
-        });
-      } else if (checked == false) {
-        let proId = data.proId;
-        getProSonDxList(proId).then((res) => {
-          this.TreedataList = res.data.list;
-          this.TreedataList.forEach((item) => {
-            item.disabled = true;
-          });
-          this.checkedListkey = [];
-          this.DataList.forEach((item, index) => {
-            if (item.proParentId == this.dataObj.proId) {
-              this.DataList.splice(index, this.TreedataList.length);
-            }
-          });
-          this.pics = 0;
-          this.DataList.forEach((item, index) => {
-            this.pics += item.proPrice;
-          });
-        });
+    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),
+        0
+      );
+    },
+    changeXianjia() {
+      if (this.form.xianprice !== 0 && this.pics) {
+        this.youhui =
+          (Math.floor((this.form.xianprice / this.pics) * 100) / 100) * 10;
       }
-    }, */
-
+    },
     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鏂规硶鍒犻櫎绗簩涓�
+      for (let i = 0; i < this.DataList.length; i++) {
+        for (let j = i + 1; j < this.DataList.length; j++) {
+          if (this.DataList[i].proId === this.DataList[j].proId) {
             this.DataList.splice(j, 1);
             j--;
           }
@@ -1375,78 +1111,98 @@
       }
       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.proPrice;
-              // this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
-            });
-          }
-        });
-      } else if (checked == true) {
+      if (!checked) {
+        this.DataList = this.DataList.filter(
+          (item) => item.proId !== data.proId
+        );
+        this.TotalPrice1 = this.DataList.reduce(
+          (sum, item) => sum + (item.priceOrd || 0),
+          0
+        );
+        this.pics = this.TotalPrice1;
+      } else {
         this.DataList.push(data);
-        this.pics = 0;
-        this.DataList.forEach((item1) => {
-          this.pics += item1.proPrice;
-          if (item1.proParentId == this.dataObj.proId) {
-            item1.propinName = this.dataObj.proName;
-            item1.propinPrice = this.dataObj.proPrice;
-          }
-        });
+        this.pics = this.DataList.reduce(
+          (sum, item) => sum + (item.priceOrd || 0),
+          0
+        );
         this.spliceData();
-        this.TotalPrice1 = 0;
-        this.pics = 0;
-        this.DataList.forEach((item1) => {
-          // this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
-          this.pics += item1.proPrice;
-        });
+        this.TotalPrice1 = this.pics;
       }
     },
-
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     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.DataList = this.DataList.filter(
+        (item) => item.proParentId !== row.proParentId
+      );
+      this.TotalPrice1 = this.DataList.reduce(
+        (sum, item) => sum + (item.priceOrd || 0),
+        0
+      );
+    },
+    submitForm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.form.xianprice !== this.lastXianPrice) {
+            this.$modal
+              .confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+                confirmButtonText: "纭畾",
+                cancelButtonText: "鍙栨秷",
+                type: "warning",
+              })
+              .then(() => {
+                this.youhui =
+                  (Math.floor((this.form.xianprice / this.pics) * 100) / 100) *
+                  10;
+                let totalYsprice = new Big(0);
+                this.DataList.forEach((item) => {
+                  item.limits = this.youhui;
+                  const ordPrice = new Big(item.priceOrd || 0);
+                  const discount = new Big(item.limits);
+                  const result = ordPrice.times(discount.div(10));
+                  item.priceNow = result.toNumber();
+                  totalYsprice = totalYsprice.plus(new Big(item.priceNow));
+                });
+                if (!totalYsprice.eq(this.form.xianprice)) {
+                  const diff = new Big(this.form.xianprice).minus(totalYsprice);
+                  if (this.DataList.length > 0) {
+                    const lastItem = this.DataList[this.DataList.length - 1];
+                    const newYsPrice = new Big(lastItem.priceNow)
+                      .plus(diff)
+                      .toNumber();
+                    this.$set(
+                      this.DataList[this.DataList.length - 1],
+                      "priceNow",
+                      newYsPrice
+                    );
+                  }
+                }
+                return this.saveData();
+              })
+              .catch(() => {
+                this.form.xianprice = this.lastXianPrice;
+              });
+          } else {
+            this.saveData();
+          }
         }
       });
-
-      // this.$refs.trees.setCheckedKeys([]);
     },
-
-    /** 鎻愪氦鎸夐挳 */
-    submitForm() {
-      console.log(this.form, 999);
+    saveData() {
       this.form.limits = this.youhui;
       this.form.price = this.pics;
-      this.form.priceNow = this.queryParams.xianprice;
-
+      this.form.priceNow = this.form.xianprice;
       if (this.keys) {
-        this.form.keywords = this.keys; // 濡傛灉鏈� this.keys锛屽垯鐩存帴璧嬪��
-      } else {
-        this.form.keywords = this.form.keywords.toString(); // 濡傛灉娌℃湁锛屽垯灏� this.form.keywords 杞垚瀛楃涓�
+        this.form.keywords = this.keys;
       }
-
-      let packageProjects = []; // 瀹氫箟涓�涓┖鏁扮粍
-
+      let packageProjects = [];
       this.DataList.forEach((item) => {
         packageProjects.push({
           proName: item.proName,
           proId: item.proId,
           priceNow: item.priceNow,
           limits: item.limits,
-          priceOrd: item.proPrice,
+          priceOrd: item.priceOrd,
         });
       });
       let data = {
@@ -1458,183 +1214,52 @@
         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--;
-              }
-            }
-          }
-          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,
-            });
-          });
-        }
-        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();
-              });
-            }
-          }
+      return saveOreditTjPacNew(data)
+        .then((res) => {
+          this.$modal.msgSuccess("淇濆瓨鎴愬姛");
+          this.open = false;
+          this.getList();
+        })
+        .catch(() => {
+          this.$message.error("淇濆瓨澶辫触");
         });
-      } else {
-        Message.warning("璇峰厛濉啓濂楅鍚嶇О");
-      }
-    }, */
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    },
     handleDelete(row) {
       const pacIds = row.pacId || this.ids;
       this.$modal
         .confirm('鏄惁纭鍒犻櫎浣撴濂楅缂栧彿涓�"' + pacIds + '"鐨勬暟鎹」锛�')
-        .then(function () {
-          return delPackage(pacIds);
-        })
+        .then(() => delPackage(pacIds))
         .then(() => {
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
         .catch(() => {});
     },
-
-    /** 鍒嗛厤濂楅鍐呴」鐩搷浣� */
-    handleProject: function (row) {
+    handleProject(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 {
   max-width: 800px;
 }
-
 .showInline {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1643,17 +1268,14 @@
   line-clamp: 2;
   -webkit-box-orient: vertical;
 }
-
 .pag {
   width: 100%;
   display: flex;
   justify-content: center;
 }
-
 .pag1 {
   width: 30%;
 }
-
 .dialog-footer {
   position: absolute;
   left: 40%;
@@ -1664,12 +1286,4 @@
   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>
\ No newline at end of file

--
Gitblit v1.8.0