diff --git a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue index 410be5e..d1d5878 100644 --- a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue +++ b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue @@ -22,43 +22,45 @@ {{pd.CHECK_NO}} - - 作业内容： - + + 作业内容： + {{pd.WORK_CONTENT}} - - 动火地点及动火部位： - + + 动火地点及动火部位： + {{pd.WORK_PLACE}} - - 动火作业级别： + + 动火作业级别： {{pd.WORK_LEVEL}} - - 动火方式： - + + 动火方式： + {{pd.WORK_FUNCTION}} - - - 动火人及证书编号： - - + + 动火人及证书编号： + {{pd.WORK_USER}} - - 关联的其他特殊作业及安全作业票编号： - + + 关联的其他特殊作业及安全作业票编号： + {{pd.SPECIAL_WORK}} - - 风险辨识结果： - + + 风险辨识结果： + {{pd.RISK_IDENTIFICATION}} - + + 分析人： + {{pd.ANALYZE_USER_NAME}} + + @@ -70,95 +72,59 @@ 主要安全措施 - 操作 - - - - {{item.PROTECTIVE_MEASURES}} - + - - - 分析人： - {{pd.ANALYZE_USER_NAME}} - - - + + + + + + + 签字照片： + + + + + + + + + + - - - - - 监护人 - {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - - - - - - - - - - 安全交底人 - {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - - - - - - - - - - 接受交底人 - {{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} - - - - - {{item.ACCEPT_CONFESS_USER_SIGNER_TIME}} - - - - - - @@ -186,87 +152,21 @@ 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, 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.getData(); // 初始化现场作业负责人 this.getDept(); - this.getLimitSpace(); this.getMeasures(); loginSession(); - }, methods: { //跳转事件 @@ -290,14 +190,11 @@ 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 - if(_this.pd.STEP_ID == 3){ - _this.forbidEdit = false; - } } else if ("exception" == data.result) { uni.showToast({ title: '错误', @@ -307,178 +204,72 @@ } }); }, - ViewShowImage(url) { - let files = []; - files.push(url) - uni.previewImage({ - urls: files, - current: 0 - }); - }, - goSubmit(STATUS){ + + goSubmit(){ 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; + } + for (let i = 0; i < this.measuresList.length; i++) { + const measures = this.measuresList[i] + if(!measures.USER_ID){ + uni.showToast({ + icon: 'none', + title: '第'+(i+1)+'项未设置确认人', + duration: 1500 + }); + return; + } + } - 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/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/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; - } - }); + const formData={} + var files = []; + var signtime = []; + this.uploadImgFaults(files,signtime) + formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.SIGNTIME = signtime.join(",") + formData.USER_ID = loginUser.USER_ID + formData.PREPARERS = JSON.stringify(_this.measuresList) + 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 + }); + } + }) }, + + uploadImgFaults(files,signtime) { + this.imgList.map((item,index) => { + var img = {} + img.name = 'file'+index + img.uri = item.filePath + files.push(img) + signtime.push(item.SIGNER_TIME) + }) + }, + getMeasures(){ var _this = this; uni.request({ @@ -493,15 +284,15 @@ USER_ID:loginUser.USER_ID, }, success: function (res) { - _this.measuresList = res.data.measuresList; + _this.measuresList = res.data.measuresList.map((item,index)=>{ + item.userList = [] + item.userIndex = -1 + return item + }) } }); }, - levelChange(e){ - this.levelindex = e.detail.value; - this.pd.WORK_LEVEL=this.levelList[this.levelindex].name; - this.$forceUpdate();//强制刷新 - }, + getDept() { var _this = this; uni.request({ @@ -527,8 +318,44 @@ } }); }, + + showDeptTree(index) { + this.isUps=true + this.$refs['tkiTree'+index][0]._show(); + }, + + deptTreeConfirm(e,i) { + this.isUps=false; + this.measuresList[i].DEPARTMENT_ID=e[0].id; + this.measuresList[i].DEPARTMENT_NAME=e[0].name; + this.measuresList[i].USER_ID = '' + this.measuresList[i].USER_NAME = '' + this.getUserList(e[0].id,i); + }, + + deptTreeCancel(e) { + this.isUps=false; + }, + + pickerUser(e,i) { + this.measuresList[i].userIndex = e.detail.value; + this.measuresList[i].USER_ID=this.measuresList[i].userList[e.detail.value].USER_ID; + this.measuresList[i].USER_NAME=this.measuresList[i].userList[e.detail.value].NAME; + this.$forceUpdate();//强制刷新 + }, + + isBlankList(i) { + if (this.measuresList[i].userList.length == 0) { + uni.showToast({ + icon: 'none', + title: '请先选择确认单位', + duration: 1500 + }) + } + }, + //获取人员列表 - getUserList(dept,list,i){ + getUserList(dept,i){ //发送 post 请求 var _this=this uni.request({ @@ -546,13 +373,7 @@ }, 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; - } + _this.measuresList[i].userList = res.data.userList; }else{ uni.showToast({ title: res.data.message, @@ -588,235 +409,6 @@ }); }, - /* - *分析人 - */ - // 确定回调事件 - 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]; // 上二级页面 @@ -824,12 +416,6 @@ uni.navigateBack({delta: 1}); uni.hideLoading(); }, - radioType(e){ - this.HASINSTRUCTOR = e.detail.value - }, - goToEdit(){ - this.forbidEdit = false; - } } }