diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index f7fd18a..763940a 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -71,15 +71,15 @@ export default { //po收货 po_ReceivingGoods: 'PO receive', po_ReturnGoods: 'DN return', - returned: 'Quantity to be returned', - returneds: 'Quantity to be returned', - Closed:'Closed', + returned: 'Return Qty', + returneds: 'Return Qty', + Closed: 'Closed', quantity: 'Cumulative return quantity', - materials:'Please return all materials', + materials: 'Please return all materials', po_OddNumbers: 'PO No', po_Supplier: 'Supplier', po_OrderType: 'Order type', - po_Location: 'Loc', + po_Location: 'Inventory', po_PleaseScan: 'Please scan PO', po_PleaseScanMATcode: 'Please scan MAT barcode', PleaseScan: 'Please scan', diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue index 431a9af..b8f8f0f 100644 --- a/src/pages/raw/handover/feeding/Location.vue +++ b/src/pages/raw/handover/feeding/Location.vue @@ -479,7 +479,7 @@ export default class RawReceiptDetail extends BasePage { height: 100%; display: flex; view { - width: 140rpx; + width: 145rpx; line-height: 100rpx; } .search{ @@ -496,7 +496,7 @@ export default class RawReceiptDetail extends BasePage { height: 100%; display: flex; .material-right-title { - width: 140rpx; + width: 145rpx; height: 100%; line-height: 100rpx; } diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue index de28ee1..28c0cd0 100644 --- a/src/pages/raw/handover/returning/index.vue +++ b/src/pages/raw/handover/returning/index.vue @@ -120,7 +120,7 @@ export default class returningDom extends BasePage { materialCode: null, // 物料类型code wlName: '', // 物料类型name wlCode: '', - totalBackAmount:'1', + totalBackAmount: '0', }; prdOrder: any = []; wlCode: any = ''; @@ -167,7 +167,7 @@ export default class returningDom extends BasePage { this.form.prdOrder = this.data.label; this.form.wlName = this.data.value; this.form.sendSpot = this.data.sendSpot; - this.form.amount = this.data.amount; + // this.form.amount = this.data.amount; } if (this.form.prdOrder != null) { @@ -204,9 +204,9 @@ export default class returningDom extends BasePage { this.form.wlName = v[0].label; this.model.materielList.forEach((item: any) => { if (this.form.materialCode == item.label) { - this.form.amount = item.amount; + // this.form.amount = item.amount; this.form.sendSpot = item.sendSpot; - this.form.totalBackAmount = item.totalBackAmount + this.form.totalBackAmount = item.totalBackAmount; // this.form.wkposCode = item.wkposCode; } }); diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue index 2d6bf7b..2c739bd 100644 --- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue +++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue @@ -35,7 +35,7 @@ - {{ $t('message.returneds') }}: + {{ $t('message.returneds') }}: {{ some.poAmount }} @@ -391,7 +391,7 @@ export default class RawReceiptDetail extends BasePage { height: 100%; display: flex; view { - width: 100rpx; + width: 145rpx; line-height: 100rpx; } .search{ @@ -408,7 +408,7 @@ export default class RawReceiptDetail extends BasePage { height: 100%; display: flex; .material-right-title { - width: 120rpx; + width: 160rpx; height: 100%; line-height: 100rpx; }