From 829bfe3e8376f20f90a4b2361c9a8c3ed0e80d45 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 17:21:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   71 ++++++++++++++++++++---------------
 1 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 3d3ea21..80377c8 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -99,8 +99,8 @@
           </FormTemplateDialog>
           <!--          淇-->
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
-                              :disabledProp="disabledProp" :templateOid="templateOid" :title="'鏁版嵁淇'"
-                              :visible.sync="amendvisible" status="amend" :selectRow="selectRow"
+                              :disabledProp="disabledProp" :selectRow="selectRow" :templateOid="templateOid"
+                              :title="'鏁版嵁淇'" :visible.sync="amendvisible" status="amend"
                               type="add" @submit="amendSumbit"></FormTemplateDialog>
           <!--          鏂板-->
           <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -111,9 +111,9 @@
           </FormTemplateDialog>
           <!--          淇敼-->
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
-                              :disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+                              :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
+                              :title="'淇敼缂栫爜淇℃伅'"
                               :visible.sync="editvisible"
-                              :rowOid="rowOid"
                               type="edit" @submit="EditSumbit"></FormTemplateDialog>
           <!--          鎵归噺缂栬緫-->
           <!--          <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -393,9 +393,9 @@
     this.doLayout()
   },
   watch: {
-    isLoading:{
-      handler(newval){
-        console.log(newval)
+    isLoading: {
+      handler(newval) {
+        // console.log(newval)
       }
     },
     tableHeadDataFateher: {
@@ -500,6 +500,7 @@
       }
     },
     cellStatusFind(lcstatus) {
+      this.isLoading = true;
       TableData({
         templateOid: this.templateOid,
         codeClassifyOid: this.codeClassifyOid,
@@ -507,7 +508,10 @@
         limit: this.page.pageSize,
         'conditionMap[lcstatus]': lcstatus
       }).then(res => {
-        this.tableData = res.data.data
+        // console.log(res)
+        this.tableData = res.data.data;
+        this.page.total = res.data.total;
+        this.isLoading = false;
       })
     },
     //灞曞紑闄勪欢
@@ -563,27 +567,36 @@
         if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
       });
     },
-    importGroupCode(type){
+    importGroupCode(type) {
       this.batchImportData.visible = true
       this.batchImportData.type = type
       this.batchImportData.codeClassifyOid = this.codeClassifyOid
     },
     //闆嗗洟鐮佸鍑�
-    excelGroupCode(){
+    excelGroupCode() {
       this.isLoading = true;
       exportGroupCodeExcel({
         codeClassifyOid: this.codeClassifyOid,
       }).then(res => {
-        console.log(res.data)
-        if (res) {
-          func.downloadFileByBlobHandler(res);
-          this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
-          this.isLoading = false;
-        }
-      }).catch(error=>{
-        this.$message.error(error);
-        this.isLoading = false;
-      })
+        let reader = new FileReader();
+        reader.readAsText(res.data)
+        reader.onload =  (result) =>{
+          try {
+            let resData = JSON.parse(result.target.result);  // 瑙ｆ瀽瀵硅薄鎴愬姛
+            if (!resData.success) {
+              console.log("resData",resData)
+              this.$message.error(resData.msg);
+              this.isLoading = false;
+            }
+          } catch (err) {
+            // console.log("err",err)// 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
+            func.downloadFileByBlobHandler(res);
+            this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+            this.isLoading = false;
+          }
+        };
+
+      });
     },
     //鏍囧噯鐢宠
     codeApplyHandler() {
@@ -624,7 +637,7 @@
         }
       });
       if (foundItem) {
-        if(this.selectRow.length >= 1){
+        if (this.selectRow.length >= 1) {
           this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', {
             confirmButtonText: '纭畾',
             cancelButtonText: '鍙栨秷',
@@ -640,7 +653,7 @@
               message: '宸插彇娑堝綋鍓嶆搷浣�'
             });
           });
-        }else {
+        } else {
           this.amendvisible = true;
         }
       } else {
@@ -658,9 +671,9 @@
         this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
         return;
       }
-        this.batchImportData.visible = true
-        this.batchImportData.type = type
-        this.batchImportData.codeClassifyOid = this.codeClassifyOid
+      this.batchImportData.visible = true
+      this.batchImportData.type = type
+      this.batchImportData.codeClassifyOid = this.codeClassifyOid
     },
     addSaveHandler() {
       this.$nextTick(() => {
@@ -1061,10 +1074,7 @@
     },
     //杈撳叆鍥炶溅鎼滅储
     tableFindInp() {
-      /*if (this.WupinFindValue.trim() === '') {
-        this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
-        return;
-      }*/
+      this.isLoading = true;
       TableData({
         templateOid: this.templateOid,
         codeClassifyOid: this.codeClassifyOid,
@@ -1073,7 +1083,8 @@
         ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
       }).then(res => {
         this.tableData = res.data.data;
-        // this.page.total = res.data.data.total;
+        this.page.total = res.data.total;
+        this.isLoading = false;
       })
     }
 

--
Gitblit v1.9.3