Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

原材料提示长存提示框

Browse Source
master
guoshuang 3 years ago
parent 81e668033f
commit 770eb0a85a
16 changed files with 79 additions and 227 deletions
Show Stats Download Patch File Download Diff File

2
src/i18n/lang/cn.ts
Unescape Escape View File

@ -170,6 +170,8 @@ export default {
ModelCode: '型号编码',
ModelName: '型号名称',
ModelScanned: '型号已扫',
Pi_tip13: '请选择要提交的物料',
Pi_tip15: '请确保交接数量等于需求数量',
//汇总交接
Summary_Query: '汇总查询',

2
src/i18n/lang/en.ts
Unescape Escape View File

@ -27,6 +27,8 @@ export default {
error: 'Error',
successful: 'Query was successful',
operation: 'Operation',
Pi_tip13: 'Please select the material to submit',
Pi_tip15: 'Please ensure that the handover quantity is equal to the demand quantity',
//版本更新
updatePrompt: 'Update tips',
Tip1: 'New version detected, update?',

32
src/pages/raw/commission/entrant/index.vue
Unescape Escape View File

@ -146,10 +146,7 @@ export default class dnReceiptDom extends BasePage {
//输入单号 查询数据
async query() {
if (this.form.documentNo == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips1') as any,
});
this.customToast(this.$t('message.Commission_tips1') as any);
return;
}
this.materialList = [];
@ -179,24 +176,15 @@ export default class dnReceiptDom extends BasePage {
//点击添加
Add() {
if (this.nowAmount == '' || this.wlCode == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips2') as any,
});
this.customToast(this.$t('message.Commission_tips2') as any);
return;
}
if (parseFloat(this.nowAmount) <= 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips3') as any,
});
this.customToast(this.$t('message.Commission_tips3') as any);
return;
}
if (parseFloat(this.nowAmount) > this.every.poAmount) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips4') as any,
});
this.customToast(this.$t('message.Commission_tips4') as any);
return;
}
let arr = {
@ -212,10 +200,7 @@ export default class dnReceiptDom extends BasePage {
}
async onSubmit() {
if (this.list == null || this.list.length == 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips5') as any,
});
this.customToast(this.$t('message.Commission_tips5') as any);
}
let upload = {
poNo: this.form.documentNo,
@ -233,10 +218,7 @@ export default class dnReceiptDom extends BasePage {
}
async bill() {
if (this.form.documentNo == '') {
uni.showToast({
icon: 'none',
title: this.$t('message._tips6') as any,
});
this.customToast(this.$t('message._tips6') as any)
return;
}
let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
@ -249,7 +231,7 @@ export default class dnReceiptDom extends BasePage {
}
//添加和删除操作的时候 计算累计收货数量
business() {
let num: number = 0;
let num = 0;
this.list.forEach((item: any) => {
num += parseFloat(item.nowAmount);
});

32
src/pages/raw/commission/goOut/index.vue
Unescape Escape View File

@ -158,10 +158,7 @@ export default class dnReceiptDom extends BasePage {
this.every = '';
this.materialList = [];
if (this.form.documentNo == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips1') as any,
});
this.customToast(this.$t('message.Commission_tips1') as any);
return;
}
this.materialList = [];
@ -192,24 +189,15 @@ export default class dnReceiptDom extends BasePage {
//点击添加
Add() {
if (!this.every) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips6') as any,
});
this.customToast(this.$t('message.Commission_tips6') as any);
return;
}
if (this.nowAmount == '' || this.wlCode == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips2') as any,
});
this.customToast(this.$t('message.Commission_tips2') as any);
return;
}
if (parseFloat(this.nowAmount) <= 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips3') as any,
});
this.customToast(this.$t('message.Commission_tips3') as any);
return;
}
let num: number = parseFloat(this.nowAmount);
@ -261,10 +249,7 @@ export default class dnReceiptDom extends BasePage {
}
async onSubmit() {
if (this.list == null || this.list.length == 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips5') as any,
});
this.customToast(this.$t('message.Commission_tips5') as any);
}
// let upload = {
// poNo: this.form.documentNo,
@ -278,10 +263,7 @@ export default class dnReceiptDom extends BasePage {
}
async bill() {
if (this.form.documentNo == '') {
uni.showToast({
icon: 'none',
title: this.$t('message._tips6') as any,
});
this.customToast(this.$t('message._tips6') as any);
return;
}
let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
@ -295,7 +277,7 @@ export default class dnReceiptDom extends BasePage {
}
//添加和删除操作的时候 计算累计收货数量
business() {
let num: number = 0;
let num = 0;
this.list.forEach((item: any) => {
num += parseFloat(item.nowAmount);
});

4
src/pages/raw/handover/aggregating/index.vue
Unescape Escape View File

@ -256,10 +256,10 @@ export default class Aggregating extends BasePage {
materialList = this.model.checkedProOrderList.map((_: any) => _.materialCode);
}
if (orderNoList.length === 0 && this.model.proOrderList.length > 0) {
uni.showToast({ icon: 'none', title: this.$t('message.Pi_OrderNoNotSelected') as string });
this.customToast(this.$t('message.Pi_OrderNoNotSelected') as string);
return;
} else if (orderNoList.length === 0) {
uni.showToast({ icon: 'none', title: this.$t('message.Pi_NoDataFound') as string });
this.customToast(this.$t('message.Pi_NoDataFound') as string);
return;
}
const params = {

44
src/pages/raw/handover/aggregating/order.vue
Unescape Escape View File

@ -177,10 +177,7 @@ export default class AggregatingOrder extends BasePage {
if (!valid) return;
const firstSelection = this.model.orderList.find((_) => _.checked);
if (firstSelection === undefined) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip7') as string,
});
this.customToast(this.$t('message.Pi_tip7') as string);
} else {
// 本次交接数量
const currentPickNum = parseFloat(this.amountForm.amount);
@ -189,10 +186,7 @@ export default class AggregatingOrder extends BasePage {
// 拣配数量
const totalMoAmount = parseFloat(firstSelection.totalMoAmount);
if (currentPickNum != totalMoAmount) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip12') as string,
});
this.customToast(this.$t('message.Pi_tip12') as string);
return;
}
model.setOrderListItemHvAmount({
@ -206,10 +200,7 @@ export default class AggregatingOrder extends BasePage {
this.$submitForm.validate(async (valid) => {
if (valid) {
if (model.orderList.length === 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip4') as string,
});
this.customToast(this.$t('message.Pi_tip4') as string);
} else {
await auth.checkPassword({
rfPwd: this.submitForm.password,
@ -230,17 +221,11 @@ export default class AggregatingOrder extends BasePage {
}
});
if (selectsta) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip4') as string,
});
this.customToast(this.$t('message.Pi_tip4') as string);
return;
}
if (submit) {
uni.showToast({
icon: 'none',
title: this.$t('message.Summary_PleaseInputNumber') as string,
});
this.customToast(this.$t('message.Summary_PleaseInputNumber') as string);
return;
}
let List: any = [];
@ -251,10 +236,7 @@ export default class AggregatingOrder extends BasePage {
}
});
if (List.length == 0) {
uni.showToast({
icon: 'none',
title: '请先选择要提交的物料' as string,
});
this.customToast(this.$t('message.Pi_tip13') as string);
return;
}
List.forEach((item: any) => {
@ -264,10 +246,7 @@ export default class AggregatingOrder extends BasePage {
}
});
if (isTrue != true) {
uni.showToast({
icon: 'none',
title: '请确保交接数量等于需求数量' as string,
});
this.customToast(this.$t('message.Pi_tip15') as string);
return;
}
await model.uploadOrderList({
@ -323,10 +302,11 @@ export default class AggregatingOrder extends BasePage {
orderOutIdList,
});
} catch (e) {
uni.showToast({
icon: 'none',
title: (this.$t('message.Summary_Tip') as string) + e.message,
});
this.customToast((this.$t('message.Summary_Tip') as string) + e.message);
// uni.showToast({
// icon: 'none',
// title: (this.$t('message.Summary_Tip') as string) + e.message,
// });
}
}
}

40
src/pages/raw/handover/aggregating/summary.vue
Unescape Escape View File

@ -176,10 +176,7 @@ export default class AggregatingSummary extends BasePage {
if (!valid) return;
const firstSelection = this.model.aggregateList.find((_) => _.checked);
if (firstSelection === undefined) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip7') as string,
});
this.customToast(this.$t('message.Pi_tip7') as string);
} else {
// 本次交接数量
const currentPickNum = parseFloat(this.amountForm.amount);
@ -188,10 +185,7 @@ export default class AggregatingSummary extends BasePage {
// 拣配数量
const totalMoAmount = parseFloat(firstSelection.totalMoAmount);
if (currentPickNum != totalMoAmount) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip12') as string,
});
this.customToast(this.$t('message.Pi_tip12') as string);
return;
}
model.setAggregateListItemHvAmount({
@ -209,10 +203,7 @@ export default class AggregatingSummary extends BasePage {
this.$submitForm.validate(async (valid) => {
if (valid) {
if (model.aggregateList.length === 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip4') as string,
});
this.customToast(this.$t('message.Pi_tip4') as string);
} else {
await auth.checkPassword({
rfPwd: this.submitForm.password,
@ -232,17 +223,11 @@ export default class AggregatingSummary extends BasePage {
}
});
if (selectsta) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip4') as string,
});
this.customToast(this.$t('message.Pi_tip4') as string);
return;
}
if (submit) {
uni.showToast({
icon: 'none',
title: this.$t('message.Summary_PleaseInputNumber') as string,
});
this.customToast(this.$t('message.Summary_PleaseInputNumber') as string);
return;
}
let List: any = [];
@ -253,10 +238,7 @@ export default class AggregatingSummary extends BasePage {
}
});
if (List.length == 0) {
uni.showToast({
icon: 'none',
title: '请先选择要提交的物料' as string,
});
this.customToast(this.$t('message.Pi_tip13') as string);
return;
}
List.forEach((item: any) => {
@ -266,10 +248,7 @@ export default class AggregatingSummary extends BasePage {
}
});
if (isTrue != true) {
uni.showToast({
icon: 'none',
title: '请确保交接数量等于需求数量' as string,
});
this.customToast(this.$t('message.Pi_tip15') as string);
return;
}
await model.uploadAggregateList({
@ -328,10 +307,7 @@ export default class AggregatingSummary extends BasePage {
orderOutIdList,
});
} catch (e) {
uni.showToast({
icon: 'none',
title: (this.$t('message.Summary_Tip') as string) + e.message,
});
this.customToast((this.$t('message.Summary_Tip') as string) + e.message);
}
}
}

34
src/pages/raw/handover/picking/ByOrder.vue
Unescape Escape View File

@ -173,34 +173,22 @@ export default class RawReceiptDetail extends BasePage {
}
Add() {
if (this.qty == '' || this.wlCode == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips2') as any,
});
this.customToast(this.$t('message.Commission_tips2') as any);
return;
}
if (parseFloat(this.qty) <= 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips3') as any,
});
this.customToast(this.$t('message.Commission_tips3') as any);
return;
}
if (JSON.stringify(this.some) == '{}') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips6') as any,
});
this.customToast(this.$t('message.Commission_tips6') as any);
return;
}
let isTrue: boolean = true;
let isTrue = true;
if (this.LocationList.length != 0) {
this.LocationList.forEach((item: any) => {
if (this.wlCode.sendSpot != item.Code || this.wlCode.label === item.wlCode) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips7') as any,
});
this.customToast(this.$t('message.Commission_tips7') as any);
return (isTrue = false);
}
});
@ -268,10 +256,7 @@ export default class RawReceiptDetail extends BasePage {
}
async bill() {
if (this.some == {} || this.some.prdOrder == null) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips6') as any,
});
this.customToast(this.$t('message.Commission_tips6') as any);
return;
}
let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
@ -293,16 +278,13 @@ export default class RawReceiptDetail extends BasePage {
}
});
if (dataList.length == 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Warehouse_Tip6') as any,
});
this.customToast(this.$t('message.Warehouse_Tip6') as any);
return;
}
await this.model.saveProOrderResultUpload(dataList);
if (this.model.code == '1') {
uni.showToast({
icon: 'none',
icon: 'success',
title: this.$t('message.Warehouse_Tip9') as any,
});
this.GetLocation();

34
src/pages/raw/handover/picking/BySummary.vue
Unescape Escape View File

@ -143,6 +143,8 @@ export default class RawReceiptDetail extends BasePage {
if (!this.model.aggregateList[data[0].index].sendSpot) {
uni.showModal({
content: this.$t('message.SAPLocation') as any,
confirmText: this.$t('message.workArea_Confirm') as string,
cancelText: this.$t('message.Cancel') as string,
success: (res) => {
if (res.confirm) {
this.model.aggregateList[data[0].index].checked = false;
@ -161,35 +163,23 @@ export default class RawReceiptDetail extends BasePage {
//添加库位和数量到数据和表格中
Add() {
if (this.qty == '' || this.wlCode == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips2') as any,
});
this.customToast(this.$t('message.Commission_tips2') as any);
return;
}
if (parseFloat(this.qty) <= 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips3') as any,
});
this.customToast(this.$t('message.Commission_tips3') as any);
return;
}
//guoshuang 判断对象为空修改 逻辑：订单勾选校验
if (JSON.stringify(this.some) == '{}') {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips6') as any,
});
this.customToast(this.$t('message.Commission_tips6') as any);
return;
}
let isTrue: boolean = true;
let isTrue = true;
if (this.LocationList.length != 0) {
this.LocationList.forEach((item: any) => {
if (this.wlCode.sendSpot != item.Code) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips7') as any,
});
this.customToast(this.$t('message.Commission_tips7') as any);
return (isTrue = false);
}
});
@ -270,10 +260,7 @@ export default class RawReceiptDetail extends BasePage {
}
});
if (dataList.length == 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Warehouse_Tip6') as any,
});
this.customToast(this.$t('message.Warehouse_Tip6') as any);
return;
}
const params = {
@ -284,10 +271,7 @@ export default class RawReceiptDetail extends BasePage {
};
await this.model.saveAggregateUpload(params);
if (this.model.code == '1') {
uni.showToast({
icon: 'none',
title: this.$t('message.Warehouse_Tip9') as any,
});
this.customToast(this.$t('message.Warehouse_Tip9') as any);
this.GetLocation();
setTimeout(() => {
this.onAggregate();

5
src/pages/raw/handover/picking/Summary-details.vue
Unescape Escape View File

@ -35,10 +35,7 @@ export default class RawReceiptDetail extends BasePage {
}
async generate() {
if (this.prdOrder == '') {
uni.showToast({
icon: 'none',
title: this.$t('message._tips6') as any,
});
this.customToast(this.$t('message._tips6') as any);
return;
}
let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);

10
src/pages/raw/handover/picking/index.vue
Unescape Escape View File

@ -173,16 +173,10 @@ export default class pickingDom extends BasePage {
orderOutIdList = this.model.checkedProOrderList.map((_: any) => _.orderOutId);
}
if (orderOutIdList.length === 0 && this.model.proOrderList.length > 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_OrderNoNotSelected') as string,
});
this.customToast(this.$t('message.Pi_OrderNoNotSelected') as string);
return;
} else if (orderOutIdList.length === 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_NoDataFound') as string,
});
this.customToast(this.$t('message.Pi_NoDataFound') as string);
return;
}
const params = {

5
src/pages/raw/handover/returning/Time-filter.vue
Unescape Escape View File

@ -116,10 +116,7 @@ export default class returningDom extends BasePage {
}
async onSubmit() {
if (this.startMobile == '' || this.endMobile == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.time') as string,
});
this.customToast(this.$t('message.time') as string);
return;
}
let time = {

10
src/pages/raw/handover/returning/index.vue
Unescape Escape View File

@ -218,18 +218,12 @@ export default class returningDom extends BasePage {
*/
onSubmit() {
if (this.form.amount > this.model.orderInInfo.amount) {
uni.showToast({
icon: 'none',
title: this.$t('message.return_Tip4') as string,
});
this.customToast(this.$t('message.return_Tip4') as string);
} else {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
if (!this.model.orderInInfo.sapFactoryCode) {
uni.showToast({
icon: 'none',
title: this.$t('message.return_Tip2') as string,
});
this.customToast(this.$t('message.return_Tip2') as string);
}
// (this.form.sendSpot as any) = this.model.orderInInfo.sendSpot;
(this.form.sapFactoryCode as any) = this.model.orderInInfo.sapFactoryCode;

4
src/pages/raw/handover/virtual/index.vue
Unescape Escape View File

@ -286,10 +286,10 @@ export default class Virtual extends BasePage {
orderNoList = this.model.checkedProOrderList.map((_: any) => _.prdOrder);
}
if (orderNoList.length === 0 && this.model.proOrderList.length > 0) {
uni.showToast({ icon: 'none', title: this.$t('message.Pi_OrderNoNotSelected') as string });
this.customToast(this.$t('message.Pi_OrderNoNotSelected') as string);
return;
} else if (orderNoList.length === 0) {
uni.showToast({ icon: 'none', title: this.$t('message.Pi_NoDataFound') as string });
this.customToast(this.$t('message.Pi_NoDataFound') as string);
return;
}
const params = {

2
src/pages/raw/handover/virtual/model.ts
Unescape Escape View File

@ -119,7 +119,7 @@ export class VirtualModule extends VuexModule {
if (!proOrderList.length) {
uni.showToast({
icon: 'none',
title: '未查询到数据！',
title: 'No data found！',
});
}
return { proOrderList };

46
src/pages/raw/handover/virtual/summary.vue
Unescape Escape View File

@ -176,10 +176,7 @@ export default class VirtualSummary extends BasePage {
// 检查
const firstRecord = model.summaryList[0];
if (firstRecord === undefined) {
uni.showToast({
icon: 'none',
title: this.$t('message.LBWK') as string,
});
this.customToast(this.$t('message.LBWK') as string);
return;
}
console.log('firstRecord', firstRecord);
@ -196,10 +193,7 @@ export default class VirtualSummary extends BasePage {
// 改数
const firstSelection = this.model.summaryList.find((_: any) => _.checked);
if (firstSelection === undefined) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip7') as string,
});
this.customToast(this.$t('message.Pi_tip7') as string);
} else {
const inputAmount = parseFloat(this.amountForm.amount); //本次交接数量
const totalHvAmount = firstSelection.totalHvAmount;
@ -207,10 +201,7 @@ export default class VirtualSummary extends BasePage {
const totalMoAmount = firstSelection.totalMoAmount; //累计拣配数量
console.log('2222', 2222222222222222222);
if (inputAmount + totalMoAmount > demand) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip14') as string,
});
this.customToast(this.$t('message.Pi_tip14') as string);
return;
}
console.log(1);
@ -224,10 +215,7 @@ export default class VirtualSummary extends BasePage {
inputAmount <= 0
// inputAmount.toString().split(".")[1].length > 3
) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip2') as string,
});
this.customToast(this.$t('message.Pi_tip2') as string);
} else {
// model.updateSummaryItem({
// index: this.model.summaryList.findIndex((_: any) => _.checked),
@ -243,7 +231,7 @@ export default class VirtualSummary extends BasePage {
}
});
uni.showToast({
icon: 'none',
icon: 'success',
title: this.$t('message.success') as string,
});
}
@ -261,10 +249,7 @@ export default class VirtualSummary extends BasePage {
let selectsta = true;
console.log('qqq', model.summaryList);
if (model.summaryList.length === 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip4') as string,
});
this.customToast(this.$t('message.Pi_tip4') as string);
return;
} else {
model.summaryList.map((item) => {
@ -279,17 +264,11 @@ export default class VirtualSummary extends BasePage {
});
}
if (selectsta) {
uni.showToast({
icon: 'none',
title: this.$t('message.Pi_tip4') as string,
});
this.customToast(this.$t('message.Pi_tip4') as string);
return;
}
if (qtyStase) {
uni.showToast({
icon: 'none',
title: this.$t('message.Summary_PleaseInputNumber') as string,
});
this.customToast(this.$t('message.Summary_PleaseInputNumber') as string);
return;
}
let res = await auth.checkPassword({
@ -350,10 +329,11 @@ export default class VirtualSummary extends BasePage {
orderOutIdList: model.proOrderResultList.map((_: any) => _.orderOutId),
});
} catch (e) {
uni.showToast({
icon: 'none',
title: (this.$t('message.Summary_Tip') as string) + e.message,
});
this.customToast((this.$t('message.Summary_Tip') as string) + e.message);
// uni.showToast({
// icon: 'none',
// title: (this.$t('message.Summary_Tip') as string) + e.message,
// });
}
}
}

Write Preview
Loading…
Cancel
Save