|
|
|
@ -55,7 +55,7 @@
|
|
|
|
<view class="library">
|
|
|
|
<view class="library">
|
|
|
|
<view class="library-left">
|
|
|
|
<view class="library-left">
|
|
|
|
<view>{{ $t('message.CommissionedLocation') }}</view>
|
|
|
|
<view>{{ $t('message.CommissionedLocation') }}</view>
|
|
|
|
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wl.value" class="search" :options="newLocation" />
|
|
|
|
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wl.value" class="search" :options="Location" />
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
|
<view class="library-right">
|
|
|
|
<view class="library-right">
|
|
|
|
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
|
|
|
|
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
|
|
|
|
@ -66,21 +66,7 @@
|
|
|
|
<view class="add">
|
|
|
|
<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>
|
|
|
|
</view>
|
|
|
|
<!-- 表格 -->
|
|
|
|
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="LocationList" :show-vert-border="false" @onCellClick="deleteItem($event)"></wyb-table>
|
|
|
|
<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-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.receiptAmount }}</u-td>
|
|
|
|
|
|
|
|
<u-td class="u-td">
|
|
|
|
|
|
|
|
<u-button type="error" size="small" style="font-size: 20px" @click="deleteItem(index)">{{ $t('message.product_Delete') }}</u-button>
|
|
|
|
|
|
|
|
</u-td>
|
|
|
|
|
|
|
|
</u-tr>
|
|
|
|
|
|
|
|
</u-table>
|
|
|
|
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
|
<!-- 底部按钮 -->
|
|
|
|
<!-- 底部按钮 -->
|
|
|
|
<view class="bottom-bar">
|
|
|
|
<view class="bottom-bar">
|
|
|
|
@ -99,12 +85,13 @@
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
|
|
<script lang="ts">
|
|
|
|
import { Component, Ref } from 'vue-property-decorator';
|
|
|
|
import { Component } from 'vue-property-decorator';
|
|
|
|
import { BasePage } from '@/components/base/page';
|
|
|
|
import { BasePage } from '@/components/base/page';
|
|
|
|
import jPicker from '@/components/J-Picker/jPicker.vue';
|
|
|
|
import jPicker from '@/components/J-Picker/jPicker.vue';
|
|
|
|
import { session } from '@/store/modules/session';
|
|
|
|
import { session } from '@/store/modules/session';
|
|
|
|
import { VForm, VFormRules } from 'vue/types/form';
|
|
|
|
|
|
|
|
import model from './model';
|
|
|
|
import model from './model';
|
|
|
|
|
|
|
|
import LocationDetail from './model.location';
|
|
|
|
|
|
|
|
import { headers } from './config';
|
|
|
|
@Component({
|
|
|
|
@Component({
|
|
|
|
components: {
|
|
|
|
components: {
|
|
|
|
jPicker,
|
|
|
|
jPicker,
|
|
|
|
@ -115,27 +102,27 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
form: any = {
|
|
|
|
form: any = {
|
|
|
|
documentNo: '',
|
|
|
|
documentNo: '',
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
// 原始物料列表（这里不准确，要修改）
|
|
|
|
material: any = [];
|
|
|
|
material: any = [];
|
|
|
|
poList: any = [];
|
|
|
|
poList: any = [];
|
|
|
|
materialList: any = [];
|
|
|
|
materialList: any = [];
|
|
|
|
|
|
|
|
// 当前被选择中原材料
|
|
|
|
every: any = {};
|
|
|
|
every: any = {};
|
|
|
|
value = '';
|
|
|
|
value = '';
|
|
|
|
|
|
|
|
headers = headers;
|
|
|
|
type = 'text';
|
|
|
|
type = 'text';
|
|
|
|
|
|
|
|
//要提交的数据
|
|
|
|
|
|
|
|
DNReceivingList: any = [];
|
|
|
|
|
|
|
|
//下标
|
|
|
|
|
|
|
|
DNReceivingListIndex: any = null;
|
|
|
|
border = true;
|
|
|
|
border = true;
|
|
|
|
//累计数量
|
|
|
|
|
|
|
|
//Cumulative: any = 0;
|
|
|
|
|
|
|
|
//判断要添加的库位和已添加的库位是否相等
|
|
|
|
|
|
|
|
//sendSpotList: any = [];
|
|
|
|
|
|
|
|
//本次数量
|
|
|
|
//本次数量
|
|
|
|
receiptAmount: any = '';
|
|
|
|
receiptAmount: any = '';
|
|
|
|
//库位
|
|
|
|
//库位
|
|
|
|
Location: any = [];
|
|
|
|
Location: LocationDetail[] = [];
|
|
|
|
//根据物料选择过滤的新库位
|
|
|
|
//添加的库位和数量的列表
|
|
|
|
newLocation: any = [];
|
|
|
|
|
|
|
|
//添加库位和数量的列表
|
|
|
|
|
|
|
|
LocationList: any = [];
|
|
|
|
LocationList: any = [];
|
|
|
|
DNReceivingListIndex: any = null;
|
|
|
|
//所选择的库位对象
|
|
|
|
//所选择的库位
|
|
|
|
|
|
|
|
wl: any = {
|
|
|
|
wl: any = {
|
|
|
|
value: null,
|
|
|
|
value: null,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
@ -143,13 +130,12 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
poNo: any = null;
|
|
|
|
poNo: any = null;
|
|
|
|
// 需求数量
|
|
|
|
// 需求数量
|
|
|
|
requestAmount: number = null;
|
|
|
|
requestAmount: number = null;
|
|
|
|
//上传
|
|
|
|
|
|
|
|
upload: any = [];
|
|
|
|
|
|
|
|
//页面初始化
|
|
|
|
|
|
|
|
async onReady() {}
|
|
|
|
|
|
|
|
// 页面初始化
|
|
|
|
// 页面初始化
|
|
|
|
// 页面需要清空仓库，因此需要复用该方法
|
|
|
|
// 页面需要清空仓库，因此需要复用该方法
|
|
|
|
async initLocation() {
|
|
|
|
async initLocation(condition): Promise<LocationDetail[]> {
|
|
|
|
|
|
|
|
console.log('condition>>>>>>>>>>>>>>>>>>.', condition);
|
|
|
|
|
|
|
|
//页面初始化 获取可选库位
|
|
|
|
|
|
|
|
let list: Array<LocationDetail> = [];
|
|
|
|
let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') 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 sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
|
|
|
|
let content = {
|
|
|
|
let content = {
|
|
|
|
@ -159,27 +145,28 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
workArea: session.workareaCode,
|
|
|
|
workArea: session.workareaCode,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
|
|
|
|
let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
|
|
|
|
res.forEach((item: any) => {
|
|
|
|
console.log('>>>>>>>>>>>>>>', res);
|
|
|
|
console.log('res is:', res);
|
|
|
|
res.forEach((item: LocationDetail) => {
|
|
|
|
let pickerName: any = {};
|
|
|
|
if (item.sendSpot === condition.sendSpot) {
|
|
|
|
pickerName.label = item.locationCode;
|
|
|
|
let pickerName: any = {};
|
|
|
|
pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
|
|
|
|
pickerName.label = item.locationCode;
|
|
|
|
pickerName.sendSpot = item.sendSpot;
|
|
|
|
pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
|
|
|
|
this.Location.push(pickerName);
|
|
|
|
pickerName.sendSpot = item.sendSpot;
|
|
|
|
|
|
|
|
list.push(pickerName);
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//输入单号 查询数据
|
|
|
|
//输入单号 查询数据
|
|
|
|
async query() {
|
|
|
|
async query() {
|
|
|
|
if (this.form.documentNo == '') {
|
|
|
|
if (!this.form.documentNo) {
|
|
|
|
uni.showToast({
|
|
|
|
uni.showToast({
|
|
|
|
icon: 'none',
|
|
|
|
icon: 'none',
|
|
|
|
title: this.$t('message.Commission_tips1') as any,
|
|
|
|
title: this.$t('message.Commission_tips1') as any,
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 查询时初始化仓库
|
|
|
|
await this.model.ImportQueryOrderInfo(this.form.documentNo.trim());
|
|
|
|
this.initLocation();
|
|
|
|
|
|
|
|
await this.model.ImportQueryOrderInfo(this.form.documentNo);
|
|
|
|
|
|
|
|
if (model.code == '1') {
|
|
|
|
if (model.code == '1') {
|
|
|
|
uni.showToast({
|
|
|
|
uni.showToast({
|
|
|
|
icon: 'none',
|
|
|
|
icon: 'none',
|
|
|
|
@ -189,7 +176,7 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
let list: any = localStorage.getItem('list');
|
|
|
|
let list: any = localStorage.getItem('list');
|
|
|
|
localStorage.removeItem('list');
|
|
|
|
localStorage.removeItem('list');
|
|
|
|
this.material = JSON.parse(list);
|
|
|
|
this.material = JSON.parse(list);
|
|
|
|
this.poList = [...this.material];
|
|
|
|
this.poList = [...this.material]; //结构
|
|
|
|
let arr = this.removeDuplicates(this.poList, 'poNo');
|
|
|
|
let arr = this.removeDuplicates(this.poList, 'poNo');
|
|
|
|
// 组装下拉结构
|
|
|
|
// 组装下拉结构
|
|
|
|
arr.forEach((item: any) => {
|
|
|
|
arr.forEach((item: any) => {
|
|
|
|
@ -215,7 +202,7 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
}, []);
|
|
|
|
}, []);
|
|
|
|
return arr;
|
|
|
|
return arr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// ADD方法后的库存数量检测 list是单号获取数组数据
|
|
|
|
// ADD方法后的库存数量检测
|
|
|
|
totalLocation(list: []) {
|
|
|
|
totalLocation(list: []) {
|
|
|
|
const receiptAmount = list.reduce((total: number, nextItem: any): any => {
|
|
|
|
const receiptAmount = list.reduce((total: number, nextItem: any): any => {
|
|
|
|
return total + +nextItem.receiptAmount;
|
|
|
|
return total + +nextItem.receiptAmount;
|
|
|
|
@ -235,42 +222,23 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
// this.material.forEach((item: any) => {
|
|
|
|
|
|
|
|
// if (item.poNo == e.pickerName.value) {
|
|
|
|
|
|
|
|
// let pickerName: any = {};
|
|
|
|
|
|
|
|
// pickerName.label = item.materialCode;
|
|
|
|
|
|
|
|
// pickerName.value = item.materialCode;
|
|
|
|
|
|
|
|
// this.materialList.push(pickerName);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// 自动化流程改造测试
|
|
|
|
// 自动化流程改造测试
|
|
|
|
this.materialChoice({
|
|
|
|
this.materialChoice({
|
|
|
|
pickerName: this.materialList.find(() => true),
|
|
|
|
pickerName: this.materialList.find(() => true),
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//选择物料后触发的回调事件 本次数量：receiptAmount 需求数量：requestAmount 选择一条物料候every=这条物料对应的所有数据
|
|
|
|
//选择物料后触发的回调事件 本次数量：receiptAmount 需求数量：requestAmount
|
|
|
|
materialChoice(e: any) {
|
|
|
|
async materialChoice(e: any) {
|
|
|
|
// 待放入新增中的公共对象
|
|
|
|
// 待放入新增中的公共对象
|
|
|
|
this.every = { ...e.pickerName };
|
|
|
|
this.every = { ...e.pickerName };
|
|
|
|
if (this.DNReceivingListIndex == null) {
|
|
|
|
//清空库位列表 避免库位重复添加
|
|
|
|
this.model.ImportDNReceivingList.push(this.every);
|
|
|
|
this.Location = [];
|
|
|
|
}
|
|
|
|
// 查询时初始化仓库
|
|
|
|
this.model.ImportDNReceivingList.forEach((item: any, index: any) => {
|
|
|
|
this.Location = await this.initLocation(this.every);
|
|
|
|
if (item.poLine == this.every.poLine || item.materialCode == this.every.materialCode || item.dnNo == this.every.dnNo) {
|
|
|
|
|
|
|
|
this.DNReceivingListIndex = index;
|
|
|
|
// 自动化流程改造测试
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
this.model.ImportDNReceivingList.forEach((item: any, index: any) => {
|
|
|
|
|
|
|
|
if (item.poLine != this.every.poLine || item.materialCode != this.every.materialCode || item.dnNo != this.every.dnNo) {
|
|
|
|
|
|
|
|
this.model.ImportDNReceivingList.push(this.every);
|
|
|
|
|
|
|
|
this.DNReceivingListIndex = index + 1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
this.newLocation = [];
|
|
|
|
|
|
|
|
this.newLocation = this.Location.filter((item: any) => item.sendSpot === this.every.sendSpot);
|
|
|
|
|
|
|
|
console.log('newLoction', this.newLocation);
|
|
|
|
|
|
|
|
this.LocationChoice({
|
|
|
|
this.LocationChoice({
|
|
|
|
pickerName: this.newLocation.find(() => true),
|
|
|
|
pickerName: this.Location.find(() => true),
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//选择库位后触发的回调事件
|
|
|
|
//选择库位后触发的回调事件
|
|
|
|
@ -279,9 +247,8 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//点击添加
|
|
|
|
//点击添加
|
|
|
|
Add() {
|
|
|
|
Add() {
|
|
|
|
//如何得到count
|
|
|
|
|
|
|
|
const count = this.totalLocation(this.LocationList);
|
|
|
|
const count = this.totalLocation(this.LocationList);
|
|
|
|
if (this.receiptAmount == '' || this.wl.value == '') {
|
|
|
|
if (this.receiptAmount == '' || !this.wl.value) {
|
|
|
|
uni.showToast({
|
|
|
|
uni.showToast({
|
|
|
|
icon: 'none',
|
|
|
|
icon: 'none',
|
|
|
|
title: this.$t('message.Commission_tips2') as any,
|
|
|
|
title: this.$t('message.Commission_tips2') as any,
|
|
|
|
@ -302,48 +269,70 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 判断已添加库位和新添加库位是否相同，不相同return
|
|
|
|
|
|
|
|
let isTrue = this.LocationList.some((item) => item.wlCode !== this.wl.label);
|
|
|
|
|
|
|
|
//是要在相同库位下add???
|
|
|
|
|
|
|
|
if (isTrue) {
|
|
|
|
|
|
|
|
uni.showToast({
|
|
|
|
|
|
|
|
icon: 'none',
|
|
|
|
|
|
|
|
title: this.$t('message._tips5') as any,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//将选好的数据aad进去
|
|
|
|
|
|
|
|
this.LocationList.push({
|
|
|
|
this.LocationList.push({
|
|
|
|
...this.every,
|
|
|
|
...this.every,
|
|
|
|
wlCode: this.wl.label,
|
|
|
|
wlCode: this.wl.label,
|
|
|
|
receiptAmount: this.receiptAmount,
|
|
|
|
receiptAmount: this.receiptAmount,
|
|
|
|
});
|
|
|
|
});
|
|
|
|
this.model.ImportDNReceivingList[this.DNReceivingListIndex].wllist.push(this.LocationList);
|
|
|
|
this.every.wllist = [];
|
|
|
|
//将本次数量蓝清空
|
|
|
|
if (this.DNReceivingList.length == 0) {
|
|
|
|
|
|
|
|
this.DNReceivingList.push(this.every);
|
|
|
|
|
|
|
|
this.DNReceivingList[0].wllist.push(this.LocationList[this.LocationList.length - 1]);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
let isTrue: any = false;
|
|
|
|
|
|
|
|
let wllistIsTrue: any = false;
|
|
|
|
|
|
|
|
this.DNReceivingList.forEach((item: any, index: any) => {
|
|
|
|
|
|
|
|
if (item.poNo == this.every.poNo || item.poLine == this.every.poLine || item.materialCode == this.every.materialCode) {
|
|
|
|
|
|
|
|
isTrue = true;
|
|
|
|
|
|
|
|
this.DNReceivingListIndex = index;
|
|
|
|
|
|
|
|
item.wllist.forEach((item: any) => {
|
|
|
|
|
|
|
|
if (item.poNo == this.LocationList.poNo || item.poLine == this.LocationList.poLine || item.materialCode == this.LocationList.materialCode || item.wlCode == this.LocationList.wlCode || item.receiptAmount == this.LocationList.receiptAmount) {
|
|
|
|
|
|
|
|
wllistIsTrue = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
if (isTrue == false) {
|
|
|
|
|
|
|
|
this.DNReceivingList.push(this.every);
|
|
|
|
|
|
|
|
this.DNReceivingList[this.DNReceivingList.length - 1].wllist.push(this.LocationList[this.LocationList.length - 1]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isTrue == true || wllistIsTrue == true) {
|
|
|
|
|
|
|
|
uni.showToast({
|
|
|
|
|
|
|
|
icon: 'none',
|
|
|
|
|
|
|
|
title: this.$t('message.repeatedly') as any,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isTrue == true || wllistIsTrue == false) {
|
|
|
|
|
|
|
|
this.DNReceivingList[this.DNReceivingListIndex].wllist.push(this.LocationList[this.LocationList.length - 1]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
isTrue = false;
|
|
|
|
|
|
|
|
wllistIsTrue = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
this.receiptAmount = '';
|
|
|
|
this.receiptAmount = '';
|
|
|
|
//为什莫要将置为true？？？？
|
|
|
|
|
|
|
|
isTrue = true;
|
|
|
|
|
|
|
|
this.business();
|
|
|
|
this.business();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
deleteItem(indexItem: any) {
|
|
|
|
deleteItem(e: any) {
|
|
|
|
let Item: any = {};
|
|
|
|
console.log('data', e.lineData);
|
|
|
|
this.model.ImportDNReceivingList.forEach((item: any) => {
|
|
|
|
uni.showModal({
|
|
|
|
if (item.poLine == this.every.poLine || item.materialCode == this.every.materialCode || item.dnNo == this.every.dnNo) {
|
|
|
|
title: this.$t('message.delete') as any,
|
|
|
|
Item = item;
|
|
|
|
cancelText: this.$t('message.Cancel') as any,
|
|
|
|
}
|
|
|
|
confirmText: this.$t('message.workArea_Confirm') as any,
|
|
|
|
});
|
|
|
|
success: (res) => {
|
|
|
|
Item.wllist.forEach((item: any, index: any) => {
|
|
|
|
if (res.confirm) {
|
|
|
|
if (item.poLine == this.LocationList[indexItem].poLine || item.materialCode == this.LocationList[indexItem].materialCode || item.dnNo == this.LocationList[indexItem].dnNo) {
|
|
|
|
this.DNReceivingList.forEach((item: any) => {
|
|
|
|
Item.wllist.splice(index, 1);
|
|
|
|
if (item.poNo == e.lineData.poNo || item.poLine == e.lineData.poLine || item.materialCode == e.lineData.materialCode) {
|
|
|
|
}
|
|
|
|
item.wllist.forEach((item: any, index: any) => {
|
|
|
|
});
|
|
|
|
if (item.poNo == e.lineData.poNo || item.poLine == e.lineData.poLine || item.materialCode == e.lineData.materialCode || item.wlCode == e.lineData.wlCode || item.receiptAmount == e.lineData.receiptAmount) {
|
|
|
|
//splice有删除功能，第一个参数为位置，第二个参数是数量
|
|
|
|
item.wllist.splice(index, 1);
|
|
|
|
this.LocationList.splice(indexItem, 1);
|
|
|
|
}
|
|
|
|
this.business();
|
|
|
|
});
|
|
|
|
// guoshuang 删除成功提示
|
|
|
|
}
|
|
|
|
uni.showToast({
|
|
|
|
});
|
|
|
|
icon: 'none',
|
|
|
|
this.LocationList.splice(e.contentIndex, 1);
|
|
|
|
title: this.$t('message.success') as any,
|
|
|
|
} else if (res.cancel) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 重置页面数据
|
|
|
|
// 重置页面数据
|
|
|
|
@ -353,7 +342,6 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
this.LocationList = [];
|
|
|
|
this.LocationList = [];
|
|
|
|
// 仓库
|
|
|
|
// 仓库
|
|
|
|
this.Location = [];
|
|
|
|
this.Location = [];
|
|
|
|
this.newLocation = [];
|
|
|
|
|
|
|
|
this.poNo = '';
|
|
|
|
this.poNo = '';
|
|
|
|
this.poList = [];
|
|
|
|
this.poList = [];
|
|
|
|
// 清空 当前选择的库位对象
|
|
|
|
// 清空 当前选择的库位对象
|
|
|
|
@ -362,10 +350,14 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
// 清空 物料对象
|
|
|
|
// 清空 物料对象
|
|
|
|
this.every = {};
|
|
|
|
this.every = {};
|
|
|
|
|
|
|
|
// 清空 原始物料列表
|
|
|
|
|
|
|
|
// this.material = [];
|
|
|
|
// 清空 去重后的物料列表
|
|
|
|
// 清空 去重后的物料列表
|
|
|
|
this.materialList = [];
|
|
|
|
this.materialList = [];
|
|
|
|
|
|
|
|
|
|
|
|
// 清空 当前累计数量
|
|
|
|
// 清空 当前累计数量
|
|
|
|
this.receiptAmount = null;
|
|
|
|
this.receiptAmount = null;
|
|
|
|
|
|
|
|
this.DNReceivingList = [];
|
|
|
|
await this.query();
|
|
|
|
await this.query();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
async onSubmit() {
|
|
|
|
async onSubmit() {
|
|
|
|
@ -376,9 +368,12 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//此条是什么作用 提交里的入参是和后端商量好的吗？？？？
|
|
|
|
let obj = {
|
|
|
|
this.every.wllist = this.LocationList;
|
|
|
|
factoryCode: this.session.factoryCode,
|
|
|
|
await this.model.submitOrderInEnter(this.model.ImportDNReceivingList);
|
|
|
|
loginName: this.session.loginName,
|
|
|
|
|
|
|
|
list: this.DNReceivingList,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
await this.model.submitOrderInEnter(obj);
|
|
|
|
this.resetForm();
|
|
|
|
this.resetForm();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
async bill() {
|
|
|
|
async bill() {
|
|
|
|
@ -395,9 +390,9 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
dnNo: this.form.documentNo,
|
|
|
|
dnNo: this.form.documentNo,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
await this.model.querydetaildlist(content);
|
|
|
|
await this.model.querydetaildlist(content);
|
|
|
|
this.redirectTo(this.page.raw.ingoods.dnReceipt.Local);
|
|
|
|
this.toPage(this.page.raw.ingoods.dnReceipt.Local);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//添加和删除操作的时候 计算累计收货数量 调用totalLocation，totalLocation用了some方法
|
|
|
|
//添加和删除操作的时候 计算累计收货数量
|
|
|
|
business() {
|
|
|
|
business() {
|
|
|
|
this.every.receiptAmount = this.totalLocation(this.LocationList);
|
|
|
|
this.every.receiptAmount = this.totalLocation(this.LocationList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -471,11 +466,25 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
height: 100%;
|
|
|
|
height: 100%;
|
|
|
|
display: flex;
|
|
|
|
display: flex;
|
|
|
|
view {
|
|
|
|
view {
|
|
|
|
width: 200rpx;
|
|
|
|
width: 140rpx;
|
|
|
|
line-height: 100rpx;
|
|
|
|
line-height: 100rpx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// .material {
|
|
|
|
|
|
|
|
// width: 100%;
|
|
|
|
|
|
|
|
// height: 100rpx;
|
|
|
|
|
|
|
|
// display: flex;
|
|
|
|
|
|
|
|
// .material-left {
|
|
|
|
|
|
|
|
// width: 100%;
|
|
|
|
|
|
|
|
// height: 100%;
|
|
|
|
|
|
|
|
// display: flex;
|
|
|
|
|
|
|
|
// view {
|
|
|
|
|
|
|
|
// width: 100rpx;
|
|
|
|
|
|
|
|
// line-height: 100rpx;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
.material {
|
|
|
|
.material {
|
|
|
|
width: 100%;
|
|
|
|
width: 100%;
|
|
|
|
height: 100rpx;
|
|
|
|
height: 100rpx;
|
|
|
|
@ -485,15 +494,11 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
height: 100%;
|
|
|
|
height: 100%;
|
|
|
|
display: flex;
|
|
|
|
display: flex;
|
|
|
|
view {
|
|
|
|
view {
|
|
|
|
width: 100rpx;
|
|
|
|
width: 140rpx;
|
|
|
|
line-height: 100rpx;
|
|
|
|
line-height: 100rpx;
|
|
|
|
|
|
|
|
text-align: left;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.material {
|
|
|
|
|
|
|
|
width: 100%;
|
|
|
|
|
|
|
|
height: 100rpx;
|
|
|
|
|
|
|
|
display: flex;
|
|
|
|
|
|
|
|
.material-right {
|
|
|
|
.material-right {
|
|
|
|
width: 100%;
|
|
|
|
width: 100%;
|
|
|
|
height: 100%;
|
|
|
|
height: 100%;
|
|
|
|
@ -538,6 +543,7 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
.number-right-title {
|
|
|
|
.number-right-title {
|
|
|
|
width: 140rpx;
|
|
|
|
width: 140rpx;
|
|
|
|
height: 100%;
|
|
|
|
height: 100%;
|
|
|
|
|
|
|
|
text-align: center;
|
|
|
|
line-height: 100rpx;
|
|
|
|
line-height: 100rpx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.input {
|
|
|
|
.input {
|
|
|
|
|
guoshuang
3 years ago