From 93fae8250930a1b9d501166a145f22ba611dfcca Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 31 Aug 2022 14:54:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=A2=86=E7=94=A8=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=AA=E6=90=BA=E5=B8=A6=E4=BB=93=E5=BA=93=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=E6=9C=AA=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/DialogInvProduct.vue | 16 ++++------------
 src/views/thrsys/SysUdimsData.vue        |  9 ++++-----
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue
index f3965a1..4063f37 100644
--- a/src/views/inventory/DialogInvProduct.vue
+++ b/src/views/inventory/DialogInvProduct.vue
@@ -14,11 +14,7 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button-group>
-                            <el-button
-                                type="primary"
-                                icon="el-icon-refresh"
-                                @click="onReset"
-                            ></el-button>
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmit"
                             >查询
                             </el-button
@@ -119,13 +115,7 @@ export default {
                 supId: null,
                 unitFk: null,
                 invStorageCode: null,
-                invWarehouseCode: null,
-            },
-            detailQuery: {
-                code: null,
-                productIdFk: null,
-                page: 1,
-                limit: 20,
+                invWarehouseCode: null
             },
             list: [],
             codeDetailVisible: false,
@@ -159,6 +149,8 @@ export default {
                 customerId: null,
                 unitFk: null,
                 supId: null,
+                invStorageCode: this.invQueryData.locStorageCode,
+                invWarehouseCode: this.invQueryData.invWarehouseCode,
                 page: 1,
                 limit: 10,
             };
diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue
index 87aa00c..b5b2fe7 100644
--- a/src/views/thrsys/SysUdimsData.vue
+++ b/src/views/thrsys/SysUdimsData.vue
@@ -19,7 +19,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-date-picker
-                            v-model="syncTime"
+                            v-model="filterQuery.syncTime"
                             type="datetime"
                             format="yyyy-MM-dd HH:mm:ss"
                             value-format="yyyy-MM-dd HH:mm:ss"
@@ -202,7 +202,6 @@ export default {
             },
             templateDlUrl: null,
             checked: false,
-            syncTime: null,
             configParms: {},
             syncInfo: null,
             syncVisible: false
@@ -289,8 +288,8 @@ export default {
 
 
         createScheduleDialog(type) {
-            if (this.$isNotBlank(this.syncTime)) {
-                this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+            if (this.$isNotBlank(this.filterQuery.syncTime)) {
+                this.$confirm("此操作将从" + this.filterQuery.syncTime + "开始同步最新数据，是否继续", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning",
@@ -309,7 +308,7 @@ export default {
         createSchedule(type) {
             let query = {
                 createType: type,
-                syncTime: this.syncTime,
+                syncTime: this.filterQuery.syncTime,
             }
 
             createSchedule(query)