diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 61f14ed..941ca1b 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -265,7 +265,7 @@ export default { // 委外-出库 CommissionGoOut: 'Subcontracting issue', Outbound: 'Outbound location', - Warehousing: 'Warehousing location', + Warehousing: 'Warehouse location', CommissionedGoOutDetails: 'Delivery details', PleaseQuantity: 'Please enter this quantity', Picked:'Picked Qty', diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue index 61ff6ae..17b64b6 100644 --- a/src/pages/raw/handover/feeding/Location.vue +++ b/src/pages/raw/handover/feeding/Location.vue @@ -180,11 +180,25 @@ export default class RawReceiptDetail extends BasePage { */ locationCodeSelect = false; detailHeader = detailHeader; + empty(){ + this.some = {} + this.someIndex = 0 + this.qty = '' + this.Location = [] + this.wlCode = '' + this.materialList = [] + this.model.blDetailList.length = 0 + } async query(){ if(this.form.documentNo == ''){ this.customToast(this.$t('message.Commission_tips1') as string); } - await await this.model.queryBlDetailList(this.form.documentNo).then(() =>{ + this.empty() + let inPrdOrderList = this.form.documentNo.split(",") + let params = { + inPrdOrderList + } + await await this.model.queryBlDetailList(params).then(() =>{ this.model.blDetailList.forEach((item:any) =>{ let arr = { label:item.materialCode, @@ -348,6 +362,7 @@ export default class RawReceiptDetail extends BasePage { item.receiptAmount = 0; item.wlQTyList = []; }); + this.model.blDetailList.length = 0 } async bill() { if (this.some == {} || this.some.prdOrder == null) { diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue index 7c72e93..de28ee1 100644 --- a/src/pages/raw/handover/returning/index.vue +++ b/src/pages/raw/handover/returning/index.vue @@ -10,7 +10,7 @@ - + {{ $t('message.screen') }} - - + + - - + + @@ -120,6 +120,7 @@ export default class returningDom extends BasePage { materialCode: null, // 物料类型code wlName: '', // 物料类型name wlCode: '', + totalBackAmount:'1', }; prdOrder: any = []; wlCode: any = ''; @@ -188,9 +189,6 @@ export default class returningDom extends BasePage { this.Location.push(pickerName); }); } - cnoso() { - console.log(1); - } back() { // this.form.sendSpot = ''; // this.form.wkposCode = ''; @@ -208,6 +206,7 @@ export default class returningDom extends BasePage { if (this.form.materialCode == item.label) { this.form.amount = item.amount; this.form.sendSpot = item.sendSpot; + this.form.totalBackAmount = item.totalBackAmount // this.form.wkposCode = item.wkposCode; } });