|
|
|
|
@ -4,84 +4,51 @@
|
|
|
|
|
<view class="left">
|
|
|
|
|
<u-icon class="icon" name="arrow-left" @click="index" />
|
|
|
|
|
</view>
|
|
|
|
|
<view class="title">{{ $t("message.Pi_SummaryPicking") }}</view>
|
|
|
|
|
<view class="title">{{ $t('message.Pi_SummaryPicking') }}</view>
|
|
|
|
|
<view class="right"></view>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="table-wrapper">
|
|
|
|
|
<wyb-table
|
|
|
|
|
class="table"
|
|
|
|
|
ref="table"
|
|
|
|
|
width="100%"
|
|
|
|
|
enable-check="single"
|
|
|
|
|
show-left-and-right-border
|
|
|
|
|
:headers="headers"
|
|
|
|
|
:contents="model.aggregateList"
|
|
|
|
|
:show-vert-border="false"
|
|
|
|
|
@onCheck="handleRow"
|
|
|
|
|
></wyb-table>
|
|
|
|
|
<wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.aggregateList" :show-vert-border="false" @onCheck="handleRow"></wyb-table>
|
|
|
|
|
</view>
|
|
|
|
|
<!-- 列表展示数据 -->
|
|
|
|
|
<view class="Exhibition">
|
|
|
|
|
<view class="Exhibition-left">
|
|
|
|
|
<view class="Exhibition-left-title"
|
|
|
|
|
>{{ $t("message.Pi_Station") }}:</view
|
|
|
|
|
>
|
|
|
|
|
<view class="Exhibition-left-title">{{ $t('message.Pi_Station') }}:</view>
|
|
|
|
|
<view class="Exhibition-left-data">{{ some.sendSpot }}</view>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="Exhibition-right">
|
|
|
|
|
<view class="Exhibition-right-title"
|
|
|
|
|
>{{ $t("message.Pi_PickedQuantity") }}:</view
|
|
|
|
|
>
|
|
|
|
|
<view class="Exhibition-right-title">{{ $t('message.Pi_PickedQuantity') }}:</view>
|
|
|
|
|
<view class="Exhibition-right-data">{{ some.totalMoAmount }}</view>
|
|
|
|
|
</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"
|
|
|
|
|
class="search"
|
|
|
|
|
:options="Location"
|
|
|
|
|
/>
|
|
|
|
|
<view>{{ $t('message.CommissionedLocation') }}:</view>
|
|
|
|
|
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode" class="search" :options="Location" />
|
|
|
|
|
</view>
|
|
|
|
|
<view class="library-right">
|
|
|
|
|
<view class="library-right-title"
|
|
|
|
|
>{{ $t("message.CommissionedThisNumber") }}:</view
|
|
|
|
|
>
|
|
|
|
|
<u-input
|
|
|
|
|
v-model="qty"
|
|
|
|
|
:type="type"
|
|
|
|
|
:border="border"
|
|
|
|
|
:placeholder="$t('message.Summary_PleaseInputNumber')"
|
|
|
|
|
class="input"
|
|
|
|
|
/>
|
|
|
|
|
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
|
|
|
|
|
<u-input v-model="qty" :type="type" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
<!-- 添加 -->
|
|
|
|
|
<view class="add">
|
|
|
|
|
<u-button type="primary" @click="Add">{{
|
|
|
|
|
$t("message.product_add")
|
|
|
|
|
}}</u-button>
|
|
|
|
|
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
|
|
|
|
|
</view>
|
|
|
|
|
<!-- 表格 -->
|
|
|
|
|
<u-table class="library-table">
|
|
|
|
|
<u-tr class="u-tr">
|
|
|
|
|
<u-th class="u-th">{{ $t("message.product_Location") }}</u-th>
|
|
|
|
|
<u-th class="u-th">{{ $t("message.product_Number") }}</u-th>
|
|
|
|
|
<u-th class="u-th">{{ $t("message.operation") }}</u-th>
|
|
|
|
|
<u-th class="u-th">{{ $t('message.product_Location') }}</u-th>
|
|
|
|
|
<u-th class="u-th">{{ $t('message.product_Number') }}</u-th>
|
|
|
|
|
<u-th class="u-th">{{ $t('message.operation') }}</u-th>
|
|
|
|
|
</u-tr>
|
|
|
|
|
<u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
|
|
|
|
|
<u-td class="u-td">{{ item.wlCode }}</u-td>
|
|
|
|
|
<u-td class="u-td">{{ item.qty }}</u-td>
|
|
|
|
|
<u-td class="u-td">
|
|
|
|
|
<div class="u-td" @click="deleteItem(index)">
|
|
|
|
|
{{ $t("message.product_Delete") }}
|
|
|
|
|
{{ $t('message.product_Delete') }}
|
|
|
|
|
</div>
|
|
|
|
|
</u-td>
|
|
|
|
|
</u-tr>
|
|
|
|
|
@ -95,18 +62,16 @@
|
|
|
|
|
<div class="container">
|
|
|
|
|
<u-row>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<u-button type="primary" class="appoint" @click="bill">{{
|
|
|
|
|
$t("message.detailed")
|
|
|
|
|
}}</u-button>
|
|
|
|
|
<u-button type="primary" class="appoint" @click="bill">{{ $t('message.detailed') }}</u-button>
|
|
|
|
|
</u-col>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<u-button type="success" @click="onSubmit">
|
|
|
|
|
{{ $t("message.po_Submit") }}
|
|
|
|
|
{{ $t('message.po_Submit') }}
|
|
|
|
|
</u-button>
|
|
|
|
|
</u-col>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<u-button type="error" @click="index">
|
|
|
|
|
{{ $t("message.po_Return") }}
|
|
|
|
|
{{ $t('message.po_Return') }}
|
|
|
|
|
</u-button>
|
|
|
|
|
</u-col>
|
|
|
|
|
</u-row>
|
|
|
|
|
@ -116,14 +81,14 @@
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script lang="ts">
|
|
|
|
|
import { Component, Ref } from "vue-property-decorator";
|
|
|
|
|
import { BasePage } from "@/components/base/page";
|
|
|
|
|
import model from "./model";
|
|
|
|
|
import { summaryHeaders } from "./config";
|
|
|
|
|
import { session } from "@/store/modules/session";
|
|
|
|
|
import { VForm, VFormRules } from "vue/types/form";
|
|
|
|
|
import jPicker from "@/components/J-Picker/jPicker.vue";
|
|
|
|
|
import { pick } from "lodash/fp";
|
|
|
|
|
import { Component, Ref } from 'vue-property-decorator';
|
|
|
|
|
import { BasePage } from '@/components/base/page';
|
|
|
|
|
import model from './model';
|
|
|
|
|
import { summaryHeaders } from './config';
|
|
|
|
|
import { session } from '@/store/modules/session';
|
|
|
|
|
import { VForm, VFormRules } from 'vue/types/form';
|
|
|
|
|
import jPicker from '@/components/J-Picker/jPicker.vue';
|
|
|
|
|
import { pick } from 'lodash/fp';
|
|
|
|
|
@Component({
|
|
|
|
|
components: {
|
|
|
|
|
jPicker,
|
|
|
|
|
@ -133,19 +98,19 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
/**
|
|
|
|
|
* 表单引用
|
|
|
|
|
*/
|
|
|
|
|
@Ref("form") readonly $form!: VForm;
|
|
|
|
|
@Ref("submitForm") readonly $submitForm!: VForm;
|
|
|
|
|
@Ref('form') readonly $form!: VForm;
|
|
|
|
|
@Ref('submitForm') readonly $submitForm!: VForm;
|
|
|
|
|
submitForm = {
|
|
|
|
|
receiver: "",
|
|
|
|
|
receiverName: "",
|
|
|
|
|
password: "",
|
|
|
|
|
receiver: '',
|
|
|
|
|
receiverName: '',
|
|
|
|
|
password: '',
|
|
|
|
|
};
|
|
|
|
|
/**
|
|
|
|
|
* 页面Module
|
|
|
|
|
*/
|
|
|
|
|
model = model;
|
|
|
|
|
type = "text";
|
|
|
|
|
wlCode: any = "";
|
|
|
|
|
type = 'text';
|
|
|
|
|
wlCode: any = '';
|
|
|
|
|
border = true;
|
|
|
|
|
//添加库位和数量的列表
|
|
|
|
|
LocationList: any = [];
|
|
|
|
|
@ -153,7 +118,7 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
Location: any = [];
|
|
|
|
|
someIndex: number = 0;
|
|
|
|
|
some: any = {};
|
|
|
|
|
qty: any = "";
|
|
|
|
|
qty: any = '';
|
|
|
|
|
again: any;
|
|
|
|
|
/**
|
|
|
|
|
* 表单数据
|
|
|
|
|
@ -171,7 +136,7 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
rules: VFormRules<any> = {
|
|
|
|
|
// locationCode: [{ required: true, message: '请选择库存地点！' }],
|
|
|
|
|
amount: [
|
|
|
|
|
{ required: true, message: this.$t("message.Pi_tip1") as string },
|
|
|
|
|
{ required: true, message: this.$t('message.Pi_tip1') as string },
|
|
|
|
|
// { type: 'integer', min: 1, transform: Number, message: this.$t('message.Pi_tip2') as string },
|
|
|
|
|
],
|
|
|
|
|
};
|
|
|
|
|
@ -187,7 +152,7 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
headers = summaryHeaders;
|
|
|
|
|
//选择库位
|
|
|
|
|
LocationChoice(e: any) {
|
|
|
|
|
console.log("e>>>>>>>>>>>>>>>>>>>>>>>>", e);
|
|
|
|
|
console.log('e>>>>>>>>>>>>>>>>>>>>>>>>', e);
|
|
|
|
|
this.wlCode = e.pickerName;
|
|
|
|
|
}
|
|
|
|
|
//选取某一条需要分配库位的物料数据
|
|
|
|
|
@ -197,29 +162,29 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
this.model.aggregateList[this.someIndex].wlList = [];
|
|
|
|
|
this.model.aggregateList[this.someIndex].currentAmount = 0;
|
|
|
|
|
this.LocationList = [];
|
|
|
|
|
this.qty = "";
|
|
|
|
|
this.qty = '';
|
|
|
|
|
}
|
|
|
|
|
//添加库位和数量到数据和表格中
|
|
|
|
|
Add() {
|
|
|
|
|
if (this.qty == "" || this.wlCode == "") {
|
|
|
|
|
if (this.qty == '' || this.wlCode == '') {
|
|
|
|
|
uni.showToast({
|
|
|
|
|
icon: "none",
|
|
|
|
|
title: this.$t("message.Commission_tips2") as any,
|
|
|
|
|
icon: 'none',
|
|
|
|
|
title: 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,
|
|
|
|
|
icon: 'none',
|
|
|
|
|
title: this.$t('message.Commission_tips3') as any,
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
//guoshuang 判断对象为空修改 逻辑：订单勾选校验
|
|
|
|
|
if (JSON.stringify(this.some) == "{}") {
|
|
|
|
|
if (JSON.stringify(this.some) == '{}') {
|
|
|
|
|
uni.showToast({
|
|
|
|
|
icon: "none",
|
|
|
|
|
title: this.$t("message.Commission_tips6") as any,
|
|
|
|
|
icon: 'none',
|
|
|
|
|
title: this.$t('message.Commission_tips6') as any,
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
@ -228,23 +193,20 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
this.LocationList.forEach((item: any) => {
|
|
|
|
|
if (this.wlCode.sendSpot != item.Code) {
|
|
|
|
|
uni.showToast({
|
|
|
|
|
icon: "none",
|
|
|
|
|
title: this.$t("message.Commission_tips7") as any,
|
|
|
|
|
icon: 'none',
|
|
|
|
|
title: this.$t('message.Commission_tips7') as any,
|
|
|
|
|
});
|
|
|
|
|
return (isTrue = false);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
if (isTrue == true) {
|
|
|
|
|
if (
|
|
|
|
|
parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) >
|
|
|
|
|
parseFloat(this.some.amount)
|
|
|
|
|
) {
|
|
|
|
|
if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
|
|
|
|
|
uni.showModal({
|
|
|
|
|
title: "Tip",
|
|
|
|
|
content: this.$t("message.Pi_tip11") as string,
|
|
|
|
|
confirmText: this.$t("message.workArea_Confirm") as string,
|
|
|
|
|
cancelText: this.$t("message.Cancel") as string,
|
|
|
|
|
title: 'Tip',
|
|
|
|
|
content: this.$t('message.Pi_tip11') as string,
|
|
|
|
|
confirmText: this.$t('message.workArea_Confirm') as string,
|
|
|
|
|
cancelText: this.$t('message.Cancel') as string,
|
|
|
|
|
showCancel: true,
|
|
|
|
|
success: (res) => {
|
|
|
|
|
if (res.confirm) {
|
|
|
|
|
@ -260,10 +222,8 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
TEM.wlCode = this.wlCode.label;
|
|
|
|
|
TEM.qty = this.qty;
|
|
|
|
|
this.model.aggregateList[this.someIndex].wlList.push(TEM);
|
|
|
|
|
this.model.aggregateList[
|
|
|
|
|
this.someIndex
|
|
|
|
|
].currentAmount += parseFloat(this.qty);
|
|
|
|
|
this.qty = "";
|
|
|
|
|
this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
|
|
|
|
|
this.qty = '';
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
@ -280,10 +240,8 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
TEM.wlCode = this.wlCode.label;
|
|
|
|
|
TEM.qty = this.qty;
|
|
|
|
|
this.model.aggregateList[this.someIndex].wlList.push(TEM);
|
|
|
|
|
this.model.aggregateList[this.someIndex].currentAmount += parseFloat(
|
|
|
|
|
this.qty
|
|
|
|
|
);
|
|
|
|
|
this.qty = "";
|
|
|
|
|
this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
|
|
|
|
|
this.qty = '';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -303,10 +261,8 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
}
|
|
|
|
|
//页面每次显示 获取可选库位
|
|
|
|
|
async onReady() {
|
|
|
|
|
let means: any = JSON.parse(
|
|
|
|
|
localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
|
|
|
|
|
);
|
|
|
|
|
let sendSpot = JSON.parse(localStorage.getItem("sendSpot") as any);
|
|
|
|
|
let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
|
|
|
|
|
let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
|
|
|
|
|
let content = {
|
|
|
|
|
loginName: means.session.user.loginName,
|
|
|
|
|
sendSpot: sendSpot,
|
|
|
|
|
@ -317,15 +273,15 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
res.forEach((item: any) => {
|
|
|
|
|
let pickerName: any = {};
|
|
|
|
|
pickerName.label = item.locationCode;
|
|
|
|
|
pickerName.value = item.locationCode + "(" + item.sendSpot + ")";
|
|
|
|
|
pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
|
|
|
|
|
pickerName.sendSpot = item.sendSpot;
|
|
|
|
|
this.Location.push(pickerName);
|
|
|
|
|
});
|
|
|
|
|
// this.model.aggregateList.forEach((item: any) => {
|
|
|
|
|
// item.hvAmount = 0;
|
|
|
|
|
// });
|
|
|
|
|
this.again = JSON.parse(sessionStorage.getItem("params") as any);
|
|
|
|
|
sessionStorage.removeItem("params");
|
|
|
|
|
this.again = JSON.parse(sessionStorage.getItem('params') as any);
|
|
|
|
|
sessionStorage.removeItem('params');
|
|
|
|
|
}
|
|
|
|
|
async bill() {
|
|
|
|
|
// if (this.some == {} || this.some.prdOrder == null) {
|
|
|
|
|
@ -347,9 +303,7 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
}
|
|
|
|
|
//点击提交 上传数据
|
|
|
|
|
async onSubmit() {
|
|
|
|
|
const includeOrderOutIdList = this.model.proOrderResultList.map(
|
|
|
|
|
(_: any) => _.orderOutId
|
|
|
|
|
);
|
|
|
|
|
const includeOrderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
|
|
|
|
|
const dataList: any = [];
|
|
|
|
|
this.model.aggregateList.forEach((item: any) => {
|
|
|
|
|
if (item.checked == true) {
|
|
|
|
|
@ -364,7 +318,9 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
};
|
|
|
|
|
await this.model.saveAggregateUpload(params).then(() => {
|
|
|
|
|
this.model.queryProOrderResult(this.again).then(() => {
|
|
|
|
|
this.toPage(this.page.raw.handover.picking.result);
|
|
|
|
|
// this.toPage(this.page.raw.handover.picking.result);
|
|
|
|
|
this.model.queryAggregate()
|
|
|
|
|
this.toPage(this.page.raw.handover.picking.bysummary);
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
@ -373,8 +329,7 @@ export default class RawReceiptDetail extends BasePage {
|
|
|
|
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
|
|
.page-picking-order {
|
|
|
|
|
background: #f2f2f2
|
|
|
|
|
linear-gradient(0deg, #eee7e7 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
|
|
|
|
|
background: #f2f2f2 linear-gradient(0deg, #eee7e7 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
|
|
|
|
|
background-size: 100% 600rpx;
|
|
|
|
|
padding: 30rpx;
|
|
|
|
|
min-height: 100%;
|
|
|
|
|
|
hou
4 years ago