From 093f2ef2537ccbc1db73a8f6796afb4a88897742 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 10 Apr 2024 17:31:48 +0800
Subject: [PATCH] =?UTF-8?q?15050=20=E7=9B=91=E6=8A=A4=E4=BA=BA=E7=AD=BE?=
 =?UTF-8?q?=E5=AD=97=E5=88=97=E8=A1=A8=20=E5=AD=97=E6=AE=B5=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-accept/hotwork-accept-detail.vue  |  6 +-
 .../hotwork-approve-detail.vue                | 62 +++++++++++++------
 .../hotwork-audit/hotwork-audit-detail.vue    | 57 ++++++++++++-----
 .../hotwork-monitor-detail.vue                |  6 +-
 4 files changed, 90 insertions(+), 41 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 a37a8e7..b5305b4 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -169,17 +169,17 @@
 					</view>
 					<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
 						<text class="title">
-							动火前验票：</text>
+              安全管理部门：</text>
 						<text>{{ pd.LEADER_USER_MEASURES}}</text>
 					</view>
 					<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
 						<text class="title">
-							安全管理部门：</text>
+              动火审批人：</text>
 						<text>{{ pd.AUDIT_USER_MEASURES}}</text>
 					</view>
 					<view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
 						<text class="title">
-							动火审批人：</text>
+              动火前验票：</text>
 						<text>{{ pd.APPROVE_USER_MEASURES}}</text>
 					</view>
 					<view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
index c617c81..46f55fe 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
@@ -154,27 +154,49 @@
 						<view class="cu-form-title">其他安全措施：</view>
 						<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>
 					</view>
-					<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
-						<text class="title">
-							作业单位：</text>
-						<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
-					</view>
-					<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
-						<text class="title">
-              动火点属地监管单位负责人：</text>
-						<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
-					</view>
-					<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
-						<text class="title">
-							车间：</text>
-						<text>{{ pd.LEADER_USER_MEASURES}}</text>
-					</view>
-					<view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
-						<text class="title">
-							安全管理部门：</text>
-						<text>{{ pd.AUDIT_USER_MEASURES}}</text>
-					</view>
 				</view>
+        <view>
+          <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_OTHER_CONTENT" class="ty-group">
+            <text class="title">
+              作业负责人：</text>
+            <text>{{ pd.CONFIRM_OTHER_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>
+            <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
+          </view>
+          <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
+            <text class="title">
+              安全管理部门：</text>
+            <text>{{ pd.LEADER_USER_MEASURES}}</text>
+          </view>
+          <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
+            <text class="title">
+              动火前验票：</text>
+            <text>{{ pd.AUDIT_USER_MEASURES}}</text>
+          </view>
+          <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
+            <text class="title">
+              动火审批人：</text>
+            <text>{{ pd.APPROVE_USER_MEASURES}}</text>
+          </view>
+          <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
+            <text class="title">
+              班长：</text>
+            <text>{{ pd.MONITOR_USER_MEASURES}}</text>
+          </view>
+        </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>
diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
index e11f6ec..8f7ba0a 100644
--- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
@@ -178,21 +178,48 @@
 						<view class="cu-form-title">其他安全措施：</view>
 						<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>
 					</view>
-					<view v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
-						<text class="title">
-							作业单位：</text>
-						<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
-					</view>
-					<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
-						<text class="title">
-              动火点属地监管单位负责人：</text>
-						<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
-					</view>
-					<view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
-						<text class="title">
-							所在车间意见：</text>
-						<text>{{ pd.LEADER_USER_MEASURES}}</text>
-					</view>
+          <view>
+            <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_OTHER_CONTENT" class="ty-group">
+              <text class="title">
+                作业负责人：</text>
+              <text>{{ pd.CONFIRM_OTHER_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>
+              <text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
+            </view>
+            <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
+              <text class="title">
+                动火前验票：</text>
+              <text>{{ pd.LEADER_USER_MEASURES}}</text>
+            </view>
+            <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
+              <text class="title">
+                安全管理部门：</text>
+              <text>{{ pd.AUDIT_USER_MEASURES}}</text>
+            </view>
+            <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
+              <text class="title">
+                动火审批人：</text>
+              <text>{{ pd.APPROVE_USER_MEASURES}}</text>
+            </view>
+            <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">
+              <text class="title">
+                班长：</text>
+              <text>{{ pd.MONITOR_USER_MEASURES}}</text>
+            </view>
+          </view>
 				</view>
 				<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
 					<view>
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
index 2f709b4..fae619b 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -177,17 +177,17 @@
             </view>
             <view v-if="pd.LEADER_USER_MEASURES" class="ty-group">
               <text class="title">
-                动火前验票：</text>
+                安全管理部门：</text>
               <text>{{ pd.LEADER_USER_MEASURES}}</text>
             </view>
             <view v-if="pd.AUDIT_USER_MEASURES" class="ty-group">
               <text class="title">
-                安全管理部门：</text>
+                动火审批人：</text>
               <text>{{ pd.AUDIT_USER_MEASURES}}</text>
             </view>
             <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
               <text class="title">
-                动火审批人：</text>
+                动火前验票：</text>
               <text>{{ pd.APPROVE_USER_MEASURES}}</text>
             </view>
             <view v-if="pd.MONITOR_USER_MEASURES" class="ty-group">