From 489efae9eaec0f1a235f46ab7b1113a92b645cb5 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 17 Jan 2025 10:48:13 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=20=E9=9C=80=E8=A6=81=E9=85=8D?=
 =?UTF-8?q?=E5=90=88=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0=20api=202?=
 =?UTF-8?q?=E3=80=81=E6=A3=80=E6=9F=A5=E8=AE=B0=E5=BD=95=20=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E4=B9=8B=E5=89=8D=E5=A4=9A=E4=BA=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=AE=8C=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/subPages/BS/safeCheckCheck.vue |  6 ++++--
 pages/apply/subPages/BS/safeCheckIndex.vue | 14 +++++++++++---
 pages/apply/subPages/BS/safeCheckShow.vue  |  7 +++++--
 services/apply/subPages/BS/safeCheck.js    | 11 +++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/pages/apply/subPages/BS/safeCheckCheck.vue b/pages/apply/subPages/BS/safeCheckCheck.vue
index a29ee6e..bcebbe1 100644
--- a/pages/apply/subPages/BS/safeCheckCheck.vue
+++ b/pages/apply/subPages/BS/safeCheckCheck.vue
@@ -99,8 +99,10 @@
 											border="none" inputAlign="right"></u--input>
 									</u-form-item>
 									<u-form-item label="检查人员" prop="checkerNames" borderBottom>
-										<u--input disabled disabledColor="#fff" v-model="item.checkerNames"
-											border="none" inputAlign="right"></u--input>
+										<!-- <u--input disabled disabledColor="#fff" v-model="item.checkerNames"
+											border="none" inputAlign="right"></u--input> -->
+										<u--textarea disabled autoHeight v-model="item.checkerNames" placeholder="检查人员"
+											border="none"></u--textarea>
 									</u-form-item>
 
 									<u-form-item label="隐患地点" prop="ADDRESS" borderBottom>
diff --git a/pages/apply/subPages/BS/safeCheckIndex.vue b/pages/apply/subPages/BS/safeCheckIndex.vue
index 0c7d472..14d29fc 100644
--- a/pages/apply/subPages/BS/safeCheckIndex.vue
+++ b/pages/apply/subPages/BS/safeCheckIndex.vue
@@ -46,6 +46,10 @@
 							<text class="left">检查类型：</text>
 							<text class="value">{{item.Nav_CheckType.NAME}}</text>
 						</view>
+						<view class="field">
+							<text class="left">状态：</text>
+							<text class="value">{{item.FORM_CODE}}</text>
+						</view>
 						<view class="field">
 							<text class="left">检查时间：</text>
 							<text class="value">{{item.CHECKTIME}}</text>
@@ -67,7 +71,7 @@
 	} from '../../../../utils/common'
 
 	import {
-		orderPage
+		orderPageApp
 	} from '../../../../services/apply/subPages/BS/safeCheck'
 
 	import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
@@ -112,8 +116,12 @@
 				extendRule(json, 'STATECHECK', 2, 0);
 
 				extendInclude(json, 'Nav_CheckType')
+				extendInclude(json, 'Nav_User')
 				if (this.keyword) {
-					extendRule(json, 'NAME', 9, this.keyword);
+					// extendRule(json, 'CheckUsers', 9, this.keyword);
+					// extendRule(json, 'Nav_User.NAME', 9, this.keyword);
+					// extendRule(json, 'NAME', 9, this.keyword);
+					json.Parameter1= this.keyword
 				}
 
 				if (this.searchStartTime && this.searchStartTime.length > 0) {
@@ -131,7 +139,7 @@
 					Order: "1"
 				})
 				// json.IgnoreDataRule = true
-				orderPage(json).then(res => {
+				orderPageApp(json).then(res => {
 					this.total = res.TotalCount
 					const newRes = (res.Data || []).map(i => {
 						return {
diff --git a/pages/apply/subPages/BS/safeCheckShow.vue b/pages/apply/subPages/BS/safeCheckShow.vue
index da5e12c..9ca3b6d 100644
--- a/pages/apply/subPages/BS/safeCheckShow.vue
+++ b/pages/apply/subPages/BS/safeCheckShow.vue
@@ -120,8 +120,11 @@
 									<!-- 问题描述 问题等级 整改建议与措施 -->
 
 									<u-form-item label="检查人员" prop="userNameHtml" borderBottom>
-										<rich-text disabled disabledColor="#fff" v-html="item.userNameHtml"
+										<!-- 	<rich-text disabled disabledColor="#fff" v-html="item.userNameHtml"
 											border="none" slot="right"></rich-text>
+											 -->
+										<u--textarea disabled autoHeight v-html="item.userNameHtml" placeholder="检查人员"
+											border="surround"></u--textarea>
 									</u-form-item>
 
 								</u-collapse-item>
@@ -358,7 +361,7 @@
 
 <style>
 	@import url("../../../../style/css/editTemplate.css");
-	
+
 	/* .todo-page {
 		padding: 16px;
 	}
diff --git a/services/apply/subPages/BS/safeCheck.js b/services/apply/subPages/BS/safeCheck.js
index ce7fc68..65221fa 100644
--- a/services/apply/subPages/BS/safeCheck.js
+++ b/services/apply/subPages/BS/safeCheck.js
@@ -12,6 +12,17 @@ export function orderPage(params) {
 		})
 	})
 }
+export function orderPageApp(params) {
+	return new Promise((resolve, reject) => {
+		request.post("/BS/BSSafeCheck/OrderPagedAPP", params).then((result) => {
+			if (result.IsSuccessful) {
+				resolve(result);
+			}
+		}).catch((error) => {
+			reject(error)
+		})
+	})
+}
 
 //BS034
 export function GetCheckInfo034ShowPrint(params) {