From 9ba58e3d97ce1118e884d657309a4cf37f54586a Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 9 Apr 2024 16:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=AE=89=E5=85=A8=E6=8E=AA?=
 =?UTF-8?q?=E6=96=BD=E4=B8=8D=E6=98=BE=E7=A4=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-accept/hotwork-accept-detail.vue     | 16 +++++++++++++---
 .../hotwork-confirm/hotwork-confirm-detail.vue   |  2 +-
 .../hotwork-safety/hotwork-safety-detail.vue     |  2 +-
 .../hotwork-xiang-mu/hotwork-xiang-detail.vue    |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
index 47bdeb3..854937f 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -147,11 +147,21 @@
 					<view class="cu-form-group">
 						<view class="title">其他安全措施：</view>
 					</view>
-					<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
+          <view v-if="pd.SAFETY_USER_MEASURES" class="ty-group">
+            <text class="title">
+              安全措施确认人：</text>
+            <text>{{ pd.SAFETY_USER_MEASURES}}</text>
+          </view>
+					<view v-if="pd.CONFIRM_CONTENT" class="ty-group">
 						<text class="title">
 							作业单位：</text>
-						<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
+						<text>{{ pd.CONFIRM_CONTENT}}</text>
 					</view>
+          <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
+            <text class="title">
+              项目责任负责人：</text>
+            <text>{{ pd.BELONGING_USER_MEASURES}}</text>
+          </view>
 					<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
 						<text class="title">
               动火点属地监管单位负责人：</text>
@@ -180,7 +190,7 @@
 				</view>
 				<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
 					<view>
-						<text class="title">分析人：</text>
+						<text class="title">气体分析单位负责人：</text>
 						<text>{{pd.ANALYZE_USER_NAME}}</text>
 					</view>
 					<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
index 77e976f..23cb5b4 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -145,7 +145,7 @@
 				</view>
 				<view class="cu-form-group" >
 					<view class="title">其他安全措施：</view>
-					<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
+					<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
 				</view>
 				<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=-99">
 					<view>
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 55b0c34..9fe32a7 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
@@ -145,7 +145,7 @@
 				</view>
 				<view class="cu-form-group" >
 					<view class="title">其他安全措施：</view>
-					<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
+					<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
 				</view>
 				<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=-99">
 					<view>
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
index f8a8849..a12b86e 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
@@ -149,7 +149,7 @@
           <view>
             <view class="cu-form-textarea">
               <view class="cu-form-title">其他安全措施：</view>
-              <textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES"
+              <textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT"
                         placeholder="请输入其他防护措施..."></textarea>
             </view>
             <view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">