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 |   65 +++++++++++++++++++++++++++++---
 1 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index f18267a..3c63ed0 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -164,6 +164,22 @@
                            @current-change="handleCurrentChange">
             </el-pagination>
           </div>
+          <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
+              v-model="SyncValue"
+              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">
+              <el-button @click="syncClose">鍙� 娑�</el-button>
+              <el-button type="primary" @click="submitSync">纭� 瀹�</el-button>
+            </div>
+          </el-dialog>
         </div>
       </div>
       <div class="bottom">
@@ -188,7 +204,8 @@
   applyGroupCode,
   receiveEditApply,
   applySaveCode,
-  exportGroupCodeExcel
+  exportGroupCodeExcel,
+  syncSearch
 } from "@/api/GetItem";
 import {processTS, changeStatus} from "@/api/template/setPersonnel"
 import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
@@ -266,6 +283,10 @@
   },
   data() {
     return {
+      //鎵嬪姩鍚屾model
+      SyncValue: '',
+      syncLoading: false,
+      syncDialogBox: false,
       isTimeStatus: false,
       isTimeName: '',
       dateValue: "",
@@ -373,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
     })
@@ -395,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;
         }
       }
     },
@@ -420,6 +438,8 @@
             fileDocClassifyName: '',
             hasDownload: true,
             hasUpload: true,
+            hasEdit: true,
+            hasDel: true,
             height: 'auto'
           }
         } else {
@@ -587,8 +607,39 @@
         if (uniqueFlag === 'excelGroupCode') return this.excelGroupCode()
         //闆嗗洟鐮佸鍏�
         if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
+        //鎵嬪姩鍚屾
+        if (uniqueFlag === 'manualSyncing') return this.manualSyncing("groupCode")
       });
     },
+    //鎵嬪姩鍚屾
+    manualSyncing() {
+      this.syncDialogBox = true;
+    },
+    //鎵嬪姩鍚屾鍏抽棴
+    syncClose() {
+      this.syncDialogBox = false;
+    },
+    //鎵嬪姩鍚屾纭畾
+    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;
+          this.SyncValue = "";
+        } else {
+          this.syncLoading = false;
+          this.syncDialogBox = false;
+          this.SyncValue = "";
+        }
+      } else {
+        this.$message.warning('璇烽�夋嫨鏈�鍚庢洿鏂版椂闂达紒')
+      }
+    },
+    //闆嗗洟鐮佸鍏�
     importGroupCode(type) {
       this.batchImportData.visible = true
       this.batchImportData.type = type
@@ -1208,7 +1259,7 @@
 .main {
   display: flex;
   flex-direction: column;
-  height: calc(100vh - 150px);
+  height: calc(100vh - 145px);
   min-height: 400px;
 }
 

--
Gitblit v1.10.0