From 0dbd43d189170cea31360342c76b9580f429765f Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 06 Mar 2024 17:36:26 +0800
Subject: [PATCH] 更新

---
 subPackage/bs/views/rentDetail.vue        |   39 +++++++++++++------
 subPackage/workbench/views/reformList.vue |    8 ---
 subPackage/task/index.vue                 |    2 
 subPackage/workbench/views/audit.vue      |   19 +++++++--
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/subPackage/bs/views/rentDetail.vue b/subPackage/bs/views/rentDetail.vue
index d65ee14..1d2098a 100644
--- a/subPackage/bs/views/rentDetail.vue
+++ b/subPackage/bs/views/rentDetail.vue
@@ -79,7 +79,7 @@
 			<u-button class="btn-item" color="#2CD5C0" plain style="width: 300rpx;" @click="addRentForm">再加一人</u-button>
 			<u-button class="btn-item" type="error" @click="isModelShow = true" v-if="btnControls.deleteBtn">删除
 			</u-button>
-			<u-button class="btn-item" type="success" @click="verify" v-if="btnControls.verifyBtn">确认</u-button>
+			<u-button class="btn-item" type="success" @click="verifyConfirm" v-if="btnControls.verifyBtn">确认</u-button>
 			<u-button class="btn-item" color="linear-gradient(to right, #06B0FD, #027BFE)" @click="saveOrUpdate">
 				{{ rentId === '' ? "保存" : "确认修改" }}</u-button>
 		</view>
@@ -376,31 +376,44 @@
 			verify() {
 				this.isAuditShow = true
 			},
-			verifyConfirm(e) {
-				const auditStatus = e.value[0].status
+			verifyConfirm() {
+				// const auditStatus = e.value[0].status
+
+
+
+				uni.showModal({
+					title: "提示",
+					content: "是否确认该租户?",
+					success: (res) => {
+						if (res.confirm) {
+							this.confirmRequest();
+						}
+					}
+				})
+
+
+			},
+
+			confirmRequest() {
 				confirmHouseRental({
 					id: this.rentId,
-					auditStatus
+					auditStatus: 1
 				}).then(res => {
 					const {
 						code,
 						data
 					} = res
 					if (code !== 200) {
-						uni.showToast({
-							title: "确认失败",
-							icon: 'error'
-						})
+						this.$showTips("确认失败", 'error')
 						return
 					}
-					uni.showToast({
-						title: "确认成功",
-						icon: 'success'
-					})
-					this.isAuditShow = false
+					this.$showTips("确认成功", 'success')
+					// this.isAuditShow = false
 					this.getCurrentRentInfo()
 				})
 			},
+
+
 			// 更新操作
 			async update() {
 				let householdVOList = []
diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index c7014a8..60dd10c 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -126,7 +126,7 @@
 				</view>
 			</view> -->
 
-			<view class="nav-item flex j-c-s-b a-i-c" @click="navTo(i.path)" v-for="i in securityList">
+			<view class="nav-item flex j-c-s-b a-i-c" @click="navTo(`${i.path}&from=task`)" v-for="i in securityList">
 				<text class="f-28">{{i.name}}</text>
 				<view class="flex">
 					<block v-if="bailCount > 0">
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index bf8b21b..916eb05 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -96,17 +96,28 @@
 			console.log(option);
 			if (option.reportType) {
 				this.reportType = option.reportType;
-				uni.setNavigationBarTitle({
-					title: "取保候审"
-				})
+				if (option.reportType == 1) {
+					uni.setNavigationBarTitle({
+						title: "取保候审"
+					})
+				} else if (option.reportType == 2) {
+					uni.setNavigationBarTitle({
+						title: "消防自查"
+					})
+				} else if (option.reportType == 3) {
+					uni.setNavigationBarTitle({
+						title: "二手交易"
+					})
+				}
 			}
+
 			if (option.from == "index") {
 				uni.setNavigationBarTitle({
 					title: "场所任务"
 				})
 			}
 			if (option.from == "task") {
-				this.tabIndex = 1;
+				this.tabIndex = 2;
 				this.currentStatus = 1;
 			}
 			if (option.code) {
diff --git a/subPackage/workbench/views/reformList.vue b/subPackage/workbench/views/reformList.vue
index 1fd6465..7915914 100644
--- a/subPackage/workbench/views/reformList.vue
+++ b/subPackage/workbench/views/reformList.vue
@@ -94,19 +94,13 @@
 
 		onLoad(option) {
 			console.log(option);
-			if (option.reportType) {
-				this.reportType = option.reportType;
-				uni.setNavigationBarTitle({
-					title: "取保候审"
-				})
-			}
 			if (option.from == "index") {
 				uni.setNavigationBarTitle({
 					title: "场所任务"
 				})
 			}
 			if (option.from == "task") {
-				this.tabIndex = 1;
+				this.tabIndex = 2;
 				this.currentStatus = 1;
 			}
 			if (option.code) {

--
Gitblit v1.9.3