From a8fadef1223bfc73f03c6a05f493a65c08c6addd Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 25 Apr 2024 17:46:47 +0800
Subject: [PATCH] 更新

---
 subPackage/school/securityDetail.vue |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/subPackage/school/securityDetail.vue b/subPackage/school/securityDetail.vue
index 41d2bcb..e357cf4 100644
--- a/subPackage/school/securityDetail.vue
+++ b/subPackage/school/securityDetail.vue
@@ -109,8 +109,8 @@
 
 								<view class="mb-20" v-if="roleType == 2 || (roleType == 1 && n.rectificationImageUrls)">
 									<view class="f-26 mb-10 c-00">整改后照片</view>
-									<u-upload v-if="roleType == 2 && (info.status == 4 || info.status == 3)"
-										:fileList="n.urls" :previewFullImage="uploadConfig.previewFullImage"
+									<u-upload v-if="roleType == 2 && info.rectificationFlag == 1" :fileList="n.urls"
+										:previewFullImage="uploadConfig.previewFullImage"
 										:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
 										:maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
 										@afterRead="afterReadImgs($event,n,m)" @delete="deleteImages($event,m)">
@@ -121,7 +121,7 @@
 									</u-upload>
 
 
-									<view class="flex flex-wrap" v-if="info.status != 4 &&  n.rectificationImageUrls ">
+									<view class="flex flex-wrap" v-if="info.status < 3 &&  n.rectificationImageUrls ">
 										<view class="mr-20" v-for="r in ($setImageUrl(n.rectificationImageUrls))">
 											<u-image :src="r" width="140rpx" height="140rpx"
 												@click="previewImage($setImageUrl(n.rectificationImageUrls),i)"></u-image>
@@ -133,7 +133,7 @@
 									<view class="f-26 mb-10 c-00">整改后描述</view>
 									<u-textarea v-model="n.rectificationRemark" placeholder="请输入整改后描述"
 										placeholderClass="c-99 f-26"
-										:disabled="roleType == 2 && (info.status == 4 || info.status == 3)?false:true"></u-textarea>
+										:disabled="roleType == 2 && info.rectificationFlag == 1?false:true"></u-textarea>
 								</view>
 							</u-collapse-item>
 						</u-collapse>
@@ -144,9 +144,10 @@
 
 		<view class="blank"></view>
 		<!-- <footer-btn @click="submitInfo" v-if="roleType == 2 && (info.status == 4 || info.status == 3)"/> -->
-		<block v-if="info.rectificationFlag == 2">
-			<audit-action v-if="roleType == 1 && info.status == 1" @handle="submitAudit" />
-		</block>
+		<!-- <block v-if="info.rectificationFlag == 2">
+			
+		</block> -->
+		<audit-action v-if="roleType == 1 && info.status == 1 && info.rectificationFlag != 3" @handle="submitAudit" />
 		<block v-if="info.rectificationFlag == 1">
 			<footer-btn v-if="roleType == 2 &&( info.status == 3  || info.status == 1)" text="提交"
 				@click="submitInfo()" />
@@ -188,6 +189,7 @@
 			}
 		},
 		async onLoad(option) {
+			console.log("===>", option)
 			let {
 				roleName,
 				roleAlias
@@ -232,13 +234,15 @@
 					}
 					let ids = [];
 					for (let i of data.taskPlaceRecordVOList) {
-						if ((data.status == 4 || data.status == 3) && this.roleType == 2) {
+						if (((data.status == 4 || data.status == 3) && this.roleType == 2) || (data
+								.rectificationFlag == 1 && this.roleType == 2)) {
 							if (i.rectificationImageUrls) {
 								i.urls = this.$setImageUrl(i.rectificationImageUrls, 2);
 							} else {
 								i.urls = [];
 							}
 						}
+
 						if (i.state == 0) {
 							ids.push(i.itemId)
 						}
@@ -249,13 +253,13 @@
 			},
 
 			getItem() {
-				let data = {
+				getPlaceCheckItem({
 					childType: 9,
 					type: 3
-				}
-				getPlaceCheckItem(data).then(res => {
+				}).then(res => {
 					if (res.code == 200) {
 						this.itemList = res.data;
+
 					}
 				})
 			},
@@ -322,6 +326,7 @@
 					if (i.urls) {
 						i.rectificationImageUrls = this.setImages(i.urls)
 					}
+					i.type = 3;
 					delete i.urls;
 				}
 				if (data.status == 3) {
@@ -330,6 +335,7 @@
 				if (data.status == 4) {
 					data.status = 1;
 				}
+				data.rectificationFlag = 2;
 				auditPlaceCheck(this.info).then(res => {
 					uni.hideLoading();
 					this.$showTips("操作成功", "success");

--
Gitblit v1.9.3