diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue index 2c61b724..f4b82b12 100644 --- a/src/views/basic/business/stockOrderPrint.vue +++ b/src/views/basic/business/stockOrderPrint.vue @@ -430,7 +430,9 @@ export default { }, combine(){ - if(this.orderQuery==null && this.orderQuery.length==0){ + debugger + console.log(this.orderQuery) + if(this.orderQuery==null || this.orderQuery.length==0){ this.$message.error("请先选择单据!") return; } diff --git a/src/views/inventory/addInvRemindSetDialog.vue b/src/views/inventory/addInvRemindSetDialog.vue index 9a0b6e65..2e06bf34 100644 --- a/src/views/inventory/addInvRemindSetDialog.vue +++ b/src/views/inventory/addInvRemindSetDialog.vue @@ -145,7 +145,7 @@ export default { deptCode: null, invCode: null, invSpaceCode: null, - lowStock: false, + lowStock: null, lackStock: false, overStock: false, expireDate: false, @@ -166,11 +166,21 @@ export default { getInfoByInvId({invId: this.invId}).then((res) => { if (res.code === 20000) { this.formData = res.data; - this.formData.lowStock = false; - this.formData.lackStock = false; - this.formData.overStock = false; - this.formData.expireDate = false; - this.formData.recentDate = false; + if (res.data.lowStock == null) { + this.formData.lowStock = false; + } + if (res.data.lackStock == null) { + this.formData.lackStock = false; + } + if (res.data.overStock == null) { + this.formData.overStock = false; + } + if (res.data.expireDate == null) { + this.formData.expireDate = false; + } + if (res.data.recentDate == null) { + this.formData.recentDate = false; + } } else { this.$message.error(res.meesage); } diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue index d70dfca1..37ce3403 100644 --- a/src/views/purchase/purOrder/purOrderEditDialog.vue +++ b/src/views/purchase/purOrder/purOrderEditDialog.vue @@ -452,6 +452,7 @@ export default { }, tableCountChange(row) { if (this.$isNotBlank(row)) { + this.currentRow.supId = row.supName; updateDetail(this.currentRow); } }, diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue index 1c73b216..0aa780b1 100644 --- a/src/views/remind/invRemindMsg.vue +++ b/src/views/remind/invRemindMsg.vue @@ -361,6 +361,7 @@ export default { limit: 20, listInv:this.invCodeList, }; + this.queryName = null; this.getList(); this.spaceList = []; this.ggxhList = [];