cosmoim-852 fix 泰国拣配交接注释获取mrp

master
guoshuang 2 years ago
parent 632e2159ca
commit 8aae5826be

@ -173,7 +173,7 @@ export default class LoginPage extends BasePage {
// //
this.Version = '1.1.23'; this.Version = '1.1.23';
} else { } else {
this.Version = '1.0.48'; this.Version = '1.0.49';
} }
console.log('////', this.Version); console.log('////', this.Version);
} }

@ -213,7 +213,7 @@ export default class Aggregating extends BasePage {
this.getLoc(); this.getLoc();
} }
async onShow() { async onShow() {
await this.getMRP(); //await this.getMRP();
} }
async getMRP() { async getMRP() {
let params = { let params = {
@ -304,12 +304,12 @@ export default class Aggregating extends BasePage {
async onQuery() { async onQuery() {
this.$form.validate(async (valid: boolean) => { this.$form.validate(async (valid: boolean) => {
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) {
await this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value })); await this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
this.isFormChange = false; this.isFormChange = false;
this.model.isFormChange = this.formParams; this.model.isFormChange = this.formParams;
} //}
}); });
} }
} }

@ -173,7 +173,7 @@ export default class pickingDom extends BasePage {
return params; return params;
} }
async onShow() { async onShow() {
await this.getMRP(); //await this.getMRP();
} }
async getMRP() { async getMRP() {
let params = { let params = {
@ -244,15 +244,15 @@ export default class pickingDom extends BasePage {
onQuery() { onQuery() {
this.$form.validate(async (valid: boolean) => { this.$form.validate(async (valid: boolean) => {
if (!valid) return; if (!valid) return;
await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpCodeRegion, loginName: session.loginName, factoryCode: session.factoryCode }); // await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpCodeRegion, loginName: session.loginName, factoryCode: session.factoryCode });
if (this.model.mrpcode == 1) { // if (this.model.mrpcode == 1) {
await this.model.queryProOrder(this.formParams); await this.model.queryProOrder(this.formParams);
this.model.checkAllProOrderList(true); this.model.checkAllProOrderList(true);
this.isFormChange = false; this.isFormChange = false;
model.mrpCodeRegion = this.form.mrpCodeRegion as any; model.mrpCodeRegion = this.form.mrpCodeRegion as any;
model.sapFactoryCode = this.form.sapFactoryCode as any; model.sapFactoryCode = this.form.sapFactoryCode as any;
model.formParams = this.formParams; model.formParams = this.formParams;
} // }
}); });
} }
} }

@ -196,7 +196,7 @@ export default class Virtual extends BasePage {
this.getLoc(); this.getLoc();
} }
async onShow() { async onShow() {
await this.getMRP(); //await this.getMRP();
} }
async getMRP() { async getMRP() {
let params = { let params = {
@ -261,11 +261,11 @@ export default class Virtual extends BasePage {
onQuery() { onQuery() {
this.$form.validate(async (valid: boolean) => { this.$form.validate(async (valid: boolean) => {
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.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
this.isFormChange = false; this.isFormChange = false;
} // }
}); });
} }
ondelete() { ondelete() {

Loading…
Cancel
Save