From a59805a550b31aaa5bd11bd7045b7de5a8aa6e21 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 12 May 2022 11:18:14 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 4 +- src/api/inout/erpOrder.js | 9 + src/views/basic/UdiInfoManageSp.vue | 1307 ++++++++++++++++++++ src/views/business/stockOrderWaitCheck.vue | 2 +- src/views/inout/DialogSelectErpOrder.vue | 2 +- src/views/inout/DialogSelectRl.vue | 1 - src/views/inout/IOAddOrder.vue | 16 +- src/views/inout/IOCheckErrorOrder.vue | 47 - src/views/inout/IOErrorOrder.vue | 2 +- src/views/inout/IONewCode.vue | 3 - src/views/inout/errorCode.vue | 334 +++++ 11 files changed, 1667 insertions(+), 60 deletions(-) create mode 100644 src/views/basic/UdiInfoManageSp.vue create mode 100644 src/views/inout/errorCode.vue diff --git a/public/config.json b/public/config.json index 07fe4ff..7ca6b5f 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", - "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/", - "SERVER_IP": "http://139.9.178.73:8080/", + "BASE_URL":"http://192.168.0.109:9991/", + "SERVER_IP": "http://192.168.0.109:9991/", "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/" } diff --git a/src/api/inout/erpOrder.js b/src/api/inout/erpOrder.js index dbc7d51..ffba4d6 100644 --- a/src/api/inout/erpOrder.js +++ b/src/api/inout/erpOrder.js @@ -92,6 +92,15 @@ export function repeatCheck(query) { }); } + +export function repeatPrintCheck(query) { + return axios({ + url: "/warehouse/repeatPrintCheck", + method: "post", + data: query + }); +} + export function dlErpStock(query) { return axios({ url: "/warehouse/dlErpStock", diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue new file mode 100644 index 0000000..d23d2e6 --- /dev/null +++ b/src/views/basic/UdiInfoManageSp.vue @@ -0,0 +1,1307 @@ + + + + + + + + + + + {{ item.companyName }} + + + + + + + + + + + + + + + + + + + + + + {{ item.sysName }} + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + + 锁定 + + 退回 + + + + + + + + + + + + + + + + + + + + + + + {{ lockStatusMap[scope.row.lockStatus] }} + + + + + + + + + + + + + + + + + + + + 详情 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 产品名称: + + + + + + + + 产品标识: + + + + + + + + + + + + + 规格型号: + + + + + + + + + 器械类别: + + + + + + + + + + 产品类别: + + + + + + + + 分类编码: + + + + + + + + + + + + 商品条码: + + + + + + + + 医保编码: + + + + + + + + + + + 医疗器械注册人: + + + + + + + + 注册人英文名称: + + + + + + + + + + + + 统一社会信用号: + + + + + + + + 注册证/备案号: + + + + + + + + + + 上级产品编码: + + + + + + + + + 包装级别: + + + + + + + + + + 计量单位/包装级别: + + + + + + + + + + 包含下级包装数量: + + + + + + + + + + 包含下级产品编码: + + + + + + + + + + 包含最小销售包装数量: + + + + + + + + + + + 最小包装单元内包含使用单元数量: + + + + + + + + 生产厂家: + + + + + + + + + + 是否包含批号: + + + + + + + + 是否包含序列号: + + + + + + + + + + 是否包含生产日期: + + + + + + + + 是否包含失效日期: + + + + + + + + + + 产品描述: + + + + + + + + + + 以使用单元数量入库 + + 是否禁用 + + 是否寄售 + + 是否允许无批次号扫码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index 72c3247..8ad5b8f 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -10,7 +10,7 @@ > - + diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue index c72ab87..24f1af4 100644 --- a/src/views/inout/DialogSelectErpOrder.vue +++ b/src/views/inout/DialogSelectErpOrder.vue @@ -131,7 +131,7 @@ :show-overflow-tooltip="true" > diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue index 79a610a..81955fd 100644 --- a/src/views/inout/DialogSelectRl.vue +++ b/src/views/inout/DialogSelectRl.vue @@ -585,7 +585,6 @@ export default { getList() { this.loading = true; this.filterQuery.nameCode = this.curRow.nameCode; - console.log(this.curAction.corpType); if (this.curAction != null && this.curAction.corpType == 0) { this.filterQuery.unitFk = this.curRow.fromCorpId; } diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index d86bef1..4e57f7a 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -414,7 +414,8 @@ export default { dialogTableVisible: false, sitcomScan: false, selectRlTitle: "绑定产品", - selectUnitTitle: "绑定供应商" + selectUnitTitle: "绑定供应商", + sictomText: "", }; }, components: { @@ -487,8 +488,10 @@ export default { } }, addCode(event) { + this.formData.corpOrderId = this.formData.corpOrderId.trim(); this.actionEnable = true; + this.sictomText = ""; if (event == null) { } else event.target.select(); this.$refs.inputRef.select(); @@ -911,24 +914,29 @@ export default { event.stopPropagation(); }; var that = this; - let sictomText = ""; + var inputer = document.getElementById("inputer"); window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 sc.onInput = function (text) { + console.log("监听掃碼:" + text); //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发 if (text.includes("delete")) { that.formData.code = ""; + that.sictomText = ""; return; } if (that.sitcomScan) { - sictomText = sictomText+text; - that.formData.code = sictomText; + let tempTxt = text; + let str= tempTxt.replace(/[\r]/g, ""); + that.sictomText = that.sictomText + str; + that.formData.code = that.sictomText; } else { that.formData.code = text; } }; inputer.focus();//别忘了给要监听的节点放置焦点,如果是div一类默认不具备焦点的节点需要给它加上“tabindex”属性。不建议传入document、Body等全局节点,可能会影响其它输入控件的流畅性。 + }, created() { this.formData.code = ''; diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 4f8d7df..9811a9a 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -12,18 +12,6 @@ - - - - - - - - - - - - 查询 - @@ -103,11 +90,6 @@ prop="id" show-overflow-tooltip="true" > - {{ fromTypeMap[scope.row.fromType] }} @@ -150,27 +132,6 @@ - - - - - - - - - - - - - - - - - - - - - {{ scope.row.actDate }} - + + + + + + + + + 查询 + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 选择产品 + + + 选择供应商 + + + + + + + + + + + + + + + + + + + + +