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

dam-7 feat 拣配 交接 增加展示字段 && 委外出库去掉关闭按钮 && 等等

Browse Source
master
hou 3 years ago
parent cfa5ea05cd
commit 8783bd4d08
7 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File

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

@ -95,7 +95,6 @@ import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session';
//import { VForm, VFormRules } from 'vue/types/form';
import model from './model';
@Component({
components: {
@ -133,8 +132,6 @@ export default class dnReceiptDom extends BasePage {
workArea: session.workareaCode,
};
await this.model.queryByFactoryCodeAndWorkAreaCode(content);
// 库位列表是undefined 委外入库、委外出库都是同样的问题
//guoshuang 修改 库位列表undefiend
this.model.LoctionList.forEach((item: any) => {
let pickerName: any = {};
pickerName.label = item.locationCode;
@ -233,6 +230,7 @@ export default class dnReceiptDom extends BasePage {
this.every = '';
this.materialList = [];
}
//跳转明细页面
async bill() {
if (this.form.documentNo == '') {
this.customToast(this.$t('message._tips6') as any);

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

@ -64,16 +64,16 @@
<!-- 底部按钮 -->
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="3">
<u-col :span="4">
<u-button type="primary" @click="bill">{{ $t('message.CommissionedDetails') }}</u-button>
</u-col>
<u-col :span="3">
<!-- <u-col :span="3">
<u-button type="primary" @click="close">{{ $t('message.Closed') }}</u-button>
</u-col>
<u-col :span="3">
</u-col> -->
<u-col :span="4">
<u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
</u-col>
<u-col :span="3">
<u-col :span="4">
<u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
</u-col>
</u-row>

31
src/pages/raw/handover/aggregating/config.ts
Unescape Escape View File

@ -28,6 +28,15 @@ export const headers = [
key: 'requireDate', //生产日期
width: 300,
},
{
label: vm.$t('message.product_FGCode'),
key: 'prodCode', //成品编码
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'prodDesc', //成品型号
width: 300,
},
];
/**
@ -81,6 +90,15 @@ export const resultHeaders = [
label: vm.$t('message.po_Location'),
key: 'wkposCode',
},
{
label: vm.$t('message.product_FGCode'),
key: 'prodCode', //成品编码
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'prodDesc', //成品型号
width: 300,
},
];
/**
@ -187,12 +205,17 @@ export const orderHeaders = [
label: vm.$t('message.Pi_OrderNo'),
key: 'prdOrder',
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'proType',
},
{
label: vm.$t('message.po_Location'),
key: 'wkposCode',
},
{
label: vm.$t('message.product_FGCode'),
key: 'prodCode', //成品编码
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'prodDesc', //成品型号
width: 300,
},
];

24
src/pages/raw/handover/feeding/Location.vue
Unescape Escape View File

@ -302,26 +302,14 @@ export default class RawReceiptDetail extends BasePage {
}
Add() {
if (this.qty == '' || this.wlCode == '') {
// uni.showToast({
// icon: 'none',
// title: this.$t('message.AppendMateriel1') as string,
// });
this.customToast(this.$t('message.AppendMateriel1') as string);
return;
}
if (parseFloat(this.qty) <= 0) {
// uni.showToast({
// icon: 'none',
// title: this.$t('message.AppendMateriel2') as string,
// });
this.customToast(this.$t('message.AppendMateriel2') as string);
return;
}
if (parseFloat(this.qty) > model.blDetailList[this.someIndex].amount) {
// uni.showToast({
// icon: 'none',
// title: this.$t('message.AppendMateriel3') as string,
// });
this.customToast(this.$t('message.AppendMateriel3') as string);
return;
}
@ -330,10 +318,6 @@ export default class RawReceiptDetail extends BasePage {
num += parseFloat(item.qty);
});
if (num > this.model.blDetailList[this.someIndex].amount) {
// uni.showToast({
// icon: 'none',
// title: this.$t('message.AppendMateriel3') as string,
// });
this.customToast(this.$t('message.AppendMateriel3') as string);
return;
}
@ -341,20 +325,12 @@ export default class RawReceiptDetail extends BasePage {
if (this.LocationList.length != 0) {
this.model.blDetailList[this.someIndex].wlList.forEach((item: any) => {
if (this.wlCode.sendSpot != item.Code) {
// uni.showToast({
// icon: 'none',
// title: this.$t('message.AppendMateriel4') as string,
// });
this.customToast(this.$t('message.AppendMateriel4') as string);
return (isTrue = false);
}
});
}
if (this.some == {}) {
// uni.showToast({
// icon: 'none',
// title: this.$t('message.AppendMateriel5') as string,
// });
this.customToast(this.$t('message.AppendMateriel5') as string);
return;
}

37
src/pages/raw/handover/picking/config.ts
Unescape Escape View File

@ -28,6 +28,15 @@ export const headers = [
key: 'requireDate', //生产日期
width: 300,
},
{
label: vm.$t('message.product_FGCode'),
key: 'prodCode', //成品编码
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'prodDesc', //成品型号
width: 300,
},
];
/**
@ -77,15 +86,24 @@ export const resultHeaders = [
label: vm.$t('message.Pi_OrderNo'),
key: 'prdOrder',
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'prdMaterialDesc',
width: 300,
},
// {
// label: vm.$t('message.Pi_FinishedProductModel'),
// key: 'prdMaterialDesc',
// width: 300,
// },
{
label: vm.$t('message.po_Location'),
key: 'wkposCode',
},
{
label: vm.$t('message.product_FGCode'),
key: 'prodCode', //成品编码
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'prodDesc', //成品型号
width: 300,
},
];
/**
@ -210,6 +228,15 @@ export const orderHeaders = [
label: vm.$t('message.Pi_OrderNo'),
key: 'prdOrder',
},
{
label: vm.$t('message.product_FGCode'),
key: 'prodCode', //成品编码
},
{
label: vm.$t('message.Pi_FinishedProductModel'),
key: 'prodDesc', //成品型号
width: 300,
},
];
export const Headers = [

2
src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
Unescape Escape View File

@ -245,6 +245,7 @@ export default class dnReceiptDom extends BasePage {
this.poNo = e.pickerName.value;
// 过滤重复物料
this.materialList = JSON.parse(JSON.stringify(this.removeDuplicates(this.material, 'materialCode')));
console.log('this.materialList??>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', this.materialList);
// 返回物料中poNo为选中的项；
this.materialList = this.materialList.filter((item: any) => {
if (item.poNo == e.pickerName.value) {
@ -253,6 +254,7 @@ export default class dnReceiptDom extends BasePage {
return true;
}
});
console.log('this.materialList', this.materialList);
// 自动化流程改造测试
this.materialChoice({
pickerName: this.materialList.find(() => true),

8
src/pages/raw/ingoods/dnReturnGoods/Location.vue
Unescape Escape View File

@ -173,6 +173,7 @@ export default class RawReceiptDetail extends BasePage {
await this.GetLocation();
this.wlCode = this.Location[0];
}
//获取库位
async GetLocation() {
let content = {
loginName: session.loginName,
@ -189,9 +190,11 @@ export default class RawReceiptDetail extends BasePage {
});
this.wlCode = this.Location[0];
}
//返回
onUpload() {
uni.navigateBack({ delta: 1 });
}
//单号查询
async query() {
if (!this.form.documentNo) {
this.customToast(this.$t('message.Commission_tips1') as any);
@ -210,10 +213,12 @@ export default class RawReceiptDetail extends BasePage {
});
this.wl = this.materialList[0];
this.some = this.model.dnReturnList[0];
this.qty = this.model.dnReturnList[0].poAmount;
console.log('this.some', this.some);
}
});
}
//选择物料
materialChoice(e: any) {
console.log('e', e);
this.model.dnReturnList.forEach((item: any, index: any) => {
@ -222,6 +227,7 @@ export default class RawReceiptDetail extends BasePage {
this.someIndex = index;
}
});
this.qty = this.some.poAmount;
console.log('this.some', this.some);
console.log('this.someIndex', this.someIndex);
}
@ -288,9 +294,11 @@ export default class RawReceiptDetail extends BasePage {
},
});
}
//查询明细
appoint() {
this.toPage(this.page.raw.ingoods.dnReturnGoods.Local);
}
//提交
async onSubmit() {
let isTrue = true;
// this.model.dnReturnList.forEach((item: any) => {

Write Preview
Loading…
Cancel
Save