diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 6a538d48..a5164ba0 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -316,21 +316,24 @@ export const BillModalMixin = { }) } else { //单个条码 - let mArr = [] - for (let i = 0; i < mList.length; i++) { - let mInfo = mList[i] - this.changeColumnShow(mInfo) - let mObj = { - rowKey: row.id, - values: this.parseInfoToObj(mInfo) + findStockByDepotAndBarCode({ depotId: row.depotId, barCode: row.barCode }).then((res) => { + if (res && res.code === 200) { + let mArr = [] + let mInfo = mList[0] + this.changeColumnShow(mInfo) + let mInfoEx = this.parseInfoToObj(mInfo) + mInfoEx.stock = res.data.stock + let mObj = { + rowKey: row.id, + values: mInfoEx + } + mArr.push(mObj) + target.setValues(mArr); + target.recalcAllStatisticsColumns() + that.autoChangePrice(target) + target.autoSelectBySpecialKey('operNumber') } - mArr.push(mObj) - } - target.setValues(mArr); - that.getStockByDepotBarCode(row, target) - target.recalcAllStatisticsColumns() - that.autoChangePrice(target) - target.autoSelectBySpecialKey('operNumber') + }) } } }); diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 97a9ca7b..05e4941a 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -323,7 +323,7 @@ }); }, onSearchLinkNumber() { - this.$refs.linkBillList.show('出库', '零售', '会员', "0") + this.$refs.linkBillList.show('出库', '零售', '会员', "1") this.$refs.linkBillList.title = "选择零售出库" }, linkBillListOk(selectBillRows) {