From d81a0cb54e874d00ee4266a7693889118a98ab09 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Thu, 21 Nov 2024 13:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E7=99=BB=E8=AE=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 2 +- src/pages/wms/Raw/ArrivalRecord/index.vue | 186 +++++++++++++----- .../wms/product/BatchOfflineStorage/index.vue | 1 + src/pages/wms/product/SaleOutWH/index.vue | 1 + .../wms/product/SpecialDelivery/index.vue | 1 + 5 files changed, 139 insertions(+), 52 deletions(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 70c3810..f312bf7 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.142'; //正式版本号 + version = '0.0.143'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/Raw/ArrivalRecord/index.vue b/src/pages/wms/Raw/ArrivalRecord/index.vue index 11619ac..3d45a02 100644 --- a/src/pages/wms/Raw/ArrivalRecord/index.vue +++ b/src/pages/wms/Raw/ArrivalRecord/index.vue @@ -12,7 +12,7 @@ - {{ startdate }} + {{ startdate }} 至 @@ -20,14 +20,18 @@ - + - - - - + + + + + + + + @@ -62,7 +66,6 @@ 时间: {{ item.lastUpdateDate }} - @@ -87,15 +90,13 @@ import { Component } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import { session } from '@/store/modules/session'; +import jPicker from '@/components/J-Picker/jPicker.vue'; import model from './model'; import dayjs from 'dayjs'; -interface OptionType { - label: string; - value: string; -} //import { session } from '@/store/modules/session'; @Component({ components: { + jPicker, //MxDatePicker }, }) @@ -106,48 +107,135 @@ export default class ArrivalRecord extends BasePage { enddate = dayjs().format('YYYY-MM-DD'); procureCode = ''; materialCode = ''; - receivedlist= []; + receivedlist = []; border = true; - async onReady() {} + aimWl: any = {}; + bimWl: any = {}; + matlist = []; + prodlist = []; startchange(e) { this.startdate = e.detail.value; + this.materialCode = ''; + this.procureCode = ''; + this.aimWl = {}; + this.bimWl = {}; } endchange(e) { this.enddate = e.detail.value; + this.materialCode = ''; + this.procureCode = ''; + this.aimWl = {}; + this.bimWl = {}; + } + selectMattCodeType(e) { + this.materialCode = e.pickerName.value; + this.aimWl = e.pickerName; + this.bimWl = {}; + this, (this.procureCode = ''); + this.onSubmit(); + } + selectProductCodeType(e) { + this.procureCode = e.pickerName.value; + this.bimWl = e.pickerName; + this.onSubmit(); } async onSubmit() { - if (this.procureCode == '' || this.procureCode.length == 0) { - (this.$refs.uToast as any).show({ - title: '请输入采购单号', - type: 'default', - }); - return; - } + // if (this.procureCode == '' || this.procureCode.length == 0) { + // (this.$refs.uToast as any).show({ + // title: '请输入采购单号', + // type: 'default', + // }); + // return; + // } let params = { - factoryCode:session.FactoryCode, - ...(this.materialCode!==''&&{materialCode:this.materialCode}) , - procureCode:this.procureCode, + factoryCode: session.FactoryCode, + ...(this.materialCode !== '' && { materialCode: this.materialCode }), + ...(this.procureCode !== '' && { procureCode: this.procureCode }), + // procureCode:this.procureCode, ...(this.startdate !== '请选择' && { lastUpdateDateMIN: this.startdate }), - ...(this.enddate !== '请选择' && { lastUpdateDateMAX: this.enddate }) - } + ...(this.enddate !== '请选择' && { lastUpdateDateMAX: this.enddate }), + }; await this.model.getArrivalRecord(params); - if(this.model.responseCode == '200'){ - this.receivedlist - let showlist = model.responseData; - this.receivedlist = showlist.map(item=>{ - let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); - return { - ...item, - materialCode:newmaterialCode - } - }) - + if (this.model.responseCode == '200') { + let showlist = model.responseData; + + if (this.materialCode == '' && this.procureCode == '') { + this.receivedlist = showlist.map((item) => { + let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); + return { + ...item, + materialCode: newmaterialCode, + }; + }); + + let uniqueMaterialCodes = {}; // 用于跟踪唯一的materialCode + + this.matlist = showlist + .filter((item) => { + // 检查newmaterialCode是否已经在uniqueMaterialCodes中 + if (!uniqueMaterialCodes[item.materialCode]) { + // 如果不在，将其添加到uniqueMaterialCodes中，并返回true以保留在filter结果中 + uniqueMaterialCodes[item.materialCode] = true; + return true; + } + // 如果已经在uniqueMaterialCodes中，返回false以从filter结果中排除 + return false; + }) + .map((item) => { + // 对于filter后保留的项，进行映射操作 + // let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); + return { + ...item, + value: item.materialCode, + label: item.materialDesc, + }; + }); + } + if (this.materialCode != '' && this.procureCode == '') { + this.receivedlist = showlist.map((item) => { + let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); + return { + ...item, + materialCode: newmaterialCode, + }; + }); + let uniqueprocureCode = {}; // 用于跟踪唯一的materialCode + this.prodlist = showlist + .filter((item) => { + if (!uniqueprocureCode[item.procureCode]) { + uniqueprocureCode[item.procureCode] = true; + return true; + } + return false; + }) + .map((item) => { + return { + ...item, + value: item.procureCode, + label: item.procureCode, + }; + }); + } + if (this.materialCode != '' && this.procureCode != '') { + this.receivedlist = showlist.map((item) => { + let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); + return { + ...item, + materialCode: newmaterialCode, + }; + }); + } } } mepty() { - this.startdate = '请选择'; - this.enddate = '请选择'; + this.startdate = '请选择'; + this.enddate = '请选择'; + this.materialCode = ''; + this.procureCode = ''; + this.aimWl = {}; + this.bimWl = {}; + this.receivedlist = []; //this.startdateValue = dayjs().format('YYYY-MM-DD'); //this.model.mepty(); } @@ -262,7 +350,7 @@ body { height: 780rpx; position: absolute; width: 92%; - top:444rpx; + top: 444rpx; /* bottom: 40px; */ overflow: auto; // background-color: #f2f2f2; @@ -275,21 +363,18 @@ body { .list { // display: flex; // flex-direction: cloumn; - - .row-list { + + .row-list { + display: flex; + flex-direction: row; + justify-content: space-between; + .list-item { display: flex; flex-direction: row; justify-content: space-between; - .list-item{ - display: flex; - flex-direction: row; - justify-content: space-between; - width: 40%; - } - + width: 40%; } - - + } } } } @@ -307,6 +392,5 @@ body { .button-bar { } - } diff --git a/src/pages/wms/product/BatchOfflineStorage/index.vue b/src/pages/wms/product/BatchOfflineStorage/index.vue index dded73c..453c70a 100644 --- a/src/pages/wms/product/BatchOfflineStorage/index.vue +++ b/src/pages/wms/product/BatchOfflineStorage/index.vue @@ -190,6 +190,7 @@ export default class BatchOfflineStorage extends BasePage { title: '请勿重复扫描标志卡', // url: '/pages/user/index' }); + this.orderNo = ''; return; } else { this.list.push(this.orderNoItemList); diff --git a/src/pages/wms/product/SaleOutWH/index.vue b/src/pages/wms/product/SaleOutWH/index.vue index 9f1a445..07ea334 100644 --- a/src/pages/wms/product/SaleOutWH/index.vue +++ b/src/pages/wms/product/SaleOutWH/index.vue @@ -362,6 +362,7 @@ export default class SaleOutWH extends BasePage { title: '请勿重复扫描标志卡', // url: '/pages/user/index' }); + this.boxnumber = ''; return; } else { (this.$refs.uToast as any).show({ diff --git a/src/pages/wms/product/SpecialDelivery/index.vue b/src/pages/wms/product/SpecialDelivery/index.vue index 4248564..894f4aa 100644 --- a/src/pages/wms/product/SpecialDelivery/index.vue +++ b/src/pages/wms/product/SpecialDelivery/index.vue @@ -366,6 +366,7 @@ export default class SpecialDelivery extends BasePage { title: '请勿重复扫描标志卡', // url: '/pages/user/index' }); + this.boxnumber = ''; return; } else { (this.$refs.uToast as any).show({