From 9c249529b6378670743c357f1653a129aa5aac53 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sun, 4 Feb 2024 08:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=96=B0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=81=87=E5=88=B0=E7=9A=84bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-safety/hotwork-safety-detail.vue  | 24 -------------------
 .../hotwork-safety/hotwork-safety-list.vue    | 17 ++++---------
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
index bd438d4..639f03e 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
@@ -85,30 +85,6 @@
 					<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.RISK_IDENTIFICATION" placeholder="请输入风险辨识结果"></textarea>
 				</view>
 
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全交底人：</view>-->
-<!--					<input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全教育人：</view>-->
-<!--					<input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">接受交底人：</view>-->
-<!--					<input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">动火措施初审人：</view>-->
-<!--					<input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-<!--        <view class="cu-form-group" >-->
-<!--          <view class="title">监护人：</view>-->
-<!--          <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>-->
-<!--        </view>-->
-
 			</view>
 
 			<view class="wui-form-list" style="padding-top: 20upx;">
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
index aa29af5..b2a6441 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
@@ -2,19 +2,10 @@
 	<view>
 		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
 			<block slot="backText">返回</block>
-			<block slot="content">作业负责人意见</block>
-<!--			<block slot="right">-->
-<!--				<view @click="$noMultipleClicks(goToAdd)">申请</view>-->
-<!--			</block>-->
+			<block slot="content">检查项检查人意见</block>
 		</cu-custom>
 		<view class="select-fixed top-fixed">
 			<view class="cu-bar search bg-white">
-<!--				<picker @change="statusChange"  :value="sindex" :range="statusList" range-key="name">-->
-<!--					<view class="saixuan">-->
-<!--						<text>筛选</text>-->
-<!--						<text class="cuIcon-triangledownfill"></text>-->
-<!--					</view>-->
-<!--				</picker>-->
 				<view class="search-form radius" style="margin-left: 0;">
 					<text class="cuIcon-search"></text>
 					<input @input="InputBlur" placeholder="请输入关键字"
@@ -289,13 +280,13 @@
 					})
 					return
 				}
-				if(item.APPLY_STATUS == '1') {
+				if(item.APPLY_STATUS == '0.9') {
 					uni.navigateTo({
-						url: '/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail?HOTWORK_ID=' + item.HOTWORK_ID
+						url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail?HOTWORK_ID=' + item.HOTWORK_ID
 					});
 				}else{
 					uni.navigateTo({
-						url: '/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
+						url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
 					});
 				}
 			},