From 76f165afb5462e1731540f761d04c621aee3cfb7 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期一, 24 三月 2025 09:11:55 +0800 Subject: [PATCH] feat:日志页面查看日志去除皮毛净 --- subPages/bill-of-lading-details/bill-of-lading-details.vue | 32 ++++++++++++--- pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue | 30 ++++++++++++-- subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 29 ++++++++++++-- 3 files changed, 74 insertions(+), 17 deletions(-) diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue index e0909a6..28d22ac 100644 --- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue +++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue @@ -519,6 +519,9 @@ name() { return uni.getStorageSync('name'); }, + roleType() { + return uni.getStorageSync('roleType'); + }, openid() { return uni.getStorageSync('openid'); }, @@ -703,6 +706,7 @@ this.$u.toast('鍔犺浇澶辫触'); } }).then(() => { + this.coalDayPage(); }) }, @@ -713,17 +717,33 @@ if (res.code == 0) { this.timeLineStatus = res.data[0].taskStatus this.timeLineEqCode = res.data[0].eqCode - this.dayRZ = res.data.map(v => { + this.dayRZ = res.data.map((v,i) => { let slicedate = v.taskStatusDes.slice(0, 10); - if (slicedate == this.currentDate) { + if(this.coalDetailsData.packingType === 1 && (this.roleType === 3 || this.roleType===1 )){ + if (slicedate == this.currentDate && !/[鐨瘺鍑�]/.test(v.taskStatusDes)) { return { ...v, taskStatusDes: v.taskStatusDes.slice(10) }; - } else { - return { ...v } + } else if( /[鐨瘺鍑�]/.test(v.taskStatusDes)){ + return null + }else{ + return {...v} } - }); + }else{ + if (slicedate == this.currentDate) { + return { + ...v, + taskStatusDes: v.taskStatusDes.slice(10) + }; + } else { + return { ...v } + } + } + + + }).filter(Boolean); + console.log(this.dayRZ,'daytRs') } }); // }, 5000); diff --git a/subPages/bill-of-lading-details/bill-of-lading-details.vue b/subPages/bill-of-lading-details/bill-of-lading-details.vue index 262d1a8..6b09211 100644 --- a/subPages/bill-of-lading-details/bill-of-lading-details.vue +++ b/subPages/bill-of-lading-details/bill-of-lading-details.vue @@ -618,6 +618,9 @@ name() { return uni.getStorageSync('name'); }, + roleType() { + return uni.getStorageSync('roleType'); + }, openid() { return uni.getStorageSync('openid'); }, @@ -838,7 +841,7 @@ } }, 1000) } - + this.coalDayPage(); }) }, // 鏃ュ織鏌ヨ @@ -848,17 +851,32 @@ if (res.code == 0) { this.timeLineStatus = res.data[0].taskStatus this.timeLineEqCode = res.data[0].eqCode - this.dayRZ = res.data.map(v => { - let slicedate = v.taskStatusDes.slice(0, 10); - if (slicedate == this.currentDate) { + this.dayRZ = res.data.map((v,i) => { + let slicedate = v.taskStatusDes.slice(0, 10); + if(this.coalDetailsData.packingType === 1 && (this.roleType == 3 || this.roleType ==1 )){ + if (slicedate == this.currentDate && !/[鐨瘺鍑�]/.test(v.taskStatusDes)) { return { ...v, taskStatusDes: v.taskStatusDes.slice(10) }; - } else { - return { ...v } + } else if( /[鐨瘺鍑�]/.test(v.taskStatusDes)){ + return null + }else{ + return {...v} } - }); + }else{ + if (slicedate == this.currentDate) { + return { + ...v, + taskStatusDes: v.taskStatusDes.slice(10) + }; + } else { + return { ...v } + } + } + + + }).filter(Boolean); } }); }, 5000); diff --git a/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue index 76ac501..35124b9 100644 --- a/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue +++ b/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue @@ -506,6 +506,9 @@ name() { return uni.getStorageSync('name'); }, + roleType() { + return uni.getStorageSync('roleType'); + }, openid() { return uni.getStorageSync('openid'); }, @@ -708,6 +711,7 @@ this.$u.toast('鍔犺浇澶辫触'); } }).then(() => { + this.coalDayPage(); }) }, @@ -718,16 +722,31 @@ this.timeLineStatus = res.data[0].taskStatus this.timeLineEqCode = res.data[0].eqCode this.dayRZ = res.data.map(v => { - let slicedate = v.taskStatusDes.slice(0, 10); - if (slicedate == this.currentDate) { + let slicedate = v.taskStatusDes.slice(0, 10); + if(this.coalDetailsData.packingType === 1 && (this.roleType == 3 || this.roleType==1 )){ + if (slicedate == this.currentDate && !/[鐨瘺鍑�]/.test(v.taskStatusDes)) { return { ...v, taskStatusDes: v.taskStatusDes.slice(10) }; - } else { - return { ...v } + } else if( /[鐨瘺鍑�]/.test(v.taskStatusDes)){ + return null + }else{ + return {...v} } - }); + }else{ + if (slicedate == this.currentDate) { + return { + ...v, + taskStatusDes: v.taskStatusDes.slice(10) + }; + } else { + return { ...v } + } + } + + + }).filter(Boolean); } }); }, -- Gitblit v1.9.1