From 4bb985f9fdf3be14cfe7afa5b9382ad5e4a87269 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 26 Apr 2024 17:10:31 +0800
Subject: [PATCH] 更新

---
 subPackage/school/troubleList.vue      |    2 +-
 subPackage/school/troubleDetail.vue    |   14 +++++++++-----
 subPackage/school/troubleAuditList.vue |    6 +++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/subPackage/school/troubleAuditList.vue b/subPackage/school/troubleAuditList.vue
index 12903f1..595a0be 100644
--- a/subPackage/school/troubleAuditList.vue
+++ b/subPackage/school/troubleAuditList.vue
@@ -24,7 +24,6 @@
 			<view class="list-item bgc-ff mb-20" v-for="item in siteList" :key="item.id" @click="pushPage(item.id)">
 				<view class="item-title flex a-i-c j-c-s-b mb-20">
 					<text class="f-32 fw">{{item.placeName}}</text>
-
 					<!-- <u-tag text="待审批" type="warning" plain plainFill></u-tag> -->
 					<u-tag class="u_tag" size="mini" :text="findObjValue(item.confirmFlag, tabList).name"
 						:type="findObjValue(item.confirmFlag, tabList).type" plain plainFill></u-tag>
@@ -87,6 +86,11 @@
 						status: 3,
 						type: 'error'
 					},
+					{
+						name: "待处理",
+						status: 4,
+						type: 'warning'
+					},
 				],
 				tabIndex: 0,
 				tabStatus: "",
diff --git a/subPackage/school/troubleDetail.vue b/subPackage/school/troubleDetail.vue
index 40de159..288d4db 100644
--- a/subPackage/school/troubleDetail.vue
+++ b/subPackage/school/troubleDetail.vue
@@ -192,10 +192,10 @@
 			submitInfo() {
 				let data = {
 					id: this.info.id,
-					confirmFlag: 1,
-					confirmNotion: this.confirmNotion
+
 				}
 				if (this.roleTypeName == "xyzt") {
+					daa.confirmFlag = 1;
 					if (!this.form.isProblem) {
 						this.$showTips("请选择是否隐患")
 						return;
@@ -205,10 +205,14 @@
 						this.$showTips("请选择是否处理")
 						return;
 					}
+				} else {
+					if (!this.confirmNotion) {
+						this.$showTips("请输入处理意见")
+						return;
+					}
+					data.confirmFlag = 2;
+					data.confirmNotion = this.confirmNotion
 				}
-
-
-
 
 				auditTroubleReport(data).then(res => {
 					if (res.code == 200) {
diff --git a/subPackage/school/troubleList.vue b/subPackage/school/troubleList.vue
index 2d8f086..dac0d92 100644
--- a/subPackage/school/troubleList.vue
+++ b/subPackage/school/troubleList.vue
@@ -6,7 +6,7 @@
 					<text class="f-32 fw">{{i.type ==1?"安全隐患排查":"矛盾纠纷排查"}}</text>
 					<!-- 	<text class="f-32 fw" v-if="i.eventType == 3">二手车交易</text>id
 					<text class="f-32 fw" v-if="i.eventType == 2">二手手机维修</text> -->
-					<u-tag v-if="i.confirmFlag == 4" text="待完成" type="warning" plain plainFill></u-tag>
+					<u-tag v-if="i.confirmFlag == 4" text="待处理" type="warning" plain plainFill></u-tag>
 					<u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
 					<u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
 					<u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>

--
Gitblit v1.9.3