From 28a9dc3f52b879053c79feb216fa868be906cd02 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 06 十二月 2023 13:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index e3e913a..3d3ea21 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -47,7 +47,7 @@
                 </el-table-column>
                 <!--              鐢熷懡鍛ㄦ湡-->
                 <el-table-column v-for="(item,index) in lcstatusArray"
-                                 v-if=" lcstatusArray.length !== 0 && !item.hidden"
+                                 v-if=" lcstatusArray.length >= 0 && !item.hidden"
                                  key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
                                  :width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"
                                  prop="lcstatus">
@@ -393,6 +393,11 @@
     this.doLayout()
   },
   watch: {
+    isLoading:{
+      handler(newval){
+        console.log(newval)
+      }
+    },
     tableHeadDataFateher: {
       handler(newval, oldval) {
         this.options = newval.tableDefineVO.seniorQueryColumns
@@ -408,7 +413,7 @@
       handler(newval, oldval) {
         this.tableData = newval;
         this.searchResults = newval
-        this.doLayout()
+        this.doLayout();
       },
     },
     tableHeadFindData: {
@@ -433,33 +438,31 @@
           }
         })
         this.tableHeadFindDatas = newval;
-        // console.log('new',newval)
-        if (!this.isCodeArrayPushed) {
+        if (newval) {
+          this.CodeArray = [];
           if (newval.find(item => item.prop === 'id')) {
             this.CodeArray.push(newval.find(item => item.prop === 'id'));
           } else {
-            this.CodeArray.push([]);
+            this.CodeArray = [];
           }
-          // console.log('CodeArray', this.CodeArray);
-          this.isCodeArrayPushed = true;
+
         }
-        if (!this.islcstatusPushed) {
+        if (newval) {
+          this.lcstatusArray = [];
           if (newval.find(item => item.prop === 'lcstatus')) {
             this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'));
           } else {
-            this.lcstatusArray.push([]);
+            this.lcstatusArray = [];
           }
-          // console.log('lcstatusArray', this.lcstatusArray);
-          this.islcstatusPushed = true;
         }
-        if (!this.isReferPushed) {
+        if (newval) {
+          this.referArray = [];
           if (newval.find(item => Object.keys(item.referConfig).length > 0)) {
             this.referArray.push(newval.find(item => Object.keys(item.referConfig).length > 0));
           } else {
-            this.referArray.push([])
+            this.referArray = [];
           }
         }
-        this.isReferPushed = true;
         this.WupinFindValue = ''
       },
     },
@@ -567,7 +570,6 @@
     },
     //闆嗗洟鐮佸鍑�
     excelGroupCode(){
-      debugger
       this.isLoading = true;
       exportGroupCodeExcel({
         codeClassifyOid: this.codeClassifyOid,
@@ -652,20 +654,13 @@
     },
     //鎵归噺缂栬緫
     bulkEditHandler(type) {
-      // console.log(this.nodeClickList)
       if (this.nodeClickList.children.length >= 1) {
         this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
         return;
       }
-      const Editing = this.selectRow.every(item => item.lcstatus === 'Editing');
-
-      if (Editing) {
         this.batchImportData.visible = true
         this.batchImportData.type = type
         this.batchImportData.codeClassifyOid = this.codeClassifyOid
-      } else {
-        this.$message.warning('閫夋嫨鐨勬暟鎹腑鏈夌紪鐮佺姸鎬佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫锛�');
-      }
     },
     addSaveHandler() {
       this.$nextTick(() => {
@@ -677,10 +672,6 @@
       if (this.selectRow.length <= 0) {
         this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
       } else {
-        // const requestData = this.selectRow.forEach(item => {
-        //   return { oids: item.oid, btmName: item.btmname };
-        // });
-
         const oids = this.selectRow.map(item => item.oid).join(',');
         applyGroupCode({oids, btmName: this.selectRow[0].btmname}).then(res => {
           if (res.data.code == 200) {
@@ -695,9 +686,6 @@
       if (this.selectRow.length <= 0) {
         this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹ā鏉匡紒')
       } else {
-        // const requestData = this.selectRow.forEach(item => {
-        //   return { oids: item.oid, btmName: item.btmname };
-        // });
         const oids = this.selectRow.map(item => item.oid).join(',');
         receiveEditApply({oids, btmName: this.selectRow[0].btmname}).then(res => {
           if (res.data.code == 200) {

--
Gitblit v1.9.3