From c9e51e3f9ab4aaca40bc6ee04c2a1cc20632e4bb Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 16:04:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=202.=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E8=AE=BE=E7=BD=AE=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=8C=89=E9=92=AE=203.=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/UdiInfoManage.vue | 25 +++++++++++++----- src/views/basic/UdiInfoManageSp.vue | 8 +++--- src/views/thrsys/SysUdimsConfig.vue | 4 +-- src/views/thrsys/SysUdimsData.vue | 2 -- src/views/thrsys/ThrInvWarehouse.vue | 3 ++- src/views/warehouse/DialogcChangeNewOrder.vue | 6 +++++ src/views/warehouse/addHosOrder.vue | 6 +++++ src/views/warehouse/addOrder.vue | 5 ++++ src/views/warehouse/editCode.vue | 15 +++++++++++ src/views/warehouse/stockHospOrderNew.vue | 9 +++---- src/views/warehouse/stockOrder.vue | 18 ++++++++++--- src/views/warehouse/stockOrderDelSearch.vue | 2 +- src/views/warehouse/stockOrderEditor.vue | 26 ++++++++++++++----- src/views/warehouse/stockOrderNew.vue | 14 +++++++++- .../warehouse/stockOrderNewDistribution.vue | 4 +-- src/views/warehouse/stockOrderWaitCheck.vue | 9 +++---- 16 files changed, 117 insertions(+), 39 deletions(-) diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index fc3a0a8..d95a5d4 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -58,16 +58,16 @@ 查询 - 关联添加 - 添加DI信息 - 添加产品信息 @@ -150,7 +150,7 @@ 关联DI @@ -164,10 +164,10 @@ 编辑 - 删除 @@ -846,6 +846,7 @@ import selectUdi from "./UdiInfoRelevance.vue"; import selectErp from "./UdiInfoselectErpUdi"; import selectLocalUdi from "./UdiInfoSelectLocalUdi"; import selectUdiVersion from "./UdiinfoSelectVersion"; +import {findConfig} from "@/api/thrsys/spsSyncStatus"; export default { data() { @@ -908,6 +909,7 @@ export default { selectLocalVisible: false, //关联UDI isUseDyCheck: false, lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"}, + configParms: {}, }; }, @@ -1325,6 +1327,16 @@ export default { this.cancelDialog(); }); }, + getSyncConfig() { + findConfig() + .then((response) => { + if (response.code == 20000) { + this.configParms = response.data; + } + }) + .catch(() => { + }); + }, selectSysParam() { let query = { @@ -1383,6 +1395,7 @@ export default { this.getList(); this.selectSysParam(); this.getSysFilter(); + this.getSyncConfig(); }, }; diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue index 18bc764..b14d060 100644 --- a/src/views/basic/UdiInfoManageSp.vue +++ b/src/views/basic/UdiInfoManageSp.vue @@ -372,6 +372,7 @@ 是否寄售 - 允许无批次号 - 允许无失效日期 - 允许无生产日期 diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index 2cac119..4bcb186 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -367,7 +367,7 @@ export default { .then((response) => { this.busTypes = response.data.list || []; this.total = response.data.total || 0; - this.getConfig(); + // this.getConfig(); }) .catch(() => { }); @@ -411,7 +411,7 @@ export default { ADMIN_ID: store.getters.adminId, ADMIN_TOKEN: store.getters.token, }; - + this.getConfig(); this.getBusType(); }, } diff --git a/src/views/thrsys/SysUdimsData.vue b/src/views/thrsys/SysUdimsData.vue index e396693..f321e83 100644 --- a/src/views/thrsys/SysUdimsData.vue +++ b/src/views/thrsys/SysUdimsData.vue @@ -370,12 +370,10 @@ export default { } , handleChange(response, files, fileList) { - console.log(response); if (response.code != 20000) { this.$message.error(response.message); this.getList(); } else { - // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]); this.$message.success(response.data); this.getList(); } diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue index 31bcfab..11f6390 100644 --- a/src/views/thrsys/ThrInvWarehouse.vue +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -134,6 +134,7 @@ 编辑 删除 { let product = { diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 002b3ed..1366a36 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -312,6 +312,12 @@ show-overflow-tooltip > + + @@ -139,6 +134,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -146,6 +142,7 @@ @@ -190,6 +187,7 @@ @current-change="detailHandleCurrentChange" layout="prev, pager, next" :total="detailTotal" + :current-page="detailTotal.page" > @@ -628,6 +626,8 @@ export default { this.detailList = []; this.haveDistributionVisible = false; this.actDateRange = []; + + this.resetDetailQuery(); }, onSubmit() { if (this.actDateRange !== null) { @@ -638,19 +638,30 @@ export default { this.query.endTime = null; } + this.query.page = 1; this.getList(); if (this.query.status === "202") { this.haveDistributionVisible = true; } else { this.haveDistributionVisible = false; } + + this.resetDetailQuery(); + }, + resetDetailQuery() { + this.detailQuery = { + orderIdFk: "", + page: 1, + limit: 20 + }; + this.detailTotal = 0; }, handleCurrentChange(val) { this.query.page = val; this.getList(); }, detailHandleCurrentChange(val) { - this.query.page = val; + this.detailQuery.page = val; this.getStockOrderDetailList(); }, // 刷新表单 @@ -755,6 +766,7 @@ export default { .then((response) => { this.detailLoading = false; this.detailList = response.data.list || []; + this.detailTotal = response.data.total; }) .catch(() => { this.detailLoading = false; diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue index c842466..d29c355 100644 --- a/src/views/warehouse/stockOrderNew.vue +++ b/src/views/warehouse/stockOrderNew.vue @@ -591,6 +591,17 @@ export default { this.haveNewDistributionVisible = false; this.actDateRange = []; + + //重置产品列表查询参数 + this.resetDetailQuery(); + }, + resetDetailQuery() { + this.detailTotal = { + orderIdFk: "", + page: 1, + limit: 20 + }; + this.detailTotal = 0; }, onSubmit() { if (this.actDateRange !== null) { @@ -607,13 +618,14 @@ export default { } else { this.haveNewDistributionVisible = false; } + this.resetDetailQuery(); }, handleCurrentChange(val) { this.query.page = val; this.getList(); }, detailHandleCurrentChange(val) { - this.query.page = val; + this.detailQuery.page = val; this.getStockOrderDetailList(); }, // 刷新表单 diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index 0c0525a..6bbe512 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -63,7 +63,7 @@ - +
@@ -98,7 +98,7 @@ - +
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue index 667e473..5df5972 100644 --- a/src/views/warehouse/stockOrderWaitCheck.vue +++ b/src/views/warehouse/stockOrderWaitCheck.vue @@ -81,10 +81,6 @@ :data="list" highlight-current-row style="width: 100%;" @row-click="getStockOrderDetailList" ref="multipleTable"> - - @@ -477,6 +473,7 @@ export default { this.query.endTime = null; } + this.query.page = 1; this.getList(); if (this.query.status === "202" || this.query.status === "502") { this.haveDistributionVisible = true; @@ -506,7 +503,7 @@ export default { this.getList(); }, detailHandleCurrentChange(val) { - this.query.page = val; + this.detailQuery.page = val; this.getStockOrderDetailList(); }, // 刷新表单 @@ -610,9 +607,9 @@ export default { this.detailLoading = true; stockOrderDetail(this.detailQuery) .then((response) => { - console.log(response) this.detailLoading = false; this.detailList = response.data.list || []; + this.detailTotal = response.data.total; }) .catch(() => { this.detailLoading = false; From 3537986f6acc7b5268f3aa08ba9deda5c1387271 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 17:47:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=202.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehouse/IOCheckErrOrder.vue | 8 +++----- src/views/warehouse/stockOrderDelSearch.vue | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue index 7c47f02..a0e1783 100644 --- a/src/views/warehouse/IOCheckErrOrder.vue +++ b/src/views/warehouse/IOCheckErrOrder.vue @@ -426,6 +426,7 @@ v-on:closeManuDialog="closeManuDialog" :orderId="orderId" :orderAction="billAction" + :curLocInv="curLocInv" > @@ -597,6 +598,7 @@ export default { index: null, formName: null, orderId: "", + curLocInv: null, formMap: { add: "新增", edit: "编辑", @@ -711,7 +713,6 @@ export default { this.getList(); }, handleSelectionChange(val) { - console.log(val); this.multipleSelection = val; }, @@ -777,7 +778,6 @@ export default { this.filterQuery.customerId = store.getters.customerId; filterOrder(this.filterQuery) .then((response) => { - console.log(response) this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; @@ -885,7 +885,6 @@ export default { refresgOrderDetail() { orderDetail(this.detailQuery) .then((response) => { - console.log(response) this.loading = false; this.detailList = response.data || []; }) @@ -928,7 +927,6 @@ export default { this.successOrderExportPDFSettingVisible = true; }, successOrderExportPDF(row) { - console.log(row) let tQuery = { orderId: row.id, customerId: store.getters.customerId @@ -1187,7 +1185,6 @@ export default { }, uploadOrderDialog(value) { - console.log(value.id + "---" + value.orderid); this.uploadQuery = { orderId: value.id, }; @@ -1238,6 +1235,7 @@ export default { importOrder(row) { this.orderId = row.id; this.billAction = row.action; + this.curLocInv = row.locStorageCode; this.addDialogVisible = true; }, invChange() { diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index e05de37..7af54fd 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -161,6 +161,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -239,6 +240,7 @@ @current-change="detailHandleCurrentChange" layout="prev, pager, next" :total="detailTotal" + :current-page="detailQuery.page" >