From 6c863f47e5a2bcf1ec7f3a2d62a00b4a8fd4a7fa Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 14 Jun 2022 13:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsReceModify.vue |  2 +-
 src/views/inout/editCode.vue               |  3 ++
 src/views/thrsys/SysUdimsData.vue          | 36 ++++++++++++++++++----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index c616152..6be2867 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -86,7 +86,7 @@
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
-                            <span>委托生成单据类型:&nbsp;</span>
+                            <span>生成单据类型:&nbsp;</span>
                         </div>
                         <el-select v-model="inputQuery.entrustAction" placeholder="单据类型" clearable>
                             <el-option
diff --git a/src/views/inout/editCode.vue b/src/views/inout/editCode.vue
index 54043ca..32e1c6e 100644
--- a/src/views/inout/editCode.vue
+++ b/src/views/inout/editCode.vue
@@ -152,6 +152,9 @@ export default {
                     this.loading = false;
                 });
         }
+    },
+    created() {
+        this.findByCode();
     }
 }
 </script>
diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue
index e5a9a00..69f04ce 100644
--- a/src/views/thrsys/SysUdimsData.vue
+++ b/src/views/thrsys/SysUdimsData.vue
@@ -30,14 +30,19 @@
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                            <el-button type="primary" icon="search" @click="createSchedule(1)"
-                                       :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck">同步单据</el-button>
-                            <el-button type="primary" icon="search" @click="createSchedule(2)"
-                                       :disabled="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">同步单据类型</el-button>
-                            <el-button type="primary" icon="search" @click="createSchedule(3)"
+                            <el-button type="primary" icon="search" @click="createScheduleDialog(1)"
+                                       :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck">
+                                同步单据
+                            </el-button>
+                            <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
+                                       :disabled="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
+                                同步单据类型
+                            </el-button>
+                            <el-button type="primary" icon="search" @click="createScheduleDialog(3)"
                                        :disabled="!configParms.basicProducts&& !configParms.basicCorp&&
                                         !configParms.basicInv&&!configParms.basicThirdProducts&& !configParms.basicThirdCorp&& !configParms.basicThirdInv
-                                && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息</el-button>
+                                && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息
+                            </el-button>
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -279,6 +284,25 @@ export default {
         }
         ,
 
+
+        createScheduleDialog(type) {
+            if (this.$isNotBlank(this.syncTime)) {
+                this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.createSchedule(type);
+                    })
+                    .catch(() => {
+                    });
+            } else {
+                this.createSchedule(type);
+            }
+
+        },
+
         createSchedule(type) {
             let query = {
                 createType: type,