~fyy/unattended-app.git

parent: 910bd93d | 补丁 | 提交 | show whitespace

yangan

2025-03-24 76f165afb5462e1731540f761d04c621aee3cfb7

feat:日志页面查看日志去除皮毛净

3个文件已修改

	pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	subPages/bill-of-lading-details/bill-of-lading-details.vue	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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,8 +717,20 @@
                        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(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 if( /[皮毛净]/.test(v.taskStatusDes)){
                                    return null
                                }else{
                                    return {...v}
                                }
                                }else{
                                if (slicedate == this.currentDate) {
                                    return {
                                        ...v,
@@ -723,7 +739,11 @@
                                } else {
                                    return { ...v }
                                }
                            });
                                }
							
							
                            }).filter(Boolean);
                            console.log(this.dayRZ,'daytRs')
                        }
                    });
                // }, 5000);

 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,8 +851,20 @@
                        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(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 if( /[皮毛净]/.test(v.taskStatusDes)){
                                    return null
                                }else{
                                    return {...v}
                                }
                                }else{
                                if (slicedate == this.currentDate) {
                                    return {
                                        ...v,
@@ -858,7 +873,10 @@
                                } else {
                                    return { ...v }
                                }
                            });
                                }
							
							
                            }).filter(Boolean);
                        }
                    });
                }, 5000);

 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();
                    
                })
            },
@@ -719,6 +723,18 @@
                            this.timeLineEqCode = res.data[0].eqCode
                            this.dayRZ = res.data.map(v => {
                                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 if( /[皮毛净]/.test(v.taskStatusDes)){
                                    return null
                                }else{
                                    return {...v}
                                }
                                }else{
                                if (slicedate == this.currentDate) {
                                    return {
                                        ...v,
@@ -727,7 +743,10 @@
                                } else {
                                    return { ...v }
                                }
                            });
                                }
							
							
                            }).filter(Boolean);
                        }
                    });
            },

			@@ -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,8 +717,20 @@
			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(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 if( /[皮毛净]/.test(v.taskStatusDes)){
			return null
			}else{
			return {...v}
			}
			}else{
			if (slicedate == this.currentDate) {
			return {
			...v,
			@@ -723,7 +739,11 @@
			} else {
			return { ...v }
			}
			});
			}


			}).filter(Boolean);
			console.log(this.dayRZ,'daytRs')
			}
			});
			// }, 5000);

			@@ -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,8 +851,20 @@
			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(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 if( /[皮毛净]/.test(v.taskStatusDes)){
			return null
			}else{
			return {...v}
			}
			}else{
			if (slicedate == this.currentDate) {
			return {
			...v,
			@@ -858,7 +873,10 @@
			} else {
			return { ...v }
			}
			});
			}


			}).filter(Boolean);
			}
			});
			}, 5000);

			@@ -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();

			})
			},
			@@ -719,6 +723,18 @@
			this.timeLineEqCode = res.data[0].eqCode
			this.dayRZ = res.data.map(v => {
			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 if( /[皮毛净]/.test(v.taskStatusDes)){
			return null
			}else{
			return {...v}
			}
			}else{
			if (slicedate == this.currentDate) {
			return {
			...v,
			@@ -727,7 +743,10 @@
			} else {
			return { ...v }
			}
			});
			}


			}).filter(Boolean);
			}
			});
			},