From 071f14e64fd76eaee15eb9b308f20941b93d741e Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Wed, 26 Jan 2022 14:29:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=87=BA=E5=BA=93=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B3=E9=97=AD=E8=AE=A2=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20&&=20=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 1 + src/i18n/lang/en.ts | 1 + .../outbound/stoOutbound/DN-delivergoods.vue | 1 - src/pages/raw/commission/entrant/index.vue | 2 +- src/pages/raw/commission/goOut/index.vue | 18 ++++++++++++++---- src/pages/raw/commission/goOut/model.ts | 13 +++++++++++++ src/utils/url.ts | 1 + 7 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index de944f8..e7e86e7 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -111,6 +111,7 @@ export default { barcode_PleaseScan: '请扫描条码', dn_CarNumber: '车牌号', dn_Time: '预约时间', + Closed:'闭单', dn_Detailed: 'DN单明细', dn_Number: '数量', dn_Confirm: '确认', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 9922c36..80c03db 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -71,6 +71,7 @@ export default { po_ReturnGoods: 'DN return', returned: 'Quantity to be returned', returneds: 'Quantity to be returned', + Closed:'Closed', quantity: 'Cumulative return quantity', materials:'Please return all materials', po_OddNumbers: 'PO No', diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index 0a21a3d..e5f1521 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -141,7 +141,6 @@ export default class stoOutboundDom extends BasePage { rules: VFormRules = { orderNo: [{ required: true, message: this.$t('message.product_Tip4') as string }], }; - // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕 async onReady() { this.$form.setRules(this.rules); diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue index 1670a50..10ed94e 100644 --- a/src/pages/raw/commission/entrant/index.vue +++ b/src/pages/raw/commission/entrant/index.vue @@ -289,7 +289,7 @@ export default class dnReceiptDom extends BasePage { view { width: 110rpx; height: 100%; - //line-height: 100rpx; + line-height: 100rpx; } } .single-right { diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index 1b8dd72..dc0d60b 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -64,13 +64,16 @@ - + {{ $t('message.CommissionedGoOutDetails') }} - + + {{ $t('message.Closed') }} + + {{ $t('message.product_Upload') }} - + {{ $t('message.po_Return') }} @@ -139,6 +142,13 @@ export default class dnReceiptDom extends BasePage { this.materialList = []; this.Location = []; } + async close(){ + if (this.form.documentNo == '') { + this.customToast(this.$t('message.Commission_tips1') as any); + return; + } + await this.model.closeCode(this.form.documentNo) + } //输入单号 查询数据 async query() { this.list = []; @@ -329,7 +339,7 @@ export default class dnReceiptDom extends BasePage { view { width: 110rpx; height: 100%; - //line-height: 100rpx; + line-height: 100rpx; } } .single-right { diff --git a/src/pages/raw/commission/goOut/model.ts b/src/pages/raw/commission/goOut/model.ts index 2ca9de3..a736984 100644 --- a/src/pages/raw/commission/goOut/model.ts +++ b/src/pages/raw/commission/goOut/model.ts @@ -135,6 +135,19 @@ export class ReturningModule extends VuexModule { const materielList: any = []; return { code, materielList }; } + //委外出库 关闭订单 + @MutationAction + async closeCode(poNo: any) { + const res:any = await http.post(url.outbound.stoOutbound.close, { + poNo, + loginName: session.loginName, + factoryCode: session.factoryCode, + }); + const code: any = res.code; + return { code }; + } + + //委外出库 初始化获取库位 @Action({ commit: 'updateCheckedOrderInInfoListKw' }) async queryByFactoryCodeAndWorkAreaCode(content: any) { diff --git a/src/utils/url.ts b/src/utils/url.ts index 67e7f66..7ff1abb 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -124,6 +124,7 @@ export const url = { findProdInfoByDN: '/wmspda/fg/findProdInfoByDN', yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse', Bookkeeping: '/wmspda/fg/scanBarcodeDN', + close:'/wmspda/material/outsourcing/close', // Bookkeeping: '/wmspda/fg/confirmMove', checkScan: '/wmspda/fg/getMaterialByCode', getMaterialByCode: '/wmspda/fg/getMaterialByCode', From c024de9c26c184062a5ddc9fdcb04d99d7353c91 Mon Sep 17 00:00:00 2001 From: yujw Date: Wed, 26 Jan 2022 14:36:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/handover/returning/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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; } });