From 3c738f4fe2762bba8087e5a22fc0dc06560eab0e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 08 Aug 2024 10:01:17 +0800
Subject: [PATCH] 三色任务与自查任务

---
 subPackage/workbench/views/checkReform.vue |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/subPackage/workbench/views/checkReform.vue b/subPackage/workbench/views/checkReform.vue
index 2620fa0..d7a3c09 100644
--- a/subPackage/workbench/views/checkReform.vue
+++ b/subPackage/workbench/views/checkReform.vue
@@ -53,7 +53,7 @@
 			<text v-if="info.status == 1">待审核</text>
 			<text v-if="info.status == 2">审核成功</text>
 			<text v-if="info.status == 3">审核驳回</text>
-			<text v-if="info.status == 4">待接收</text>
+			<text v-if="info.status == 4">待完成</text>
 		</view>
 		<view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.reasonFailure">
 			<text>驳回原因</text>
@@ -90,8 +90,9 @@
 							<text class="item-left">{{i.title}}</text>
 							<text>不存在</text>
 						</view> -->
-						<u-collapse ref="collapse" :value="ids" v-if="i.id == n.itemId && n.state == 0">
-							<u-collapse-item :name="n.itemId" :title="i.title" value="存在">
+						<u-collapse :value="ids" v-if="i.id == n.itemId && n.state == 0" ref="collapse">
+							<u-collapse-item :name="n.itemId" :title="i.title" value="存在" :disabled="true"
+								:clickable="false" :isLink="false">
 								<view class="mb-20" v-if="n.imageUrls">
 									<view class="f-26 mb-10 c-00">隐患照片</view>
 									<view class="flex flex-wrap">
@@ -111,8 +112,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" :fileList="n.urls"
-										:previewFullImage="uploadConfig.previewFullImage"
+									<u-upload v-if="roleType == 2 && (info.status == 4 || info.status == 3)"
+										: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)">
@@ -123,7 +124,7 @@
 									</u-upload>
 
 
-									<view class="flex flex-wrap" v-if="roleType == 1 && n.rectificationImageUrls">
+									<view class="flex flex-wrap" v-if="info.status != 4 &&  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,8 +134,9 @@
 
 								<view class="" v-if="roleType == 2 || (roleType == 1 && n.rectificationRemark)">
 									<view class="f-26 mb-10 c-00">整改后描述</view>
-									<u-textarea v-model="n.rectificationRemark" placeholder="请输入处罚说明内容"
-										placeholderClass="c-99 f-26" :disabled="roleType == 1?true:false"></u-textarea>
+									<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>
 								</view>
 							</u-collapse-item>
 						</u-collapse>
@@ -150,7 +152,7 @@
 </template>
 
 <script>
-	import uploadMixin from "@/mixin/uploadMixin";
+	import uploadMixin from "@/mixin/uploadMixinPlace";
 	import {
 		getPlaceCheckItem,
 		getPlaceCheckReformDetail,
@@ -188,11 +190,10 @@
 			await this.getItem();
 			this.getDetail(option.id);
 		},
-		onReady() {
-
-		},
 
 		methods: {
+
+
 			getDetail(id) {
 				getPlaceCheckReformDetail({
 					taskId: id
@@ -207,7 +208,7 @@
 					}
 					let ids = [];
 					for (let i of data.patrolRecordVOList) {
-						if ((data.status == 1 || data.status == 3) && this.roleType == 2) {
+						if ((data.status == 4 || data.status == 3) && this.roleType == 2) {
 							if (i.rectificationImageUrls) {
 								i.urls = this.$setImageUrl(i.rectificationImageUrls, 2);
 							} else {
@@ -220,18 +221,14 @@
 					}
 					this.ids = ids;
 					this.info = data;
-
-					this.$nextTick(() => {
-						this.$refs.collapse.init();
-					})
-
-
 				})
 			},
 
-
 			getItem() {
-				getPlaceCheckItem().then(res => {
+				getPlaceCheckItem({
+					childType: 1,
+					type: 1
+				}).then(res => {
 					if (res.code == 200) {
 						this.itemList = res.data;
 					}
@@ -290,7 +287,6 @@
 				})
 			},
 
-
 			//整改提交
 			submitInfo() {
 				uni.showLoading({
@@ -306,7 +302,9 @@
 				if (data.status == 3) {
 					data.status = 1;
 				}
-
+				if (data.status == 4) {
+					data.status = 1;
+				}
 				addPlaceCheckReform(data).then(res => {
 					uni.hideLoading()
 					if (res.code == 200) {
@@ -404,4 +402,8 @@
 	.c-00 {
 		color: #000;
 	}
+
+	/deep/ .u-collapse-item .u-collapse-item__content {
+		height: auto !important;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3