动火页面统计数逻辑修改

安全检查项意见逻辑修改
所有节点字段显示内容修改

pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue

@@ -218,26 +218,43 @@
 						<text>{{ pd.MONITOR_USER_MEASURES}}</text>
 					</view>
 				</view>
-
+        <view v-if="pd.SAFETY_SIGNATURE">
-				<view v-if="pd.CONFESS_USER_SIGNER_PATH">
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-group" >
+              <view class="title">安全项检查人</view>
+              {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
+            </view>
+            <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+              <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
+                     mode="" style="width: 200upx;height: 200upx;"></image>
+            </view>
+          </view>
+        </view>
+        <view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
+          <view v-for="(item,index) in pd.confessList" >
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group">
                 <view class="title">安全交底人</view>
-							{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
+                {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
               </view>
               <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
-							<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
+                <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
+                       @click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
               </view>
             </view>
           </view>
-				<view v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH">
+        </view>
+        <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
+          <view v-for="(item,index) in pd.acceptConfessList" >
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group">
                 <view class="title">接受交底人</view>
-							{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+                {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
               </view>
               <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
-							<image :src="baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
+                <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
+                       @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
             </view>
           </view>
         </view>
@@ -470,6 +487,9 @@
             <view class="title">项目主管部门负责人</view>
             {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
           </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
         </view>
 				<view v-if="pd.LEADER_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
@@ -565,6 +585,30 @@
 							<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 				</view>
 			</view>
 		</view>

pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue

@@ -154,6 +154,18 @@
 							<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
 						</view>
 					</view>
+          <view v-if="pd.SAFETY_SIGNATURE">
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">安全项检查人</view>
+                {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
+              </view>
+              <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+                <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
+                       mode="" style="width: 200upx;height: 200upx;"></image>
+              </view>
+            </view>
+          </view>
 				</view>
 				<view class="wui-form-list">
 					<view v-if="pd.GUARDIAN_USER_SIGNER_PATH">
@@ -197,7 +209,7 @@
 					<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">作业负责人意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
             </view>
 						<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 							<view class="cu-form-group" >
@@ -209,11 +221,27 @@
 							</view>
 						</view>
 					</view>
+          <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-textarea" style="border: none;">
+                <view class="cu-form-title">项目主管部门负责意见</view>
+                <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+              </view>
+            </view>
+            <view class="cu-form-group" >
+              <view class="title">项目主管部门负责人</view>
+              {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+            </view>
+          </view>
           <view v-if="pd.LEADER_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">属地监管单位意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
             </view>
+            <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">动火点属地监管单位负责人</view>-->
+            <!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group" >
                 <view class="title">属地监管单位负责人</view>
@@ -227,8 +255,12 @@
           <view v-if="pd.AUDIT_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">安全管理部门意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
             </view>
+            <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">安全管理部门负责人</view>-->
+            <!--					{{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group" >
                 <view class="title">安全管理部门负责人</view>
@@ -242,8 +274,12 @@
           <view v-if="pd.APPROVE_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">动火审批人意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
             </view>
+            <!--				<view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">审批人</view>-->
+            <!--					{{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group" >
                 <view class="title">动火审批人</view>
@@ -257,8 +293,12 @@
           <view v-if="pd.MONITOR_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">动火前验票负责人意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
             </view>
+            <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">动火前验票负责人</view>-->
+            <!--					{{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group" >
                 <view class="title">动火前验票负责人</view>
@@ -284,6 +324,30 @@
 							</view>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 					<view class="wui-sign" v-if="!pd.ACCEPT_CONFESS_USER_SIGNER_PATH">
 						<view class="title">接受交底人</view>
 						<view>
@@ -403,6 +467,26 @@
 				imgList:[],
 			}
 		},
+    computed: {
+      formattedConfirmContent() {
+        return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+      },
+      formattedExamineApprovalOpinions() {
+        return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+      },
+      formattedLeaderContent() {
+        return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+      },
+      formattedAuditContent() {
+        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
+      },
+      formattedApproveContent() {
+        return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
+      },
+      formattedMonitorContent() {
+        return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意';
+      }
+    },
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
@@ -466,6 +550,14 @@
 								duration: 2000
 							});
 						}
+            if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
+              for (let i = 0; i < _this.pd.safetyList.length; i++) {
+                if (_this.pd.safetyList[i].APPROVAL_SIGNATURE) {
+                  _this.pd.SAFETY_SIGNATURE = _this.pd.safetyList[i].APPROVAL_SIGNATURE;
+                  break;
+                }
+              }
+            }
 					}
 				});
 			},

pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue

@@ -219,11 +219,11 @@
 					</view>
 				</view>
 
-        <view v-if="pd.SAFETY_USER_NAME">
+        <view v-if="pd.SAFETY_SIGNATURE">
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-group" >
               <view class="title">安全项检查人</view>
-              {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}}
+              {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
             </view>
             <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
               <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
@@ -480,6 +480,9 @@
             <view class="title">项目主管部门负责人</view>
             {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
           </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
         </view>
 				<!--				<view class="cu-form-textarea" style="border: none;">-->
 				<!--					<view class="cu-form-title">监护人意见</view>-->
@@ -583,6 +586,30 @@
 							<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 				</view>
 			</view>
 		</view>

pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue

@@ -487,6 +487,9 @@
             <view class="title">项目主管部门负责人</view>
             {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
           </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
         </view>
         <view v-if="pd.LEADER_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
@@ -502,6 +505,9 @@
               <view class="title">属地监管单位负责人</view>
               {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
             </view>
+            <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+              <image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
+            </view>
           </view>
         </view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
@@ -579,6 +585,30 @@
 							<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 				</view>
 			</view>
 		</view>

pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue

@@ -197,7 +197,18 @@
 							<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
 						</view>
 					</view>
-
+          <view v-if="pd.SAFETY_SIGNATURE">
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">安全项检查人</view>
+                {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
+              </view>
+              <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+                <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
+                       mode="" style="width: 200upx;height: 200upx;"></image>
+              </view>
+            </view>
+          </view>
 				</view>
 				<view class="wui-form-list">
 					<view v-if="pd.GUARDIAN_USER_SIGNER_PATH">
@@ -256,7 +267,7 @@
 					<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">作业负责人意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
             </view>
 						<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
 						<!--					<view class="title">作业负责人</view>-->
@@ -272,10 +283,22 @@
 							</view>
 						</view>
 					</view>
+          <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-textarea" style="border: none;">
+                <view class="cu-form-title">项目主管部门负责意见</view>
+                <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+              </view>
+            </view>
+            <view class="cu-form-group" >
+              <view class="title">项目主管部门负责人</view>
+              {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+            </view>
+          </view>
           <view v-if="pd.LEADER_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">属地监管单位意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
             </view>
             <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
             <!--					<view class="title">动火点属地监管单位负责人</view>-->
@@ -294,7 +317,7 @@
           <view v-if="pd.AUDIT_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">安全管理部门意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
             </view>
             <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
             <!--					<view class="title">安全管理部门负责人</view>-->
@@ -313,7 +336,7 @@
           <view v-if="pd.APPROVE_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">动火审批人意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
             </view>
             <!--				<view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
             <!--					<view class="title">审批人</view>-->
@@ -332,7 +355,7 @@
           <view v-if="pd.MONITOR_USER_SIGNER_PATH">
             <view class="cu-form-textarea" style="border: none;">
               <view class="cu-form-title">动火前验票负责人意见</view>
-							<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
             </view>
             <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
             <!--					<view class="title">动火前验票负责人</view>-->
@@ -367,6 +390,30 @@
 							</view>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 
 					<!--				<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">-->
 					<!--					<view class="cu-form-title">监护人意见</view>-->
@@ -485,6 +532,26 @@
 				imgList:[],
 			}
 		},
+    computed: {
+      formattedConfirmContent() {
+        return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+      },
+      formattedExamineApprovalOpinions() {
+        return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+      },
+      formattedLeaderContent() {
+        return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+      },
+      formattedAuditContent() {
+        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
+      },
+      formattedApproveContent() {
+        return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
+      },
+      formattedMonitorContent() {
+        return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意';
+      }
+    },
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
@@ -556,6 +623,14 @@
 								duration: 2000
 							});
 						}
+            if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
+              for (let i = 0; i < _this.pd.safetyList.length; i++) {
+                if (_this.pd.safetyList[i].APPROVAL_SIGNATURE) {
+                  _this.pd.SAFETY_SIGNATURE = _this.pd.safetyList[i].APPROVAL_SIGNATURE;
+                  break;
+                }
+              }
+            }
 					}
 				});
 			},

pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue

@@ -476,6 +476,9 @@
             <view class="title">项目主管部门负责人</view>
             {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
           </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
         </view>
 				<!--				<view class="cu-form-textarea" style="border: none;">-->
 				<!--					<view class="cu-form-title">监护人意见</view>-->
@@ -485,11 +488,15 @@
 				<!--					<view class="title">监护人</view>-->
 				<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
 				<!--				</view>-->
-        <view v-if="pd.LEADER_CONTENT  && pd.LEADER_CONTENT !== '无'">
+        <view v-if="pd.LEADER_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">属地监管单位意见</view>
             <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
           </view>
+          <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+          <!--					<view class="title">动火点属地监管单位负责人</view>-->
+          <!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
+          <!--				</view>-->
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-group" >
               <view class="title">属地监管单位负责人</view>
@@ -575,6 +582,30 @@
 							<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 				</view>
 			</view>
 		</view>

pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue

@@ -173,7 +173,18 @@
 						<text>{{ pd.CONFIRM_USER_MEASURES}}</text>
 					</view>
 				</view>
-
+        <view v-if="pd.SAFETY_SIGNATURE">
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-group" >
+              <view class="title">安全项检查人</view>
+              {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
+            </view>
+            <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+              <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
+                     mode="" style="width: 200upx;height: 200upx;"></image>
+            </view>
+          </view>
+        </view>
 			</view>
 			<view class="wui-form-list">
 				<view v-if="pd.GUARDIAN_USER_SIGNER_PATH">
@@ -201,17 +212,16 @@
             </view>
           </view>
         </view>
-				<view v-if="files.length > 0">
+        <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
+          <view v-for="(item,index) in pd.acceptConfessList" >
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group">
                 <view class="title">接受交底人</view>
-							{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+                {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
               </view>
-						<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
+              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
-							<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+                <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
-								<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
+                       @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
-									   mode="" style="width: 200upx;height: 200upx;"></image>
-								<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
               </view>
             </view>
           </view>
@@ -221,7 +231,7 @@
 				<view v-if="pd.CONFIRM_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">作业负责人意见</view>
-						<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
           </view>
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 						<view class="cu-form-group" >
@@ -233,11 +243,27 @@
 						</view>
 					</view>
 				</view>
+        <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">项目主管部门负责意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+            </view>
+          </view>
+          <view class="cu-form-group" >
+            <view class="title">项目主管部门负责人</view>
+            {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+          </view>
+        </view>
         <view v-if="pd.LEADER_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">属地监管单位意见</view>
-						<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
           </view>
+          <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+          <!--					<view class="title">动火点属地监管单位负责人</view>-->
+          <!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
+          <!--				</view>-->
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-group" >
               <view class="title">属地监管单位负责人</view>
@@ -251,8 +277,12 @@
         <view v-if="pd.AUDIT_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">安全管理部门意见</view>
-						<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
           </view>
+          <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+          <!--					<view class="title">安全管理部门负责人</view>-->
+          <!--					{{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
+          <!--				</view>-->
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-group" >
               <view class="title">安全管理部门负责人</view>
@@ -266,8 +296,12 @@
         <view v-if="pd.APPROVE_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">动火审批人意见</view>
-						<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
           </view>
+          <!--				<view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+          <!--					<view class="title">审批人</view>-->
+          <!--					{{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
+          <!--				</view>-->
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-group" >
               <view class="title">动火审批人</view>
@@ -281,8 +315,12 @@
         <view v-if="pd.MONITOR_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
             <view class="cu-form-title">动火前验票负责人意见</view>
-						<textarea maxlength="255" disabled="disabled" v-model="pd.MONITOR_CONTENT"></textarea>
+            <textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
           </view>
+          <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+          <!--					<view class="title">动火前验票负责人</view>-->
+          <!--					{{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
+          <!--				</view>-->
           <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
             <view class="cu-form-group" >
               <view class="title">动火前验票负责人</view>
@@ -308,7 +346,30 @@
 						</view>
 					</view>
 				</view>
-
+        <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+          <view class="cu-form-group">
+            <view class="title">动火是否完成</view>
+            <view>
+              已完成
+            </view>
+          </view>
+        </view>
+        <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+          <view class="cu-form-group">
+            <view class="title">作业现场是否清理</view>
+            <view>
+              已清理
+            </view>
+          </view>
+        </view>
+        <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+          <view class="cu-form-group">
+            <view class="title">是否存在遗留火种</view>
+            <view>
+              无遗留火种
+            </view>
+          </view>
+        </view>
 				<view class="wui-sign"  v-if="!pd.GUARDIAN_USER_SIGNER_PATH">
 					<view class="title">监护人</view>
 					<button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">手写签字</button>
@@ -421,6 +482,26 @@
 				imgList:[],
 			}
 		},
+    computed: {
+      formattedConfirmContent() {
+        return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+      },
+      formattedExamineApprovalOpinions() {
+        return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+      },
+      formattedLeaderContent() {
+        return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+      },
+      formattedAuditContent() {
+        return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
+      },
+      formattedApproveContent() {
+        return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
+      },
+      formattedMonitorContent() {
+        return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意';
+      }
+    },
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
@@ -492,6 +573,14 @@
 								duration: 2000
 							});
 						}
+            if (_this.pd.safetyList && _this.pd.safetyList.length > 0) {
+              for (let i = 0; i < _this.pd.safetyList.length; i++) {
+                if (_this.pd.safetyList[i].APPROVAL_SIGNATURE) {
+                  _this.pd.SAFETY_SIGNATURE = _this.pd.safetyList[i].APPROVAL_SIGNATURE;
+                  break;
+                }
+              }
+            }
 					}
 				});
 			},

pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue

@@ -478,6 +478,9 @@
               <view class="title">项目主管部门负责人</view>
               {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
             </view>
+            <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+              <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+            </view>
           </view>
         </view>
 				<!--				<view class="cu-form-textarea" style="border: none;">-->
@@ -502,6 +505,9 @@
               <view class="title">属地监管单位负责人</view>
               {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
             </view>
+            <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+              <image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
+            </view>
           </view>
         </view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
@@ -579,6 +585,30 @@
 							<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 				</view>
 			</view>
 		</view>

pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue

@@ -218,26 +218,43 @@
 						<text>{{ pd.MONITOR_USER_MEASURES}}</text>
 					</view>
 				</view>
-
+        <view v-if="pd.SAFETY_SIGNATURE">
-				<view v-if="pd.CONFESS_USER_SIGNER_PATH">
+          <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+            <view class="cu-form-group" >
+              <view class="title">安全项检查人</view>
+              {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
+            </view>
+            <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+              <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
+                     mode="" style="width: 200upx;height: 200upx;"></image>
+            </view>
+          </view>
+        </view>
+        <view v-if="pd.confessList && pd.confessList.length > 0 && pd.confessList.length !== pd.confessList.filter(item => item.APPROVAL_STATUS === '0').length">
+          <view v-for="(item,index) in pd.confessList" >
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group">
                 <view class="title">安全交底人</view>
-							{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
+                {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
               </view>
               <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
-							<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
+                <image :src="baseImgPath + item.APPROVAL_SIGNATURE" mode="aspectFill"
+                       @click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
               </view>
             </view>
           </view>
-				<view v-if="pd.ACCEPT_CONFESS_USER_SIGNER_PATH">
+        </view>
+        <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
+          <view v-for="(item,index) in pd.acceptConfessList" >
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group">
                 <view class="title">接受交底人</view>
-							{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+                {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
               </view>
               <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
-							<image :src="baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
+                <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
+                       @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
             </view>
           </view>
         </view>
@@ -470,6 +487,9 @@
             <view class="title">项目主管部门负责人</view>
             {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
           </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
         </view>
 				<view v-if="pd.LEADER_USER_SIGNER_PATH">
           <view class="cu-form-textarea" style="border: none;">
@@ -565,6 +585,30 @@
 							<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 				</view>
 			</view>
 		</view>

pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue

@@ -115,21 +115,21 @@
 
                   <view class="cu-form-group" v-if="item.QUESTION1">
                     <view class="title">{{item.QUESTION1}}</view>
-                  <input name="input" v-model="item.ANSWER1" type="number" placeholder="请输入"></input>
+                    <input name="input" :disabled="forbidEdit" v-model="item.ANSWER1" type="number" placeholder="请输入"></input>
                   </view>
                   <view class="cu-form-group" v-if="item.QUESTION2">
                     <view class="title">{{item.QUESTION2}}</view>
-                  <input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input>
+                    <input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" type="number" placeholder="请输入"></input>
                   </view>
                   <view class="cu-form-group" v-if="item.QUESTION3">
                     <view style="display: flex;flex-direction: column">
                       <view class="title">{{item.QUESTION3}}</view>
-                  <input name="input" v-model="item.ANSWER3" type="number" placeholder="请输入"></input>
+                      <input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" type="number" placeholder="请输入"></input>
                     </view>
                   </view>
                   <view class="cu-form-group" v-if="item.QUESTION4">
                     <view class="title">{{item.QUESTION4}}</view>
-                  <input name="input" v-model="item.ANSWER4" type="number" placeholder="请输入"></input>
+                    <input name="input" :disabled="forbidEdit" v-model="item.ANSWER4" type="number" placeholder="请输入"></input>
                   </view>
                 </uni-td>
                 <uni-td align="center">
@@ -147,10 +147,27 @@
               </uni-tr>
             </uni-table>
           </view>
+<!--          <view class="cu-form-group">-->
+<!--            <view class="title">其他安全措施：</view>-->
+<!--            <input v-if="!forbidEdit" name="input" ref="OTHER_PROTECTIVE_MEASURES" v-model="pd.APPROVAL_CONTENT" :disabled="forbidEdit" placeholder="请输入"></input>-->
+<!--            <view v-else>-->
+<!--              <view v-for="(item, index) in pd.safetyList" :key="index">-->
+<!--                <textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="item.APPROVAL_CONTENT"></textarea>-->
+<!--              </view>-->
+<!--            </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 v-for="(item, index) in pd.safetyList" :key="index">
+              <view v-if="!pd.SAFETY_SIGNATURE && !forbidEdit">
+                <input v-model="item.APPROVAL_CONTENT" :disabled="forbidEdit" placeholder="请输入" style="width: 100%; height: 40px;"></input>
               </view>
+              <view v-else>
+                <input v-model="item.APPROVAL_CONTENT" :disabled="true" style="width: 100%; height: 40px;"></input>
+              </view>
+            </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>
@@ -160,6 +177,18 @@
           </view>
         </view>
         <view class="wui-form-list">
+          <view v-if="pd.SAFETY_SIGNATURE">
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">安全项检查人</view>
+                {{pd.SAFETY_USER_NAME}}<text>{{pd.SAFETY_SIGNATURE_TIME}}</text>
+              </view>
+              <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+                <image :src="baseImgPath+pd.SAFETY_SIGNATURE" @click="ViewShowImage(baseImgPath+v.SAFETY_SIGNATURE)"
+                       mode="" style="width: 200upx;height: 200upx;"></image>
+              </view>
+            </view>
+          </view>
           <view v-if="pd.GUARDIAN_USER_SIGNER_PATH">
             <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
               <view class="cu-form-group" >
@@ -185,23 +214,198 @@
               </view>
             </view>
           </view>
-				<view v-if="files.length > 0">
+          <view v-if="pd.acceptConfessList && pd.acceptConfessList.length > 0 && pd.acceptConfessList.length !== pd.acceptConfessList.filter(item => item.APPROVAL_STATUS === '0').length">
+            <view v-for="(item,index) in pd.acceptConfessList" >
               <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
                 <view class="cu-form-group">
                   <view class="title">接受交底人</view>
-                {{pd.ACCEPT_CONFESS_USER_NAME}} {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}
+                  {{ item.ACCEPT_CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
                 </view>
-							<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
+                <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;">
-								<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
+                  <image :src="baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH" mode="aspectFill"
-									   mode="" style="width: 200upx;height: 200upx;"></image>
+                         @click="previewImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
                 </view>
               </view>
             </view>
           </view>
         </view>
         <view class="wui-form-list">
-				<view class="wui-sign">
+          <view v-if="pd.CONFIRM_USER_SIGNER_PATH">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">作业负责人意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
+            </view>
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">作业负责人</view>
+                {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}
+              </view>
+              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+                <image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+          <view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-textarea" style="border: none;">
+                <view class="cu-form-title">项目主管部门负责意见</view>
+                <textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
+              </view>
+            </view>
+            <view class="cu-form-group" >
+              <view class="title">项目主管部门负责人</view>
+              {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
+            </view>
+            <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+              <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+            </view>
+<!--            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">-->
+<!--              <view class="cu-form-group" >-->
+<!--                <view class="title">项目主管部门负责人</view>-->
+<!--                {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}-->
+<!--              </view>-->
+<!--              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
+<!--                <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>-->
+<!--              </view>-->
+<!--            </view>-->
+          </view>
+          <view v-if="pd.LEADER_USER_SIGNER_PATH">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">属地监管单位意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
+            </view>
+            <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">动火点属地监管单位负责人</view>-->
+            <!--					{{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">属地监管单位负责人</view>
+                {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
+              </view>
+              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+                <image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+          <view v-if="pd.AUDIT_USER_SIGNER_PATH">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">安全管理部门意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
+            </view>
+            <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">安全管理部门负责人</view>-->
+            <!--					{{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">安全管理部门负责人</view>
+                {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}}
+              </view>
+              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+                <image :src="baseImgPath + pd.AUDIT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.AUDIT_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+          <view v-if="pd.APPROVE_USER_SIGNER_PATH">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">动火审批人意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
+            </view>
+            <!--				<view class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">审批人</view>-->
+            <!--					{{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">动火审批人</view>
+                {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}}
+              </view>
+              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+                <image :src="baseImgPath + pd.APPROVE_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.APPROVE_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+          <view v-if="pd.MONITOR_USER_SIGNER_PATH">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">动火前验票负责人意见</view>
+              <textarea maxlength="255" disabled="disabled" v-model="formattedMonitorContent"></textarea>
+            </view>
+            <!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+            <!--					<view class="title">动火前验票负责人</view>-->
+            <!--					{{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}-->
+            <!--				</view>-->
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">动火前验票负责人</view>
+                {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}}
+              </view>
+              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+                <image :src="baseImgPath + pd.MONITOR_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.MONITOR_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+          <view v-if="pd.ACCEPT_USER_SIGNER_PATH">
+            <view class="cu-form-textarea" style="border: none;">
+              <view class="cu-form-title">完工验收</view>
+              <textarea maxlength="255" disabled="disabled" v-model="pd.ACCEPT_CONTENT"></textarea>
+            </view>
+            <view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
+              <view class="cu-form-group" >
+                <view class="title">验收部门负责人</view>
+                {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}}
+              </view>
+              <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+                <image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
+
+<!--          <view class="wui-sign"  v-if="!pd.GUARDIAN_USER_SIGNER_PATH">-->
+<!--            <view class="title">监护人</view>-->
+<!--            <button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">手写签字</button>-->
+<!--          </view>-->
+
+<!--          <view class="wui-sign-box"  v-show="imgList && imgList.length > 0">-->
+<!--            <view class="sign-title">-->
+<!--              签字照片：-->
+<!--            </view>-->
+<!--            <view class="wui-sign-cotent">-->
+<!--              <view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"  data-type="0" :data-url="imgList[index].filePath">-->
+<!--                <image :src="imgList[index].filePath" mode="aspectFit"></image>-->
+<!--              </view>-->
+<!--            </view>-->
+<!--          </view>-->
+          <view class="cu-modal" :class="modalName=='Modal'?'show':''">
+            <writing-board  @confirm="subCanvas" @cancel="hideModal"></writing-board>
+          </view>
+        </view>
+        <view class="wui-form-list">
+          <view class="wui-sign" v-if="!pd.SAFETY_SIGNATURE">
             <view class="title">安全检查项人</view>
             <button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">手写签字</button>
           </view>
@@ -253,8 +457,6 @@
       buttonloading: false,
       isUps:false,
       files: [],
-				forbidEdit:true,// 禁止修改
-				msg:'add',
       noClick:true,
       treeNode:[],//部门下拉数据
       levelList:[
@@ -282,6 +484,7 @@
       acceptindex:-1,
       pd:{},// 数据
       measuresList:[],
+      safetyList: [],
       rules:[
         {name:'CHECK_NO',message:'请输入编号'},
         {name:'WORK_CONTENT',message:'请输入作业内容'},
@@ -311,6 +514,27 @@
       modalName:null,
       signModalShow: false,
       imgList:[],
+      forbidEdit: true,
+    }
+  },
+  computed: {
+    formattedConfirmContent() {
+      return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
+    },
+    formattedExamineApprovalOpinions() {
+      return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
+    },
+    formattedLeaderContent() {
+      return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
+    },
+    formattedAuditContent() {
+      return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
+    },
+    formattedApproveContent() {
+      return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
+    },
+    formattedMonitorContent() {
+      return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意';
     }
   },
   onLoad(event){
@@ -325,7 +549,6 @@
       this.pd.APPLY_DEPARTMENT_NAME = loginUser.DEPARTMENT_NAME;
       this.pd.APPLY_USER_ID = loginUser.USER_ID;
       this.pd.APPLY_USER_NAME = loginUser.NAME;
-				this.forbidEdit = false;
     }
     // 初始化现场作业负责人
     this.getDept();
@@ -360,6 +583,7 @@
         success: (res) => {
           if ("success" == res.data.result) {
             uni.hideLoading();
+            console.log(res.data.pd,'11111111111111111111111')
             _this.pd = res.data.pd; //参数map
             if (res.data.measuresList && res.data.measuresList.length > 0) {
               _this.measuresList = res.data.measuresList
@@ -368,9 +592,9 @@
             }
             _this.measuresList = res.data.measuresList
             _this.files = res.data.imgList;
-							if(_this.pd.APPLY_STATUS < 1){
+            _this.safetyList = res.data.safetyList || [];
-								_this.forbidEdit = false;
+            _this.forbidEdit = _this.safetyList.some(item => item.APPROVAL_STATUS === '1');
-							}
+            _this.updateForbidEdit();
             let dongHuoCaoZuoRenPic = res.data.imgList2
             if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) {
               _this.pd.dongHuoCaoZuoRenPic = []
@@ -433,7 +657,6 @@
             });
             return;
           }1
-            console.log('11111111111111111', measures)
           if (measures.STATUS == '1' && measures.QUESTION1 && !measures.ANSWER1) {
             uni.showToast({
               icon: 'none',
@@ -778,7 +1001,6 @@
     /*
     *审批部门
      */
-			// 确定回调事件
     approvetreeConfirm(e) {
       this.isUps=false;
       this.pd.APPROVE_DEPARTMENT_ID=e[0].id;
@@ -786,11 +1008,9 @@
       this.$forceUpdate();//强制刷新
       this.getUserList(e[0].id,'approveUserList');
     },
-			// 取消回调事件
     approvetreeCancel(e) {
       this.isUps=false;
     },
-			// 显示树形选择器
     showApproveTree() {
       this.isUps=true
       this.$refs.tkiTree_approve._show();
@@ -839,11 +1059,9 @@
       this.$forceUpdate();//强制刷新
       this.getUserList(e[0].id,'acceptUserList');
     },
-// 取消回调事件
     accepttreeCancel(e) {
       this.isUps=false;
     },
-// 显示树形选择器
     showAcceptTree() {
       this.isUps=true
       this.$refs.tkiTree_accept._show();

pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue

@@ -480,6 +480,9 @@
             <view class="title">项目主管部门负责人</view>
             {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
           </view>
+          <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+            <image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
+          </view>
         </view>
 				<!--				<view class="cu-form-textarea" style="border: none;">-->
 				<!--					<view class="cu-form-title">监护人意见</view>-->
@@ -503,6 +506,9 @@
               <view class="title">属地监管单位负责人</view>
               {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}
             </view>
+            <view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
+              <image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
+            </view>
           </view>
         </view>
 				<view v-if="pd.AUDIT_USER_SIGNER_PATH">
@@ -580,6 +586,30 @@
 							<image :src="baseImgPath + pd.ACCEPT_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.ACCEPT_USER_SIGNER_PATH)" style="height: 100%;"></image>
 						</view>
 					</view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.FIRE_COMPLETED == 1">
+            <view class="cu-form-group">
+              <view class="title">动火是否完成</view>
+              <view>
+                已完成
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.SITE_CLEANED == 1">
+            <view class="cu-form-group">
+              <view class="title">作业现场是否清理</view>
+              <view>
+                已清理
+              </view>
+            </view>
+          </view>
+          <view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee" v-if="pd.NO_REMAINING_EMBERS == 1">
+            <view class="cu-form-group">
+              <view class="title">是否存在遗留火种</view>
+              <view>
+                无遗留火种
+              </view>
+            </view>
+          </view>
 				</view>
 			</view>
 		</view>
@@ -688,7 +718,7 @@
         return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
       },
       formattedMonitorContent() {
-        return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '' ? this.pd.MONITOR_CONTENT : '同意';
+        return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意';
       }
     },
 		onLoad(event){