@ -208,6 +208,7 @@ export default {
Replenishment_Number: '可补数量',
Summary_Receiver: '接收人',
different: '请输入不同接收人',
Summary_Password: '口令',
screen: '筛选',
Summary_PleaseInputNumber: '请输入数量',
@ -256,6 +256,7 @@ export default {
InventoryPleaseScan: 'Please scan No.',
InventoryFinish: 'Finish',
collecting: 'Please enter the collecting doc No',
different: 'Please enter a different recipient',
MaterialCount: 'Stocktaking by MAT',
InventoryNumber: 'Inventory number',
DocumentScanned: 'Document scanned',
@ -150,7 +150,7 @@ export default class LoginPage extends BasePage {
console.log('image', this.image);
console.log('Version////', this.Version);
}
Version = '1.0.15';
Version = '1.0.16';
compareVersion(version1: any, version2: any) {
//如果version1 大 会返回1 &&& 如果version2 大 会返回 -1
const newVersion1 = `${version1}`.split('.').length < 3 ? `${version1}`.concat('.0') : `${version1}`;
@ -196,6 +196,10 @@ export default class AggregatingOrder extends BasePage {
if (model.orderList.length === 0) {
this.customToast(this.$t('message.Pi_tip4') as string);
} else {
if (this.submitForm.receiverName == session.loginName) {
this.customToast(this.$t('message.different') as string);
return;
await auth.checkPassword({
rfPwd: this.submitForm.password,
factoryCode: session.factoryCode as string,
@ -231,6 +231,10 @@ export default class AggregatingSummary extends BasePage {
if (this.model.aggregateList.length === 0) {
@ -306,6 +306,12 @@ export default class RawReceiptDetail extends BasePage {
async onAggregate() {
await this.model.queryProOrder(this.model.formParams);
await this.model.queryProOrderResult(this.model.NEWparams);
// if (this.model.proOrderResultList.length == 0) {
// this.some = {};
// this.LocationList = [];
// this.wlCode = '';
// return;
// }
const orderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
const params = {
factoryCode: session.factoryCode,
@ -250,6 +250,10 @@ export default class VirtualSummary extends BasePage {
this.customToast(this.$t('message.Summary_PleaseInputNumber') as string);
let res = await auth.checkPassword({