diff --git a/src/pages/raw/handover/virtual-Vn/index.vue b/src/pages/raw/handover/virtual-Vn/index.vue
index e75ec74..1e8c311 100644
--- a/src/pages/raw/handover/virtual-Vn/index.vue
+++ b/src/pages/raw/handover/virtual-Vn/index.vue
@@ -58,7 +58,7 @@
{{ $t('message.Pi_order') }}
- {{ $t('message.dn_Confirm') }}
+ {{ $t('message.dn_Confirm') }}
{{ $t('message.po_Return') }}
@@ -223,13 +223,13 @@ export default class Virtual extends BasePage {
/**
* 确认
*/
- onOk() {
+ onConfirm() {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
let orderNoList = [];
let materialCodeList = [];
if (this.isFormChange || this.model.proOrderList.length === 0) {
- await model.queryProOrder(this.formParams);
+ await model.queryProOrderInfo(this.formParams);
orderNoList = model.proOrderList.map((_: any) => _.prdOrder);
materialCodeList = model.proOrderList.map((_: any) => _.materialCode);
} else {
@@ -249,7 +249,7 @@ export default class Virtual extends BasePage {
materialCodeList: materialCodeList,
};
this.model.QueryParams(params);
- await this.model.queryProOrderResult(params);
+ await this.model.queryProOrderResultList(params);
this.model.setSapFactoryCode({ sapFactoryCode: this.form.sapFactoryCode });
this.toPage(this.page.raw.handover.virtual.result);
});
@@ -263,7 +263,7 @@ export default class Virtual extends BasePage {
if (!valid) return;
// await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpScope, loginName: session.loginName, factoryCode: session.factoryCode });
// 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;
// }
});
diff --git a/src/pages/raw/handover/virtual-Vn/model.ts b/src/pages/raw/handover/virtual-Vn/model.ts
index 0e9451e..449fd46 100644
--- a/src/pages/raw/handover/virtual-Vn/model.ts
+++ b/src/pages/raw/handover/virtual-Vn/model.ts
@@ -116,7 +116,7 @@ export class VirtualModule extends VuexModule {
* @param params
*/
@MutationAction
- async queryProOrder(params: any) {
+ async queryProOrderInfo(params: any) {
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 }));
proOrderList.forEach((_: any) => (_.checked = true));
@@ -131,7 +131,7 @@ export class VirtualModule extends VuexModule {
* @param params
*/
@MutationAction
- async queryProOrderResult(params: any) {
+ async queryProOrderResultList(params: any) {
const { list: proOrderResultList }: any = await http.post(url.virtual.query.ordoutlist, params);
proOrderResultList.forEach((item: any) => {
item.hvAmount = 0;
diff --git a/src/pages/raw/handover/virtual-Vn/summary.vue b/src/pages/raw/handover/virtual-Vn/summary.vue
index 2ff1dc1..c284c38 100644
--- a/src/pages/raw/handover/virtual-Vn/summary.vue
+++ b/src/pages/raw/handover/virtual-Vn/summary.vue
@@ -272,7 +272,7 @@ export default class VirtualSummary extends BasePage {
dataList: list,
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) {
uni.showToast({
title: this.$t('message.Pi_NoDataFound') as string,