From 2d95e769f7dcdc30e2ba699d6674820787b5e5fb Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 03 Feb 2024 11:05:31 +0800
Subject: [PATCH] 更新

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

diff --git a/subPackage/workbench/views/checkReform.vue b/subPackage/workbench/views/checkReform.vue
index b662a6d..2620fa0 100644
--- a/subPackage/workbench/views/checkReform.vue
+++ b/subPackage/workbench/views/checkReform.vue
@@ -28,11 +28,6 @@
 			<text>地址</text>
 			<text class="item-content">{{info.location}}</text>
 		</view>
-
-		<view class="item-row flex j-c-s-b a-i-c" v-if="info.remark">
-			<text>其它隐患问题</text>
-			<text class="item-content">{{info.remark}}</text>
-		</view>
 		<view class="item-row flex j-c-s-b a-i-c" v-if="info.rectificationNoticeFlag == 2">
 			<text>下发整改通知</text>
 			<text class="item-content">是</text>
@@ -53,6 +48,17 @@
 			<text>其它隐患问题</text>
 			<text class="item-content">{{info.remark}}</text>
 		</view>
+		<view class="item-row flex j-c-s-b a-i-c">
+			<text>状态</text>
+			<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>
+		</view>
+		<view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.reasonFailure">
+			<text>驳回原因</text>
+			<text class="item-content">{{info.reasonFailure}}</text>
+		</view>
 
 		<view class="image-wrap bgc-ff" v-if="images.length">
 			<view class="mb-20">
@@ -63,7 +69,6 @@
 					<u-image :src="i" width="100rpx" height="100rpx"></u-image>
 				</view>
 			</view>
-
 		</view>
 
 		<view class="image-wrap bgc-ff" v-if="signatureUrl.length">
@@ -75,27 +80,18 @@
 			</view>
 		</view>
 
-		<view class="item-row flex j-c-s-b a-i-c">
-			<text>状态</text>
-			<text v-if="info.status == 1">待审核</text>
-			<text v-if="info.status == 2">审核成功</text>
-			<text v-if="info.status == 3">审核驳回</text>
-		</view>
-		<view class="item-row flex j-c-s-b a-i-c" v-if="info.status == 3 && info.reasonFailure">
-			<text>驳回原因</text>
-			<text class="item-content">{{info.reasonFailure}}</text>
-		</view>
+
 
 		<view class="mt-20 bgc-ff">
 			<block v-for="(item,index) in itemList">
 				<block v-for="(i,k) in item.children">
 					<block v-for="(n,m) in info.patrolRecordVOList">
-						<view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 1">
+						<!-- <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 1">
 							<text class="item-left">{{i.title}}</text>
 							<text>不存在</text>
-						</view>
-						<u-collapse ref="collapse" v-if="i.id == n.itemId && n.state == 0">
-							<u-collapse-item :name="index" :title="i.title" value="存在">
+						</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="存在">
 								<view class="mb-20" v-if="n.imageUrls">
 									<view class="f-26 mb-10 c-00">隐患照片</view>
 									<view class="flex flex-wrap">
@@ -148,7 +144,7 @@
 		</view>
 
 		<view class="blank"></view>
-		<footer-btn @click="submitInfo" v-if="roleType == 2 && (info.status == 1 || info.status == 3)" />
+		<footer-btn @click="submitInfo" v-if="roleType == 2 && (info.status == 4 || info.status == 3)" />
 		<audit-action v-if="roleType == 1 && info.status == 1" @handle="submitAudit" />
 	</view>
 </template>
@@ -174,7 +170,8 @@
 				signatureUrl: [],
 				label: "",
 				itemList: [],
-				roleType: '' //1.民警/系统管理员   2.场所负责人
+				roleType: '', //1.民警/系统管理员   2.场所负责人
+				ids: []
 			}
 		},
 		async onLoad(option) {
@@ -191,6 +188,10 @@
 			await this.getItem();
 			this.getDetail(option.id);
 		},
+		onReady() {
+
+		},
+
 		methods: {
 			getDetail(id) {
 				getPlaceCheckReformDetail({
@@ -204,6 +205,7 @@
 						this.label = res.data.placePoiLabelVOList[res.data.placePoiLabelVOList.length - 1]
 							.labelName;
 					}
+					let ids = [];
 					for (let i of data.patrolRecordVOList) {
 						if ((data.status == 1 || data.status == 3) && this.roleType == 2) {
 							if (i.rectificationImageUrls) {
@@ -212,8 +214,18 @@
 								i.urls = [];
 							}
 						}
+						if (i.state == 0) {
+							ids.push(i.itemId)
+						}
 					}
+					this.ids = ids;
 					this.info = data;
+
+					this.$nextTick(() => {
+						this.$refs.collapse.init();
+					})
+
+
 				})
 			},
 
@@ -320,7 +332,7 @@
 				}).then(res => {
 					uni.hideLoading()
 					if (res.code == 200) {
-						this.$showTips("操作成功");
+						this.$showTips("操作成功", "success");
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 300)

--
Gitblit v1.9.3