From cef4bc7d0d18da686ac7abcaeef48f898d47dbc9 Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Tue, 23 Jan 2024 11:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E5=8A=A8?=
 =?UTF-8?q?=E7=81=AB=E7=9B=91=E6=8A=A4=E4=BA=BA=E7=AD=BE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   4 +
 pages/application/hotwork/home.vue            |   4 +-
 .../hotwork-guardian-detail.vue               | 687 ++++++++++++++++++
 .../hotwork/hotwork-list/index.vue            |   4 +
 4 files changed, 697 insertions(+), 2 deletions(-)
 create mode 100644 pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue

diff --git a/pages.json b/pages.json
index a93af5a..53f7c76 100644
--- a/pages.json
+++ b/pages.json
@@ -383,6 +383,10 @@
       "path": "pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail",
       "style": {}
     },
+    {
+      "path": "pages/application/hotwork/hotwork-confess/hotwork-confess-detail",
+      "style": {}
+    },
     {
       "path": "pages/application/hotwork/hotwork-gas/gas-list",
       "style": {}
diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue
index 7ee9c50..741b43d 100644
--- a/pages/application/hotwork/home.vue
+++ b/pages/application/hotwork/home.vue
@@ -51,13 +51,13 @@
 							<view>意见</view>
 						</view>
 					</navigator>
-					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-leader/hotwork-leader-list">
+					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-list/index?flow=安全交底人签字">
 						<view class="imgs action">
 							<image src="../../../static/icon-apps/icon-807.png" mode=""></image>
 							<view v-if="count.COUNTLEADER" class="cu-tag badge">{{count.COUNTLEADER}}</view>
 						</view>
 						<view class="text-semi"  style="text-align: center;">
-							<view>所在单位</view>
+							<view>安全交底人</view>
 							<view>意见</view>
 						</view>
 					</navigator>
diff --git a/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue
new file mode 100644
index 0000000..7ad75bc
--- /dev/null
+++ b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue
@@ -0,0 +1,687 @@
+<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" >
+					<view class="title">申请单位：</view>
+					{{pd.APPLY_DEPARTMENT_NAME}}
+				</view>
+
+				<view class="cu-form-group" >
+					<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="forbidEdit" 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">
+					<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-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 bb-default">
+					<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 class="wui-sign" v-if="!files.length">
+					<view class="title">监护人</view>
+					<view>
+						<view>
+							<button class="cu-btn bg-green shadow" @tap="showModal">新增手写签字</button>
+						</view>
+					</view>
+				</view>
+
+				<view class="wui-sign-box wui-sign-box1"  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 class="cu-tag bg-red" @tap.stop="DelImg(index)">
+								<text class='cuIcon-close'></text>
+							</view>
+						</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</button>
+				<button class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(1))">保存</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',
+				files: [],
+				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_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,
+				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/hotwork-gas/gas-list?HOTWORK_ID='+e
+				});
+			},
+			getData() {
+				var _this = this;
+				uni.showLoading({
+					title: '请稍候'
+				})
+				uni.request({
+					url: basePath + '/app/hotwork/findById',
+					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]
+							})
+							_this.pd.OTHER_PROTECTIVE_MEASURES = ''
+							if(_this.pd.STEP_ID == 4){
+								_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(){
+				var _this = this;
+				let required = true
+				uni.showLoading({
+					title: '请稍候'
+				})
+
+					if (_this.imgList.length <= 0) {
+						uni.showToast({
+							icon: 'none',
+							title: '请签字',
+							duration: 1500
+						});
+						return;
+					}
+				const formData={}
+				var files = [];
+				var signtime = [];
+				Object.keys(this.pd).map(key => {
+					formData[key]=this.pd[key]
+				})
+				this.uploadImgFaults(files,signtime)
+				formData.SIGNTIME = signtime.join(",")
+				formData.CREATOR=loginUser.USER_ID
+				formData.OPERATOR=loginUser.USER_ID
+				formData.ACTION_USER=loginUser.NAME
+				formData.CORPINFO_ID = loginUser.CORPINFO_ID
+				formData.USER_ID = loginUser.USER_ID
+					uni.uploadFile({
+						url: basePath+'app/hotwork/nextStep',
+						files: files,
+						formData:formData,
+						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
+							});
+						}
+					}
+				})
+			},
+
+			/*
+         *手写板
+         */
+			showModal() {
+				this.modalName = 'Modal'
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+			//完成
+			subCanvas(e) {
+				this.imgList.push(e);
+				e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
+				this.hideModal()
+			},
+			ViewImage(e) {
+				let files =[];
+				files.push(e.currentTarget.dataset.url)
+				uni.previewImage({
+					urls: files,
+					current: e.currentTarget.dataset.url
+				});
+			},
+			DelImg(index){
+				this.imgList.splice(index,1)
+			},
+			uploadImgFaults(files,signtime) {
+				this.imgList.map(item => {
+					var img = {}
+					img.name = 'file'+(files.length)
+					img.uri = item.filePath
+					files.push(img)
+					signtime.push(item.SIGNER_TIME)
+				})
+			},
+			/*
+			*分析人
+			 */
+			// 确定回调事件
+			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 scoped>
+	.wui-sign-box1{
+		margin-top: 20upx;
+		display: block;
+	}
+	.sign-img{
+		position: relative;
+		border-bottom: 1px dashed #eee;
+		padding-top: 20upx;
+	}
+	.cu-tag{
+		position: absolute;
+		right: 20upx;
+		top: 20upx;
+	}
+</style>
diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue
index 21f7f8f..16cb531 100644
--- a/pages/application/hotwork/hotwork-list/index.vue
+++ b/pages/application/hotwork/hotwork-list/index.vue
@@ -171,6 +171,10 @@
 					uni.navigateTo({
 						url: '/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail?HOTWORK_ID='+e
 					});
+				}else if(this.flow === '安全交底人签字'){
+					uni.navigateTo({
+						url: '/pages/application/hotwork/hotwork-confess/hotwork-confess-detail?HOTWORK_ID='+e
+					});
 				}
 
 			},