diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index fbff126..f3e5140 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -120,6 +120,7 @@ export default class stoOutboundDom extends BasePage { productDescZh: '', scanAmount: 0, rowItem: '', + row:'', barCode: '', }; materialList: any = []; //物料列表 @@ -177,6 +178,7 @@ export default class stoOutboundDom extends BasePage { sessionStorage.setItem('SweepCode', JSON.stringify(this.form.orderNo)); this.toPage(this.page.product.outbound.Back); } + //单号回车查询 async query() { if (!this.form.orderNo) { this.customToast(this.$t('message.Commission_tips1') as any); @@ -190,11 +192,13 @@ export default class stoOutboundDom extends BasePage { }); this.form.productCode = this.model.materielList[0].materialCode; this.form.productDescZh = this.model.materielList[0].materialDesc; - this.form.rowItem = this.model.materielList[0].rowItem; + this.form.rowItem = this.model.materielList[0].materialCode; + this.form.row = this.model.materielList[0].rowItem; this.form.orderAmount = this.model.materielList[0].orderAmount; this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount); } } + //选择成品编码 materialConfirm(v: any) { console.log('v[0].value', v[0]); // this.form.productCode = v[0].value; @@ -208,11 +212,12 @@ export default class stoOutboundDom extends BasePage { // } // }); this.model.materielList.forEach((item: any) => { - if (v[0].value == item.rowItem) { + if (v[0].rowItem == item.rowItem) { console.log('item', item); this.form.productCode = item.materialCode; this.form.productDescZh = item.materialDesc; - this.form.rowItem = item.rowItem; + this.form.rowItem = item.materialCode; + this.form.row = item.rowItem; this.form.orderAmount = item.orderAmount; this.form.scanAmount = parseFloat(item.outAmount); return; @@ -360,7 +365,7 @@ export default class stoOutboundDom extends BasePage { factoryCode: session.factoryCode, keepBy: session.loginName, order3: this.form.orderNo, - orderItem: this.form.rowItem, + orderItem: this.form.row, type: 0, orderType: 4, productCode: this.form.productCode, diff --git a/src/pages/product/outbound/stoOutbound/model.ts b/src/pages/product/outbound/stoOutbound/model.ts index cd63685..2ce4b78 100644 --- a/src/pages/product/outbound/stoOutbound/model.ts +++ b/src/pages/product/outbound/stoOutbound/model.ts @@ -102,7 +102,8 @@ export class ReturningModule extends VuexModule { stoAmount += item.orderAmount; }); const materielList = result.data.map((item: any) => ({ - value: item.rowItem, + value: item.materialCode, + rowItem:item.rowItem, label: item.rowItem + '(' + item.materialCode + ')', ...item, }));