From 80700bc193815f573843868db60b593b8e35ef00 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 9 May 2022 15:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=B9=E6=AC=A1=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/UdiInfoManage.vue | 36 +++----- src/views/basic/UdiInfoManageSp.vue | 35 ++------ src/views/basic/basicCompanyProducts.vue | 83 +++++++++---------- src/views/warehouse/DialogSelectRl.vue | 38 ++++----- src/views/warehouse/addHosOrder.vue | 10 ++- src/views/warehouse/addOrder.vue | 8 +- src/views/warehouse/stockHospOrderNew.vue | 4 +- .../warehouse/stockOrderEditDistribution.vue | 4 +- src/views/warehouse/stockOrderEditor.vue | 1 + .../warehouse/stockOrderNewDistribution.vue | 4 +- 10 files changed, 97 insertions(+), 126 deletions(-) diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 9404905..b4fa0ab 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -150,7 +150,7 @@ 关联DI @@ -690,39 +690,24 @@ - - - - - +
+ 以使用单元数量入库 - - - - - - - - - - - - 是否禁用 - - - - - 是否寄售 - + 是否允许无批次号扫码 + +
- @@ -852,6 +837,7 @@ export default { isUseDy: false, isLock: null, isAdavence: null, + allowNoBatch: null }, defaultSys: null, isImport: false, diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue index ed7573b..80dc597 100644 --- a/src/views/basic/UdiInfoManageSp.vue +++ b/src/views/basic/UdiInfoManageSp.vue @@ -673,39 +673,22 @@ - - - - - +
+ 以使用单元数量入库 - - - - - - - - - - - - - 是否禁用 - - - - - 是否寄售 - + 是否允许无批次号扫码 + +
- diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue index 332ce5b..593c915 100644 --- a/src/views/basic/basicCompanyProducts.vue +++ b/src/views/basic/basicCompanyProducts.vue @@ -144,9 +144,8 @@ v-if="isSpCombine" type="text" size="small" - :disabled="scope.row.thirdId == null - || scope.row.thirdId == '' - || scope.row.flbm!=null + :disabled=" + scope.row.originUuid!=null || scope.row.lockStatus===3" @click.native.stop="intentSelectUdi(scope.row)" >关联DI @@ -185,7 +184,7 @@ v-if="isSpCombine" type="text" size="small" - :disabled="scope.row.thirdId==scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null" + :disabled="scope.row.thirdId==scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3" @click.native.stop="splitSelectUdi(scope.row)" >拆分产品 @@ -715,28 +714,21 @@ - - - - - +
+ 以使用单元数量入库 - - - - - 是否禁用 - - - - - 是否寄售 - + 是否允许无批次号扫码 + +
@@ -1260,37 +1252,31 @@ size="small" splaceholder="请输入内容" v-model="editQuery.versionNumber" + disabled > - 切换版本 - + + + + - - - - - +
+ 以使用单元数量入库 - - - - - 是否禁用 - - - - - 是否寄售 - + 是否允许无批次号扫码 + +
@@ -1492,6 +1478,7 @@ export default { 5: '拒绝反审', }, lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"}, + isUseDyCheck: false, }; }, @@ -1552,9 +1539,15 @@ export default { this.loading = true; filterByUuid(detailQuery) .then((response) => { + this.isUseDyCheck = false; this.loading = false; this.detailList = response.data || []; this.productType = this.detailList[0].productType; + this.detailList.forEach((item, index, array) => { + if (item.zxxsbzbhsydysl > 1) { + this.isUseDyCheck = true; + } + }); }) .catch(() => { this.loading = false; @@ -1919,15 +1912,17 @@ export default { this.selectVersionVisible = false; }, onAddSubmit() { + this.relevanceEdit.isDisable = this.editQuery.isDisable; + this.relevanceEdit.isLock = this.editQuery.isLock; + this.relevanceEdit.isAdavence = this.editQuery.isAdavence; + this.relevanceEdit = this.editQuery; if (this.checked == true) { this.relevanceEdit.isUseDy = 1; } else { this.relevanceEdit.isUseDy = 0; } - this.relevanceEdit.isDisable = this.editQuery.isDisable; - this.relevanceEdit.isAdavence = this.editQuery.isAdavence; - - console.log(this.relevanceEdit.isUseDy); + this.relevanceEdit.id = this.editQuery.rlId, + console.log(this.relevanceEdit.isUseDy); updatetUdiInfos(this.relevanceEdit) .then((response) => { this.loading = false; diff --git a/src/views/warehouse/DialogSelectRl.vue b/src/views/warehouse/DialogSelectRl.vue index 51b0f49..8d0c792 100644 --- a/src/views/warehouse/DialogSelectRl.vue +++ b/src/views/warehouse/DialogSelectRl.vue @@ -451,29 +451,21 @@ - - - - - +
+ 以使用单元数量入库 - - - - - 是否锁定 - - - - - - 是否禁用 - + 是否寄售 + + 是否允许无批次号扫码 + +
@@ -723,18 +715,18 @@ export default { id: this.curRow.id, bindStatus: 0, bindRlFk: val.id, - mySupId:this.curRow.unitFk, + mySupId: this.curRow.unitFk, }; updateBind(query).then((response) => { - console.log(response.code+response.message) + console.log(response.code + response.message) if (response.code == 20000) { this.$message.success("绑定成功"); this.closeBindDialog(this.curRow.id); } else { - this.$message.error("-----503码？？"+response.message); - if(response.code == 503){ + this.$message.error("-----503码？？" + response.message); + if (response.code == 503) { this.closeBindDialog(503); } diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 4d23856..bdc3e6b 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -414,7 +414,8 @@ export default { dialogTableVisible: false, sitcomScan: false, selectRlTitle: "绑定产品", - selectUnitTitle: "绑定供应商" + selectUnitTitle: "绑定供应商", + sictomText: "", }; }, components: { @@ -487,6 +488,7 @@ export default { } }, addCode(event) { + this.sictomText = ""; this.formData.corpOrderId = this.formData.corpOrderId.trim(); this.actionEnable = true; if (event == null) { @@ -914,14 +916,16 @@ export default { var inputer = document.getElementById("inputer"); window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 sc.onInput = function (text) { - console.log("监听掃碼："+text); + console.log("监听掃碼：" + text); //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发 if (text.includes("delete")) { that.formData.code = ""; + that.sitcomScan = ""; return; } if (that.sitcomScan) { - that.formData.code = that.formData.code; + that.sictomText = that.sictomText + text; + that.formData.code = that.sictomText; } else { that.formData.code = text; } diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 50c32c3..0130cfe 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -419,6 +419,7 @@ export default { addCode(event) { if (event == null) { } else event.target.select(); + this.sictomText = ""; this.$refs.inputRef.select(); if (this.$isBlank(this.formData.billType)) { this.$message.warning("请选择单据类型！"); @@ -712,17 +713,20 @@ export default { event.stopPropagation(); }; var that = this; + var inputer = document.getElementById("inputer"); window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 sc.onInput = function (text) { - console.log("监听掃碼："+text); + console.log("监听掃碼：" + text); //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发 if (text.includes("delete")) { that.formData.code = ""; + that.sictomText = ""; return; } if (that.sitcomScan) { - that.formData.code = that.formData.code; + that.sictomText = that.sictomText + text; + that.formData.code = that.sictomText; } else { that.formData.code = text; } diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 53deb7f..d141928 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -644,7 +644,9 @@ export default { return this.$message.error('单据数量不能为0'); } if (this.$isBlank(this.codeArray[i].batchNo)) { - return this.$message.error('批次号不能为空'); + if (!this.codeArray[i].allowNoBatch) { + return this.$message.error('批次号不能为空'); + } } if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { return this.$message.error('生产日期与失效日期不能全部为空'); diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue index 8cdf114..a7e8f96 100644 --- a/src/views/warehouse/stockOrderEditDistribution.vue +++ b/src/views/warehouse/stockOrderEditDistribution.vue @@ -576,7 +576,9 @@ export default { } else { for (let i = 0; i < this.codeArray.length; i++) { if (this.$isBlank(this.codeArray[i].batchNo)) { - return this.$message.error('批次号不能为空'); + if (!this.codeArray[i].allowNoBatch) { + return this.$message.error('批次号不能为空'); + } } if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { return this.$message.error('生产日期与失效日期不能全部为空'); diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue index 695a7f0..2cfa889 100644 --- a/src/views/warehouse/stockOrderEditor.vue +++ b/src/views/warehouse/stockOrderEditor.vue @@ -919,6 +919,7 @@ export default { this.storageList = response.data || []; if (this.storageList.length > 0) { this.query.locStorageCode = this.storageList[0].code; + this.getList(); } }) .catch(() => { diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index ad24bb1..cba5b24 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -570,7 +570,9 @@ export default { return this.$message.error('单据数量不能为0'); } if (this.$isBlank(this.codeArray[i].batchNo)) { - return this.$message.error('批次号不能为空'); + if (!this.codeArray[i].allowNoBatch) { + return this.$message.error('批次号不能为空'); + } } if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { return this.$message.error('生产日期与失效日期不能全部为空');