diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts index f632861..b339325 100644 --- a/src/pages/raw/handover/aggregating/model.ts +++ b/src/pages/raw/handover/aggregating/model.ts @@ -38,6 +38,7 @@ export class AggregatingModule extends VuexModule { * 查询结果辅料列表 */ accessoryList: any[] = []; + lockCode: any = ''; /** * 库存地点列表 @@ -251,6 +252,12 @@ export class AggregatingModule extends VuexModule { }); return { orderList }; } + @MutationAction + async lock(params: any) { + const res: any = await http.post(url.sortscan.lock.list, params); + const lockCode = res.code; + return { lockCode }; + } /** * 查询结果-辅料列表 * @param params diff --git a/src/pages/raw/handover/aggregating/result.vue b/src/pages/raw/handover/aggregating/result.vue index b49cfbd..949e159 100644 --- a/src/pages/raw/handover/aggregating/result.vue +++ b/src/pages/raw/handover/aggregating/result.vue @@ -124,13 +124,16 @@ export default class AggregatingResult extends BasePage { font-size: 34rpx; font-weight: 500; text-align: center; + .title { flex: 3; } + .left, .right { flex: 1; } + .icon { display: flex; justify-content: center; diff --git a/src/pages/raw/handover/picking/model.ts b/src/pages/raw/handover/picking/model.ts index cc70f52..0ba5528 100644 --- a/src/pages/raw/handover/picking/model.ts +++ b/src/pages/raw/handover/picking/model.ts @@ -23,6 +23,7 @@ export class PickingModule extends VuexModule { orderOutIdList: any; NEWparams: any; LocList: any = []; + lockCode: any = ''; /** * 查询结果列表(按单列表) @@ -316,7 +317,12 @@ export class PickingModule extends VuexModule { })); return { locationList }; } - + @MutationAction + async lock(params: any) { + const res: any = await http.post(url.sortscan.lock.list, params); + const lockCode = res.code; + return { lockCode }; + } /** * 上传汇总列表 */ diff --git a/src/pages/raw/handover/picking/result.vue b/src/pages/raw/handover/picking/result.vue index f01408d..b2504b0 100644 --- a/src/pages/raw/handover/picking/result.vue +++ b/src/pages/raw/handover/picking/result.vue @@ -52,6 +52,7 @@ export default class RawReceiptDetail extends BasePage { async onOrder() { // const list = this.model.proOrderResultList; // await this.model.lockProOrderResult(list); + await this.model.lock(this.model.proOrderResultList); this.toPage(this.page.raw.handover.picking.byorder); } //汇总 diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue index 966516f..d9d643a 100644 --- a/src/pages/raw/handover/returning/index.vue +++ b/src/pages/raw/handover/returning/index.vue @@ -189,7 +189,7 @@ export default class returningDom extends BasePage { this.form.sendSpot = this.data.sendSpot; } if (this.form.prdOrder != null) { - model.queryOrderInInfo(this.form.prdOrder); + await this.query(); } uni.removeStorageSync('data'); }