From 43776e768c0427aa8730fa8e6ad755fb847575ff Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 9 Dec 2025 14:35:51 +0800
Subject: [PATCH] up

---
 src/views/contract/contractEdit.vue | 52 +++++++++++++++++++++++++++--
 vue.config.js                       |  8 ++---
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index 0168283..153f333 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -785,6 +785,21 @@
       :before-close="handleDrawerClose"
     >
       <div style="padding: 0 20px">
+        <div style="margin-bottom: 15px;">
+          <el-input
+            v-model="contractSelect.keyword"
+            placeholder="关键字搜索"
+            clearable
+            @clear="handleKeywordClear"
+            @keyup.enter.native="handleKeywordSearch"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click="handleKeywordSearch"
+            ></el-button>
+          </el-input>
+        </div>
         <xy-table
           :list="contractList"
           ref="contractToContractsTable"
@@ -1153,6 +1168,7 @@ export default {
         page: 1,
         page_size: 10,
         is_framework: 1,
+        keyword: "",
       },
       contractList: [],
       loading: false,
@@ -1463,9 +1479,40 @@ export default {
       this.contractList = res.list.data;
       this.contractTotal = res.list.total;
     },
+    // 关键字搜索
+    handleKeywordSearch() {
+      this.contractSelect.page = 1;
+      this.getContractToContracts();
+    },
+    // 清除关键字
+    handleKeywordClear() {
+      this.contractSelect.keyword = "";
+      this.contractSelect.page = 1;
+      this.getContractToContracts();
+    },
     closeTag (i) {
-      this.form.contract_to_contracts.splice(this.form.contract_to_contracts.findIndex(j => j.to_contract_id === i.id),1)
-      this.$refs['contractToContractsTable']?.toggleRowSelection(this.$refs['contractToContractsTable']?.getSelection().find(j => i.id === j.id),true)
+      // 从表格中找到对应的行并取消选中
+      const table = this.$refs['contractToContractsTable'];
+      if (table) {
+        const currentSelections = table.getSelection();
+        const rowToDeselect = currentSelections.find(j => j.id === i.id);
+        if (rowToDeselect) {
+          // 取消选中该行（第二个参数为 false 表示取消选中）
+          table.toggleRowSelection(rowToDeselect, false);
+        }
+        // 更新 form.contract_to_contracts
+        const newSelections = table.getSelection();
+        this.form.contract_to_contracts = newSelections.map(item => {
+          return this.id ? {
+            contract_id: this.contractId,
+            to_contract_id: item.id,
+            use_money: this.form.plan_price
+          } : {
+            to_contract_id: item.id,
+            use_money: this.form.plan_price
+          };
+        });
+      }
     },
 
     async getDetail () {
@@ -1786,6 +1833,7 @@ export default {
           page: 1,
           page_size: 10,
           is_framework: 1,
+          keyword: "",
         };
         this.contractList = [];
         this.contractTotal = 0;
diff --git a/vue.config.js b/vue.config.js
index fc24963..fac8d03 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,11 +25,11 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath:  process.env.ENV === 'staging' ? '/admin' : '/admin',
+  publicPath: process.env.ENV === 'staging' ? '/admin' : '/admin',
   // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin',
-  outputDir: process.env.ENV === 'staging' ? '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin'
-  :'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
-  // /Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public
+  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
+  // :'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
+  // /Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,