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

cosmoim-852 fix 俄罗斯功能优化

Browse Source
master
hou 3 years ago
parent 77d360fb7a
commit 22e24049d0
12 changed files with 109 additions and 30 deletions
Show Stats Download Patch File Download Diff File

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

@ -180,8 +180,8 @@ export default {
Pi_QuantityHandedOver: 'Handedover Qty',
Pi_distribution: 'Distribution',
successful: 'Query was successful',
ModelCode: 'Model code',
ModelName: 'Model name',
ModelCode: 'code',
ModelName: 'material',
ModelScanned: 'Model scanned',
Pi_tip13: 'Please select the material to submit',
Pi_tip15: 'Please ensure that the handover quantity is equal to the demand quantity',

77
src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
Unescape Escape View File

@ -43,17 +43,6 @@
<u-input placeholder=" " v-model="every.outAmount" :type="type" :border="border" class="input" style="padding: '0'" disabled />
</view>
</view>
<!-- 库位 -->
<view class="library">
<view class="library-left">
<view>{{ $t('message.CommissionedLocation') }}</view>
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Loc" />
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
<u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :border="border" class="input" />
</view>
</view>
<!-- 条码 -->
<view class="single">
<view class="single-left">
@ -64,6 +53,17 @@
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 库位 -->
<view class="library">
<view class="library-left">
<view>{{ $t('message.CommissionedLocation') }}</view>
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Loc" />
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
<u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :disabled="disabled" :border="border" class="input" />
</view>
</view>
<!-- 添加 -->
<!-- <view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@ -102,6 +102,7 @@ import model from './model';
export default class SemiFinishedSO extends BasePage {
model = model;
detailHeader = detailHeader;
disabled = false;
form: any = {
documentNo: '',
};
@ -193,6 +194,10 @@ export default class SemiFinishedSO extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
this.Loc = [];
this.Container = '';
this.nowAmount = '';
this.disabled = false;
let params = {
productCode: this.every.materialCode,
barcode: this.Barcode,
@ -204,7 +209,14 @@ export default class SemiFinishedSO extends BasePage {
label: this.Container.locCode + '(' + this.Container.locCodesendSpot + ')',
});
this.wlCode = this.Loc[0];
this.nowAmount = 1;
// this.nowAmount = 1;
if (this.Container.cpRef4 == null) {
this.nowAmount = parseFloat(this.Container.qty);
this.disabled = true;
} else {
this.nowAmount = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4);
this.disabled = true;
}
}
//点击添加
Add() {
@ -225,26 +237,38 @@ export default class SemiFinishedSO extends BasePage {
return;
}
}
let codenum = 0;
// let codenum = 0;
// if (this.list.length != 0) {
// this.list.forEach((item: any) => {
// if (item.barCode == this.Container.barcode) {
// num += parseFloat(item.receiptAmount);
// }
// });
// }
// if (this.Container.cpRef4 == null) {
// if (parseFloat(this.nowAmount) + codenum > this.Container.qty) {
// this.customToast(this.$t('message.AppendMateriel3') as any);
// console.log('3');
// return;
// }
// } else {
// if (parseFloat(this.nowAmount) + codenum > this.Container.qty - parseFloat(this.Container.cpRef4)) {
// this.customToast(this.$t('message.AppendMateriel3') as any);
// console.log('4');
// return;
// }
// }
let isTrue = true;
if (this.list.length != 0) {
this.list.forEach((item: any) => {
if (item.barCode == this.Container.barcode) {
num += item.receiptAmount;
return (isTrue = false);
}
});
}
if (this.Container.cpRef4 == null) {
if (parseFloat(this.nowAmount) + codenum > this.Container.qty) {
this.customToast(this.$t('message.AppendMateriel3') as any);
console.log('3');
return;
}
} else {
if (parseFloat(this.nowAmount) + codenum > this.Container.qty - parseFloat(this.Container.cpRef4)) {
this.customToast(this.$t('message.AppendMateriel3') as any);
console.log('4');
return;
}
if (isTrue != true) {
this.customToast(this.$t('message.repeatedly') as any);
return;
}
if (!this.every) {
this.customToast(this.$t('message.Commission_tips6') as any);
@ -305,6 +329,7 @@ export default class SemiFinishedSO extends BasePage {
this.nowAmount = '';
this.Barcode = '';
this.Container = '';
this.disabled = false;
}
}
deleteItem(e: any) {

14
src/pages/raw/Semi-finished/Semi-finished-offline/index.vue
Unescape Escape View File

@ -129,6 +129,8 @@ export default class finishProductOfflineDom extends BasePage {
}
this.every = this.model.materielList[this.model.materielList.length - 1];
console.log(this.form.aimWl);
await this.model.queryReturningTypeList();
this.wlcodeList = this.model.returningTypeList;
let list: any = [];
this.wlcodeList.forEach((item: any) => {
if (item.sendSpot == this.every.sendSpot) {
@ -157,6 +159,18 @@ export default class finishProductOfflineDom extends BasePage {
this.customToast(this.$t('message.product_Tip3') as string);
return;
}
let isTrue = true;
if (this.materielList.length != 0) {
this.materielList.forEach((item: any) => {
if (item.barcode == this.form.barCode) {
return (isTrue = false);
}
});
}
if (isTrue != true) {
this.customToast(this.$t('message.repeatedly') as string);
return;
}
this.materielList.push(this.every);
this.materielList[this.materielList.length - 1].locCode = this.form.aimWl.label;
}

10
src/pages/raw/commission/RUS-Out/index.vue
Unescape Escape View File

@ -221,6 +221,8 @@ export default class dnReceiptDom extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
this.Container = '';
this.nowAmount = '';
let params = {
productCode: this.every.materialCode,
barcode: this.Barcode,
@ -262,7 +264,7 @@ export default class dnReceiptDom extends BasePage {
if (this.list.length != 0) {
this.list.forEach((item: any) => {
if (item.barCode == this.Container.barcode) {
num += parseFloat(item.nowAmount);
codenum += parseFloat(item.nowAmount);
}
});
}
@ -310,6 +312,9 @@ export default class dnReceiptDom extends BasePage {
this.list.push(arr);
this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].nowAmount);
this.nowAmount = '';
this.Container = '';
this.Loc = [];
this.Barcode = '';
} else if (res.cancel) {
return;
}
@ -329,6 +334,9 @@ export default class dnReceiptDom extends BasePage {
this.list.push(arr);
this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].nowAmount);
this.nowAmount = '';
this.Container = '';
this.Loc = [];
this.Barcode = '';
}
}
deleteItem(e: any) {

10
src/pages/raw/commission/RUS-entrant/index.vue
Unescape Escape View File

@ -69,7 +69,7 @@
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
<u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
<u-input v-model="receiptAmount" :disabled="disabled" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
</view>
</view>
<!-- 添加 -->
@ -110,6 +110,7 @@ import { url } from '@/utils/url';
})
export default class dnReceiptDom extends BasePage {
model = model;
disabled = false;
form: any = {
documentNo: '',
};
@ -314,6 +315,8 @@ export default class dnReceiptDom extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
this.Container = '';
this.receiptAmount = '';
let params = {
dnNo: this.form.documentNo,
poNo: this.poNo,
@ -324,6 +327,7 @@ export default class dnReceiptDom extends BasePage {
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
this.receiptAmount = parseFloat(this.Container.requestAmount);
this.disabled = true;
}
//点击添加
Add() {
@ -380,7 +384,10 @@ export default class dnReceiptDom extends BasePage {
});
this.DNReceivingList[this.everyIndex].receiptAmount = num;
this.receiptAmount = '';
this.Container = '';
this.Barcode = '';
this.every = this.DNReceivingList[this.everyIndex];
this.disabled = false;
}
}
deleteItem(e: any) {
@ -442,6 +449,7 @@ export default class dnReceiptDom extends BasePage {
await this.query();
}
empty() {
this.disabled = false;
this.LocationList = [];
this.Location = [];
this.poNo = '';

5
src/pages/raw/handover/RUS-returning/index.vue
Unescape Escape View File

@ -150,12 +150,14 @@ export default class returningDom extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
this.Container = '';
let params = {
productCode: this.materieCode.value,
barcode: this.Barcode,
};
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
this.Location = [];
let arr = {
label: this.Container.locCode,
value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
@ -223,6 +225,9 @@ export default class returningDom extends BasePage {
this.LocationList[this.LocationList.length - 1].operatorPass = this.operator;
this.LocationList[this.LocationList.length - 1].wkposCode = this.wlCode.label;
this.model.materielList[this.checkindex].totalAmount = this.accSubtract(this.LocationList[this.LocationList.length - 1].totalAmount, this.qty);
this.Container = '';
this.Barcode = '';
this.qty = '';
}
deleteItem(e: any) {
uni.showModal({

3
src/pages/raw/handover/feeding/RUS-Location.vue
Unescape Escape View File

@ -304,6 +304,8 @@ export default class RawReceiptDetail extends BasePage {
this.customToast(this.$t('message.AppendMateriel5') as string);
return;
}
this.Container = '';
this.qty = '';
let params = {
productCode: this.some.materialCode,
barcode: this.Barcode,
@ -402,6 +404,7 @@ export default class RawReceiptDetail extends BasePage {
console.log(' this.model.blDetailList', this.model.blDetailList);
this.business();
this.qty = '';
this.Container = '';
}
}
deleteItem(e: any): void {

4
src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue
Unescape Escape View File

@ -319,6 +319,8 @@ export default class dnReceiptDom extends BasePage {
this.customToast(this.$t('message.AppendMateriel5') as string);
return;
}
this.Container = '';
this.receiptAmount = '';
let params = {
dnNo: this.form.documentNo,
poNo: this.poNo,
@ -381,6 +383,8 @@ export default class dnReceiptDom extends BasePage {
this.DNReceivingList[this.everyIndex].receiptAmount = num;
this.receiptAmount = '';
this.every = this.DNReceivingList[this.everyIndex];
this.Container = '';
this.Barcode = '';
}
}
deleteItem(e: any) {

4
src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue
Unescape Escape View File

@ -184,6 +184,8 @@ export default class RawReceiptDetail extends BasePage {
this.customToast(this.$t('message.AppendMateriel5') as string);
return;
}
this.Container = '';
this.qty = '';
let params = {
productCode: this.some.materialCode,
barcode: this.Barcode,
@ -306,6 +308,8 @@ export default class RawReceiptDetail extends BasePage {
this.model.dnReturnList[this.someIndex].receiptAmount += parseFloat(this.qty);
this.LocationList.push(arr);
this.qty = '';
this.Container = '';
this.Barcode = '';
}
//删除某一项 触发事件
deleteItem(e: any) {

3
src/pages/raw/warehouse/RUS-rowCollect/index.vue
Unescape Escape View File

@ -142,6 +142,8 @@ export default class KanDanHandOver extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
this.Container = '';
this.qty = 0;
let params = {
productCode: this.Some.productCode,
barcode: this.Barcode,
@ -210,6 +212,7 @@ export default class KanDanHandOver extends BasePage {
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode;
this.qty = 0;
this.Container = '';
this.Barcode = '';
this.model.orderInInfoList[this.SomeIndex].totalqty += this.qty;
}
deleteItem(e: any) {

2
src/pages/raw/warehouse/RUS-rowScrap/index.vue
Unescape Escape View File

@ -154,6 +154,8 @@ export default class KanDanHandOver extends BasePage {
this.customToast(this.$t('message.AppendMateriel5') as string);
return;
}
this.Container = '';
this.qty = '';
let params = {
productCode: this.Some.productCode,
barcode: this.Barcode,

3
src/pages/raw/warehouse/RUS-rowTransfer/index.vue
Unescape Escape View File

@ -132,6 +132,8 @@ export default class KanDanHandOver extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
this.Container = '';
this.total = 0;
let params = {
productCode: this.orderlist.productCode,
barcode: this.Barcode,
@ -172,6 +174,7 @@ export default class KanDanHandOver extends BasePage {
this.model.materielList[this.orderlistIndex].actualQty += parseFloat(this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty);
this.Barcode = '';
this.Container = '';
this.total = 0;
}
deleteItem(e: any) {
uni.showModal({

Write Preview
Loading…
Cancel
Save