From f1f47e571a894dab18a26259470e04e0b12dcbcd Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 29 Sep 2022 18:06:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E4=B8=8E=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E5=AF=B9=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202.=E5=BC=B9=E7=AA=97=E7=BB=9F=E4=B8=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=81=AE=E7=BD=A9=E5=B1=82=EF=BC=8C=E9=81=BF=E5=85=8D=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=A9=BA=E7=99=BD=E5=A4=84=E8=AF=AF=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/invWarehouse.vue | 7 ++++- src/views/inventory/InvPreProductsDetail.vue | 2 ++ src/views/userManage/admin/authAdmin.vue | 4 +-- .../userManage/param/systemPDFModule.vue | 3 +- .../userManage/param/systemPDFTemplate.vue | 2 ++ src/views/warehouse/AdditionalOrder.vue | 9 +++++- src/views/warehouse/DialogSelectRl.vue | 2 +- src/views/warehouse/InvProducts.vue | 6 ++-- src/views/warehouse/addOrder.vue | 4 +++ src/views/warehouse/codeReplace.vue | 16 +++++----- src/views/warehouse/errorCode.vue | 4 +++ src/views/warehouse/ioFinishOrder.vue | 14 ++++++++- src/views/warehouse/ioUdiTrace.vue | 10 ++++++- src/views/warehouse/stockOrderDelSearch.vue | 26 ++++++++++++---- src/views/warehouse/stockOrderDelete.vue | 11 +++++-- src/views/warehouse/stockOrderSearch.vue | 30 +++++++++++++++---- 16 files changed, 119 insertions(+), 31 deletions(-) diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index a2259b0..9d0ff63 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -434,7 +434,12 @@ - + + 查询 正常 - +
取消 diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue index 0863987..3aa8933 100644 --- a/src/views/userManage/param/systemPDFModule.vue +++ b/src/views/userManage/param/systemPDFModule.vue @@ -794,7 +794,8 @@ export default { if (this.selectTemplateQuery.type == 1) { let query = { id: this.selectTemplateQuery.busRlId, - templateId: data.templateId + templateId: data.templateId, + customerId: store.getters.customerId }; updateDetailRel(query) .then(response => { diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue index 9d51b1d..648ca07 100644 --- a/src/views/userManage/param/systemPDFTemplate.vue +++ b/src/views/userManage/param/systemPDFTemplate.vue @@ -323,6 +323,8 @@ title="字段说明" :visible.sync="centerDialogVisible" width="80%" + :close-on-click-modal="false" + :close-on-press-escape="false" center> {{ currentRow }} diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue index 92a117e..970c340 100644 --- a/src/views/warehouse/AdditionalOrder.vue +++ b/src/views/warehouse/AdditionalOrder.vue @@ -138,7 +138,14 @@ - + {{ errorDetail }} diff --git a/src/views/warehouse/InvProducts.vue b/src/views/warehouse/InvProducts.vue index 035951c..3588ff0 100644 --- a/src/views/warehouse/InvProducts.vue +++ b/src/views/warehouse/InvProducts.vue @@ -7,7 +7,7 @@ - + @@ -116,7 +116,7 @@ export default { data() { return { filterQuery: { - cpmctymc: null, + productsName: null, nameCode: null, relIdFk: null, batchNo: null, @@ -158,7 +158,7 @@ export default { path: "" }); this.filterQuery = { - cpmctymc: null, + productsName: null, nameCode: null, relIdFk: null, batchNo: null, diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 1d645fc..a673ff0 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -208,6 +208,8 @@ v-if="dialogTableVisible" width="70%" append-to-body + :close-on-click-modal="false" + :close-on-press-escape="false" > - + 查询 @@ -65,6 +66,8 @@ :visible.sync="replaceVisible" :append-to-body="true" width="70%" + :close-on-click-modal="false" + :close-on-press-escape="false" > @@ -191,7 +194,6 @@ export default { return { query: { code: "", - corpOrderId: "", page: 1, limit: 20, }, @@ -229,12 +231,8 @@ export default { }, methods: { onReset() { - this.$router.push({ - path: "", - }); this.query = { code: "", - corpOrderId: "", page: 1, limit: 20, }; @@ -255,7 +253,10 @@ export default { this.query.page = val; this.getCodeList(); }, - + search() { + this.query.page = 1; + this.getCodeList(); + }, getCodeList() { this.loading = true; this.query.orderId = this.idQuery.id; @@ -370,7 +371,6 @@ export default { this.query = Object.assign(this.query, query); this.query.limit = parseInt(this.query.limit); - this.query.corpOrderId = query.id; // 加载表格数据 this.getCodeList(); diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue index 1a1980d..fa04350 100644 --- a/src/views/warehouse/errorCode.vue +++ b/src/views/warehouse/errorCode.vue @@ -79,6 +79,8 @@ v-if="dialogTableVisible" width="70%" append-to-body + :close-on-click-modal="false" + :close-on-press-escape="false" > @@ -279,6 +281,8 @@ :visible.sync="addDialogVisible" width="80%" v-if="addDialogVisible" + :close-on-click-modal="false" + :close-on-press-escape="false" > - + {{ errorDetail }} - + {{ errorDetail }} - + - + @@ -236,7 +242,12 @@
- + @@ -249,7 +260,12 @@ - + @@ -613,7 +629,7 @@ export default { }, printOrder(row) { let tQuery = { - queryId: row.orderId, + orderId: row.orderId, moduleId: 4 }; this.loading = true; diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue index 4e2ee6b..bddc872 100644 --- a/src/views/warehouse/stockOrderDelete.vue +++ b/src/views/warehouse/stockOrderDelete.vue @@ -10,7 +10,8 @@ > - + @@ -170,7 +171,13 @@ > - + {{ errorDetail }} 关 闭 diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue index 24933c9..2ca2fbe 100644 --- a/src/views/warehouse/stockOrderSearch.vue +++ b/src/views/warehouse/stockOrderSearch.vue @@ -28,7 +28,8 @@ - + - + @@ -225,7 +231,12 @@ - + @@ -238,7 +249,12 @@ - + @@ -293,6 +309,8 @@ width="60%" v-if="distributionVisible" @close='closeDialog' + :close-on-click-modal="false" + :close-on-press-escape="false" > @@ -732,7 +752,7 @@ export default { }, printOrder(row) { let tQuery = { - queryId: row.id, + orderId: row.orderId, moduleId: 4 }; this.loading = true;