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/audit.vue |  125 ++++++++++++++++++++++++++++++-----------
 1 files changed, 90 insertions(+), 35 deletions(-)

diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index 1100f49..7d3cc42 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -11,7 +11,7 @@
 							<text class="f-28">时间筛选</text>
 							<u-icon name="arrow-down"></u-icon>
 						</view>
-						<u-search placeholder="请输入需要查询信息的名称" v-model="keyWord" :clearabled="true" :showAction="true"
+						<u-search placeholder="请输入需要查询信息的名称" v-model="keyword" :clearabled="true" :showAction="true"
 							:animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>
 					</view>
 				</view>
@@ -20,10 +20,13 @@
 
 		<view class="list">
 			<view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k"
-				@click="navTo(i.id,i.reportType,i.status)">
+				@click="navTo(i.id,i.reportType,i.status,i.type)">
 				<view class="item-title flex a-i-c j-c-s-b mb-20">
-					<text class="f-32 fw">{{i.name}}</text>
-					<u-tag v-if="i.status == 4" text="待接收" type="warning" plain plainFill></u-tag>
+					<text class="f-32 fw" v-if="i.reportType == 4">{{i.placeName}}</text>
+					<text class="f-32 fw" v-else>{{i.name}}</text>
+					<u-tag v-if="i.color" :bgColor='i.color' :borderColor='i.color' color="#191919"
+						:text="i.categoryName"></u-tag>
+					<u-tag v-if="i.status == 4" text="待完成" type="warning" plain plainFill></u-tag>
 					<u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
 					<u-tag v-if="i.status == 2" text="审核通过" type="success" plain plainFill></u-tag>
 					<u-tag v-if="i.status == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
@@ -63,7 +66,7 @@
 						status: "",
 					},
 					{
-						name: "待接收",
+						name: "待完成",
 						status: 4,
 					},
 					{
@@ -96,38 +99,61 @@
 			console.log(option);
 			if (option.reportType) {
 				this.reportType = option.reportType;
-				uni.setNavigationBarTitle({
-					title: "取保候审"
-				})
+				if (option.from == "task") {
+					this.tabIndex = 2;
+					this.currentStatus = 1;
+				}
+				if (option.reportType == 1) {
+					uni.setNavigationBarTitle({
+						title: "取保监居"
+					})
+				} else if (option.reportType == 7) {
+					uni.setNavigationBarTitle({
+						title: "消防自查"
+					})
+				} else if (option.reportType == 4) {
+					uni.setNavigationBarTitle({
+						title: "校园安全检查"
+					})
+				} else if (option.reportType == 5) {
+					uni.setNavigationBarTitle({
+						title: "二手交易"
+					})
+					// 去掉已完成状态
+					this.tabList.splice(1, 1);
+					this.tabIndex = 1;
+				}
 			}
+
 			if (option.from == "index") {
 				uni.setNavigationBarTitle({
 					title: "场所任务"
 				})
 			}
-			if (option.from == "task") {
-				this.tabIndex = 1;
-				this.currentStatus = 1;
-			}
+
 			if (option.code) {
 				this.houseCode = option.code;
 			}
+			// this.getList()
+		},
+
+		onShow() {
+			this.resetParams();
 			this.getList()
 		},
+
 		onReachBottom() {
 			this.currentPage++
 			this.getList()
 		},
 
 		methods: {
-
-
 			searchConfirm() {
 				this.resetParams()
 				this.getList()
 			},
 			clearConfirm() {
-				this.keyWord = ''
+				this.keyword = ''
 				this.searchConfirm()
 			},
 			changeTab(e) {
@@ -150,7 +176,7 @@
 					})
 				})
 				let params = {
-					page: this.currentPage,
+					current: this.currentPage,
 					size: 20,
 					status: this.currentStatus,
 					frequency: this.frequency
@@ -186,39 +212,68 @@
 					this.loadingStatus = 'nomore'
 				})
 			},
-			navTo(id, type, status) {
+			navTo(id, reportType, status, type) {
 				if (status == 4) {
-					if (uni.getStorageSync("activeRole").roleName == "民警") {
-						this.navToDetail(type, id)
+					if (reportType == 8) {
+						this.navToDetail(reportType, id, type)
 					} else {
-						this.navToEdit(type, id);
+						if (uni.getStorageSync("activeRole").roleName == "民警") {
+							this.navToDetail(reportType, id, type)
+						} else {
+							this.navToEdit(reportType, id, type);
+						}
 					}
 				} else {
-					this.navToDetail(type, id)
+					this.navToDetail(reportType, id, type)
 				}
 			},
 
-			navToEdit(type, id) {
-				if (type == 1) {
+			navToEdit(reportType, id, type) {
+				// if (reportType == 1) {
+				// 	this.$u.func.globalNavigator(`/subPackage/label/bail?id=${id}`)
+				// } else if (reportType == 2 || type == 7) {
+				// 	this.$u.func.globalNavigator(`/subPackage/label/hotel?id=${id}`)
+				// } else if (reportType == 3 || reportType == 4 || reportType == 5) {
+				// 	this.$u.func.globalNavigator(`/subPackage/label/form?id=${id}`)
+				// } else if (reportType == 6) {
+				// 	this.$u.func.globalNavigator(`/subPackage/label/school?id=${id}`)
+				// }
+
+				if (reportType == 1) {
 					this.$u.func.globalNavigator(`/subPackage/label/bail?id=${id}`)
-				} else if (type == 2) {
-					this.$u.func.globalNavigator(`/subPackage/label/hotel?id=${id}`)
-				} else if (type == 3 || type == 4 || type == 5) {
+				} else if (reportType == 2) {
+					this.$u.func.globalNavigator(`/subPackage/label/check?id=${id}`)
+				} else if (reportType == 5) {
 					this.$u.func.globalNavigator(`/subPackage/label/form?id=${id}`)
-				} else if (type == 6) {
-					this.$u.func.globalNavigator(`/subPackage/label/school?id=${id}`)
 				}
 			},
 
-			navToDetail(type, id) {
-				if (type == 1) {
+			navToDetail(reportType, id, type) {
+				// if (reportType == 1) {
+				// 	this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
+				// } else if (reportType == 2 || type == 7) {
+				// 	this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
+				// } else if (reportType == 3 || reportType == 4 || reportType == 5) {
+				// 	this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
+				// } else if (reportType == 6) {
+				// 	this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
+				// } else {
+				// 	this.$u.func.globalNavigator(`checkReform?id=${id}`)
+				// }
+
+				if (reportType == 1) {
 					this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
-				} else if (type == 2) {
-					this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
-				} else if (type == 3 || type == 4 || type == 5) {
+				} else if (reportType == 7 || reportType == 4) {
+					if (reportType == 4) {
+						this.$u.func.globalNavigator(`/subPackage/school/securityDetail?id=${id}&type=2`)
+					} else {
+						this.$u.func.globalNavigator(`selfCheckDetail?id=${id}`)
+					}
+
+				} else if (reportType == 5) {
 					this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
-				} else if (type == 6) {
-					this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
+				} else {
+					this.$u.func.globalNavigator(`checkReform?id=${id}`)
 				}
 			},
 

--
Gitblit v1.9.3