From 6bb2a23358624f72c886fccff39bfb54de868e4f Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 14:59:39 +0800
Subject: [PATCH] jgjl

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

diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 441f8d6..f9a7a08 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -234,7 +234,12 @@
                     :value="dict.value" />
                 </el-select>
               </el-form-item>
-              
+                <el-form-item label="鏄惁鏇挎" prop="tj">
+                <el-select v-model="forms.tj" placeholder="璇烽�夋嫨鏄惁鏇挎" style="width: 120px" clearable>
+                  <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                    :value="dict.value" />
+                </el-select>
+              </el-form-item>
               <el-form-item label="骞撮緞娈�">
                 <el-col :span="7">
                   <el-input v-model="forms.ltAge" style="width: 53px" />
@@ -360,7 +365,7 @@
               
               <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>
@@ -453,7 +458,7 @@
 
               <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>
@@ -545,7 +550,7 @@
              
               <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>
@@ -812,7 +817,7 @@
     "dict_comp_type",
     "dict_data_status",
     "sys_user_sex",
-    "reservation_pay_type",
+    "reservation_pay_type","sys_yes_no"
   ],
   data() {
     let checkPhoneNum = (rule, value, callback) => {
@@ -1440,7 +1445,7 @@
         });
       }
     },
-    handleSearchFor() {
+    /* handleSearchFor() {
       // 鍒ゆ柇鏄惁涓烘眽瀛�
       const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
       if (isChineseChar(this.queryParams1.proName)) {
@@ -1455,7 +1460,29 @@
           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) {
       console.log(selection,22222222)
@@ -1678,6 +1705,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