diff --git a/pages.json b/pages.json
index bbb77ed..a2b11e0 100644
--- a/pages.json
+++ b/pages.json
@@ -863,15 +863,27 @@
 			"style": {}
 		},
 		{
-			"path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail",
+			"path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail",
 			"style": {}
 		},
 		{
-			"path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail",
+			"path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail",
 			"style": {}
 		},
 		{
-			"path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list",
+			"path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list",
+			"style": {}
+		},
+		{
+			"path": "pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail",
+			"style": {}
+		},
+		{
+			"path": "pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail",
+			"style": {}
+		},
+		{
+			"path": "pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list",
 			"style": {}
 		},
 		{
diff --git a/pages/application/eight-assignments/index.vue b/pages/application/eight-assignments/index.vue
index 83d0969..f2d0934 100644
--- a/pages/application/eight-assignments/index.vue
+++ b/pages/application/eight-assignments/index.vue
@@ -52,6 +52,16 @@
               <view>申请</view>
             </view>
           </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-yh-1.png" mode=""></image>
+              <view v-if="count.safetyNum" class="cu-tag badge">{{count.safetyNum}}</view>
+            </view>
+            <view class="text-semi"  style="text-align: center;">
+              <view>安全措施确认人</view>
+              <view>意见</view>
+            </view>
+          </navigator>
           <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list">
             <view class="imgs action">
               <image src="../../../static/icon-apps/icon-yh-1.png" mode=""></image>
@@ -62,7 +72,7 @@
               <view>意见</view>
             </view>
           </navigator>
-          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list">
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list">
             <view class="imgs action">
               <image src="../../../static/icon-apps/icon-yh-1.png" mode=""></image>
               <view v-if="count.xiangMuNum" class="cu-tag badge">{{count.xiangMuNum}}</view>
diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
index 0dc06a6..eea2afe 100644
--- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
@@ -285,6 +285,31 @@
             </view>
           </view>
         </view>
+        <view class="wui-form-list" v-if="!forbidEdit">
+          <view class="cu-form-group">
+            <view class="title">安全措施确认人单位</view>
+            <view class="picker-tree-box">
+              <view class="picker-tree" @tap="showSafetyTree">
+                {{ pd.SAFETY_DEPARTMENT_NAME ? pd.SAFETY_DEPARTMENT_NAME : '请选择' }}
+              </view>
+            </view>
+            <tki-tree ref="tkiTree_safety"
+                      :selectParent=true
+                      :range="treeNode"
+                      rangeKey="name"
+                      @confirm="safetyTreeConfirm"
+                      @cancel="safetyTreeCancel"></tki-tree>
+          </view>
+          <view class="cu-form-group">
+            <view class="title">安全措施确认人</view>
+            <picker @change="PickerSafety" :value="safetyIndex" :range="safetyUserList" range-key="NAME"
+                    :disabled="safetyUserList.length === 0" @click="isBlankList('anQuanCuoShiQueRenRen')">
+              <view class="picker">
+                {{ pd.SAFETY_USER_NAME ? pd.SAFETY_USER_NAME : '请选择' }}
+              </view>
+            </picker>
+          </view>
+        </view>
         <view class="wui-form-list" v-if="!forbidEdit">
           <view class="cu-form-group">
             <view class="title">气体分析单位</view>
@@ -687,7 +712,7 @@
       <view class="cu-bar btn-group" style="margin-top: 30upx;">
         <button
             v-if="!forbidEdit && pd.APPLY_STATUS <1 && pd.APPLY_STATUS != -99 && pd.APPLY_STATUS != -98 || !pd.APPLY_STATUS "
-            :loading="buttonloading" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1.5')">提交
+            :loading="buttonloading" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'0.9')">提交
         </button>
         <button
             v-if="!forbidEdit && pd.APPLY_STATUS <1 && pd.APPLY_STATUS != -99 && pd.APPLY_STATUS != -98 || !pd.APPLY_STATUS "
@@ -797,6 +822,9 @@ export default {
           }
       ],
 
+      safetyIndex: -1,
+      safetyUserList: [],
+
     }
   },
   onLoad(event) {
@@ -904,7 +932,7 @@ export default {
                 _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH)
               }
             }
-            if (_this.pd.APPLY_STATUS < 1) {
+            if (_this.pd.APPLY_STATUS <= 0) {
               _this.forbidEdit = false;
             }
             _this.pd.WORK_LONGITUDE = res.data.pd.WORK_LONGITUDE
@@ -1386,6 +1414,15 @@ export default {
             })
           }
           break
+        case 'anQuanCuoShiQueRenRen':
+          if (this.confirmUserList.length == 0) {
+            uni.showToast({
+              icon: 'none',
+              title: '请先选择项目主管部门负责人',
+              duration: 1500
+            })
+          }
+          break
       }
     },
     // 确定回调事件
@@ -1774,6 +1811,29 @@ export default {
     removeConfessUser(index){
       this.confessList.splice(index,1);
     },
+    // 2024-02-03 created by liu jun description:安全措施确认人信息选怎
+    showSafetyTree(){
+      this.isUps = true
+      this.$refs.tkiTree_safety._show();
+    },
+    safetyTreeConfirm(e) {
+      this.isUps = false;
+      this.pd.SAFETY_DEPARTMENT_ID = e[0].id;
+      this.pd.SAFETY_DEPARTMENT_NAME = e[0].name;
+      this.pd.SAFETY_USER_ID = ''
+      this.pd.SAFETY_USER_NAME = ''
+      this.$forceUpdate();//强制刷新
+      this.getUserList(e[0].id, 'safetyUserList');
+    },
+    safetyTreeCancel(e) {
+      this.isUps = false;
+    },
+    PickerSafety(e) {
+      this.safetyIndex = e.detail.value;
+      this.pd.SAFETY_USER_ID = this.safetyUserList[this.safetyIndex].USER_ID;
+      this.pd.SAFETY_USER_NAME = this.safetyUserList[this.safetyIndex].NAME;
+      this.$forceUpdate();//强制刷新
+    },
   }
 }
 </script>
diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue
index a06e97a..51e9c1e 100644
--- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue
@@ -37,23 +37,24 @@
 						</view>
 						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
 							<text>申请人:{{item.APPLY_USER_NAME}}</text>
-							<text>分析人:{{item.ANALYZE_USER_NAME}}</text>
+							<text>气体分析人:{{item.ANALYZE_USER_NAME}}</text>
 						</view>
 						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
 							<text>作业负责人：{{item.CONFIRM_USER_NAME}}</text>
-             				 <text>动火点所在单位负责人：{{item.LEADER_USER_NAME}}</text>
+              <text>动火点所在单位负责人：{{item.LEADER_USER_NAME}}</text>
 						</view>
 						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
 							<text>安全管理部门负责人：{{item.AUDIT_USER_NAME}}</text>
-              				<text>审批部门负责人：{{item.APPROVE_USER_NAME}}</text>
+              <text>审批部门负责人：{{item.APPROVE_USER_NAME}}</text>
 						</view>
 						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
 							<text>监护人：{{item.GUARDIAN_USER_NAME}}</text>
-							<text>安全交底人：{{item.CONFESS_USER_NAME}}</text>
+							<text>安全交底人：{{item.confessUserNames}}</text>
 						</view>
 
 						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
 							<text>接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}</text>
+              <text>安全措施确认人：{{item.SAFETY_USER_NAME}}</text>
 						</view>
 						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
 							<text>动火前验票负责人：{{item.MONITOR_USER_NAME}}</text>
@@ -81,7 +82,7 @@
 								<template v-else-if="item.APPLY_STATUS==-98">已作废(未进行气体检测)</template>
 								<template v-else-if="item.APPLY_STATUS==-99">已作废（班长未验票）</template>
 							</text>
-							<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
+							<text v-if="item.APPLY_STATUS<= 0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
 						</view>
 						<view class="dy-subtitle-flex">
 							<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
index 2eec7d1..c0a3fa4 100644
--- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
@@ -545,7 +545,7 @@
 				formData.CORPINFO_ID = loginUser.CORPINFO_ID
 				formData.USER_ID = loginUser.USER_ID
 				uni.uploadFile({
-					url: basePath+'/app/hotwork/cfd/editConfess',
+					url: basePath+'/app/hotwork/cfd/confessApproval',
 					filePath: _this.imgList[0].filePath,
 					name: 'FFILE',
 					formData:formData,
diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue
index 3a8d262..9b22373 100644
--- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue
@@ -79,7 +79,7 @@
 								<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
 								<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
 							</text>
-							<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
+							<text v-if="item.APPLY_STATUS <= 0"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
 						</view>
 						<view class="dy-subtitle-flex">
 							<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
@@ -518,7 +518,7 @@
 					title:"加载中..."
 				});//加载中动画
 				uni.request({
-					url: basePath +'/app/hotwork/cfd/aqlist?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
+					url: basePath +'/app/hotwork/cfd/safetyList?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
 					method: 'POST',
 					dataType: 'json',
 					header: {
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 bd438d4..fd71196 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -286,15 +286,15 @@
 				confirmindex:-1,
 				guardianUserList:[],
 				guardianindex:-1,
-                leaderUserList:[],
-                leaderindex:-1,
+        leaderUserList:[],
+        leaderindex:-1,
 				auditUserList:[],
 				auditindex:-1,
 				approveUserList:[],
 				approveindex:-1,
-                monitorUserList:[],
-                monitorindex:-1,
-                acceptUserList:[],
+        monitorUserList:[],
+        monitorindex:-1,
+        acceptUserList:[],
 				acceptindex:-1,
 				pd:{},// 数据
 				measuresList:[],
@@ -332,17 +332,17 @@
 		onLoad(event){
 			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
-			if(this.pd.HOTWORK_ID){
-				this.msg="edit";
-				this.getData();
-			}else {
-				// 初始化作业负责人
-				this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
-				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;
-			}
+      if (this.pd.HOTWORK_ID) {
+        this.msg = "edit";
+        this.getData();
+      } else {
+        // 初始化作业负责人
+        this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
+        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();
 			this.getLimitSpace();
@@ -398,150 +398,169 @@
 					current: 0
 				});
 			},
-			goSubmit(STATUS){
-				var _this = this;
-				let required = true
-				uni.showLoading({
-					title: '请稍候'
-				})
-				if(STATUS==2) {
+      goSubmit(STATUS) {
+        var _this = this;
+        let required = true
+        uni.showLoading({
+          title: '请稍候'
+        })
+        if (STATUS === 2) {
 
-					if (_this.imgList.length <= 0) {
-						uni.showToast({
-							icon: 'none',
-							title: '请签字',
-							duration: 1500
-						});
-						return;
-					}
-				}
-				const formData={}
-				Object.keys(this.pd).map(key => {
-					formData[key]=this.pd[key]
-				})
-				formData.CORPINFO_ID=corpinfoId
-				formData.CREATOR=loginUser.USER_ID
-				formData.OPERATOR=loginUser.USER_ID
-				formData.ACTION_USER=loginUser.NAME
-				formData.APPLY_STATUS=STATUS
-				if(STATUS==2){
-					if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) {
-						uni.showModal({
-							title: '',
-							content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!',
-							cancelColor: "#000000",
-							cancelText: '取消',
-							confirmText: '确定',
-							success: res => {
-								this.buttonloading = false
-								_this.goback()
-							}
-						})
-					} else {
-						formData.STATUS = STATUS
-						for (let i = 0; i < this.measuresList.length; i++) {
-							const measures = this.measuresList[i]
-							if(!measures.STATUS){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未勾选',
-									duration: 1500
-								});
-								return;
-							}
-							if(measures.STATUS=='1' && measures.QUESTION1 && !measures.ANSWER1){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未填写第一项',
-									duration: 1500
-								});
-								return;
-							}
-							if(measures.STATUS=='1' && measures.QUESTION2 && !measures.ANSWER2){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未填写第二项',
-									duration: 1500
-								});
-								return;
-							}
-							if(measures.STATUS=='1' && measures.QUESTION3 && !measures.ANSWER3){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未填写第三项',
-									duration: 1500
-								});
-								return;
-							}
-						if(measures.STATUS=='1' && measures.QUESTION4 && !measures.ANSWER4){
-							uni.showToast({
-								icon: 'none',
-								title: '第'+(i+1)+'项未填写第四项',
-								duration: 1500
-							});
-							return;
-						}
-					}
-						formData.measuresList = JSON.stringify(this.measuresList)
-					  formData.CORPINFO_ID = loginUser.CORPINFO_ID
-					  formData.USER_ID = loginUser.USER_ID
-						this.buttonloading = true
-						uni.uploadFile({
-							url: basePath+'/app/hotwork/cfd/editStatus',
-							filePath: _this.imgList[0].filePath,
-							name: 'FFILE',
-							formData:formData,
-							success: (res) => {
-								uni.showToast({
-									icon:'none',
-									title: '保存成功',
-									duration: 2000
-								});
-								_this.goback()
-								this.buttonloading = false
-							},
-							fail: (err) => {
-								uni.hideLoading();
-								uni.showModal({
-									content: err.errMsg,
-									showCancel: false
-								});
-							}
-						})
-					}
-				}else{
-					formData.STATUS=STATUS
-					this.buttonloading = true
-					uni.request({
-						url: basePath + "/app/hotwork/cfd/editStatus",
-						method: 'POST',
-						dataType: 'json',
-						header:{
-							'Content-type':'application/x-www-form-urlencoded'
-						},
-						data: {
-							  ...formData,
-							  CORPINFO_ID:loginUser.CORPINFO_ID,
-							  USER_ID:loginUser.USER_ID,
-							},
-						success: (res) => {
-							uni.showToast({
-								icon:'none',
-								title: '保存成功',
-								duration: 2000
-							});
-							_this.goback()
-							this.buttonloading = false
-						},
-						fail: (err) => {
-							uni.hideLoading();
-							uni.showModal({
-								content: err.errMsg,
-								showCancel: false
-							});
-						}
-					})
-				}
+          if (_this.imgList.length <= 0) {
+            uni.showToast({
+              icon: 'none',
+              title: '请签字',
+              duration: 1500
+            });
+            return;
+          }
+        }
+        const formData = {}
+        Object.keys(this.pd).map(key => {
+          formData[key] = this.pd[key]
+        })
+        formData.CORPINFO_ID = corpinfoId
+        formData.CREATOR = loginUser.USER_ID
+        formData.OPERATOR = loginUser.USER_ID
+        formData.ACTION_USER = loginUser.NAME
+        formData.APPLY_STATUS = STATUS
+        if (STATUS === 2) {
+          uni.request({
+            url: basePath + '/app/hotwork/cfd/check',
+            method: 'POST',
+            header: {
+              'Content-type': 'application/x-www-form-urlencoded'
+            },
+            data: {
+              HOTWORK_ID: _this.pd.HOTWORK_ID
+            },
+            success: (res) => {
+              if ("success" === res.data.result) {
+                uni.hideLoading();
+                if (res.data.passFlag === '0') {
+                  uni.showModal({
+                    title: '',
+                    content: res.data.message,
+                    cancelColor: "#000000",
+                    cancelText: '取消',
+                    confirmText: '确定',
+                    success: res => {
+                      this.buttonloading = false
+                    }
+                  })
+                } else {
+                  formData.STATUS = STATUS
+                  for (let i = 0; i < this.measuresList.length; i++) {
+                    const measures = this.measuresList[i]
+                    if (!measures.STATUS) {
+                      uni.showToast({
+                        icon: 'none',
+                        title: '第' + (i + 1) + '项未勾选',
+                        duration: 1500
+                      });
+                      return;
+                    }
+                    if (measures.STATUS === '1' && measures.QUESTION1 && !measures.ANSWER1) {
+                      uni.showToast({
+                        icon: 'none',
+                        title: '第' + (i + 1) + '项未填写第一项',
+                        duration: 1500
+                      });
+                      return;
+                    }
+                    if (measures.STATUS === '1' && measures.QUESTION2 && !measures.ANSWER2) {
+                      uni.showToast({
+                        icon: 'none',
+                        title: '第' + (i + 1) + '项未填写第二项',
+                        duration: 1500
+                      });
+                      return;
+                    }
+                    if (measures.STATUS === '1' && measures.QUESTION3 && !measures.ANSWER3) {
+                      uni.showToast({
+                        icon: 'none',
+                        title: '第' + (i + 1) + '项未填写第三项',
+                        duration: 1500
+                      });
+                      return;
+                    }
+                    if (measures.STATUS === '1' && measures.QUESTION4 && !measures.ANSWER4) {
+                      uni.showToast({
+                        icon: 'none',
+                        title: '第' + (i + 1) + '项未填写第四项',
+                        duration: 1500
+                      });
+                      return;
+                    }
+                  }
+                  formData.measuresList = JSON.stringify(this.measuresList)
+                  formData.CORPINFO_ID = loginUser.CORPINFO_ID
+                  formData.USER_ID = loginUser.USER_ID
+                  this.buttonloading = true
+                  uni.uploadFile({
+                    url: basePath + '/app/hotwork/cfd/editStatus',
+                    filePath: _this.imgList[0].filePath,
+                    name: 'FFILE',
+                    formData: formData,
+                    success: (res) => {
+                      uni.showToast({
+                        icon: 'none',
+                        title: '保存成功',
+                        duration: 2000
+                      });
+                      _this.goback()
+                      this.buttonloading = false
+                    },
+                    fail: (err) => {
+                      uni.hideLoading();
+                      uni.showModal({
+                        content: err.errMsg,
+                        showCancel: false
+                      });
+                    }
+                  })
+                }
+              } else if ("exception" === data.result) {
+                uni.showToast({
+                  title: '错误',
+                  duration: 2000
+                });
+              }
+            }
+          });
+        } else {
+          formData.STATUS = STATUS
+          _this.buttonloading = true
+          uni.request({
+            url: basePath + "/app/hotwork/cfd/editStatus",
+            method: 'POST',
+            dataType: 'json',
+            header: {
+              'Content-type': 'application/x-www-form-urlencoded'
+            },
+            data: {
+              ...formData,
+              CORPINFO_ID: loginUser.CORPINFO_ID,
+              USER_ID: loginUser.USER_ID,
+            },
+            success: (res) => {
+              uni.showToast({
+                icon: 'none',
+                title: '保存成功',
+                duration: 2000
+              });
+              _this.goback()
+              this.buttonloading = false
+            },
+            fail: (err) => {
+              uni.hideLoading();
+              uni.showModal({
+                content: err.errMsg,
+                showCancel: false
+              });
+            }
+          })
+        }
 			},
 			// 获取动火列表
 			getLimitSpace(){
@@ -734,29 +753,27 @@
 				this.pd.GUARDIAN_USER_NAME=this.guardianUserList[this.guardianindex].NAME;
 				this.$forceUpdate();//强制刷新
 			},
-
-
-            /*
-            *单位领导
-            */
-// 确定回调事件
-            leadertreeConfirm(e) {
+      /*
+       *单位领导
+      */
+      // 确定回调事件
+      leadertreeConfirm(e) {
                 this.isUps=false;
                 this.pd.LEADER_DEPARTMENT_ID=e[0].id;
                 this.pd.LEADER_DEPARTMENT_NAME=e[0].name;
                 this.$forceUpdate();//强制刷新
                 this.getUserList(e[0].id,'leaderUserList');
             },
-// 取消回调事件
-            leadertreeCancel(e) {
+      // 取消回调事件
+      leadertreeCancel(e) {
                 this.isUps=false;
             },
-// 显示树形选择器
-            showLeaderTree() {
+      // 显示树形选择器
+      showLeaderTree() {
                 this.isUps=true
                 this.$refs.tkiTree_leader._show();
             },
-            PickerLeader(e) {
+      PickerLeader(e) {
                 this.leaderindex = e.detail.value;
                 this.pd.LEADER_USER_ID=this.leaderUserList[this.leaderindex].USER_ID;
                 this.pd.LEADER_USER_NAME=this.leaderUserList[this.leaderindex].NAME;
@@ -817,27 +834,27 @@
 				this.$forceUpdate();//强制刷新
 			},
 
-            /*
-*在岗班长
-*/
-// 确定回调事件
-            monitortreeConfirm(e) {
+      /*
+       *在岗班长
+       */
+      // 确定回调事件
+      monitortreeConfirm(e) {
                 this.isUps=false;
                 this.pd.MONITOR_DEPARTMENT_ID=e[0].id;
                 this.pd.MONITOR_DEPARTMENT_NAME=e[0].name;
                 this.$forceUpdate();//强制刷新
                 this.getUserList(e[0].id,'monitorUserList');
             },
-// 取消回调事件
-            monitortreeCancel(e) {
+      // 取消回调事件
+      monitortreeCancel(e) {
                 this.isUps=false;
             },
-// 显示树形选择器
-            showMonitorTree() {
+      // 显示树形选择器
+      showMonitorTree() {
                 this.isUps=true
                 this.$refs.tkiTree_monitor._show();
             },
-            PickerMonitor(e) {
+      PickerMonitor(e) {
                 this.monitorindex = e.detail.value;
                 this.pd.MONITOR_USER_ID=this.monitorUserList[this.monitorindex].USER_ID;
                 this.pd.MONITOR_USER_NAME=this.monitorUserList[this.monitorindex].NAME;
@@ -846,7 +863,7 @@
 			/*
 			*验收部门
 			*/
-// 确定回调事件
+      // 确定回调事件
 			accepttreeConfirm(e) {
 				this.isUps=false;
 				this.pd.ACCEPT_DEPARTMENT_ID=e[0].id;
@@ -854,11 +871,11 @@
 				this.$forceUpdate();//强制刷新
 				this.getUserList(e[0].id,'acceptUserList');
 			},
-// 取消回调事件
+      // 取消回调事件
 			accepttreeCancel(e) {
 				this.isUps=false;
 			},
-// 显示树形选择器
+      // 显示树形选择器
 			showAcceptTree() {
 				this.isUps=true
 				this.$refs.tkiTree_accept._show();
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail.vue
similarity index 100%
rename from pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue
rename to pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail.vue
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
new file mode 100644
index 0000000..bd438d4
--- /dev/null
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
@@ -0,0 +1,905 @@
+<template>
+	<view >
+		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" >
+			<block slot="backText">返回</block>
+			<block slot="content">作业负责人意见</block>
+		</cu-custom>
+		<scroll-view scroll-y="false" >
+		<view class="form">
+			<view class="wui-form-list">
+				<view class="cu-form-group group-picker" >
+					<view class="title">申请单位：</view>
+					{{pd.APPLY_DEPARTMENT_NAME}}
+				</view>
+
+				<view class="cu-form-group group-picker" >
+					<view class="title">申请人：</view>
+					{{pd.APPLY_USER_NAME}}
+				</view>
+
+				<view class="cu-form-group bb-default">
+					<view class="title">编号：</view>
+          {{pd.CHECK_NO}}
+				</view>
+
+				<view class="cu-form-textarea">
+					<view class="cu-form-title">作业内容：</view>
+					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
+				</view>
+
+				<view class="cu-form-group">
+					<view class="title">动火地点及动火部位：</view>
+					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
+				</view>
+
+				<view class="cu-form-group group-picker">
+					<view class="title">动火作业级别：</view>
+					{{pd.WORK_LEVEL}}
+				</view>
+
+				<view class="cu-form-group">
+					<view class="title">动火方式：</view>
+					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_FUNCTION" placeholder="请输入"></input>
+				</view>
+
+				<view class="cu-form-group ">
+					<view class="title">作业开始时间</view>
+					<ruiDatePicker v-if="!forbidEdit"
+								   :start="todayDate"
+								   fields="minute"
+								   :value="pd.WORK_START_DATE?pd.WORK_START_DATE:''"
+								   @change="changeStartDate"
+					></ruiDatePicker>
+					<view v-else>{{pd.WORK_START_DATE}}</view>
+				</view>
+				<view class="cu-form-group">
+					<view class="title">作业结束时间</view>
+					<ruiDatePicker v-if="!forbidEdit"
+								   :start="todayDate"
+								   fields="minute"
+								   :value="pd.WORK_END_DATE?pd.WORK_END_DATE:''"
+								   @change="changeEndDate"
+					></ruiDatePicker>
+					<view v-else>{{pd.WORK_END_DATE}}</view>
+				</view>
+
+<!--				<view class="cu-form-group" >-->
+<!--					<view class="title">作业负责人：</view>-->
+<!--					<input name="input" ref="WORK_MANAGER" :disabled="forbidEdit" v-model="pd.WORK_MANAGER" placeholder="请输入"></input>-->
+<!--				</view>-->
+
+				<view class="cu-form-textarea">
+					<view style="display: flex;justify-content: space-between;align-items: center">
+						<view class="cu-form-title">动火人及证书编号：</view>
+					</view>
+					<textarea maxlength="255" v-model="pd.WORK_USER" placeholder="请输入动火人及证书编号"></textarea>
+				</view>
+
+				<view class="cu-form-textarea" >
+					<view class="cu-form-title">关联的其他特殊作业及安全作业票编号：</view>
+					<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.SPECIAL_WORK" placeholder="请输入关联的其他特殊作业及安全作业票编号"></textarea>
+				</view>
+
+				<view class="cu-form-textarea" >
+					<view class="cu-form-title">风险辨识结果：</view>
+					<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;">
+				<view class="wui-title" style="margin-left: 20upx;">
+					<text class="text-semi">安全防护措施</text>
+				</view>
+				<view class="wui-table" style="padding: 0 20upx;">
+					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
+							<uni-th align="center" style="font-weight: bold;width: 80px">操作</uni-th>
+						</uni-tr>
+						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+							<uni-td>
+								<view style="margin-bottom: 20upx;">
+								    {{item.PROTECTIVE_MEASURES}}
+								  </view>
+
+								<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>
+								</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>
+								</view>
+								<view class="cu-form-group" v-if="item.QUESTION3">
+									<view class="title">{{item.QUESTION3}}</view>
+									<input name="input"  v-model="item.ANSWER3" type="number" placeholder="请输入"></input>
+								</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>
+								</view>
+							</uni-td>
+							<uni-td align="center">
+								<radio-group class="wui-radio-group wui-radio-col">
+									<view class="group" style="margin-bottom: 10px">
+										<radio class='radio'  value="-1" :checked="item.STATUS=='-1'" @click="changeRadio(index,'-1')">
+											<text class="wui-pl10">不涉及</text></radio>
+									</view>
+									<view class="group" style="margin-bottom: 10px">
+										<radio class='radio' value="1" :checked="item.STATUS=='1'" @click="changeRadio(index,'1')">
+											<text class="wui-pl10">涉&nbsp;&nbsp;&nbsp;&nbsp;及</text></radio>
+									</view>
+								</radio-group>
+							</uni-td>
+						</uni-tr>
+					</uni-table>
+				</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 class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=-99">
+					<view>
+						<text class="title">分析人：</text>
+						<text>{{pd.ANALYZE_USER_NAME}}</text>
+					</view>
+					<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
+				</view>
+			</view>
+			<view class="wui-form-list">
+				<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" >
+							<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>
+				<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="files.length > 0">
+					<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}}
+						</view>
+						<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
+							<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" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
+									   mode="" style="width: 200upx;height: 200upx;"></image>
+								<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="wui-form-list">
+				<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
+					<view class="cu-form-title">作业负责人意见</view>
+					<textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>
+				</view>
+				<view class="wui-sign">
+					<view class="title">作业负责人</view>
+					<button class="cu-btn bg-green shadow" @tap="signModalShow = true" data-target="Modal">手写签字</button>
+					<!-- <button class="cu-btn bg-green shadow" @tap="showModal" 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>
+		<view class="cu-bar btn-group" style="margin-top: 30upx;">
+			<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-2')">打 回</button>
+			<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')">通 过</button>
+		</view>
+		<view class="padding flex flex-direction">
+		</view>
+		<view class="cu-modal" :class="{'show':signModalShow}">
+		  <sign @confirm="subCanvas" @cancel="signModalShow = false"></sign>
+		</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {
+		basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath
+	} from '@/common/tool.js';
+	import tkiTree from "@/components/select-tree/select-tree.vue"
+	import writingBoard from "@/components/writing-board/writing-board.vue"
+	import gcoord from '@/common/gcoord.js'
+	import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
+	export default {
+		components: {
+			tkiTree,ruiDatePicker,writingBoard
+		},
+		data() {
+			return {
+				baseImgPath:baseImgPath,
+				buttonloading: false,
+				isUps:false,
+				files: [],
+				forbidEdit:true,// 禁止修改
+				msg:'add',
+				noClick:true,
+				treeNode:[],//部门下拉数据
+				levelList:[
+					{id:'特级',name:'特级'},
+					{id:'一级',name:'一级'},
+					{id:'二级',name:'二级'},
+				],
+				levelindex:-1,
+
+				analyzeUserList:[],
+				analyzeindex:-1,
+				confirmUserList:[],
+				confirmindex:-1,
+				guardianUserList:[],
+				guardianindex:-1,
+                leaderUserList:[],
+                leaderindex:-1,
+				auditUserList:[],
+				auditindex:-1,
+				approveUserList:[],
+				approveindex:-1,
+                monitorUserList:[],
+                monitorindex:-1,
+                acceptUserList:[],
+				acceptindex:-1,
+				pd:{},// 数据
+				measuresList:[],
+				rules:[
+					{name:'CHECK_NO',message:'请输入编号'},
+					{name:'WORK_CONTENT',message:'请输入作业内容'},
+					{name:'WORK_PLACE',message:'请输入作业地点'},
+					{name:'WORK_LEVEL',message:'请选择动火级别'},
+					{name:'WORK_FUNCTION',message:'请输入动火方式'},
+					{name:'WORK_START_DATE',message:'请选择工作开始时间'},
+					{name:'WORK_START_DATE',message:'请选择工作结束时间'},
+					{name:'WORK_MANAGER',message:'请输入作业负责人'},
+					{name:'WORK_USER',message:'请输入作业人'},
+					{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
+					{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
+					{name:'CONFESS_USER',message:'请输入安全交底人'},
+					{name:'EDUCATE_USER',message:'请输入安全教育人'},
+					{name:'ACCEPT_EDUCATE_USER',message:'请输入接受交底、教育人'},
+					{name:'TRIAL_USER',message:'请输入动火措施初审人'},
+					{name:'ANALYZE_USER_ID',message:'请选择分析人'},
+					{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
+					{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
+					{name:'LEADER_USER_ID',message:'请选择动火点车间负责人'},
+					{name:'AUDIT_USER_ID',message:'请选择安全管理部门负责人'},
+					{name:'APPROVE_USER_ID',message:'请选择审批部门'},
+					{name:'MONITOR_USER_ID',message:'请选择验票班长'},
+					{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}
+				],
+				todayDate:'',
+				modalName:null,
+				signModalShow: false,
+				imgList:[],
+			}
+		},
+		onLoad(event){
+			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
+			this.pd.HOTWORK_ID = event.HOTWORK_ID;
+			if(this.pd.HOTWORK_ID){
+				this.msg="edit";
+				this.getData();
+			}else {
+				// 初始化作业负责人
+				this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
+				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();
+			this.getLimitSpace();
+			loginSession();
+
+		},
+		methods: {
+			//跳转事件
+			goToDetail(e) {
+				uni.navigateTo({
+					url: '/pages/application/hotwork_cfd/hotwork-gas/gas-list?HOTWORK_ID='+e
+				});
+			},
+			getData() {
+				var _this = this;
+				uni.showLoading({
+					title: '请稍候'
+				})
+				uni.request({
+					url: basePath + '/app/hotwork/cfd/goEdit',
+					method: 'POST',
+ 					header: {
+						'Content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						HOTWORK_ID: _this.pd.HOTWORK_ID,
+						CORPINFO_ID:loginUser.CORPINFO_ID,
+						USER_ID:loginUser.USER_ID,
+								},
+					success: (res) => {
+						if ("success" == res.data.result) {
+							uni.hideLoading();
+							_this.pd = res.data.pd; //参数map
+							_this.measuresList = res.data.measuresList
+							_this.files = res.data.imgList;
+							if(_this.pd.APPLY_STATUS < 1){
+								_this.forbidEdit = false;
+							}
+						} else if ("exception" == data.result) {
+							uni.showToast({
+								title: '错误',
+								duration: 2000
+							});
+						}
+					}
+				});
+			},
+			ViewShowImage(url) {
+				let files = [];
+				files.push(url)
+				uni.previewImage({
+					urls: files,
+					current: 0
+				});
+			},
+			goSubmit(STATUS){
+				var _this = this;
+				let required = true
+				uni.showLoading({
+					title: '请稍候'
+				})
+				if(STATUS==2) {
+
+					if (_this.imgList.length <= 0) {
+						uni.showToast({
+							icon: 'none',
+							title: '请签字',
+							duration: 1500
+						});
+						return;
+					}
+				}
+				const formData={}
+				Object.keys(this.pd).map(key => {
+					formData[key]=this.pd[key]
+				})
+				formData.CORPINFO_ID=corpinfoId
+				formData.CREATOR=loginUser.USER_ID
+				formData.OPERATOR=loginUser.USER_ID
+				formData.ACTION_USER=loginUser.NAME
+				formData.APPLY_STATUS=STATUS
+				if(STATUS==2){
+					if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) {
+						uni.showModal({
+							title: '',
+							content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!',
+							cancelColor: "#000000",
+							cancelText: '取消',
+							confirmText: '确定',
+							success: res => {
+								this.buttonloading = false
+								_this.goback()
+							}
+						})
+					} else {
+						formData.STATUS = STATUS
+						for (let i = 0; i < this.measuresList.length; i++) {
+							const measures = this.measuresList[i]
+							if(!measures.STATUS){
+								uni.showToast({
+									icon: 'none',
+									title: '第'+(i+1)+'项未勾选',
+									duration: 1500
+								});
+								return;
+							}
+							if(measures.STATUS=='1' && measures.QUESTION1 && !measures.ANSWER1){
+								uni.showToast({
+									icon: 'none',
+									title: '第'+(i+1)+'项未填写第一项',
+									duration: 1500
+								});
+								return;
+							}
+							if(measures.STATUS=='1' && measures.QUESTION2 && !measures.ANSWER2){
+								uni.showToast({
+									icon: 'none',
+									title: '第'+(i+1)+'项未填写第二项',
+									duration: 1500
+								});
+								return;
+							}
+							if(measures.STATUS=='1' && measures.QUESTION3 && !measures.ANSWER3){
+								uni.showToast({
+									icon: 'none',
+									title: '第'+(i+1)+'项未填写第三项',
+									duration: 1500
+								});
+								return;
+							}
+						if(measures.STATUS=='1' && measures.QUESTION4 && !measures.ANSWER4){
+							uni.showToast({
+								icon: 'none',
+								title: '第'+(i+1)+'项未填写第四项',
+								duration: 1500
+							});
+							return;
+						}
+					}
+						formData.measuresList = JSON.stringify(this.measuresList)
+					  formData.CORPINFO_ID = loginUser.CORPINFO_ID
+					  formData.USER_ID = loginUser.USER_ID
+						this.buttonloading = true
+						uni.uploadFile({
+							url: basePath+'/app/hotwork/cfd/editStatus',
+							filePath: _this.imgList[0].filePath,
+							name: 'FFILE',
+							formData:formData,
+							success: (res) => {
+								uni.showToast({
+									icon:'none',
+									title: '保存成功',
+									duration: 2000
+								});
+								_this.goback()
+								this.buttonloading = false
+							},
+							fail: (err) => {
+								uni.hideLoading();
+								uni.showModal({
+									content: err.errMsg,
+									showCancel: false
+								});
+							}
+						})
+					}
+				}else{
+					formData.STATUS=STATUS
+					this.buttonloading = true
+					uni.request({
+						url: basePath + "/app/hotwork/cfd/editStatus",
+						method: 'POST',
+						dataType: 'json',
+						header:{
+							'Content-type':'application/x-www-form-urlencoded'
+						},
+						data: {
+							  ...formData,
+							  CORPINFO_ID:loginUser.CORPINFO_ID,
+							  USER_ID:loginUser.USER_ID,
+							},
+						success: (res) => {
+							uni.showToast({
+								icon:'none',
+								title: '保存成功',
+								duration: 2000
+							});
+							_this.goback()
+							this.buttonloading = false
+						},
+						fail: (err) => {
+							uni.hideLoading();
+							uni.showModal({
+								content: err.errMsg,
+								showCancel: false
+							});
+						}
+					})
+				}
+			},
+			// 获取动火列表
+			getLimitSpace(){
+				var _this = this;
+				uni.request({
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type': 'application/x-www-form-urlencoded'
+					},
+					url: basePath + '/app/limitspace/listAllSpace?tm=' + new Date().getTime(),
+					data: {
+						CORPINFO_ID:loginUser.CORPINFO_ID,
+						USER_ID:loginUser.USER_ID,
+					  },
+					success: function (res) {
+						_this.limitSpaceList = res.data.varList;
+					}
+				});
+			},
+			levelChange(e){
+				this.levelindex = e.detail.value;
+				this.pd.WORK_LEVEL=this.levelList[this.levelindex].name;
+				this.$forceUpdate();//强制刷新
+			},
+			getDept() {
+				var _this = this;
+				uni.request({
+					url: basePath + '/app/sys/listTree',//部门下拉接口
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					data: {
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+					},
+					success: (res) => {
+						if("success" == res.data.result){
+							_this.treeNode=eval(res.data.zTreeNodes);
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								duration: 2000
+							});
+						}
+					}
+				});
+			},
+			//获取人员列表
+			getUserList(dept,list,i){
+				//发送 post 请求
+				var _this=this
+				uni.request({
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					url: basePath+'/app/sys/listUser',
+					data: {
+            DEPARTMENT_ID:dept,
+            tm:new Date().getTime(),
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+					success: function(res){
+						if("success" == res.data.result){
+							if(i>-1) {
+								_this[list][i] = [];
+								_this[list][i] = res.data.userList;
+								_this.$forceUpdate();//强制刷新
+							}else{
+								_this[list]=res.data.userList;
+							}
+						}else{
+							uni.showToast({
+								title: res.data.message,
+								duration: 2000
+							});
+						}
+					}
+				})
+			},
+
+			/*
+         *手写板
+         */
+			showModal(e) {
+				this.modalName = e.currentTarget.dataset.target
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+			//完成
+			subCanvas(e) {
+				this.imgList.splice(0,this.imgList.length);
+				this.imgList.push(e);
+				this.pd.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
+				this.hideModal();
+				this.signModalShow = false;
+			},
+			ViewImage(e) {
+				let files =[];
+				files.push(e.currentTarget.dataset.url)
+				uni.previewImage({
+					urls: files,
+					current: e.currentTarget.dataset.url
+				});
+			},
+
+			/*
+			*分析人
+			 */
+			// 确定回调事件
+			analyzetreeConfirm(e) {
+				this.isUps=false;
+				this.pd.ANALYZE_DEPARTMENT_ID=e[0].id;
+				this.pd.ANALYZE_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'analyzeUserList');
+			},
+			// 取消回调事件
+			analyzetreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showAnalyzeTree() {
+				this.isUps=true
+				this.$refs.tkiTree_analyze._show();
+			},
+			PickerAnalyze(e) {
+				this.analyzeindex = e.detail.value;
+				this.pd.ANALYZE_USER_ID=this.analyzeUserList[this.analyzeindex].USER_ID;
+				this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			/*
+			*确认人
+		 	*/
+			// 确定回调事件
+			confirmtreeConfirm(e) {
+				this.isUps=false;
+				this.pd.CONFIRM_DEPARTMENT_ID=e[0].id;
+				this.pd.CONFIRM_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'confirmUserList');
+			},
+			// 取消回调事件
+			confirmtreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showConfirmTree() {
+				this.isUps=true
+				this.$refs.tkiTree_confirm._show();
+			},
+			PickerConfirm(e) {
+				this.confirmindex = e.detail.value;
+				this.pd.CONFIRM_USER_ID=this.confirmUserList[this.confirmindex].USER_ID;
+				this.pd.CONFIRM_USER_NAME=this.confirmUserList[this.confirmindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			/*
+			*监护人
+			 */
+			// 确定回调事件
+			guardiantreeConfirm(e) {
+				this.isUps=false;
+				this.pd.GUARDIAN_DEPARTMENT_ID=e[0].id;
+				this.pd.GUARDIAN_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'guardianUserList');
+			},
+			// 取消回调事件
+			guardiantreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showGuardianTree() {
+				this.isUps=true
+				this.$refs.tkiTree_guardian._show();
+			},
+			PickerGuardian(e) {
+				this.guardianindex = e.detail.value;
+				this.pd.GUARDIAN_USER_ID=this.guardianUserList[this.guardianindex].USER_ID;
+				this.pd.GUARDIAN_USER_NAME=this.guardianUserList[this.guardianindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+
+            /*
+            *单位领导
+            */
+// 确定回调事件
+            leadertreeConfirm(e) {
+                this.isUps=false;
+                this.pd.LEADER_DEPARTMENT_ID=e[0].id;
+                this.pd.LEADER_DEPARTMENT_NAME=e[0].name;
+                this.$forceUpdate();//强制刷新
+                this.getUserList(e[0].id,'leaderUserList');
+            },
+// 取消回调事件
+            leadertreeCancel(e) {
+                this.isUps=false;
+            },
+// 显示树形选择器
+            showLeaderTree() {
+                this.isUps=true
+                this.$refs.tkiTree_leader._show();
+            },
+            PickerLeader(e) {
+                this.leaderindex = e.detail.value;
+                this.pd.LEADER_USER_ID=this.leaderUserList[this.leaderindex].USER_ID;
+                this.pd.LEADER_USER_NAME=this.leaderUserList[this.leaderindex].NAME;
+                this.$forceUpdate();//强制刷新
+            },
+
+			/*
+			*安全管理部门负责人
+		 	*/
+			// 确定回调事件
+			audittreeConfirm(e) {
+				this.isUps=false;
+				this.pd.AUDIT_DEPARTMENT_ID=e[0].id;
+				this.pd.AUDIT_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'auditUserList');
+			},
+			// 取消回调事件
+			audittreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showAuditTree() {
+				this.isUps=true
+				this.$refs.tkiTree_audit._show();
+			},
+			PickerAudit(e) {
+				this.auditindex = e.detail.value;
+				this.pd.AUDIT_USER_ID=this.auditUserList[this.auditindex].USER_ID;
+				this.pd.AUDIT_USER_NAME=this.auditUserList[this.auditindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			/*
+			*审批部门
+		 	*/
+			// 确定回调事件
+			approvetreeConfirm(e) {
+				this.isUps=false;
+				this.pd.APPROVE_DEPARTMENT_ID=e[0].id;
+				this.pd.APPROVE_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'approveUserList');
+			},
+			// 取消回调事件
+			approvetreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showApproveTree() {
+				this.isUps=true
+				this.$refs.tkiTree_approve._show();
+			},
+			PickerApprove(e) {
+				this.approveindex = e.detail.value;
+				this.pd.APPROVE_USER_ID=this.approveUserList[this.approveindex].USER_ID;
+				this.pd.APPROVE_USER_NAME=this.approveUserList[this.approveindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+            /*
+*在岗班长
+*/
+// 确定回调事件
+            monitortreeConfirm(e) {
+                this.isUps=false;
+                this.pd.MONITOR_DEPARTMENT_ID=e[0].id;
+                this.pd.MONITOR_DEPARTMENT_NAME=e[0].name;
+                this.$forceUpdate();//强制刷新
+                this.getUserList(e[0].id,'monitorUserList');
+            },
+// 取消回调事件
+            monitortreeCancel(e) {
+                this.isUps=false;
+            },
+// 显示树形选择器
+            showMonitorTree() {
+                this.isUps=true
+                this.$refs.tkiTree_monitor._show();
+            },
+            PickerMonitor(e) {
+                this.monitorindex = e.detail.value;
+                this.pd.MONITOR_USER_ID=this.monitorUserList[this.monitorindex].USER_ID;
+                this.pd.MONITOR_USER_NAME=this.monitorUserList[this.monitorindex].NAME;
+                this.$forceUpdate();//强制刷新
+            },
+			/*
+			*验收部门
+			*/
+// 确定回调事件
+			accepttreeConfirm(e) {
+				this.isUps=false;
+				this.pd.ACCEPT_DEPARTMENT_ID=e[0].id;
+				this.pd.ACCEPT_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'acceptUserList');
+			},
+// 取消回调事件
+			accepttreeCancel(e) {
+				this.isUps=false;
+			},
+// 显示树形选择器
+			showAcceptTree() {
+				this.isUps=true
+				this.$refs.tkiTree_accept._show();
+			},
+			PickerAccept(e) {
+				this.acceptindex = e.detail.value;
+				this.pd.ACCEPT_USER_ID=this.acceptUserList[this.acceptindex].USER_ID;
+				this.pd.ACCEPT_USER_NAME=this.acceptUserList[this.acceptindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			changeStartDate(e) {
+				this.pd.WORK_START_DATE = e
+				this.$forceUpdate();//强制刷新
+			},
+			changeEndDate(e) {
+				this.pd.WORK_END_DATE = e
+				this.$forceUpdate();//强制刷新
+			},
+
+			changeRadio(i,value){
+				this.measuresList[i].STATUS=value
+			},
+
+			goback(){
+				var pages = getCurrentPages();	// 获取当前页面栈
+				var prePage = pages[pages.length - 2];	// 上二级页面
+				prePage.$vm.initflag = true;    // A 页面 init方法 为true
+				uni.navigateBack({delta: 1});
+				uni.hideLoading();
+			},
+			radioType(e){
+				this.HASINSTRUCTOR = e.detail.value
+			},
+			goToEdit(){
+				this.forbidEdit = false;
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
new file mode 100644
index 0000000..1ff64a3
--- /dev/null
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
@@ -0,0 +1,773 @@
+<template>
+	<view>
+		<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="请输入关键字"
+					confirm-type="search"></input>
+
+				</view>
+				<view class="action">
+					<button class="cu-btn bg-green shadow-blur radius" @click="getQuery">搜索</button>
+				</view>
+			</view>
+			<view class="line"></view>
+		</view>
+		<scroll-view class="dy-scroll" @scrolltolower="scrolltolower" scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
+			<view v-if="list.length>0" >
+				<view class="dy-list">
+					<view v-for="(item,index) of list" :key="index" :data-id="item.HOTWORK_ID" class="dy-list-item p20">
+            <view class="dy-title-flex align-center" @click="$noMultipleClicks(goToDetail,item)">
+              <text>编号:{{item.CHECK_NO}}</text>
+              <text>作业级别:{{item.WORK_LEVEL}}</text>
+            </view>
+            <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+              <text>申请人:{{item.APPLY_USER_NAME}}</text>
+              <text>分析人:{{item.ANALYZE_USER_NAME}}</text>
+            </view>
+            <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+              <text>作业负责人：{{item.CONFIRM_USER_NAME}}</text>
+              <text>动火点所在单位负责人：{{item.LEADER_USER_NAME}}</text>
+            </view>
+            <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+              <text>安全管理部门负责人：{{item.AUDIT_USER_NAME}}</text>
+              <text>审批部门负责人：{{item.APPROVE_USER_NAME}}</text>
+            </view>
+			<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+				<text>监护人：{{item.GUARDIAN_USER_NAME}}</text>
+				<text>安全交底人：{{item.CONFESS_USER_NAME}}</text>
+			</view>
+
+			<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+				<text>接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}</text>
+			</view>
+            <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+              <text>动火前验票负责人：{{item.MONITOR_USER_NAME}}</text>
+              <text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
+            </view>
+						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
+							<text>
+								审核状态：
+								<template v-if="item.APPLY_STATUS==0">动火作业待提交</template>
+								<template v-else-if="item.APPLY_STATUS==1">作业负责人待审核</template>
+								<!--								<template v-else-if="item.APPLY_STATUS==2">监护人待确认</template>-->
+								<template v-else-if="item.APPLY_STATUS==2">所在单位待审核</template>
+								<template v-else-if="item.APPLY_STATUS==4">安全管理部门待审核</template>
+								<template v-else-if="item.APPLY_STATUS==5">动火审批人待审核</template>
+								<template v-else-if="item.APPLY_STATUS==6">班长待验票</template>
+								<template v-else-if="item.APPLY_STATUS==7">待验收</template>
+								<template v-else-if="item.APPLY_STATUS==8">验收归档</template>
+								<template v-else-if="item.APPLY_STATUS==-2">作业负责人审核打回</template>
+								<!--								<template v-else-if="item.APPLY_STATUS==-3">监护人确认打回</template>-->
+								<template v-else-if="item.APPLY_STATUS==-4">所在单位审核打回</template>
+								<template v-else-if="item.APPLY_STATUS==-5">安全管理部门审核打回</template>
+								<template v-else-if="item.APPLY_STATUS==-6">动火审批人审核打回</template>
+								<template v-else-if="item.APPLY_STATUS==-7">班长验票打回</template>
+								<template v-else-if="item.APPLY_STATUS==-8">验收打回</template>
+							</text>
+							<text v-if="item.APPLY_STATUS<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
+						</view>
+						<view class="dy-subtitle-flex">
+							<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
+										  @click="showDrawer('showRight',item)">查看流程图</button></text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else-if="dataFlag=='noData'" class="dy-null">
+				<view class="dy-null-img">
+					<image :src="background[dataFlag].url" mode=""></image>
+				</view>
+				<view class="dy-null-title">
+					{{background[dataFlag].msg}}
+				</view>
+			</view>
+			<view class="cu-tabbar-height"></view>
+		</scroll-view>
+		<!-- 右侧抽屉 -->
+		<uni-drawer ref="showRight" mode="right" :mask-click="true" @change="change($event,'showRight')">
+			<view>
+				<view class="step-top ">
+					查看流程图
+				</view>
+				<view class="step-item-container">
+					<view class="step-item">
+						<view class="step-item-wrap" v-for="(item,key) of lclist" :key="key"
+							  :class="getShowStatus(item)">
+							<view class="step-item-wrap-doter">
+								<view class="step-item-wrap-dot"></view>
+							</view>
+							<view class="step-item-wrap-right">
+								<view class="step-item-wrap-right-title">{{item.name}}</view>
+								<view class="step-item-wrap-right-title">{{item.USER_NAME}}{{item.STATE}}</view>
+								<view class="step-item-wrap-right-title">{{item.TIME}}</view>
+								<view class="step-item-wrap-right-info">
+									{{item.msg}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="GUARDIAN_USER_SIGNER_TIME">
+					<view style="padding: 0 60upx;color: #5db174">
+						监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}已签字
+					</view>
+				</view>
+				<view v-if="!GUARDIAN_USER_SIGNER_TIME">
+					<view style="padding: 0 60upx;color: red">
+						监&nbsp;&nbsp;&nbsp;护&nbsp;&nbsp;&nbsp;&nbsp;人：{{GUARDIAN_USER_NAME}}未签字
+					</view>
+				</view>
+				<view v-if="CONFESS_USER_SIGNER_TIME">
+					<view style="padding: 0 60upx;color: #5db174">
+						安全交底人：{{CONFESS_USER_NAME}}已签字
+					</view>
+				</view>
+				<view v-if="!CONFESS_USER_SIGNER_TIME">
+					<view style="padding: 0 60upx;color: red">
+						安全交底人：{{CONFESS_USER_NAME}}未签字
+					</view>
+				</view>
+				<view v-if="ACCEPT_CONFESS_USER_SIGNER_TIME">
+					<view style="padding: 0 60upx;color: #5db174">
+						接受交底人：{{ACCEPT_CONFESS_USER_NAME}}已签字
+					</view>
+				</view>
+				<view v-if="!ACCEPT_CONFESS_USER_SIGNER_TIME">
+					<view style="padding: 0 60upx;color: red">
+						接受交底人：{{ACCEPT_CONFESS_USER_NAME}}未签字
+					</view>
+				</view>
+			</view>
+		</uni-drawer>
+	</view>
+</template>
+
+<script>
+	import {
+		basePath,corpinfoId,loginSession,formatDate,loginUser
+	} from '@/common/tool.js';
+	import tkiTree from "@/components/select-tree/select-tree.vue"
+	export default {
+		components: {
+			tkiTree
+		},
+		data() {
+			return {
+				showRight: false,
+				dataFlag:'noData',
+				sTop:0,
+				totalHeight:0,
+				list:[],//返回数据
+				page:1,//分页参数--页数
+				rows:10,//分页参数--每页数据条数
+				totalCount:0,//分页参数--初始化页数
+				isEnd:false,//防止多次刷新
+				totalPage:0,//分页参数--分页数量
+				NameLikes : '',
+				noClick:true,
+				statusList:[
+					{id:'',name:'请选择'},
+					{id:'0',name:'待提交'},
+					{id:'1',name:'作业负责人待审核'},
+					{id:'2',name:'监护人待确认'},
+					{id:'3',name:'车间负责人待确认'},
+					{id:'4',name:'安全管理部门待审核'},
+					{id:'5',name:'待审批'},
+					{id:'6',name:'班长待验票'},
+					{id:'7',name:'待验收'},
+					{id:'8',name:'验收归档'},
+					{id:'-2',name:'作业负责人确认打回'},
+					{id:'-3',name:'监护人确认打回'},
+					{id:'-4',name:'车间负责人打回'},
+					{id:'-5',name:'安全管理部门打回'},
+					{id:'-6',name:'审批打回'},
+					{id:'-7',name:'班长验票打回'},
+					{id:'-8',name:'验收打回'}
+				],
+				sindex:-1,
+				STATUS:'',
+
+				lclist: [{
+					id: '0',
+					name: '动火作业待提交'
+				},
+					{
+						id: '1',
+						name: '作业负责人待审核'
+					},
+					{
+						id: '2',
+						name: '所在单位待审核'
+					},
+					{
+						id: '4',
+						name: '安全管理部门待审核'
+					},
+					{
+						id: '5',
+						name: '动火审批人待审核'
+					},
+					{
+						id: '6',
+						name: '班长待验票'
+					},
+					{
+						id: '7',
+						name: '待验收'
+					},
+					{
+						id: '8',
+						name: '验收归档'
+					},
+				],
+				GUARDIAN_USER_SIGNER_TIME:'',
+				GUARDIAN_USER_NAME:'',
+				CONFESS_USER_SIGNER_TIME: '',
+				CONFESS_USER_NAME: '',
+				ACCEPT_CONFESS_USER_SIGNER_TIME: '',
+				ACCEPT_CONFESS_USER_NAME: ''
+			}
+		},
+		onReady() {
+			let that=this;
+			let CustomBar = this.CustomBar;
+			uni.getSystemInfo({ //调用uni-app接口获取屏幕高度
+				success(res) { //成功回调函数
+					let titleH=uni.createSelectorQuery().select(".top-fixed"); //想要获取高度的元素名（class/id）
+					titleH.boundingClientRect(data=>{
+						that._data.sTop=data.height  //计算高度：元素高度=窗口高度-元素距离顶部的距离（data.top）
+						that.totalHeight = data.height+CustomBar
+					}).exec()
+				}
+			})
+		},
+		onLoad() {//页面第一次加载时触发，从跳转页面返回时不能触发，可以传递参
+
+		},
+		onShow() {
+			//页面显示或从后台跳回小程序时显示此页面时触发，从跳转页面返回时触发，不能传递参数
+			var _this = this;
+			_this.background = require('@/common/background.json');
+			_this.showCount = -1;
+			_this.currentPage = 1;
+			_this.list = [];
+			_this.isEnd = false;
+			_this.getData();
+			// _this.getDept();
+			loginSession();
+		},
+
+		filters: {
+			formatDate(time) {
+				let date = new Date(time)
+				return formatDate(date, 'yyyy-MM-dd')
+			}
+		},
+		methods: {
+			//跳转事件
+			goToDetail(item) {
+				if(!item.ANALYZE_TIME || item.ANALYZE_TIME === '无'){
+					uni.showModal({
+						title:'提示',
+						content:'请进行气体检测后在审核',
+						showCancel:false
+					})
+					return
+				}
+				if(item.APPLY_STATUS == '1') {
+					uni.navigateTo({
+						url: '/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail?HOTWORK_ID=' + item.HOTWORK_ID
+					});
+				}else{
+					uni.navigateTo({
+						url: '/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
+					});
+				}
+			},
+			goToAdd(){
+				uni.navigateTo({
+					url: '/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail'
+				});
+			},
+			getQuery(){	//搜索按钮事件
+				var _this = this;
+				_this.showCount = -1;
+				_this.currentPage = 1;
+				_this.list = [];
+				_this.isEnd = false;
+				_this.getData();
+			},
+			InputBlur(e){
+				this.NameLikes = e.detail.value
+			},
+			// 显示树形选择器
+			showDeptTree() {
+				// this.isUps=true
+				this.$refs.tkiTree._show();
+			},
+			// 打开窗口
+			showDrawer(e, STATUS) {
+				this.lclist = [{
+					id: '0',
+					name: '动火作业提交',
+					USER_NAME: STATUS.APPLY_USER_NAME,
+					TIME: STATUS.CREATTIME,
+					REPULSE: STATUS.OPERATTIME
+				},
+					{
+						id: '1',
+						name: '作业负责人意见',
+						USER_NAME: STATUS.CONFIRM_USER_NAME,
+						TIME: STATUS.CONFIRM_USER_SIGNER_TIME
+					},
+					{
+						id: '2',
+						name: '所在单位意见',
+						USER_NAME: STATUS.LEADER_USER_NAME,
+						TIME: STATUS.LEADER_USER_SIGNER_TIME
+					},
+					{
+						id: '4',
+						name: '安全管理部门意见',
+						USER_NAME: STATUS.AUDIT_USER_NAME == undefined ? "已跳过" : STATUS.AUDIT_USER_NAME,
+						TIME: STATUS.AUDIT_USER_SIGNER_TIME
+					},
+
+					{
+						id: '5',
+						name: '动火审批人意见',
+						USER_NAME: STATUS.APPROVE_USER_NAME == undefined ? "已跳过" : STATUS.APPROVE_USER_NAME,
+						TIME: STATUS.APPROVE_USER_SIGNER_TIME
+					},
+					{
+						id: '6',
+						name: '班长验票',
+						USER_NAME: STATUS.MONITOR_USER_NAME,
+						TIME: STATUS.MONITOR_USER_SIGNER_TIME
+					},
+					{
+						id: '7',
+						name: '完成验收',
+						USER_NAME: STATUS.ACCEPT_USER_NAME,
+						TIME: STATUS.ACCEPT_USER_SIGNER_TIME
+					},
+					{
+						id: '8',
+						name: '验收归档',
+						USER_NAME: STATUS.ACCEPT_USER_NAME,
+						TIME: STATUS.ACCEPT_USER_SIGNER_TIME
+					},
+				]
+				this.$refs[e].open()
+				this.showStatus = STATUS.APPLY_STATUS
+				this.APPLY_STATUS = STATUS.APPLY_STATUS
+				this.GUARDIAN_USER_SIGNER_TIME = STATUS.GUARDIAN_USER_SIGNER_TIME
+				this.GUARDIAN_USER_NAME = STATUS.GUARDIAN_USER_NAME
+				this.CONFESS_USER_SIGNER_TIME = STATUS.CONFESS_USER_SIGNER_TIME
+				this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME
+				this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME
+				this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME
+			},
+			getShowStatus(step) {
+				if (this.showStatus == -2 && step.id == 0) {
+					step.msg = '作业负责人审核打回'
+					step.STATE = '待提交'
+					step.REPULSE = step.REPULSE
+				}
+				if (this.showStatus == -4 && step.id == 0) {
+					step.msg = '所在单位审核打回'
+					step.STATE = '待提交'
+					step.REPULSE = step.REPULSE
+				}
+				if (this.showStatus == -5 && step.id == 0) {
+					step.msg = '安全管理部门审核打回'
+					step.STATE = '待提交'
+					step.REPULSE = step.REPULSE
+				}
+				if (this.showStatus == -6 && step.id == 0) {
+					step.msg = '动火审批人审核打回'
+					step.STATE = '待提交'
+					step.REPULSE = step.REPULSE
+				}
+				if (this.showStatus == -7 && step.id == 0) {
+					step.msg = '班长验票打回'
+					step.STATE = '待提交'
+					step.REPULSE = step.REPULSE
+				}
+				if (this.showStatus == -8 && step.id == 0) {
+					step.msg = '验收打回'
+					step.STATE = '待提交'
+					step.REPULSE = step.REPULSE
+				}
+				if (step.id == 0){
+					step.STATE = '待提交'
+				}
+
+				if (this.showStatus == 8) {
+					if(step.USER_NAME == "已跳过"){
+						step.STATE = '审核'
+					}else {
+						if (step.name == '动火作业提交') {
+							step.STATE = '已提交'
+						}
+						if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') {
+							step.STATE = '已审核'
+						}
+						if (step.name == '班长验票') {
+							step.STATE = '已验票'
+						}
+						if (step.name == '完成验收') {
+							step.STATE = '已验收'
+						}
+						if (step.name == '验收归档') {
+							step.STATE = '已归档'
+						}
+					}
+					return 'success'
+				}
+				if (this.showStatus == step.id) {
+					if(step.name == '作业负责人意见'){
+						step.STATE = '待审核'
+					}
+					if(step.name == '所在单位意见'){
+						step.STATE = '待审核'
+					}
+					if(step.name == '安全管理部门意见'){
+						step.STATE = '待审核'
+					}
+					if(step.name == '动火审批人意见'){
+						step.STATE = '待审核'
+					}
+					if(step.name == '班长验票'){
+						step.STATE = '待验票'
+					}
+					if(step.name == '完成验收'){
+						step.STATE = '待验收'
+					}
+					return 'active'
+				} else if (this.showStatus > step.id) {
+					if(step.name == '动火作业提交'){
+						step.STATE = '已提交'
+					}
+					if(step.name == '作业负责人意见'){
+						step.STATE = '已审核'
+					}
+					if(step.name == '所在单位意见'){
+						step.STATE = '已审核'
+					}
+					if(step.USER_NAME == "已跳过"){
+						step.STATE = '审核'
+					}else {
+						if (step.name == '安全管理部门意见') {
+							step.STATE = '已审核'
+						}
+						if (step.name == '动火审批人意见') {
+							step.STATE = '已审核'
+						}
+					}
+					if(step.name == '班长验票'){
+						step.STATE = '已验票'
+					}
+					if(step.name == '完成验收'){
+						step.STATE = '已验收'
+					}
+					return 'success'
+				} else if (this.showStatus < step.id) {
+					if (this.showStatus < 0 && step.id == 0) return 'erroractive'
+					return ''
+				}
+			},
+			// 关闭窗口
+			closeDrawer(e) {
+				this.$refs[e].close()
+			},
+
+
+			// 抽屉状态发生变化触发
+			change(e, type) {
+				console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+				this[type] = e
+			},
+			// 滑动到底方法
+			scrolltolower(){
+				var _this = this;
+				_this.showCount = -1;
+				_this.currentPage = _this.currentPage + 1;
+				_this.isEnd = false;
+				if(_this.totalPage >= _this.currentPage){
+					_this.getData();//开始分页查询
+				}
+			},
+
+			statusChange(e){
+				this.sindex = e.detail.value;
+				this.STATUS=this.statusList[this.sindex].id;
+				this.getQuery();
+			},
+			getData(){
+				var _this = this;
+				if (_this.isEnd) {
+					return
+				}else{
+					this.isEnd =true;
+				}
+				uni.showLoading({
+					title:"加载中..."
+				});//加载中动画
+				uni.request({
+					url: basePath +'/app/hotwork/cfd/list?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					data: {
+						CONFIRM_USER_ID:loginUser.USER_ID,
+						// CONFIRM_USER_ID:'6d6c37756530434382e2f14fbcafaa92',
+						APPLY_STATUS:'0.9',
+						tm:new Date().getTime(),
+						KEYWORDS : _this.NameLikes, //关键字模糊查询
+						CORPINFO_ID:loginUser.CORPINFO_ID,
+						USER_ID:loginUser.USER_ID,
+					},
+					success: (res) => {
+						uni.hideLoading();//结束加载中动画
+						if (res.data != null) {
+							_this.totalPage = res.data.page.totalPage;
+							if(_this.list.length == 0){
+								_this.list = res.data.varList;
+							}else{
+								if(res.data.varList != null){
+									_this.list2 = res.data.varList;
+									_this.list = _this.list.concat(_this.list2);
+								}
+							}
+						}
+
+					}
+				})
+			},
+			handleDelete(id){
+				var _this = this;
+				uni.showModal({
+					title: '',
+					content: '确定要删除这条申请？',
+					cancelColor:"#000000",
+					cancelText: '取消',
+					confirmText: '确定',
+					success: res => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '处理中'
+							})
+							uni.request({
+								url: basePath+'/app/hotwork/cfd/delete',
+								method: 'POST',
+								dataType: 'json',
+								header: {
+									'Content-type':'application/x-www-form-urlencoded'
+								},
+								data: {
+									HOTWORK_ID: id,
+									  CORPINFO_ID:loginUser.CORPINFO_ID,
+									  USER_ID:loginUser.USER_ID,
+								},
+								success: (res) => {
+									uni.hideLoading();
+									uni.showToast({
+										icon: 'none',
+										title: '删除成功',
+										duration: 1500
+									});
+									_this.getQuery()
+								},
+								fail: (err) => {
+									uni.hideLoading();
+									uni.showModal({
+										content: err.errMsg,
+										showCancel: false
+									});
+								}
+							})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.dy-card {
+		background-color: #fff;
+		border-radius: 10upx;
+		margin: 30upx
+	}
+
+	.dy-card-title {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #eee;
+		min-height: 80upx;
+		line-height: 80upx;
+		padding: 0 30upx;
+	}
+
+	.dy-card-content {
+		padding: 0upx 30upx 30upx;
+
+	}
+
+	.dy-card-content-item {
+		margin-top: 20upx;
+	}
+
+	.dy-card-content-item .title {
+		display: flex;
+		align-items: center;
+	}
+
+	.dy-card-content-item .title .l {
+		width: 10upx;
+		height: 30upx;
+		border-radius: 20upx;
+		background-color: #666;
+		margin-right: 10upx;
+	}
+
+	.dy-card-content-item .content {
+		background-color: #F1F1F1;
+		padding: 10upx 14upx;
+		margin-top: 14upx;
+		line-height: 1.6;
+	}
+
+	.dy-card-content-item .name text {
+		background-color: #F1F1F1;
+		padding: 10upx 14upx;
+		margin-top: 14upx;
+		line-height: 1.6;
+		display: inline-block;
+	}
+
+	.dy-card-foot {
+		border-top: 1px solid #eee;
+		padding: 30upx;
+	}
+	.p20 {
+		padding: 40upx;
+	}
+
+	.step-top {
+		width: 100%;
+		border-bottom: 1px solid #eee;
+		background: #f9f9f9;
+		padding: 20upx;
+	}
+
+	.step-item-container {
+		width: 100%;
+		padding: 20upx;
+
+	}
+
+	.step-item {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		padding: 20upx 40upx;
+	}
+
+
+	.step-item-wrap {
+		width: 100%;
+		border-left: 1px solid #ccc;
+		min-height: 100upx;
+		position: relative;
+		display: flex;
+		flex-direction: row;
+	}
+
+	.step-item-wrap.active .step-item-wrap-doter .step-item-wrap-dot {
+		background: #4cc9fb;
+	}
+
+	.step-item-wrap.success .step-item-wrap-doter .step-item-wrap-dot {
+		background: #5db174;
+	}
+
+	.step-item-wrap.erroractive .step-item-wrap-doter .step-item-wrap-dot {
+		background: red;
+	}
+
+	.step-item-wrap.active {
+		border-left: 1px solid #5db174;
+	}
+
+	.step-item-wrap.activeing {
+		border-left: 1px solid #ccc;
+	}
+
+	.step-item-wrap:last-child {
+		border: none;
+	}
+
+	.step-item-wrap-doter {
+		width: 30upx;
+		height: 30upx;
+		border-radius: 100%;
+		background: #fff;
+		position: absolute;
+		top: 0upx;
+		left: -12upx;
+		text-align: center;
+		padding-top: 5upx;
+
+	}
+
+	.step-item-wrap-dot {
+		width: 20upx;
+		height: 20upx;
+		background: #c0c4cc;
+		border-radius: 100%;
+	}
+
+	.step-item-wrap-right {
+		margin-left: 40upx;
+		margin-top: -5upx;
+		padding-bottom: 60upx;
+	}
+
+
+	.step-item-wrap-right-info {
+		color: #999;
+		margin-top: 10upx;
+	}
+	.step-item-wrap.active .step-item-wrap-right,.step-item-wrap.active .step-item-wrap-right-info {
+		color: #4cc9fb;
+	}
+
+	.step-item-wrap.success .step-item-wrap-right,.step-item-wrap.success .step-item-wrap-right-info {
+		color: #5db174;
+	}
+
+	.step-item-wrap.erroractive .step-item-wrap-right,.step-item-wrap.erroractive .step-item-wrap-right-info {
+		color: red;
+	}
+
+</style>
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
new file mode 100644
index 0000000..dff4e0f
--- /dev/null
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
@@ -0,0 +1,1192 @@
+<template>
+	<view >
+		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" >
+			<block slot="backText">返回</block>
+			<block slot="content">动火安全作业</block>
+		</cu-custom>
+		<scroll-view scroll-y="false" >
+		<view class="form">
+			<view class="wui-form-list">
+				<view class="cu-form-group group-picker" >
+					<view class="title">申请单位：</view>
+					{{pd.APPLY_DEPARTMENT_NAME}}
+				</view>
+
+				<view class="cu-form-group group-picker" >
+					<view class="title">申请人：</view>
+					{{pd.APPLY_USER_NAME}}
+				</view>
+
+				<view class="cu-form-group bb-default">
+					<view class="title">编号：</view>
+					<input name="input" ref="CHECK_NO" :disabled="true" v-model="pd.CHECK_NO" placeholder="请输入编号"></input>
+				</view>
+
+				<view class="cu-form-textarea">
+					<view class="cu-form-title">作业内容：</view>
+					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容" ></textarea>
+				</view>
+
+				<view class="cu-form-group">
+					<view class="title">动火地点及动火部位：</view>
+					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
+				</view>
+
+				<view class="cu-form-group group-picker">
+					<view class="title">动火作业级别：</view>
+					<picker v-if="!forbidEdit" @change="levelChange" :disabled="forbidEdit" :value="levelindex" :range="levelList" range-key="name">
+						<view class="picker">
+							{{pd.WORK_LEVEL?pd.WORK_LEVEL:'请选择'}}
+						</view>
+					</picker>
+					<view v-else>{{pd.WORK_LEVEL}}</view>
+				</view>
+
+				<view class="cu-form-group">
+					<view class="title">动火方式：</view>
+					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_FUNCTION" placeholder="请输入"></input>
+				</view>
+
+				<view v-if="!forbidEdit" class="cu-form-group ">
+					<view class="title">作业开始时间</view>
+					<ruiDatePicker v-if="!forbidEdit"
+								   :start="todayDate"
+								   fields="minute"
+								   :value="pd.WORK_START_DATE?pd.WORK_START_DATE:''"
+								   @change="changeStartDate"
+					></ruiDatePicker>
+					<view v-else>{{pd.WORK_START_DATE}}</view>
+				</view>
+				<view v-if="!forbidEdit" class="cu-form-group">
+					<view class="title">作业结束时间</view>
+					<ruiDatePicker v-if="!forbidEdit"
+								   :start="todayDate"
+								   fields="minute"
+								   :value="pd.WORK_END_DATE?pd.WORK_END_DATE:''"
+								   @change="changeEndDate"
+					></ruiDatePicker>
+					<view v-else>{{pd.WORK_END_DATE}}</view>
+				</view>
+
+				<view v-if="forbidEdit" class="cu-form-group" style="height: 140upx;">
+					<view class="title" style="width: 175upx; height: 90upx; margin: 0;line-height: 1.6;">
+						<view>动火作业</view>
+						<view>实施时间：</view>
+					</view>
+					<view >
+						<text>{{pd.WORK_START_DATE}}</text>
+						<text>至</text>
+						<text>{{pd.WORK_END_DATE}}</text>
+					</view>
+				</view>
+
+<!--				<view class="cu-form-group" >-->
+<!--					<view class="title">作业负责人：</view>-->
+<!--					<input name="input" ref="WORK_MANAGER" :disabled="forbidEdit" v-model="pd.WORK_MANAGER" placeholder="请输入"></input>-->
+<!--				</view>-->
+
+				<view class="cu-form-textarea">
+					<view style="display: flex;justify-content: space-between;align-items: center">
+						<view class="cu-form-title">动火人及证书编号：</view>
+					</view>
+					<textarea maxlength="255" v-model="pd.WORK_USER" placeholder="请输入动火人及证书编号"></textarea>
+				</view>
+
+				<view class="cu-form-textarea" >
+					<view class="cu-form-title">关联的其他特殊作业及安全作业票编号：</view>
+					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.SPECIAL_WORK" placeholder="请输入关联的其他特殊作业及安全作业票编号"></textarea>
+				</view>
+
+				<view class="cu-form-textarea" >
+					<view class="cu-form-title">风险辨识结果：</view>
+					<textarea maxlength="255" :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;" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
+				<view class="wui-title" style="margin-left: 20upx;">
+					<text class="text-semi">安全防护措施</text>
+				</view>
+				<view class="wui-table" style="padding: 0 20upx;">
+					<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
+							<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
+						</uni-tr>
+						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
+							<uni-td>
+								<view style="margin-bottom: 20upx;">
+								    {{item.PROTECTIVE_MEASURES}}
+								  </view>
+								<view class="cu-form-group" v-if="item.QUESTION1">
+									<view class="title">{{item.QUESTION1}}</view>
+									<input name="input" :disabled="forbidEdit" v-model="item.ANSWER1" placeholder="请输入"></input>
+								</view>
+								<view class="cu-form-group" v-if="item.QUESTION2">
+									<view class="title">{{item.QUESTION2}}</view>
+									<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input>
+								</view>
+								<view class="cu-form-group" v-if="item.QUESTION3">
+									<view class="title">{{item.QUESTION3}}</view>
+									<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input>
+								</view>
+								<view class="cu-form-group" v-if="item.QUESTION4">
+									<view class="title">{{item.QUESTION4}}</view>
+									<input name="input" :disabled="forbidEdit" v-model="item.ANSWER4" placeholder="请输入"></input>
+								</view>
+							</uni-td>
+							<uni-td align="center">
+								<radio-group class="wui-radio-group">
+									<view class="group" v-if="item.STATUS=='-1'">
+										<radio class='radio'  value="-1"  checked>
+											<text class="wui-pl10">不涉及</text></radio>
+									</view>
+									<view class="group" v-if="item.STATUS=='1'">
+										<radio class='radio' value="1" checked>
+											<text class="wui-pl10">涉&nbsp;&nbsp;&nbsp;&nbsp;及</text></radio>
+									</view>
+								</radio-group>
+							</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+				<view v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
+					<view class="cu-form-group">
+						<view class="title">其他安全措施：</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>
+
+				<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.ACCEPT_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.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_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>
+						</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" >
+							<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>
+			</view>
+
+			<view class="wui-form-list" v-if="!forbidEdit">
+				<view class="cu-form-group" >
+					<view class="title">气体分析单位</view>
+					<view class="picker-tree-box">
+						<view class="picker-tree" @tap="showAnalyzeTree">{{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}}</view>
+					</view>
+					<tki-tree ref="tkiTree_analyze"
+							  :selectParent=true
+							  :range="treeNode"
+							  rangeKey="name"
+							  @confirm="analyzetreeConfirm"
+							  @cancel="analyzetreeCancel"></tki-tree>
+				</view>
+				<view class="cu-form-group" >
+					<view class="title">气体分析单位负责人</view>
+					<picker @change="PickerAnalyze" :value="analyzeindex" :range="analyzeUserList" range-key="NAME" :disabled="analyzeUserList.length == 0" @click="isBlankList('analyze')">
+						<view class="picker">
+							{{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}}
+						</view>
+					</picker>
+				</view>
+
+				<view class="cu-form-group" v-if="!forbidEdit">
+					<view class="title">作业负责人单位</view>
+					<view class="picker-tree-box">
+						<view class="picker-tree" @tap="showConfirmTree">{{pd.CONFIRM_DEPARTMENT_NAME?pd.CONFIRM_DEPARTMENT_NAME:'请选择'}}</view>
+					</view>
+					<tki-tree ref="tkiTree_confirm"
+							  :selectParent=true
+							  :range="treeNode"
+							  rangeKey="name"
+							  @confirm="confirmtreeConfirm"
+							  @cancel="confirmtreeCancel"></tki-tree>
+				</view>
+				<view class="cu-form-group" v-if="!forbidEdit">
+					<view class="title">作业负责人</view>
+					<picker @change="PickerConfirm" :value="confirmindex" :range="confirmUserList" range-key="NAME" :disabled="confirmUserList.length == 0" @click="isBlankList('confirm')">
+						<view class="picker">
+							{{pd.CONFIRM_USER_NAME?pd.CONFIRM_USER_NAME:'请选择'}}
+						</view>
+					</picker>
+				</view>
+
+<!--				<view class="cu-form-group" >-->
+<!--					<view class="title">监护人单位</view>-->
+<!--					<view class="picker-tree-box">-->
+<!--						<view class="picker-tree" @tap="showGuardianTree">{{pd.GUARDIAN_DEPARTMENT_NAME?pd.GUARDIAN_DEPARTMENT_NAME:'请选择'}}</view>-->
+<!--					</view>-->
+<!--					<tki-tree ref="tkiTree_guardian"-->
+<!--							  :selectParent=true-->
+<!--							  :range="treeNode"-->
+<!--							  rangeKey="name"-->
+<!--							  @confirm="guardiantreeConfirm"-->
+<!--							  @cancel="guardiantreeCancel"></tki-tree>-->
+<!--				</view>-->
+<!--				<view class="cu-form-group" >-->
+<!--					<view class="title">监护人</view>-->
+<!--					<picker @change="PickerGuardian" :value="guardianindex" :range="guardianUserList" range-key="NAME" :disabled="guardianUserList.length == 0" @click="isBlankList('guardian')">-->
+<!--						<view class="picker">-->
+<!--							{{pd.GUARDIAN_USER_NAME?pd.GUARDIAN_USER_NAME:'请选择'}}-->
+<!--						</view>-->
+<!--					</picker>-->
+<!--				</view>-->
+
+        <view class="cu-form-group" v-if="!forbidEdit">
+            <view class="title">所在单位</view>
+            <view class="picker-tree-box">
+                <view class="picker-tree" @tap="showLeaderTree">{{pd.LEADER_DEPARTMENT_NAME?pd.LEADER_DEPARTMENT_NAME:'请选择'}}</view>
+            </view>
+            <tki-tree ref="tkiTree_leader"
+                      :selectParent=true
+                      :range="treeNode"
+                      rangeKey="name"
+                      @confirm="leadertreeConfirm"
+                      @cancel="leadertreeCancel"></tki-tree>
+        </view>
+        <view class="cu-form-group" v-if="!forbidEdit">
+            <view class="title">所在单位负责人</view>
+            <picker @change="PickerLeader" :value="leaderindex" :range="leaderUserList" range-key="NAME" :disabled="leaderUserList.length == 0" @click="isBlankList('leader')">
+                <view class="picker">
+                    {{pd.LEADER_USER_NAME?pd.LEADER_USER_NAME:'请选择'}}
+                </view>
+            </picker>
+        </view>
+
+				<view class="cu-form-group" >
+					<view class="title">安全管理部门</view>
+					<view class="picker-tree-box">
+						<view class="picker-tree" @tap="showAuditTree">{{pd.AUDIT_DEPARTMENT_NAME?pd.AUDIT_DEPARTMENT_NAME:'请选择'}}</view>
+					</view>
+					<tki-tree ref="tkiTree_audit"
+							  :selectParent=true
+							  :range="treeNode"
+							  rangeKey="name"
+							  @confirm="audittreeConfirm"
+							  @cancel="audittreeCancel"></tki-tree>
+				</view>
+				<view class="cu-form-group" >
+					<view class="title">安全管理部门负责人</view>
+					<picker @change="PickerAudit" :value="auditindex" :range="auditUserList" range-key="NAME" :disabled="auditUserList.length == 0" @click="isBlankList('audit')">
+						<view class="picker">
+							{{pd.AUDIT_USER_NAME?pd.AUDIT_USER_NAME:'请选择'}}
+						</view>
+					</picker>
+				</view>
+
+				<view class="cu-form-group" >
+					<view class="title">动火审批单位</view>
+					<view class="picker-tree-box">
+						<view class="picker-tree" @tap="showApproveTree">{{pd.APPROVE_DEPARTMENT_NAME?pd.APPROVE_DEPARTMENT_NAME:'请选择'}}</view>
+					</view>
+					<tki-tree ref="tkiTree_approve"
+							  :selectParent=true
+							  :range="treeNode"
+							  rangeKey="name"
+							  @confirm="approvetreeConfirm"
+							  @cancel="approvetreeCancel"></tki-tree>
+				</view>
+				<view class="cu-form-group" >
+					<view class="title">动火审批人</view>
+					<picker @change="PickerApprove" :value="approveindex" :range="approveUserList" range-key="NAME" :disabled="approveUserList.length == 0" @click="isBlankList('approve')">
+						<view class="picker">
+							{{pd.APPROVE_USER_NAME?pd.APPROVE_USER_NAME:'请选择'}}
+						</view>
+					</picker>
+				</view>
+
+        <view class="cu-form-group" v-if="!forbidEdit">
+            <view class="title">动火前验票部门</view>
+            <view class="picker-tree-box">
+                <view class="picker-tree" @tap="showMonitorTree">{{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}}</view>
+            </view>
+            <tki-tree ref="tkiTree_monitor"
+                      :selectParent=true
+                      :range="treeNode"
+                      rangeKey="name"
+                      @confirm="monitortreeConfirm"
+                      @cancel="monitortreeCancel"></tki-tree>
+        </view>
+        <view class="cu-form-group" v-if="!forbidEdit">
+            <view class="title">动火前验票负责人</view>
+            <picker @change="PickerMonitor" :value="monitorindex" :range="monitorUserList" range-key="NAME" :disabled="monitorUserList.length == 0" @click="isBlankList('monitor')">
+                <view class="picker">
+                    {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}}
+                </view>
+            </picker>
+        </view>
+
+				<view class="cu-form-group" >
+					<view class="title">验收部门</view>
+					<view class="picker-tree-box">
+						<view class="picker-tree" @tap="showAcceptTree">{{pd.ACCEPT_DEPARTMENT_NAME?pd.ACCEPT_DEPARTMENT_NAME:'请选择'}}</view>
+					</view>
+					<tki-tree ref="tkiTree_accept"
+							  :selectParent=true
+							  :range="treeNode"
+							  rangeKey="name"
+							  @confirm="accepttreeConfirm"
+							  @cancel="accepttreeCancel"></tki-tree>
+				</view>
+				<view class="cu-form-group" >
+					<view class="title">验收部门负责人</view>
+					<picker @change="PickerAccept" :value="acceptindex" :range="acceptUserList" range-key="NAME" :disabled="acceptUserList.length == 0" @click="isBlankList('accept')">
+						<view class="picker">
+							{{pd.ACCEPT_USER_NAME?pd.ACCEPT_USER_NAME:'请选择'}}
+						</view>
+					</picker>
+				</view>
+			</view>
+
+			<view class="wui-form-list" v-if="forbidEdit">
+				<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=1">
+					<view>
+						<text class="title">分析人：</text>
+						<text>{{pd.ANALYZE_USER_NAME}}</text>
+					</view>
+					<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
+				</view>
+				<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>
+					</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>
+							{{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 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: none;">-->
+				<!--					<view class="title">监护人</view>-->
+				<!--					{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
+				<!--				</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>
+					</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="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>
+							{{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="pd.APPROVE_CONTENT"></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="pd.MONITOR_CONTENT"></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 class="cu-form-group" v-if="forbidEdit" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;">-->
+					<!--					<view class="title">验收部门负责人</view>-->
+					<!--					{{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_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.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>
+		</view>
+		<view class="cu-bar btn-group" style="margin-top: 30upx;">
+			<button v-if="!forbidEdit" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1')">提交</button>
+			<button v-if="!forbidEdit" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'0')">暂存</button>
+			<button v-if="forbidEdit" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goback)">返回</button>
+		</view>
+		<view class="padding flex flex-direction">
+		</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {
+		basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath
+	} from '@/common/tool.js';
+	import tkiTree from "@/components/select-tree/select-tree.vue"
+	import writingBoard from "@/components/writing-board/writing-board.vue"
+	import gcoord from '@/common/gcoord.js'
+	import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
+	export default {
+		components: {
+			tkiTree,ruiDatePicker,writingBoard
+		},
+		data() {
+			return {
+				baseImgPath:baseImgPath,
+				isUps:false,
+				forbidEdit:true,// 禁止修改
+				msg:'add',
+				noClick:true,
+				treeNode:[],//部门下拉数据
+				levelList:[
+					{id:'特级',name:'特级'},
+					{id:'一级',name:'一级'},
+					{id:'二级',name:'二级'},
+				],
+				levelindex:-1,
+
+				analyzeUserList:[],
+				analyzeindex:-1,
+				confirmUserList:[],
+				confirmindex:-1,
+				guardianUserList:[],
+				guardianindex:-1,
+                leaderUserList:[],
+                leaderindex:-1,
+				auditUserList:[],
+				auditindex:-1,
+				approveUserList:[],
+				approveindex:-1,
+                monitorUserList:[],
+                monitorindex:-1,
+                acceptUserList:[],
+				acceptindex:-1,
+				pd:{
+					OTHER_PROTECTIVE_MEASURES:';_;;_;;_;;_;;_;;_;;_;'
+					},// 数据
+				measuresList:[],
+				rules:[
+					{name:'CHECK_NO',message:'请输入编号'},
+					{name:'WORK_CONTENT',message:'请输入作业内容'},
+					{name:'WORK_PLACE',message:'请输入动火地点及动火部位'},
+					{name:'WORK_LEVEL',message:'请选择动火级别'},
+					{name:'WORK_FUNCTION',message:'请输入动火方式'},
+					{name:'WORK_START_DATE',message:'请选择工作开始时间'},
+					{name:'WORK_END_DATE',message:'请选择工作结束时间'},
+					// {name:'WORK_MANAGER',message:'请输入作业负责人'},
+					{name:'WORK_USER',message:'请输入动火人及证书编号'},
+					{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
+					{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
+					{name:'CONFESS_USER',message:'请输入安全交底人'},
+					{name:'EDUCATE_USER',message:'请输入安全教育人'},
+					{name:'ACCEPT_EDUCATE_USER',message:'请输入接受交底、教育人'},
+					{name:'TRIAL_USER',message:'请输入动火措施初审人'},
+					{name:'ANALYZE_USER_ID',message:'请选择分析人'},
+					{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
+					// {name:'GUARDIAN_USER_ID',message:'请选择监护人'},
+					{name:'LEADER_USER_ID',message:'请选择动火点车间负责人'},
+					{name:'AUDIT_USER_ID',message:'请选择安全管理部门负责人'},
+					{name:'APPROVE_USER_ID',message:'请选择审批人'},
+					{name:'MONITOR_USER_ID',message:'请选择验票班长'},
+					{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'},
+					{name:'GUARDIAN_USER',message:'请输入监护人'},
+				],
+				todayDate:'',
+
+			}
+		},
+		onLoad(event){
+			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
+			this.pd.HOTWORK_ID = event.HOTWORK_ID;
+			if(this.pd.HOTWORK_ID){
+				this.msg="edit";
+				this.getData();
+			}else {
+				// 初始化作业负责人
+				this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
+				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.pd.OTHER_PROTECTIVE_MEASURES = ''
+        this.getCode()
+			}
+			// 初始化现场作业负责人
+			this.getDept();
+			this.getLimitSpace();
+			loginSession();
+
+		},
+		methods: {
+			//跳转事件
+			goToDetail(e) {
+				uni.navigateTo({
+					url: '/pages/application/hotwork_cfd/hotwork-gas/gas-list?HOTWORK_ID='+e
+				});
+			},
+      getCode(){
+        uni.request({
+          url: basePath + '/app/hotwork/cfd/getCode',
+          method: 'POST',
+          dataType: 'json',
+          header: {
+            'Content-type': 'application/x-www-form-urlencoded'
+          },
+          data: {
+            CORPINFO_ID: loginUser.CORPINFO_ID,
+          },
+          success: (res) => {
+            this.pd.CHECK_NO = res.data.code;
+          }
+        })
+      },
+			getData() {
+				var _this = this;
+				uni.showLoading({
+					title: '请稍候'
+				})
+				uni.request({
+					url: basePath + '/app/hotwork/cfd/goEdit',
+					method: 'POST',
+ 					header: {
+						'Content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						HOTWORK_ID: _this.pd.HOTWORK_ID,
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+					},
+					success: (res) => {
+						if ("success" == res.data.result) {
+							uni.hideLoading();
+							_this.pd = res.data.pd; //参数map
+							_this.pd = Object.assign(_this.pd,
+							{
+								"CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],
+								"GUARDIAN_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[1],
+								"LEADER_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[2],
+								"AUDIT_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[3],
+								"APPROVE_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[4],
+								"MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5]
+							})
+							_this.pd.OTHER_PROTECTIVE_MEASURES = ''
+							_this.measuresList = res.data.measuresList
+							if(_this.pd.APPLY_STATUS < 1){
+								_this.forbidEdit = false;
+							}
+						} else if ("exception" == data.result) {
+							uni.showToast({
+								title: '错误',
+								duration: 2000
+							});
+						}
+					}
+				});
+			},
+			goSubmit(STATUS){
+				var _this = this;
+				let required = true
+				uni.showLoading({
+					title: '请稍候'
+				})
+				if(STATUS==1) {
+					this.rules.map(({name,message})  => {
+						if (!this.pd[name]) {
+							uni.showToast({
+								icon: 'none',
+								title: message,
+								duration: 1500
+							});
+							required = false
+						}
+					})
+					if (!required) {
+						return
+					}
+				}
+				const formData={}
+				Object.keys(this.pd).map(key => {
+					formData[key]=this.pd[key]
+				})
+				formData.CORPINFO_ID=corpinfoId
+				formData.CREATOR=loginUser.USER_ID
+				formData.OPERATOR=loginUser.USER_ID
+				formData.ACTION_USER=loginUser.NAME
+				formData.APPLY_STATUS=STATUS
+				uni.request({
+					url: basePath + "/app/hotwork/cfd/"+_this.msg,
+					method: 'POST',
+					dataType: 'json',
+					header:{
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					data: {
+            ...formData,
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+					success: (res) => {
+						uni.showToast({
+							icon:'none',
+							title: '保存成功',
+							duration: 2000
+						});
+						_this.goback()
+					},
+					fail: (err) => {
+						uni.hideLoading();
+						uni.showModal({
+							content: err.errMsg,
+							showCancel: false
+						});
+					}
+				})
+			},
+			// 获取动火列表
+			getLimitSpace(){
+				var _this = this;
+				uni.request({
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type': 'application/x-www-form-urlencoded'
+					},
+					url: basePath + '/app/limitspace/listAllSpace?tm=' + new Date().getTime(),
+					data: {
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+					success: function (res) {
+						_this.limitSpaceList = res.data.varList;
+					}
+				});
+			},
+			levelChange(e){
+				this.levelindex = e.detail.value;
+				this.pd.WORK_LEVEL=this.levelList[this.levelindex].name;
+				this.$forceUpdate();//强制刷新
+			},
+			getDept() {
+				var _this = this;
+				uni.request({
+					url: basePath + '/app/sys/listTree',//部门下拉接口
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					data: {
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+					},
+					success: (res) => {
+						if("success" == res.data.result){
+							_this.treeNode=eval(res.data.zTreeNodes);
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								duration: 2000
+							});
+						}
+					}
+				});
+			},
+			//获取人员列表
+			getUserList(dept,list,i){
+				//发送 post 请求
+				var _this=this
+				uni.request({
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					url: basePath+'/app/sys/listUser',
+					data: {
+            DEPARTMENT_ID:dept,
+            tm:new Date().getTime(),
+            CORPINFO_ID:loginUser.CORPINFO_ID,
+            USER_ID:loginUser.USER_ID,
+          },
+					success: function(res){
+						if("success" == res.data.result){
+							if(i>-1) {
+								_this[list][i] = [];
+								_this[list][i] = res.data.userList;
+								_this.$forceUpdate();//强制刷新
+							}else{
+								_this[list]=res.data.userList;
+							}
+						}else{
+							uni.showToast({
+								title: res.data.message,
+								duration: 2000
+							});
+						}
+					}
+				})
+			},
+			isBlankList(userType) {
+				switch(userType) {
+					case 'analyze':
+						if(this.analyzeUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择气体分析单位',
+								duration: 1500
+							})
+						}
+						break
+					case 'confirm':
+						if(this.confirmUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择作业单位',
+								duration: 1500
+							})
+						}
+						break
+					case 'guardian':
+						if(this.guardianUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择监护人单位',
+								duration: 1500
+							})
+						}
+						break
+					case 'leader':
+						if(this.leaderUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择动火点所在单位',
+								duration: 1500
+							})
+						}
+						break
+					case 'audit':
+						if(this.auditUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择安全管理部门',
+								duration: 1500
+							})
+						}
+						break
+					case 'approve':
+						if(this.approveUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择审批单位',
+								duration: 1500
+							})
+						}
+						break
+					case 'monitor':
+						if(this.monitorUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择动火前验票部门',
+								duration: 1500
+							})
+						}
+						break
+					case 'accept':
+						if(this.acceptUserList.length == 0) {
+							uni.showToast({
+								icon: 'none',
+								title: '请先选择验收部门',
+								duration: 1500
+							})
+						}
+						break
+				}
+			},
+
+			/*
+			*分析人
+			 */
+			// 确定回调事件
+			analyzetreeConfirm(e) {
+				this.isUps=false;
+				this.pd.ANALYZE_DEPARTMENT_ID=e[0].id;
+				this.pd.ANALYZE_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'analyzeUserList');
+			},
+			// 取消回调事件
+			analyzetreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showAnalyzeTree() {
+				this.isUps=true
+				this.$refs.tkiTree_analyze._show();
+			},
+			PickerAnalyze(e) {
+				this.analyzeindex = e.detail.value;
+				this.pd.ANALYZE_USER_ID=this.analyzeUserList[this.analyzeindex].USER_ID;
+				this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			/*
+			*确认人
+		 	*/
+			// 确定回调事件
+			confirmtreeConfirm(e) {
+				this.isUps=false;
+				this.pd.CONFIRM_DEPARTMENT_ID=e[0].id;
+				this.pd.CONFIRM_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'confirmUserList');
+			},
+			// 取消回调事件
+			confirmtreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showConfirmTree() {
+				this.isUps=true
+				this.$refs.tkiTree_confirm._show();
+			},
+			PickerConfirm(e) {
+				this.confirmindex = e.detail.value;
+				this.pd.CONFIRM_USER_ID=this.confirmUserList[this.confirmindex].USER_ID;
+				this.pd.CONFIRM_USER_NAME=this.confirmUserList[this.confirmindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			/*
+			*监护人
+			 */
+			// 确定回调事件
+			guardiantreeConfirm(e) {
+				this.isUps=false;
+				this.pd.GUARDIAN_DEPARTMENT_ID=e[0].id;
+				this.pd.GUARDIAN_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'guardianUserList');
+			},
+			// 取消回调事件
+			guardiantreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showGuardianTree() {
+				this.isUps=true
+				this.$refs.tkiTree_guardian._show();
+			},
+			PickerGuardian(e) {
+				this.guardianindex = e.detail.value;
+				this.pd.GUARDIAN_USER_ID=this.guardianUserList[this.guardianindex].USER_ID;
+				this.pd.GUARDIAN_USER_NAME=this.guardianUserList[this.guardianindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+
+            /*
+            *单位领导
+            */
+// 确定回调事件
+            leadertreeConfirm(e) {
+                this.isUps=false;
+                this.pd.LEADER_DEPARTMENT_ID=e[0].id;
+                this.pd.LEADER_DEPARTMENT_NAME=e[0].name;
+                this.$forceUpdate();//强制刷新
+                this.getUserList(e[0].id,'leaderUserList');
+            },
+// 取消回调事件
+            leadertreeCancel(e) {
+                this.isUps=false;
+            },
+// 显示树形选择器
+            showLeaderTree() {
+                this.isUps=true
+                this.$refs.tkiTree_leader._show();
+            },
+            PickerLeader(e) {
+                this.leaderindex = e.detail.value;
+                this.pd.LEADER_USER_ID=this.leaderUserList[this.leaderindex].USER_ID;
+                this.pd.LEADER_USER_NAME=this.leaderUserList[this.leaderindex].NAME;
+                this.$forceUpdate();//强制刷新
+            },
+
+			/*
+			*安全管理部门负责人
+		 	*/
+			// 确定回调事件
+			audittreeConfirm(e) {
+				this.isUps=false;
+				this.pd.AUDIT_DEPARTMENT_ID=e[0].id;
+				this.pd.AUDIT_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'auditUserList');
+			},
+			// 取消回调事件
+			audittreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showAuditTree() {
+				this.isUps=true
+				this.$refs.tkiTree_audit._show();
+			},
+			PickerAudit(e) {
+				this.auditindex = e.detail.value;
+				this.pd.AUDIT_USER_ID=this.auditUserList[this.auditindex].USER_ID;
+				this.pd.AUDIT_USER_NAME=this.auditUserList[this.auditindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			/*
+			*审批人
+		 	*/
+			// 确定回调事件
+			approvetreeConfirm(e) {
+				this.isUps=false;
+				this.pd.APPROVE_DEPARTMENT_ID=e[0].id;
+				this.pd.APPROVE_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'approveUserList');
+			},
+			// 取消回调事件
+			approvetreeCancel(e) {
+				this.isUps=false;
+			},
+			// 显示树形选择器
+			showApproveTree() {
+				this.isUps=true
+				this.$refs.tkiTree_approve._show();
+			},
+			PickerApprove(e) {
+				this.approveindex = e.detail.value;
+				this.pd.APPROVE_USER_ID=this.approveUserList[this.approveindex].USER_ID;
+				this.pd.APPROVE_USER_NAME=this.approveUserList[this.approveindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+            /*
+*在岗班长
+*/
+// 确定回调事件
+            monitortreeConfirm(e) {
+                this.isUps=false;
+                this.pd.MONITOR_DEPARTMENT_ID=e[0].id;
+                this.pd.MONITOR_DEPARTMENT_NAME=e[0].name;
+                this.$forceUpdate();//强制刷新
+                this.getUserList(e[0].id,'monitorUserList');
+            },
+// 取消回调事件
+            monitortreeCancel(e) {
+                this.isUps=false;
+            },
+// 显示树形选择器
+            showMonitorTree() {
+                this.isUps=true
+                this.$refs.tkiTree_monitor._show();
+            },
+            PickerMonitor(e) {
+                this.monitorindex = e.detail.value;
+                this.pd.MONITOR_USER_ID=this.monitorUserList[this.monitorindex].USER_ID;
+                this.pd.MONITOR_USER_NAME=this.monitorUserList[this.monitorindex].NAME;
+                this.$forceUpdate();//强制刷新
+            },
+			/*
+			*验收部门
+			*/
+// 确定回调事件
+			accepttreeConfirm(e) {
+				this.isUps=false;
+				this.pd.ACCEPT_DEPARTMENT_ID=e[0].id;
+				this.pd.ACCEPT_DEPARTMENT_NAME=e[0].name;
+				this.$forceUpdate();//强制刷新
+				this.getUserList(e[0].id,'acceptUserList');
+			},
+// 取消回调事件
+			accepttreeCancel(e) {
+				this.isUps=false;
+			},
+// 显示树形选择器
+			showAcceptTree() {
+				this.isUps=true
+				this.$refs.tkiTree_accept._show();
+			},
+			PickerAccept(e) {
+				this.acceptindex = e.detail.value;
+				this.pd.ACCEPT_USER_ID=this.acceptUserList[this.acceptindex].USER_ID;
+				this.pd.ACCEPT_USER_NAME=this.acceptUserList[this.acceptindex].NAME;
+				this.$forceUpdate();//强制刷新
+			},
+
+			changeStartDate(e) {
+				this.pd.WORK_START_DATE = e
+				this.$forceUpdate();//强制刷新
+			},
+			changeEndDate(e) {
+				this.pd.WORK_END_DATE = e
+				this.$forceUpdate();//强制刷新
+			},
+
+			goback(){
+				var pages = getCurrentPages();	// 获取当前页面栈
+				var prePage = pages[pages.length - 2];	// 上二级页面
+				prePage.$vm.initflag = true;    // A 页面 init方法 为true
+				uni.navigateBack({delta: 1});
+				uni.hideLoading();
+			},
+			radioType(e){
+				this.HASINSTRUCTOR = e.detail.value
+			},
+			goToEdit(){
+				this.forbidEdit = false;
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
similarity index 100%
rename from pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail.vue
rename to pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
similarity index 100%
rename from pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue
rename to pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue