From 02148424662ce08bec755588c3b77ac6abc8e6af Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 04 八月 2023 16:19:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 85c6ee2..f2ccf2b 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -300,8 +300,6 @@
     },
     tableDataArray: {
       handler(newval, oldval) {
-        this.keyWordFind='';
-        this.WupinFindValue=''
         this.tableData = newval;
         this.searchResults = newval
         this.doLayout()
@@ -323,8 +321,13 @@
               }
             }
           }
+
+          if(_index==0){
+            this.keyWordFind=record.field
+          }
         })
         this.tableHeadFindDatas = newval;
+        this.WupinFindValue=''
       },
     },
     total: {
@@ -876,10 +879,10 @@
     },
     //杈撳叆鍥炶溅鎼滅储
     tableFindInp() {
-      if (this.WupinFindValue.trim() === '') {
+      /*if (this.WupinFindValue.trim() === '') {
         this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
         return;
-      }
+      }*/
       TableData({
         templateOid: this.templateOid,
         codeClassifyOid: this.codeClassifyOid,
@@ -887,7 +890,6 @@
         limit: this.page.pageSize,
         [ 'conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
       }).then(res => {
-        console.log(res)
         this.tableData = res.data.data
       })
     }

--
Gitblit v1.9.3