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 a33ebac..e35e1a7 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
@@ -85,30 +85,6 @@
 					<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.RISK_IDENTIFICATION" placeholder="请输入风险辨识结果"></textarea>
 				</view>
 
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全交底人：</view>-->
-<!--					<input name="input" ref="CONFESS_USER" :disabled="forbidEdit" v-model="pd.CONFESS_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">安全教育人：</view>-->
-<!--					<input name="input" ref="EDUCATE_USER" :disabled="forbidEdit" v-model="pd.EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">接受交底人：</view>-->
-<!--					<input name="input" ref="ACCEPT_EDUCATE_USER" :disabled="forbidEdit" v-model="pd.ACCEPT_EDUCATE_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-
-<!--				<view class="cu-form-group" >-->
-<!--					<view class="title">动火措施初审人：</view>-->
-<!--					<input name="input" ref="TRIAL_USER" :disabled="forbidEdit" v-model="pd.TRIAL_USER" placeholder="请输入"></input>-->
-<!--				</view>-->
-<!--        <view class="cu-form-group" >-->
-<!--          <view class="title">监护人：</view>-->
-<!--          <input name="input" ref="GUARDIAN_USER" :disabled="forbidEdit" v-model="pd.GUARDIAN_USER" placeholder="请输入"></input>-->
-<!--        </view>-->
-
 			</view>
 
 			<view class="wui-form-list" style="padding-top: 20upx;">
@@ -207,17 +183,20 @@
 						</view>
 					</view>
 				</view>
-				<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.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_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>
-						</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>
+                {{ 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 + item.APPROVAL_SIGNATURE" mode="aspectFill"
+                       @click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+        </view>
 				<view v-if="files.length > 0">
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 						<view class="cu-form-group" >
@@ -239,10 +218,6 @@
 					<view class="cu-form-title">作业负责人意见</view>
 					<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
 				</view>
-<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">作业负责人</view>-->
-<!--					{{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_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>
@@ -253,32 +228,10 @@
 					</view>
 				</view>
 
-<!--				<view class="cu-form-textarea" style="border: none;">-->
-<!--					<view class="cu-form-title">监护人意见</view>-->
-<!--					<textarea maxlength="255" disabled="disabled" v-model="pd.GUARDIAN_CONTENT"></textarea>-->
-<!--				</view>-->
-<!--				<view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
-<!--					<view class="title">监护人</view>-->
-<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_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.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
-<!--					</view>-->
-<!--					<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >-->
-<!--						<image :src="baseImgPath + pd.GUARDIAN_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.GUARDIAN_USER_SIGNER_PATH)" style="height: 100%;"></image>-->
-<!--					</view>-->
-<!--				</view>-->
-
 				<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>
 				</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>
@@ -293,10 +246,6 @@
 					<view class="cu-form-title">安全管理部门意见</view>
 					<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></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>
diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue
index 9cc6244..9fe2055 100644
--- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue
@@ -3,18 +3,9 @@
 		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
 			<block slot="backText">返回</block>
 			<block slot="content">动火审批人意见</block>
-<!--			<block slot="right">-->
-<!--				<view @click="$noMultipleClicks(goToAdd)">申请</view>-->
-<!--			</block>-->
 		</cu-custom>
 		<view class="select-fixed top-fixed">
 			<view class="cu-bar search bg-white">
-<!--				<picker @change="statusChange"  :value="sindex" :range="statusList" range-key="name">-->
-<!--					<view class="saixuan">-->
-<!--						<text>筛选</text>-->
-<!--						<text class="cuIcon-triangledownfill"></text>-->
-<!--					</view>-->
-<!--				</picker>-->
 				<view class="search-form radius" style="margin-left: 0;">
 					<text class="cuIcon-search"></text>
 					<input @input="InputBlur" placeholder="请输入关键字"
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 b5ace25..dd8a639 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -184,7 +184,7 @@
 						</view>
 					</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>
diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
index 0d9331c..af35e24 100644
--- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
@@ -162,7 +162,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-if="pd.confessList && pd.confessList.length > 0">
+        <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">
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 f25bbe6..4d721ef 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -197,17 +197,20 @@
 						</view>
 					</view>
 				</view>
-				<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.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_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>
-						</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>
+                {{ 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 + item.APPROVAL_SIGNATURE" mode="aspectFill"
+                       @click="previewImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"></image>
+              </view>
+            </view>
+          </view>
+        </view>
 				<view v-if="files.length > 0">
 					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 						<view class="cu-form-group" >
@@ -227,15 +230,15 @@
 			<view class="wui-form-list">
 				<view class="cu-form-textarea" style="border: none;">
 					<view class="cu-form-title">项目主管部门负责人意见</view>
-					<textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_CONTENT"></textarea>
+					<textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
 				</view>
 				<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
 					<view class="cu-form-group" >
 						<view class="title">项目主管部门负责人</view>
-						{{pd.BELONGING_USER_NAME}} {{pd.BELONGING_USER_SIGNER_TIME}}
+						{{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
 					</view>
 					<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-						<image :src="baseImgPath + pd.BELONGING_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_USER_SIGNER_PATH)" style="height: 100%;"></image>
+						<image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
 					</view>
 				</view>
 
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue
index 6ef2780..dc8fbb0 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue
@@ -3,18 +3,9 @@
 		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
 			<block slot="backText">返回</block>
 			<block slot="content">班长验票</block>
-<!--			<block slot="right">-->
-<!--				<view @click="$noMultipleClicks(goToAdd)">申请</view>-->
-<!--			</block>-->
 		</cu-custom>
 		<view class="select-fixed top-fixed">
 			<view class="cu-bar search bg-white">
-<!--				<picker @change="statusChange"  :value="sindex" :range="statusList" range-key="name">-->
-<!--					<view class="saixuan">-->
-<!--						<text>筛选</text>-->
-<!--						<text class="cuIcon-triangledownfill"></text>-->
-<!--					</view>-->
-<!--				</picker>-->
 				<view class="search-form radius" style="margin-left: 0;">
 					<text class="cuIcon-search"></text>
 					<input @input="InputBlur" placeholder="请输入关键字"
@@ -282,6 +273,14 @@
 		methods: {
 			//跳转事件
 			goToDetail(item) {
+        if (new Date().getTime() - new Date(item.WORK_END_DATE).getTime() > 0) {
+          uni.showModal({
+            title:'提示',
+            content:'动火作业已结束，不能验票',
+            showCancel:false,
+          })
+          return
+        }
 				if(new Date().getTime() - new Date(item.ANALYZE_TIME).getTime() <= 1800000) {
 					if (item.APPLY_STATUS == '6') {
 						uni.navigateTo({
@@ -608,7 +607,7 @@
 						}
 					}
 				})
-			},
+			}
 		}
 	}
 </script>
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
index 02fd36a..c053cd7 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
@@ -340,12 +340,17 @@
 						HOTWORK_ID: _this.pd.HOTWORK_ID,
 						CORPINFO_ID:loginUser.CORPINFO_ID,
 						USER_ID:loginUser.USER_ID,
-            showInfo:'1'
+            showInfo:'0'
 								},
 					success: (res) => {
 						if ("success" == res.data.result) {
 							uni.hideLoading();
 							_this.pd = res.data.pd; //参数map
+              if (res.data.measuresList && res.data.measuresList.length > 0) {
+                _this.measuresList = res.data.measuresList
+              }else {
+                _this.getSafetyCheck()
+              }
 							_this.measuresList = res.data.measuresList
 							_this.files = res.data.imgList;
 							if(_this.pd.APPLY_STATUS < 1){
@@ -852,7 +857,25 @@
 			},
 			goToEdit(){
 				this.forbidEdit = false;
-			}
+			},
+      getSafetyCheck(){
+        var _this = this;
+        uni.request({
+          method: 'POST',
+          dataType: 'json',
+          header: {
+            'Content-type': 'application/x-www-form-urlencoded'
+          },
+          url: basePath + '/app/hotwork/cfd/getSafetyCheckItem?tm=' + new Date().getTime(),
+          data: {
+            CORPINFO_ID: loginUser.CORPINFO_ID,
+            USER_ID: loginUser.USER_ID,
+          },
+          success: function (res) {
+            _this.measuresList = res.data.measuresList;
+          }
+        });
+      },
 		}
 	}
 </script>
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 1f3e2e3..383881b 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
@@ -460,14 +460,18 @@ export default {
       Object.keys(this.pd).map(key => {
         formData[key] = this.pd[key]
       })
+      if (STATUS > 0){
+        formData.APPROVAL_STATUS = "1"
+      }else {
+        formData.APPROVAL_STATUS = "-1"
+      }
       formData.CREATOR = loginUser.USER_ID
       formData.OPERATOR = loginUser.USER_ID
       formData.ACTION_USER = loginUser.NAME
       formData.APPLY_STATUS = STATUS
       formData.CORPINFO_ID = loginUser.CORPINFO_ID
       formData.USER_ID = loginUser.USER_ID
-
-        formData.STATUS = STATUS
+      formData.STATUS = '2'
         this.buttonloading = true
         uni.uploadFile({
           url: basePath + '/app/hotwork/cfd/editStatus',