From ec276afd3cf49d1a81576360a3ac72a610c19316 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Tue, 18 Jun 2024 10:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=9A?=
 =?UTF-8?q?=20=E5=85=B6=E4=BB=96=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-accept-alldetail.vue              | 66 ++++++++++++-------
 .../hotwork-accept/hotwork-accept-detail.vue  | 19 +++---
 .../hotwork-approve-alldetail.vue             | 57 ++++++++++------
 .../hotwork-approve-detail.vue                |  3 +-
 .../hotwork-audit/hotwork-audit-alldetail.vue | 62 +++++++++--------
 .../hotwork-audit/hotwork-audit-detail.vue    | 13 ++--
 .../hotwork-confirm-alldetail.vue             | 65 +++++++++---------
 .../hotwork-confirm-detail.vue                | 10 +--
 .../hotwork-leader-alldetail.vue              | 59 +++++++++--------
 .../hotwork-leader/hotwork-leader-detail.vue  | 13 ++--
 .../hotwork-monitor-alldetail.vue             | 45 +++++++------
 .../hotwork-monitor-detail.vue                |  3 +-
 .../hotwork-xiang-alldetail.vue               | 60 ++++++++++-------
 .../hotwork-xiang-mu/hotwork-xiang-detail.vue | 29 ++++----
 14 files changed, 285 insertions(+), 219 deletions(-)

diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
index f5273b3..69eae6f 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
@@ -181,42 +181,57 @@
 					</uni-table>
 				</view>
 				<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
-          <view class="cu-form-textarea">
-            <view class="cu-form-title">其他安全措施：</view>
-            <view>
-              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.MONITOR_USER_MEASURES"></textarea>
-            </view>
+<!--          <view class="cu-form-textarea">-->
+<!--            <view class="cu-form-title">其他安全措施：</view>-->
+<!--            <view>-->
+<!--              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.MONITOR_USER_MEASURES"></textarea>-->
+<!--            </view>-->
+<!--          </view>-->
+          <view v-if="pd.CONFIRM_CONTENT" class="ty-group">
+            <text class="title">
+              作业负责人：</text>
+            <text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>
           </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.BELONGING_USER_MEASURES" class="ty-group">
+            <text class="title">
+              项目责任负责人：</text>
+            <text>{{ pd.BELONGING_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 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.SAFETY_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
@@ -784,6 +799,7 @@
 					success: (res) => {
 						if ("success" == res.data.result) {
 							uni.hideLoading();
+              console.log(res.data.pd,'1111111111111111111111111')
 							_this.pd = res.data.pd; //参数map
               if (res.data.pd.confessList && res.data.pd.confessList.length > 0) {
                 _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE;
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 f9b4eb5..d7464b1 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -148,10 +148,10 @@
 					</uni-table>
 				</view>
 				<view>
-          <view class="cu-form-group" >
-            <view class="title">其他安全措施：</view>
-            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
-          </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>-->
+<!--          </view>-->
 <!--          <view v-if="pd.safetyList" class="ty-group">-->
 <!--            <view v-for="(item, index) in pd.safetyList" :key="index">-->
 <!--              <text class="title">-->
@@ -159,11 +159,11 @@
 <!--              <text>{{ item.USER_NAME }}</text>-->
 <!--            </view>-->
 <!--          </view>-->
-<!--					<view v-if="pd.CONFIRM_CONTENT" class="ty-group">-->
-<!--						<text class="title">-->
-<!--							作业负责人：</text>-->
-<!--						<text>{{ pd.CONFIRM_OTHER_CONTENT}}</text>-->
-<!--					</view>-->
+					<view v-if="pd.CONFIRM_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>
@@ -689,6 +689,7 @@ export default {
       formData.FIRE_COMPLETED = this.pd.FIRE_COMPLETED;
       formData.SITE_CLEANED = this.pd.SITE_CLEANED;
       formData.NO_REMAINING_EMBERS = this.pd.NO_REMAINING_EMBERS;
+      formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
 
       if (STATUS == 8) {
         if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) {
diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
index 0d2326a..6a329fe 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
@@ -184,34 +184,49 @@
           <view class="cu-form-textarea">
             <view class="cu-form-title">其他安全措施：</view>
             <view>
-              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.APPROVE_USER_MEASURES"></textarea>
+              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.AUDIT_USER_MEASURES"></textarea>
             </view>
           </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.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.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.LEADER_USER_MEASURES" class="ty-group">-->
+<!--						<text class="title">-->
+<!--							车间：</text>-->
+<!--						<text>{{ pd.LEADER_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.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>
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 d2b8c12..1920f9e 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
@@ -156,7 +156,7 @@
 				<view>
           <view class="cu-form-group" >
             <view class="title">其他安全措施：</view>
-            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
+            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
           </view>
 				</view>
         <view>
@@ -579,6 +579,7 @@
 				formData.OPERATOR=loginUser.USER_ID
 				formData.ACTION_USER=loginUser.NAME
 				formData.APPLY_STATUS=STATUS
+        formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
 				if(STATUS==6){
 					formData.STATUS = STATUS
 					this.buttonloading = true
diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
index 2f0a21b..1241df8 100644
--- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
@@ -184,39 +184,49 @@
           <view class="cu-form-textarea">
             <view class="cu-form-title">其他安全措施：</view>
             <view>
-              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.AUDIT_USER_MEASURES"></textarea>
+              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.LEADER_USER_MEASURES"></textarea>
             </view>
           </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.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.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 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.SAFETY_USER_NAME">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
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 37ccead..1cf8a96 100644
--- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
@@ -180,7 +180,7 @@
 				<view>
           <view class="cu-form-group" >
             <view class="title">其他安全措施：</view>
-            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
+            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
           </view>
           <view>
 <!--            <view v-if="pd.safetyList" class="ty-group">-->
@@ -205,16 +205,16 @@
                 属地监管单位：</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.LEADER_USER_MEASURES" class="ty-group">
+              <text class="title">
+                动火前验票：</text>
+              <text>{{ pd.LEADER_USER_MEASURES}}</text>
+            </view>
             <view v-if="pd.APPROVE_USER_MEASURES" class="ty-group">
               <text class="title">
                 动火审批人：</text>
@@ -617,6 +617,7 @@
 				formData.APPLY_STATUS=STATUS
 				formData.CORPINFO_ID = loginUser.CORPINFO_ID
 				formData.USER_ID = loginUser.USER_ID
+        formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
 				if(STATUS==5){
 					formData.STATUS = STATUS
 					if (!_this.validStr(this.pd.APPROVE_USER_ID)) {
diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
index f394a83..19d35bb 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
@@ -187,36 +187,41 @@
               <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.CONFIRM_OTHER_CONTENT"></textarea>
             </view>
           </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 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 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.SAFETY_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
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 37f0b5f..ecd3a98 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -157,11 +157,11 @@
 <!--              安全措施确认人：</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.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>
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
index 28513f7..12b8b3c 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
@@ -183,40 +183,45 @@
 				<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
           <view class="cu-form-textarea">
             <view class="cu-form-title">其他安全措施：</view>
-            <view v-for="(item, index) in pd.safetyList" :key="index">
-              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>
+            <view>
+              <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.GUARDIAN_USER_MEASURES"></textarea>
             </view>
           </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.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 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.SAFETY_USER_NAME">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
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 7817f3e..35d07b2 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -151,7 +151,7 @@
 				<view>
           <view class="cu-form-group" >
             <view class="title">其他安全措施：</view>
-            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
+            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
           </view>
           <view>
 <!--            <view v-if="pd.safetyList" class="ty-group">-->
@@ -171,11 +171,11 @@
                 项目责任负责人：</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.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>
@@ -554,6 +554,7 @@
 				formData.APPLY_STATUS=STATUS
 				formData.CORPINFO_ID = loginUser.CORPINFO_ID
 				formData.USER_ID = loginUser.USER_ID
+        formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES;
 				if(STATUS==4){
 					formData.STATUS = STATUS
 
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
index ae152a4..f8aec09 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
@@ -187,31 +187,36 @@
               <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.APPROVE_USER_MEASURES"></textarea>
             </view>
           </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.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.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.MONITOR_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 d3d25fc..0876cde 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -156,7 +156,7 @@
 				<view>
           <view class="cu-form-group" >
             <view class="title">其他安全措施：</view>
-            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" placeholder="请输入"></input>
+            <input name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.OTHER_PROTECTIVE_MEASURES" placeholder="请输入"></input>
           </view>
           <view>
 <!--            <view v-if="pd.safetyList" class="ty-group">-->
@@ -597,6 +597,7 @@
 				formData.OPERATOR = loginUser.USER_ID
 				formData.ACTION_USER = loginUser.NAME
 				formData.APPLY_STATUS = STATUS
+        formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES
 				if (STATUS == 7) {
 					formData.STATUS = STATUS
 					this.buttonloading = true
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
index cc7e51e..31aeaa6 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
@@ -187,36 +187,46 @@
               <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.BELONGING_USER_MEASURES"></textarea>
             </view>
           </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.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 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.SAFETY_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
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 f76e3b8..6ccaf86 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
@@ -168,11 +168,6 @@
                   作业负责人：</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>
@@ -199,18 +194,18 @@
                 <text>{{ pd.MONITOR_USER_MEASURES}}</text>
               </view>
             </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.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>
           <view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
             <view>