cosmoim-852 fix 俄罗斯工厂功能优化

master
hou 3 years ago
parent eee74c7182
commit ed4030cfbc

@ -1058,6 +1058,14 @@
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/handover/feeding/RUS-Local-details",
"style": {
"navigationBarTitleText": "俄罗斯明细",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/handover/RUS-picking/index",
"style": {

@ -16,12 +16,12 @@ export const headers = [
{
label: vm.$t('message.workArea_RegionName'),
key: 'regionDesc',
width: 200,
width: 300,
},
{
label: vm.$t('message.workArea_WorkAreaName'),
key: 'workareaName',
width: 200,
width: 350,
},
{
label: vm.$t('message.workArea_WarehouseClassify'),

@ -60,4 +60,9 @@ export const detailHeader = [
key: 'nowAmount',
width: 186,
},
{
label: vm.$t('message.Container'),
key: 'barCode',
width: 400,
},
];

@ -43,6 +43,16 @@
<u-input placeholder=" " v-model="every.outAmount" :type="type" :border="border" class="input" style="padding: '0'" disabled />
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 库位 -->
<view class="library">
<view class="library-left">
@ -54,16 +64,6 @@
<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">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 添加 -->
<!-- <view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@ -227,14 +227,20 @@ export default class dnReceiptDom extends BasePage {
};
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
this.nowAmount = this.Container.qty;
let arr = {
label: this.Container.locCode,
value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
sendSpot: this.Container.sendSpot,
};
this.Loc.push(arr);
this.wlCode = this.Loc[0];
}
//
Add() {
// if (this.Container == '') {
// this.customToast(this.$t('message.scanningContainer') as any);
// return;
// }
if (this.Container == '') {
this.customToast(this.$t('message.scanningContainer') as any);
return;
}
// if (this.Container.cpRef4 == null) {
// if (parseFloat(this.nowAmount) > this.Container.qty) {
// this.customToast(this.$t('message.AppendMateriel3') as any);
@ -293,8 +299,7 @@ export default class dnReceiptDom extends BasePage {
factoryCode: this.session.factoryCode,
wlCode: this.wlCode.label,
nowAmount: this.nowAmount,
// barCode: this.Container.barcode,
barCode: this.Barcode,
barCode: this.Container.barcode,
};
this.list.push(arr);
this.material[this.materialIndex].outAmount += parseFloat(this.list[this.list.length - 1].nowAmount);

@ -83,4 +83,9 @@ export const DNheader = [
label: vm.$t('message.product_Number'),
key: 'receiptAmount',
},
{
label: vm.$t('message.Container'),
key: 'palletCode',
width: 400,
},
];

@ -51,6 +51,16 @@
<!-- <u-input v-model="allNum" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled /> -->
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 库位 -->
<view class="library">
<view class="library-left">
@ -62,16 +72,6 @@
<u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 添加 -->
<!-- <view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@ -145,7 +145,7 @@ export default class dnReceiptDom extends BasePage {
Container: any = '';
//
async onShow() {
await this.queryLoction();
// await this.queryLoction();
}
async queryLoction() {
this.Location = [];
@ -317,10 +317,25 @@ export default class dnReceiptDom extends BasePage {
};
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
this.receiptAmount = this.Container.qty;
if (this.Container.cpRef4 == null) {
this.receiptAmount = this.Container.qty;
} else {
this.receiptAmount = this.Container.qty - this.Container.cpRef4;
}
// let arr = {
// label: this.Container.locCode,
// value: this.Container.locCode + '(' + this.Container.sendSpot + ')',
// sendSpot: this.Container.sendSpot,
// };
// this.Location.push(arr);
// this.wl = this.Location[0];
}
//
Add() {
if (this.Barcode == '') {
this.customToast(this.$t('message.barcode') as string);
return;
}
// if (this.Container == '') {
// this.customToast(this.$t('message.scanningContainer') as any);
// return;
@ -340,7 +355,7 @@ export default class dnReceiptDom extends BasePage {
// if (this.LocationList.length != 0) {
// this.LocationList.forEach((item: any) => {
// if (item.palletCode == this.Container.barcode) {
// num += item.receiptAmount;
// num += parseFloat(item.receiptAmount);
// }
// });
// }

@ -163,19 +163,19 @@ export default class returningDom extends BasePage {
};
this.Location.push(arr);
this.wlCode = this.Location[0];
let num = 0;
if (this.LocationList.length != 0) {
this.LocationList.forEach((item: any) => {
if (item.barcode == this.Container.barcode) {
num += parseFloat(item.amount);
}
});
}
if (this.Container.cpRef4 == null) {
this.qty = parseFloat(this.Container.qty) - num;
} else {
this.qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4) - num;
}
// let num = 0;
// if (this.LocationList.length != 0) {
// this.LocationList.forEach((item: any) => {
// if (item.barcode == this.Container.barcode) {
// num += parseFloat(item.amount);
// }
// });
// }
// if (this.Container.cpRef4 == null) {
// this.qty = parseFloat(this.Container.qty) - num;
// } else {
// this.qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4) - num;
// }
}
Add() {
if (parseFloat(this.qty) > parseFloat(this.form.totalAmount)) {

@ -0,0 +1,79 @@
<template>
<view class="page-receipt-detail">
<view class="header">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="go" />
</view>
<view class="title">{{ $t('message.Pi_QueryResults') }}</view>
<view class="right"></view>
</view>
<view class="table-wrapper">
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="model.detailedList" :show-vert-border="false"></wyb-table>
</view>
</view>
</template>
<script lang="ts">
import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { headers } from './config';
import model from './model';
@Component
export default class RawReceiptDetail extends BasePage {
model = model;
headers = headers;
go() {
// this.redirectTo(this.page.raw.handover.feeding.Location);
uni.navigateBack({ delta: 1 });
}
}
</script>
<style lang="scss" scoped>
.page-receipt-detail {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx;
padding: 30rpx;
min-height: 100%;
padding-top: 118rpx;
padding-bottom: 162rpx;
.header {
position: fixed;
top: 36rpx;
left: 0;
right: 0;
display: flex;
height: 88rpx;
line-height: 88rpx;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
.title {
flex: 3;
}
.left,
.right {
flex: 1;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
width: 88rpx;
height: 88rpx;
}
}
.table-wrapper {
background-color: #fff;
}
.form {
background-color: #fff;
padding: 40rpx;
border-radius: 10rpx;
}
}
</style>
function go() { throw new Error('Function not implemented.'); }

@ -55,6 +55,16 @@
<u-input placeholder=" " v-model="some.fillAmount" :type="type" :border="border" class="input" style="padding: '0'" disabled />
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 库位 -->
<view class="library">
<view class="library-left">
@ -66,16 +76,6 @@
<u-input :placeholder="$t('message.po_PleaseInput')" v-model="qty" type="number" :border="border" class="input" />
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 添加 -->
<!-- <view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@ -399,8 +399,8 @@ export default class RawReceiptDetail extends BasePage {
this.LocationList.push(arr);
this.model.blDetailList[this.someIndex].wlList.push(arr);
console.log(' this.model.blDetailList', this.model.blDetailList);
this.qty = '';
this.business();
this.qty = '';
}
}
deleteItem(e: any): void {
@ -430,7 +430,7 @@ export default class RawReceiptDetail extends BasePage {
num += parseFloat(item.qty);
});
this.model.blDetailList[i].fillAmount = num;
console.log('this.model.blDetailList', this.model.blDetailList);
this.model.blDetailList[i].totalFillAmount -= lineData.qty;
} else if (res.cancel) {
return;
}
@ -444,6 +444,7 @@ export default class RawReceiptDetail extends BasePage {
});
this.model.blDetailList[this.someIndex].fillAmount = num;
this.some.fillAmount = num;
this.model.blDetailList[this.someIndex].totalFillAmount += parseFloat(this.qty);
console.log('this.model.blDetailList', this.model.blDetailList);
}
async bill() {
@ -457,7 +458,7 @@ export default class RawReceiptDetail extends BasePage {
prdOrder: this.some.prdOrder,
};
await this.model.querydetaildlist(content);
this.redirectTo(this.page.raw.handover.feeding.Local);
this.toPage(this.page.raw.handover.feeding.RUSLocal);
}
async onSubmit() {
this.model.blDetailList.forEach((item: any) => {

@ -29,7 +29,14 @@ export default class RawReceiptDetail extends BasePage {
model = model;
detailHeaders = detailHeaders;
poNo: any = '';
onLoad() {
async onLoad() {
if (!uni.getStorageSync('poNo')) {
return;
} else {
this.poNo = uni.getStorageSync('poNo');
await this.generate();
uni.removeStorageSync('poNo');
}
this.model.detailedList.length = 0;
}
async generate() {

@ -66,6 +66,16 @@
<u-input placeholder=" " v-model="some.receiptAmount" :type="type" :border="border" class="input" style="padding: '0'" disabled />
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 库位 -->
<view class="library">
<!-- 库位 -->
@ -79,16 +89,6 @@
<u-input :placeholder="$t('message.po_PleaseInput')" v-model="qty" type="number" :border="border" class="input" />
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view>
<!-- 添加 -->
<!-- <view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@ -331,6 +331,7 @@ export default class RawReceiptDetail extends BasePage {
}
//
appoint() {
uni.setStorageSync('poNo', this.form.documentNo);
this.toPage(this.page.raw.ingoods.RUSdnReturnGoods.Local);
}
//

@ -10,7 +10,7 @@
<view class="content">
<view class="single">
<view class="single-left">
<view>{{ $t('message.container') }}</view>
<view>{{ $t('message.Pi_OrderNo') }}</view>
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="containerCode" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
@ -94,6 +94,7 @@ export default class dnReceiptDom extends BasePage {
}
containerCode: any = '';
async query() {
this.total = 0;
if (!this.containerCode) {
this.customToast(this.$t('message.Commission_tips1') as any);
return;
@ -105,6 +106,7 @@ export default class dnReceiptDom extends BasePage {
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.total = this.model.containerList.length;
}
}
current = 0;
@ -133,6 +135,7 @@ export default class dnReceiptDom extends BasePage {
});
this.model.empty();
this.containerCode = '';
this.total = 0;
}
}
}

@ -149,7 +149,11 @@ export default class KanDanHandOver extends BasePage {
};
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
this.qty = this.Container.qty;
if (this.Container.cpRef4 == null) {
this.qty = this.Container.qty;
} else {
this.qty = this.Container.qty - this.Container.cpRef4;
}
}
Add() {
if (!this.Some) {

@ -161,7 +161,11 @@ export default class KanDanHandOver extends BasePage {
};
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
this.qty = this.Container.qty;
if (this.Container.cpRef4 == null) {
this.qty = this.Container.qty;
} else {
this.qty = this.Container.qty - this.Container.cpRef4;
}
}
Add() {
if (this.order3 === '') {
@ -390,7 +394,7 @@ export default class KanDanHandOver extends BasePage {
bottom: 0;
left: 0;
right: 0;
z-index: 99;
z-index: 19999;
background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;

@ -59,7 +59,7 @@
</view> -->
<!-- 本次数量 -->
<u-form-item :label="$t('message.CommissionedThisNumber')">
<u-input :disabled="true" v-model="Container.qty" placeholder="" />
<u-input :disabled="true" v-model="total" placeholder="" />
</u-form-item>
</u-form>
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="RUSdetailHeader" :contents="SubmitOrderlist" :show-vert-border="false" @onCellClick="deleteItem($event)"></wyb-table>
@ -126,6 +126,7 @@ export default class KanDanHandOver extends BasePage {
}
});
}
total = 0;
async searchBarcode() {
if (this.Barcode == '') {
this.customToast(this.$t('message.barcode') as string);
@ -138,6 +139,11 @@ export default class KanDanHandOver extends BasePage {
};
await this.model.searchBarcode(params);
this.Container = this.model.ContainerCode;
if (this.Container.cpRef4 == null) {
this.total = this.Container.qty;
} else {
this.total = this.Container.qty - this.Container.cpRef4;
}
}
Add() {
if (this.Container == '' || !this.Container.barcode) {
@ -157,11 +163,12 @@ export default class KanDanHandOver extends BasePage {
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].keepBy = session.loginName;
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].orderType = '0';
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode;
if (this.Container.cpRef4 == null) {
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty);
} else {
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4);
}
this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = this.total;
// if (this.Container.cpRef4 == null) {
// this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty);
// } else {
// this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4);
// }
this.model.materielList[this.orderlistIndex].actualQty += parseFloat(this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty);
this.Barcode = '';
this.Container = '';
@ -203,6 +210,7 @@ export default class KanDanHandOver extends BasePage {
this.SubmitOrderlist = [];
this.Barcode = '';
this.Container = '';
this.total = 0;
this.query();
}
}

@ -101,6 +101,7 @@ export const page = {
detail: '/pages/raw/handover/feeding/detail',
Location: '/pages/raw/handover/feeding/Location',
Local: '/pages/raw/handover/feeding/Local-details',
RUSLocal: '/pages/raw/handover/feeding/RUS-Local-details',
},
returning: {
index: '/pages/raw/handover/returning/index',

Loading…
Cancel
Save