From d3ea99796e35f4be7d2a77957b0be57bee011663 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 15:46:42 +0800
Subject: [PATCH] tj

---
 src/views/system/comp/index.vue |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 6dfc31d..f29b2d6 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -252,7 +252,7 @@
               @submit.native.prevent>
               <el-form-item label="濂楅鍚嶇О" prop="pacName">
                 <el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
-                  @keyup.enter.native="handleSearch" style="width: 140px" />
+                  @keyup.enter.native="handleSearch" @clear="handleClearSearch" style="width: 140px" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
@@ -423,7 +423,7 @@
               label-width="68px" @submit.native.prevent>
               <el-form-item label="椤圭洰鍚嶇О" prop="proName">
                 <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
-                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
+                  @keyup.enter.native="handleSearchFor" @clear="handleClearSearch" style="width: 140px" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
@@ -517,7 +517,7 @@
               label-width="68px" @submit.native.prevent>
               <el-form-item label="椤圭洰鍚嶇О" prop="proName">
                 <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
-                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
+                  @keyup.enter.native="handleSearchFor"  @clear="handleClearSearch" style="width: 140px" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
@@ -1305,7 +1305,7 @@
         });
       }
     },
-    handleSearchFor() {
+    /* handleSearchFor() {
       // 鍒ゆ柇鏄惁涓烘眽瀛�
       const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char);
       if (isChineseChar(this.queryParams1.proName)) {
@@ -1320,6 +1320,27 @@
           this.Treedata = response.data;
         });
       }
+    }, */
+     handleSearchFor() {
+      // 鍒ゆ柇鏄惁涓烘眽瀛�
+      const keyword = this.queryParams1.proName?.trim() || '';
+      const isChineseChar = /[\u4E00-\u9FA5]/.test(keyword);
+      const query = {
+      ...this.queryParams1,
+      proName: isChineseChar ? keyword : null,
+      pym: isChineseChar ? null : keyword
+     };
+      getProjectList(query).then((response) => {
+          this.Treedata = response.data;
+      });
+    },
+    handleClearSearch() {
+      this.queryParams1.proName = '';
+      this.queryParams1.pym = null;
+      // 閲嶆柊鍔犺浇琛ㄦ牸鏁版嵁
+      getProjectList({}).then((response) => {
+          this.Treedata = response.data;
+        });
     },
     // 鍗曢」鏁版嵁鑾峰彇
     handleChangesingle(selection) {
@@ -1557,7 +1578,9 @@
         });
     },
     xiangmuWh() {
-      if (!this.forms.groupingName || !this.forms.sex || !this.forms.payType) {
+      if (!this.forms.groupingName ||
+        !this.forms.sex ||
+        !this.forms.payType) {
         this.$modal.msgError("璇峰厛濉啓鎵�鏈夊繀濉」!");
         return; // Stop execution if any required field is empty
       }
@@ -1565,6 +1588,9 @@
       this.title = "鍒嗙粍椤圭洰缁存姢";
       this.OnenewpacName = [];
       this.queryParams.price = 0;
+      // 娓呯┖椤圭洰鍚嶇О鎼滅储妗�
+      this.queryParams1.proName = '';
+      this.queryParams1.pym = null;
       this.loading = true;
       if (this.groupList[0]) {
         let id = this.groupList[0].id || "";

--
Gitblit v1.8.0