From 64476a29ce9fb00590bc9222a76a6c5a622a5d11 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 2 Mar 2023 10:54:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=82=A3=E8=80=85?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=BA=AF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- src/api/inventory/deviceMAOrder.js | 2 +- src/api/inventory/deviceReceiveOrder.js | 2 +- src/api/inventory/invSickTrace.js | 9 + .../{ => trace}/invUdiTraceOrder.vue | 10 +- .../inventory/trace/sickerUdiTraceOrder.vue | 421 ++++++++++++++++++ 6 files changed, 439 insertions(+), 9 deletions(-) create mode 100644 src/api/inventory/invSickTrace.js rename src/views/inventory/{ => trace}/invUdiTraceOrder.vue (98%) create mode 100644 src/views/inventory/trace/sickerUdiTraceOrder.vue diff --git a/.env.production b/.env.production index 5ee32c9b..75eb363f 100644 --- a/.env.production +++ b/.env.production @@ -4,8 +4,8 @@ VUE_APP_TITLE = UDI管理系统 # 生产环境配置 ENV = 'production' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://192.168.0.55:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.0.55:9150/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/inventory/deviceMAOrder.js b/src/api/inventory/deviceMAOrder.js index 1f70683d..b5c72512 100644 --- a/src/api/inventory/deviceMAOrder.js +++ b/src/api/inventory/deviceMAOrder.js @@ -1,4 +1,4 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; export function getDeviceMAOrderList(params) { return axios({ diff --git a/src/api/inventory/deviceReceiveOrder.js b/src/api/inventory/deviceReceiveOrder.js index 4d06aed4..3a9c1844 100644 --- a/src/api/inventory/deviceReceiveOrder.js +++ b/src/api/inventory/deviceReceiveOrder.js @@ -1,4 +1,4 @@ -import axios from "../../utils/request"; +import axios from "@/utils/request"; export function getDeviceReceiveOrderList(params) { return axios({ diff --git a/src/api/inventory/invSickTrace.js b/src/api/inventory/invSickTrace.js new file mode 100644 index 00000000..b8db0dcf --- /dev/null +++ b/src/api/inventory/invSickTrace.js @@ -0,0 +1,9 @@ +import axios from "@/utils/request"; + +export function filterSickTrace(query) { + return axios({ + url: "/spms/inv/sick/order/trace", + method: "get", + params: query + }); +} diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue similarity index 98% rename from src/views/inventory/invUdiTraceOrder.vue rename to src/views/inventory/trace/invUdiTraceOrder.vue index 90775c79..3119cc76 100644 --- a/src/views/inventory/invUdiTraceOrder.vue +++ b/src/views/inventory/trace/invUdiTraceOrder.vue @@ -199,15 +199,15 @@ import { updateExportStatus, uploadOrder, orderDetail, -} from "../../api/inout/order"; +} from "../../../api/inout/order"; import draggable from "vuedraggable"; import {saveAs} from "file-saver"; -import codeDetail from "../inout/IOFinishCode"; -import store from "../../store"; -import {getBussinessType} from "../../api/basic/bussinessType"; +import codeDetail from "../../inout/IOFinishCode"; +import store from "../../../store"; +import {getBussinessType} from "../../../api/basic/bussinessType"; import {filterOrderTrace} from "@/api/inventory/invCodeTrace"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; -import A from "../../plugins/KeyScaner" +import A from "../../../plugins/KeyScaner" const formJson = { site_id: "", diff --git a/src/views/inventory/trace/sickerUdiTraceOrder.vue b/src/views/inventory/trace/sickerUdiTraceOrder.vue new file mode 100644 index 00000000..fd5ea8b6 --- /dev/null +++ b/src/views/inventory/trace/sickerUdiTraceOrder.vue @@ -0,0 +1,421 @@ + + + + + + From a9c48c3c016bf33285228d1789230e087ed6c5dc Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 2 Mar 2023 11:19:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogReviewOrder.vue | 11 ++--------- src/views/inout/IoCheckErrorOrder.vue | 1 + 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/views/inout/DialogReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue index dbcfcf64..6d99fb7d 100644 --- a/src/views/inout/DialogReviewOrder.vue +++ b/src/views/inout/DialogReviewOrder.vue @@ -26,7 +26,7 @@ - @@ -53,14 +53,7 @@ - - - - - - diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue index 118dfae5..7aeec9ac 100644 --- a/src/views/inout/IoCheckErrorOrder.vue +++ b/src/views/inout/IoCheckErrorOrder.vue @@ -475,6 +475,7 @@ export default { }, storageList: [], subInvList: [], + list: [], total: 0, loading: false, index: null, From 70da6b2573e0c52990fa3db85089fb020038b3b8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 2 Mar 2023 11:27:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/invWarehouse.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index d313c779..12c0c8e6 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -773,6 +773,7 @@ export default { .vue-treeselect >>> .vue-treeselect__value-container { font-size: 12px; + height: 30px; } .vue-treeselect >>> .vue-treeselect__control { From 2077f87c06fc9a4615a186fe785373d152fc6ffa Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 2 Mar 2023 13:53:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=85=E6=A3=80=E9=AA=8C=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/orderDetailBiz.js | 10 ++ src/views/inout/IoDealOrder.vue | 189 +++++++++++++++++++++++++++++++- 2 files changed, 196 insertions(+), 3 deletions(-) diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js index c6ef9fe7..79953cc4 100644 --- a/src/api/inout/orderDetailBiz.js +++ b/src/api/inout/orderDetailBiz.js @@ -8,4 +8,14 @@ export function getBizDetailList(params) { }); } +export function getCheckDetailList(params) { + return axios({ + url: "/udiwms/inout/wditCheck/filterList", + method: "get", + params: params + }); +} + + + diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue index 515110b2..9ad7ed8e 100644 --- a/src/views/inout/IoDealOrder.vue +++ b/src/views/inout/IoDealOrder.vue @@ -83,11 +83,12 @@ >查询 - - @@ -185,6 +186,120 @@ @pagination="getList" /> + + + + + + 单据 {{ currentRow.billNo }}-业务详情 + + + + + + + + 重置 + + 查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -202,6 +317,8 @@ import store from "../../store"; import {getInvListByUser} from "@/api/system/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busType"; import {selectSysParamByKey} from "@/api/param/systemParamConfig"; +import {isBlank} from "@/utils/strUtil"; +import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz"; export default { @@ -220,7 +337,6 @@ export default { startTime: null, endTime: null, invCode: this.$store.getters.locInvCode, - }, viewType: 3, checkStatus: { @@ -306,6 +422,19 @@ export default { }, ], }, + currentRow: { + billNo: "" + }, + bizQuery: { + productName: null, + orderIdFk: null, + page: 1, + limit: 10 + }, + bizTotal: 0, + bizDetailLoading: false, + bizDetailList: [], + }; }, components: { @@ -474,6 +603,60 @@ export default { return statusMap[status]; }, + rowStyle({row, rowIndex}) { + let rowBackground = {}; + if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) { + rowBackground.color = '#f60303'; + return rowBackground; + } + if (!row.checkSuccess) { + rowBackground.color = '#f60303'; + } + return rowBackground; + }, + + + onBizReset() { + this.bizQuery = { + productName: null, + orderIdFk: null, + page: 1, + limit: 10 + }; + this.getBizDetailList(); + }, + onBizSubmit() { + this.bizQuery.page = 1; + this.getBizDetailList(); + }, + + handleSelectionChange(val) { + this.currentRow = val; + this.getBizDetailList(); + }, + getBizDetailList() { + if (isBlank(this.currentRow.billNo)) { + this.$message.error("请先选择需要查询的单据!") + return; + } + this.bizDetailLoading = true; + this.bizQuery.orderIdFk = this.currentRow.billNo; + getCheckDetailList(this.bizQuery).then((res) => { + this.bizDetailLoading = false; + if (res.code === 20000) { + this.bizDetailList = res.data || []; + } else { + this.$message.error(res.message); + this.bizDetailList = []; + } + }).catch((error) => { + this.bizDetailLoading = false; + this.$message.error(error.message); + this.bizDetailList = []; + this.bizTotal = 0; + }) + }, + }, mounted() { document.body.ondrop = function (event) {