Overseamom-518 feat 虚拟交接重复调用问题

master
mabaoyan 2 years ago
parent caaae983c7
commit fc7725ae67

@ -58,7 +58,7 @@
<u-button type="primary" @click="onQuery">{{ $t('message.Pi_order') }}</u-button> <u-button type="primary" @click="onQuery">{{ $t('message.Pi_order') }}</u-button>
</u-col> </u-col>
<u-col :span="3"> <u-col :span="3">
<u-button type="success" @click="onOk">{{ $t('message.dn_Confirm') }}</u-button> <u-button type="success" @click="onConfirm">{{ $t('message.dn_Confirm') }}</u-button>
</u-col> </u-col>
<u-col :span="3"> <u-col :span="3">
<u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button> <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
@ -223,13 +223,13 @@ export default class Virtual extends BasePage {
/** /**
* 确认 * 确认
*/ */
onOk() { onConfirm() {
this.$form.validate(async (valid: boolean) => { this.$form.validate(async (valid: boolean) => {
if (!valid) return; if (!valid) return;
let orderNoList = []; let orderNoList = [];
let materialCodeList = []; let materialCodeList = [];
if (this.isFormChange || this.model.proOrderList.length === 0) { if (this.isFormChange || this.model.proOrderList.length === 0) {
await model.queryProOrder(this.formParams); await model.queryProOrderInfo(this.formParams);
orderNoList = model.proOrderList.map((_: any) => _.prdOrder); orderNoList = model.proOrderList.map((_: any) => _.prdOrder);
materialCodeList = model.proOrderList.map((_: any) => _.materialCode); materialCodeList = model.proOrderList.map((_: any) => _.materialCode);
} else { } else {
@ -249,7 +249,7 @@ export default class Virtual extends BasePage {
materialCodeList: materialCodeList, materialCodeList: materialCodeList,
}; };
this.model.QueryParams(params); this.model.QueryParams(params);
await this.model.queryProOrderResult(params); await this.model.queryProOrderResultList(params);
this.model.setSapFactoryCode({ sapFactoryCode: this.form.sapFactoryCode }); this.model.setSapFactoryCode({ sapFactoryCode: this.form.sapFactoryCode });
this.toPage(this.page.raw.handover.virtual.result); this.toPage(this.page.raw.handover.virtual.result);
}); });
@ -263,7 +263,7 @@ export default class Virtual extends BasePage {
if (!valid) return; if (!valid) return;
// await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpScope, loginName: session.loginName, factoryCode: session.factoryCode }); // await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpScope, loginName: session.loginName, factoryCode: session.factoryCode });
// if (this.model.mrpcode == 1) { // if (this.model.mrpcode == 1) {
this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value })); this.model.queryProOrderInfo(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
this.isFormChange = false; this.isFormChange = false;
// } // }
}); });

@ -116,7 +116,7 @@ export class VirtualModule extends VuexModule {
* @param params * @param params
*/ */
@MutationAction @MutationAction
async queryProOrder(params: any) { async queryProOrderInfo(params: any) {
const { list: proOrderList }: any = await http.post(url.virtual.query.orderno, params); const { list: proOrderList }: any = await http.post(url.virtual.query.orderno, params);
//const proOrderList = list.map((v: any) => ({ prdOrder: v.prdOrder, amount: v.amount, materialCode: v.materialCode, materialDesc: v.materialDesc })); //const proOrderList = list.map((v: any) => ({ prdOrder: v.prdOrder, amount: v.amount, materialCode: v.materialCode, materialDesc: v.materialDesc }));
proOrderList.forEach((_: any) => (_.checked = true)); proOrderList.forEach((_: any) => (_.checked = true));
@ -131,7 +131,7 @@ export class VirtualModule extends VuexModule {
* @param params * @param params
*/ */
@MutationAction @MutationAction
async queryProOrderResult(params: any) { async queryProOrderResultList(params: any) {
const { list: proOrderResultList }: any = await http.post(url.virtual.query.ordoutlist, params); const { list: proOrderResultList }: any = await http.post(url.virtual.query.ordoutlist, params);
proOrderResultList.forEach((item: any) => { proOrderResultList.forEach((item: any) => {
item.hvAmount = 0; item.hvAmount = 0;

@ -272,7 +272,7 @@ export default class VirtualSummary extends BasePage {
dataList: list, dataList: list,
includeOrderOutIdList: model.proOrderResultList.map((item: any) => item.orderOutId), includeOrderOutIdList: model.proOrderResultList.map((item: any) => item.orderOutId),
}); });
await this.model.queryProOrderResult(this.model.nextQueryParams); await this.model.queryProOrderResultList(this.model.nextQueryParams);
if (this.model.proOrderResultList.length == 0) { if (this.model.proOrderResultList.length == 0) {
uni.showToast({ uni.showToast({
title: this.$t('message.Pi_NoDataFound') as string, title: this.$t('message.Pi_NoDataFound') as string,

Loading…
Cancel
Save