From e3715f75a9fd4f73d59d7802660708fc1da3e6f8 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 10 Apr 2024 16:43:35 +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  |  8 +--
 .../hotwork-confirm-detail.vue                | 42 ++++++++++++
 .../hotwork-leader/hotwork-leader-detail.vue  | 42 ++++++++++++
 .../hotwork-monitor-detail.vue                | 67 ++++++++++++-------
 .../hotwork-xiang-mu/hotwork-xiang-detail.vue | 42 ++++++++++++
 5 files changed, 172 insertions(+), 29 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 53f3e1b..a37a8e7 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -154,7 +154,7 @@
           </view>
 					<view v-if="pd.CONFIRM_CONTENT" class="ty-group">
 						<text class="title">
-							作业单位：</text>
+							作业负责人：</text>
 						<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
 					</view>
           <view v-if="pd.BELONGING_USER_MEASURES" class="ty-group">
@@ -164,12 +164,12 @@
           </view>
 					<view v-if="pd.GUARDIAN_USER_MEASURES" class="ty-group">
 						<text class="title">
-              动火点属地监管单位负责人：</text>
+              属地监管单位：</text>
 						<text>{{ pd.GUARDIAN_USER_MEASURES}}</text>
 					</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">
@@ -179,7 +179,7 @@
 					</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-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
index b8e64d6..ec275a2 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -147,6 +147,48 @@
 					<view class="title">其他安全措施：</view>
 					<input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
 				</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!=-99">
 					<view>
 						<text class="title">气体分析单位负责人：</text>
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
index c422ec1..429e3dd 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -149,6 +149,48 @@
 						<view class="cu-form-title">其他安全措施：</view>
 						<textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入其他防护措施..."></textarea>
 					</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 v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
 						<text class="title">
 							作业单位：</text>
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 0421432..2f709b4 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -154,31 +154,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_OTHER_CONTENT" class="ty-group">
-						<text class="title">
-							作业单位：</text>
-						<text>{{ pd.CONFIRM_OTHER_CONTENT}}</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>
+            <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-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
index 9d20150..2b5bc41 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
@@ -152,6 +152,48 @@
               <textarea maxlength="255" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT"
                         placeholder="请输入其他防护措施..."></textarea>
             </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 v-if="pd.CONFIRM_USER_MEASURES" class="ty-group">
               <text class="title">
                 作业单位：