From 8783bd4d08ee7d871b82344f4cd821f0c51d850e Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Mon, 21 Mar 2022 16:48:09 +0800 Subject: [PATCH] =?UTF-8?q?dam-7=20feat=20=E6=8B=A3=E9=85=8D=20=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=20=E5=A2=9E=E5=8A=A0=E5=B1=95=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20&&=20=E5=A7=94=E5=A4=96=E5=87=BA=E5=BA=93=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=20&&=20=E7=AD=89?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/commission/entrant/index.vue | 4 +- src/pages/raw/commission/goOut/index.vue | 10 ++--- src/pages/raw/handover/aggregating/config.ts | 31 ++++++++++++++-- src/pages/raw/handover/feeding/Location.vue | 24 ------------ src/pages/raw/handover/picking/config.ts | 37 ++++++++++++++++--- .../raw/ingoods/dnReceipt/dnReceiving.vue | 2 + .../raw/ingoods/dnReturnGoods/Location.vue | 8 ++++ 7 files changed, 75 insertions(+), 41 deletions(-) diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue index b59d702..ad87239 100644 --- a/src/pages/raw/commission/entrant/index.vue +++ b/src/pages/raw/commission/entrant/index.vue @@ -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); diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index db60804..f7b6864 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -64,16 +64,16 @@ - + {{ $t('message.CommissionedDetails') }} - + + {{ $t('message.product_Upload') }} - + {{ $t('message.po_Return') }} diff --git a/src/pages/raw/handover/aggregating/config.ts b/src/pages/raw/handover/aggregating/config.ts index 837f72e..266d77a 100644 --- a/src/pages/raw/handover/aggregating/config.ts +++ b/src/pages/raw/handover/aggregating/config.ts @@ -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, + }, ]; diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue index beab675..61f6317 100644 --- a/src/pages/raw/handover/feeding/Location.vue +++ b/src/pages/raw/handover/feeding/Location.vue @@ -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; } diff --git a/src/pages/raw/handover/picking/config.ts b/src/pages/raw/handover/picking/config.ts index aeb81c0..28ea9cf 100644 --- a/src/pages/raw/handover/picking/config.ts +++ b/src/pages/raw/handover/picking/config.ts @@ -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 = [ diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue index 3e695ad..f60a0f5 100644 --- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue +++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue @@ -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), diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue index cb012d1..9733f2d 100644 --- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue +++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue @@ -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) => {