From 61e65aef5024f07036db3ffd09465c0b6bbb0342 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 3 Jul 2024 17:56:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BB=A5=E5=8F=8A=E8=BF=9B=E5=BA=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BB=A5=E5=8F=8A=E4=BA=A4=E4=BA=92BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/compatibleLogin.vue               |   2 +-
 .../laborManage/searchTeam/detailsMod.vue     |  59 +++++++--
 .../laborManage/searchTeam/personDetail.vue   |   5 +-
 pages/standardScheduleNews/addFrom.vue        | 115 +++++++++++-------
 pages/standardScheduleNews/auditPage.vue      |   3 +-
 pages/standardScheduleNews/detail.vue         |   6 +-
 6 files changed, 134 insertions(+), 56 deletions(-)

diff --git a/pages/login/compatibleLogin.vue b/pages/login/compatibleLogin.vue
index 57e7abc3..dfc4786c 100644
--- a/pages/login/compatibleLogin.vue
+++ b/pages/login/compatibleLogin.vue
@@ -22,7 +22,7 @@
 			</u-form>
 			<view class="between">
 				<view class="link" @click="forgetPassword">忘记密码</view>
-				<view class="link" @click="goToPage">{{ type == "user" ? "用户账号注册" : "供应商账号注册" }}</view>
+				<!-- <view class="link" @click="goToPage">{{ type == "user" ? "用户账号注册" : "供应商账号注册" }}</view> -->
 			</view>
 		</view>
 		<view class="selectDept" v-else>
diff --git a/pages/projectEnd/laborManage/searchTeam/detailsMod.vue b/pages/projectEnd/laborManage/searchTeam/detailsMod.vue
index a182a3f1..3ddff4d6 100644
--- a/pages/projectEnd/laborManage/searchTeam/detailsMod.vue
+++ b/pages/projectEnd/laborManage/searchTeam/detailsMod.vue
@@ -60,6 +60,10 @@
 					<view>城乡居民医疗保险：{{item.medicalInsurance==1?'否':item.medicalInsurance==2?'是':''}}</view>
 					<view>城乡居民养老保险：{{item.endowmentInsurance==1?'否':item.endowmentInsurance==2?'是':''}}</view>
 				</view>
+				<view class="no_data" v-if="info.length == 0">
+					<image src="/static/noData.png"></image>
+					<view>暂无数据</view>
+				</view>
 			</view>
 			<view class="info_wrap" v-if="type==4">
 				<view class="title">
@@ -67,7 +71,7 @@
 					<text class="state2" v-else>已培训</text>
 				</view>
 				<view class="detailInfo" v-for="(item,index) in info" :key="index">
-					<view>培训类型： {{
+					<!-- <view>培训类型： {{
                     item.eduType == 1
                       ? "入场三级教育"
                       : item.eduType == 2
@@ -77,11 +81,11 @@
                       : item.eduType == 4
                       ? "VR安全教育"
                       : ""
-                  }}</view>
-					<view>培训主题：{{item.eduCourseName}}</view>
-					<view>培训课时：{{item.eduClasshour}}</view>
-					<view>培训得分：{{item.score}}</view>
-					<view>是否合格：{{item.isQualified == 1 ? "合格":item.isQualified == 2? "不合格":''}}</view>
+                  }}</view> -->
+					<view>培训日期：{{item.date}}</view>
+					<view>培训主题：{{item.subject}}</view>
+					<view>考试分数：{{item.score}}</view>
+					<view>是否合格：{{item.isPass == 1 ? "是":item.isPass == 0? "否":''}}</view>
 				</view>
 			</view>
 		</view>
@@ -93,15 +97,36 @@
 		data() {
 			return {
 				type: 1,
-				info: null
+				info: null,
+				workerId: ""
 			}
 		},
 		onLoad(option) {
 			this.type = Number(option.type);
+			this.workerId = option.workerId;
 			this.info = uni.getStorageSync('moduleInfo');
 			this.getFileInfo();
+			if(this.type == 4){ // 安全教育考试数据特殊处理
+				this.getExamDataList();
+			}
 		},
 		methods: {
+			// 获取考试数据
+			getExamDataList() {
+				this.sendRequest({
+					url: 'xmgl/workerInfo/getTrainRecordsByWorkerId',
+					method: 'post',
+					data: {
+						projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
+						workerId: this.workerId,
+					},
+					success: res => {
+						if(res.code == 200){
+							this.info = res.result;
+						}
+					}
+				})
+			},
 			//获取附件信息
 			getFileInfo() {
 				let data = JSON.parse(JSON.stringify(this.info))
@@ -151,6 +176,7 @@
 <style>
 	.info_wrap {
 		text-align: center;
+		padding-bottom: 2rpx;
 	}
 
 	.detailInfo {
@@ -162,7 +188,24 @@
 		font-size: 30rpx;
 		line-height: 28px;
 	}
-
+	.no_data{
+		position: fixed;
+		top: 35%;
+		// transform: translateY(-50%);
+		left: 50%;
+		transform: translateX(-50%);
+		padding-top: 60rpx;
+		text-align: center;
+		color: rgba(0,0,0,0.5);
+		font-size: 28rpx;
+		uni-image{
+			width: 162rpx;
+			height: 130rpx;
+			display: block;
+			margin: 0 auto;
+			margin-bottom: 40rpx;
+		}
+	}
 	.info_wrap .title {
 		font-size: 30rpx;
 		margin-top: 8px;
diff --git a/pages/projectEnd/laborManage/searchTeam/personDetail.vue b/pages/projectEnd/laborManage/searchTeam/personDetail.vue
index 2d03f84a..e6ee914f 100644
--- a/pages/projectEnd/laborManage/searchTeam/personDetail.vue
+++ b/pages/projectEnd/laborManage/searchTeam/personDetail.vue
@@ -574,7 +574,8 @@
 				} else if (type == 3) {
 					moduleInfo = this.insuranceList;
 				} else if (type == 4) {
-					moduleInfo = this.safeEducationList;
+					// moduleInfo = this.safeEducationList;
+					moduleInfo = [];
 				} else if (type == 5) {
 					// moduleInfo = this.safeEducationList;
 				} else if (type == 6) {
@@ -585,7 +586,7 @@
 				};
 				uni.setStorageSync('moduleInfo', moduleInfo)
 				uni.navigateTo({
-					url: "./detailsMod?type=" + type
+					url: "./detailsMod?type=" + type + "&workerId=" + this.workerId
 				})
 			},
 
diff --git a/pages/standardScheduleNews/addFrom.vue b/pages/standardScheduleNews/addFrom.vue
index 53e183b5..4030289b 100644
--- a/pages/standardScheduleNews/addFrom.vue
+++ b/pages/standardScheduleNews/addFrom.vue
@@ -31,7 +31,8 @@
 			</view>
 			<view class="b-bottom-textarea">
 				<view class="name">反馈内容</view>
-				<textarea auto-height :maxlength="-1" @input='supplementTextarea' :value="form.feedbackContent" placeholder="多行输入"></textarea>
+				<textarea auto-height :maxlength="-1" @input='supplementTextarea' :value="form.feedbackContent"
+					placeholder="多行输入"></textarea>
 			</view>
 			<view class="b-bottom" style="border-bottom: 2rpx solid #f0f0f0;">
 				<view class="name">上传图片</view>
@@ -49,20 +50,32 @@
 			<view class="delay-content" style="border-bottom: 2rpx solid #f0f0f0;">
 				<view class="name"><text class="mustStar">*</text>是否有延期误工事件</view>
 				<radio-group class="radio_box" @change="radioChange">
-					<label class="radio"><radio value="1" />是</label>
-					<label class="radio"><radio value="0" checked="true"/>否</label>
+					<label class="radio">
+						<radio value="1" />是
+					</label>
+					<label class="radio">
+						<radio value="0" checked="true" />否
+					</label>
 				</radio-group>
 			</view>
 			<view class="b-bottom-textarea" v-if="form.hasDelayEvent == 1">
 				<view class="name" style="width: 30%;"><text class="mustStar">*</text>延期误工原因</view>
-				<textarea auto-height :maxlength="-1" @input='reasonTextarea' :value="form.delayEventReason" placeholder="多行输入"></textarea>
+				<textarea auto-height :maxlength="-1" @input='reasonTextarea' :value="form.delayEventReason"
+					placeholder="多行输入"></textarea>
 			</view>
-			<view class="delay-reason-content" style="border-bottom: 2rpx solid #f0f0f0;" v-if="form.hasDelayEvent == 1">
+			<view class="delay-reason-content" style="border-bottom: 2rpx solid #f0f0f0;"
+				v-if="form.hasDelayEvent == 1">
 				<view class="name"><text class="mustStar">*</text>延期原因类型</view>
 				<checkbox-group class="check_box" @change="checkChange">
-					<label class="check"><checkbox value="1" />人为因素</label>
-					<label class="check"><checkbox value="2" />环境因素</label>
-					<label class="check"><checkbox value="3" />不可抵抗因素</label>
+					<label class="check">
+						<checkbox value="1" />人为因素
+					</label>
+					<label class="check">
+						<checkbox value="2" />环境因素
+					</label>
+					<label class="check">
+						<checkbox value="3" />不可抵抗因素
+					</label>
 				</checkbox-group>
 			</view>
 			<!-- <view class="title">
@@ -101,31 +114,31 @@
 				imgFileList: [],
 				projectSn: '',
 				materialList: [],
-				id: ''
+				itemForm: {}
 			}
 		},
 		onLoad(option) {
 			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
-			this.id = option.id
-			console.log('id有了吗', this.id);
+			this.itemForm = JSON.parse(decodeURIComponent(option.item));
+			console.log("数据itemForm",this.itemForm)
 		},
 		onShow() {
 			// this.getList()
 		},
 		methods: {
-			checkChange(e){
-				console.log(e,777)
+			checkChange(e) {
+				console.log(e, 777)
 				this.form.delayEventType = e.detail.value
 			},
-			radioChange(e){
-				console.log(e,666)
+			radioChange(e) {
+				console.log(e, 666)
 				this.form.hasDelayEvent = e.detail.value;
 			},
 			//获取材料用量列表
 			getList() {
 				let data = {
 					projectSn: this.projectSn,
-					taskProgressId: this.id,
+					taskProgressId: this.itemForm.id,
 				}
 				this.sendRequest({
 					url: 'xmgl/xzTaskProgressMaterialRel/detailList',
@@ -146,7 +159,7 @@
 			//获取任务
 			getDetail() {
 				let data = {
-					taskProgressId: this.id,
+					taskProgressId: this.itemForm.id,
 				}
 				this.sendRequest({
 					url: 'xmgl/xzTaskProgressContent/list',
@@ -162,7 +175,7 @@
 							if (res.result[0].image !== "") {
 								this.imgFileList = JSON.parse(res.result.image)
 							}
-						}else {
+						} else {
 							this.selectNowDate()
 						}
 
@@ -178,7 +191,7 @@
 				}
 			},
 			// 延期误工原因
-			reasonTextarea(e){
+			reasonTextarea(e) {
 				this.form.delayEventReason = e.detail.value
 			},
 			//反馈内容
@@ -243,37 +256,44 @@
 			},
 			//新增保存
 			addSaveBtn() {
-				console.log(this.form,111222);
+				console.log(this.form, 111222);
 				if (this.form.uploadDate == "") {
 					uni.showToast({
 						title: "请选择上报时间",
-						icon: 'error'
+						icon: 'none'
 					})
 					return
 				}
-				if(this.form.hasDelayEvent !== '0'){
-					if(!this.form.delayEventReason){
+				if (this.form.hasDelayEvent !== '0') {
+					if (!this.form.delayEventReason) {
 						uni.showToast({
 							title: "请输入延期误工原因",
-							icon: 'error'
+							icon: 'none'
 						})
 						return
 					}
-					if(this.form.delayEventType.length == 0){
+					if (this.form.delayEventType.length == 0) {
 						uni.showToast({
 							title: "请选择延期原因类型",
-							icon: 'error'
+							icon: 'none'
 						})
 						return
 					}
 				}
 				let data = JSON.parse(JSON.stringify(this.form));
 				data.projectSn = this.projectSn;
-				data.taskProgressId = String(this.id)
+				data.taskProgressId = String(this.itemForm.id)
 				data.image = JSON.stringify(this.imgFileList)
 				data.typeDataList = this.materialList
 				console.log('新增提交的数据', data);
 				data.delayEventType = this.form.delayEventType.join(',')
+				if (+this.form.progressRatio <= +this.itemForm.progressRatio) {
+					uni.showToast({
+						title: "上报进度必须大于当前进度",
+						icon: 'none'
+					})
+					return;
+				}
 				this.sendRequest({
 					url: 'xmgl/xzTaskProgressContent/add',
 					method: 'post',
@@ -369,48 +389,54 @@
 
 
 		}
-		.b-bottom-textarea{
+
+		.b-bottom-textarea {
 			border-top: 2rpx solid #f0f0f0;
 			display: flex;
 			min-height: 200rpx;
 			// line-height: 80rpx;
 			padding-top: 20rpx;
-			
+
 			.inputFrom {
 				width: 80%;
 				margin-left: 40rpx;
 			}
-			
+
 			.name {
 				width: 20%;
 			}
-			
+
 			.icon-right {
 				margin-left: 16rpx;
 				width: 16rpx;
 				height: 32rpx;
 			}
-			/deep/.uni-textarea-placeholder{
+
+			/deep/.uni-textarea-placeholder {
 				font-size: 28rpx;
 			}
 		}
-		
-		.delay-content{
+
+		.delay-content {
 			border-top: 2rpx solid #f0f0f0;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			height: 200rpx;
+
 			.name {
 				width: 50%;
 			}
-			.radio_box{
+
+			.radio_box {
 				display: flex;
+
 				.radio {
 					margin-right: 40rpx;
 					display: flex;
 					align-items: center;
 				}
+
 				// /deep/.uni-radio-input{
 				// 	width: 28rpx;
 				// 	height: 28rpx;
@@ -421,34 +447,39 @@
 				// }
 			}
 		}
-		
-		.delay-reason-content{
+
+		.delay-reason-content {
 			border-top: 2rpx solid #f0f0f0;
 			display: flex;
 			height: 200rpx;
 			padding-top: 20rpx;
+
 			.name {
 				width: 28%;
 			}
-			.check_box{
+
+			.check_box {
 				display: flex;
 				flex-direction: column;
+
 				.check {
 					margin-bottom: 20rpx;
 					display: flex;
 					align-items: center;
 				}
-				/deep/.uni-checkbox-input{
+
+				/deep/.uni-checkbox-input {
 					width: 28rpx;
 					height: 28rpx;
 					font-size: 28rpx;
 				}
-				/deep/.uni-checkbox-input-checked::before{
+
+				/deep/.uni-checkbox-input-checked::before {
 					font-size: 28rpx;
 				}
 			}
 		}
-		
+
 		.addProgess {
 			width: 50%;
 			background: #5181f6;
@@ -560,4 +591,4 @@
 	.mustStar {
 		color: red;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/standardScheduleNews/auditPage.vue b/pages/standardScheduleNews/auditPage.vue
index c871908b..871d8a8f 100644
--- a/pages/standardScheduleNews/auditPage.vue
+++ b/pages/standardScheduleNews/auditPage.vue
@@ -228,7 +228,8 @@
 				let that = this;
 				let requestData = {
 					...that.condition,
-					...that.option
+					...that.option,
+					isApprovalList: 1
 				}
 				if (this.checkedTab == 1) {
 					requestData.isAudit = 0
diff --git a/pages/standardScheduleNews/detail.vue b/pages/standardScheduleNews/detail.vue
index 162ed988..3c5f9701 100644
--- a/pages/standardScheduleNews/detail.vue
+++ b/pages/standardScheduleNews/detail.vue
@@ -156,10 +156,12 @@
 			},
 			//点击上报
 			addProgessBtn() {
+				// uni.navigateTo({
+				// 	url: './addFrom?id=' + this.itemFrom.id
+				// })
 				uni.navigateTo({
-					url: './addFrom?id=' + this.itemFrom.id
+					url: './addFrom?item=' + encodeURIComponent(JSON.stringify(this.itemFrom))
 				})
-
 			},
 			// 开始任务
 			startTask() {