From 525e32e381ab18bbfec0298ff541e8a29b1bf7d4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 21 七月 2023 17:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue |   26 +++++---------------------
 1 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 6747729..0863be2 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -278,6 +278,7 @@
     tableDataArray: {
       handler(newval, oldval) {
         this.tableData = newval;
+        this.searchResults=newval
       },
     },
     tableHeadFindData: {
@@ -568,6 +569,7 @@
       list.forEach((item) => {
         this.parameter.ids.push(item.oid);
       });
+      console.log(this.parameter)
     },
     //閫夋嫨
     handleSelection(list, row) {
@@ -659,36 +661,18 @@
       this.batchImportData.codeClassifyOid = this.codeClassifyOid
     },
     //杈撳叆鍥炶溅鎼滅储
-    tableFindInp(event) {
-      console.log('鍥炶溅閿鎸変笅');
-      console.log(this.WupinFindValue)
-      console.log(this.tableData)
-      // 鍦ㄨ繖閲屾墽琛屼綘鐨勬搷浣�
-      // let referList=[]
-      // this.tableData.filter(item => {
-        // console.log(item.name.includes(this.WupinFindValue))
-        // console.log(item.name.indexOf(this.WupinFindValue)>=0)
-      // })
-      // const regex = new RegExp(this.WupinFindValue, 'i');
-      // this.tableData.filter(item => {
-      //   console.log(regex.test(item.name))
-      //   // return regex.test(item.name);
-      // });
+    tableFindInp() {
       if (this.WupinFindValue.trim() === '') {
-        this.searchResults = []; // 杈撳叆鍊间负绌猴紝娓呯┖鎼滅储缁撴灉
+        this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
         return;
       }
-
-        this.tableData = this.tableData.filter(item => {
+        this.tableData = this.searchResults.filter(item => {
         if (typeof item.name === 'string') {
           return item.name.includes(this.WupinFindValue);
         }else {
           return false; // item.name涓嶆槸瀛楃涓茬被鍨嬶紝杩斿洖false
         }
-
       });
-      console.log(this.searchResults);
-
     }
 
   }

--
Gitblit v1.9.3