From f94ded5d0a6545bb564f986bc2db03a989fae662 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 三月 2024 10:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 54b5ad0..3c63ed0 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -164,14 +164,15 @@
                            @current-change="handleCurrentChange">
             </el-pagination>
           </div>
-          <el-dialog title="鎵嬪姩鍚屾" :visible.sync="syncDialogBox"append-to-body @close="syncClose" top="200px">
+          <el-dialog v-loading="syncLoading" :visible.sync="syncDialogBox" append-to-body title="鎵嬪姩鍚屾" top="200px"
+                     width="30%" @close="syncClose">
             <p style="display: inline-block">鏈�鍚庢洿鏂版椂闂达細</p>
             <el-date-picker
-              style="width: 300px"
               v-model="SyncValue"
-              type="date"
-              placeholder="閫夋嫨鏃ユ湡"
               format="yyyy 骞� MM 鏈� dd 鏃� HH 鏃� mm 鍒� ss 绉�"
+              placeholder="閫夋嫨鏃ユ湡"
+              style="width: 300px"
+              type="date"
               value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
             <div slot="footer" class="dialog-footer">
@@ -283,8 +284,9 @@
   data() {
     return {
       //鎵嬪姩鍚屾model
-      SyncValue:'',
-      syncDialogBox:false,
+      SyncValue: '',
+      syncLoading: false,
+      syncDialogBox: false,
       isTimeStatus: false,
       isTimeName: '',
       dateValue: "",
@@ -392,8 +394,6 @@
     },
   },
   created() {
-    // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
-    // this.result = this.$route.query.id.substring(index);
     getUserInfo().then(res => {
       this.result = res.data.data.realName
     })
@@ -414,9 +414,8 @@
     },
     tableHeadDataFateher: {
       handler(newval, oldval) {
-        // console.log(newval)
-        if (newval.length > 0) {
-          this.options = newval.tableDefineVO.seniorQueryColumns
+        if (Object.keys(newval).length > 0) {
+          this.options = newval.tableDefineVO.seniorQueryColumns;
         }
       }
     },
@@ -439,6 +438,8 @@
             fileDocClassifyName: '',
             hasDownload: true,
             hasUpload: true,
+            hasEdit: true,
+            hasDel: true,
             height: 'auto'
           }
         } else {
@@ -611,21 +612,30 @@
       });
     },
     //鎵嬪姩鍚屾
-    manualSyncing(){
+    manualSyncing() {
       this.syncDialogBox = true;
     },
     //鎵嬪姩鍚屾鍏抽棴
-    syncClose(){
+    syncClose() {
       this.syncDialogBox = false;
     },
     //鎵嬪姩鍚屾纭畾
-    submitSync(){
-      if(this.SyncValue){
-        syncSearch({enDate:this.SyncValue}).then(res=>{
+    async submitSync() {
+      if (this.SyncValue) {
+        this.syncLoading = true;
+        const response = await syncSearch({endDate: this.SyncValue})
+        console.log('response',response)
+        if (response.data.code === 200) {
           this.$message.success('鍚屾鎴愬姛锛�')
+          this.syncLoading = false;
           this.syncDialogBox = false;
-        })
-      }else {
+          this.SyncValue = "";
+        } else {
+          this.syncLoading = false;
+          this.syncDialogBox = false;
+          this.SyncValue = "";
+        }
+      } else {
         this.$message.warning('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
       }
     },

--
Gitblit v1.10.0