From 8a57daafecda7e03a5e41726618253505e1d1017 Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Wed, 24 Jan 2024 13:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E7=89=B9?= =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E4=B8=80=E7=BA=A7=EF=BC=8C=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=B5=81=E7=A8=8B=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/application/hotwork/home.vue | 28 +- .../hotwork-accept/hotwork-accept-detail.vue | 531 ++++++++++++++++++ .../hotwork-acceptconfess-detail.vue | 415 ++++++++++++++ .../hotwork-apply/hotwork-apply-detail.vue | 459 +++++++-------- .../hotwork-approve-detail.vue | 433 ++++++++++++++ .../hotwork-audit/hotwork-audit-detail.vue | 429 ++++++++++++++ .../hotwork-confess-detail.vue | 389 +++++++++++++ .../hotwork-confirm-detail.vue | 417 ++++++++++++++ .../hotwork-endwork-detail.vue | 530 +++++++++++++++++ .../hotwork-guardian-detail.vue | 368 +++--------- .../hotwork-leader/hotwork-leader-detail.vue | 434 ++++++++++++++ .../hotwork-measures-detail.vue | 312 +++++----- .../hotwork-monitor-detail.vue | 461 +++++++++++++++ .../hotwork-startwork-detail.vue | 494 ++++++++++++++++ 14 files changed, 4958 insertions(+), 742 deletions(-) create mode 100644 pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue create mode 100644 pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue create mode 100644 pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue create mode 100644 pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue create mode 100644 pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue create mode 100644 pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue create mode 100644 pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue create mode 100644 pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue create mode 100644 pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue create mode 100644 pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue index 5c004a6..085ad28 100644 --- a/pages/application/hotwork/home.vue +++ b/pages/application/hotwork/home.vue @@ -15,7 +15,7 @@ - {{count.COUNTBACK}} + {{count.CREATE}} 动火作业 @@ -25,7 +25,7 @@ - {{count.COUNTANALYZE}} + {{count.ANALYZE}} 气体分析 @@ -34,7 +34,7 @@ - {{count.COUNTCONFIRM}} + {{count.MEASURES_CONFIRM}} 安全措施 @@ -44,7 +44,7 @@ - {{count.COUNTGUARDIAN}} + {{count.GUARDIAN}} 监护人 @@ -54,7 +54,7 @@ - {{count.COUNTLEADER}} + {{count.CONFESS}} 安全交底人 @@ -64,7 +64,7 @@ - {{count.COUNTAUDIT}} + {{count.ACCEPT_CONFESS}} 接受安全交底人 @@ -74,7 +74,7 @@ - {{count.COUNTAPPROVE}} + {{count.CONFIRM}} 作业负责人 @@ -84,7 +84,7 @@ - {{count.COUNTMONITOR}} + {{count.LEADER}} 所在单位 @@ -94,7 +94,7 @@ - {{count.COUNTACCEPT}} + {{count.AUDIT}} 安全管理部门 @@ -104,7 +104,7 @@ - {{count.COUNTACCEPT}} + {{count.APPROVE}} 动火审批人 @@ -115,7 +115,7 @@ - {{count.COUNTGUARDIAN}} + {{count.MONITOR}} 当班班长验票 @@ -124,7 +124,7 @@ - {{count.COUNTCONFESS}} + {{count.WORK_START}} 开始进行作业时间 @@ -133,7 +133,7 @@ - {{count.COUNTACCEPTCONFESS}} + {{count.WORK_END}} 结束作业时间 @@ -142,7 +142,7 @@ - {{count.COUNTACCEPTCONFESS}} + {{count.ACCEPT}} 验收归档 diff --git a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue new file mode 100644 index 0000000..dde6ba1 --- /dev/null +++ b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue @@ -0,0 +1,531 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue new file mode 100644 index 0000000..c442c82 --- /dev/null +++ b/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue index 9133461..0fb0812 100644 --- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue @@ -7,32 +7,32 @@ - + 申请单位： {{pd.APPLY_DEPARTMENT_NAME}} - + 申请人： {{pd.APPLY_USER_NAME}} 编号： - + {{pd.CHECK_NO}} - + 作业内容： - + 动火地点及动火部位： - + 动火作业级别： @@ -42,32 +42,11 @@ {{pd.WORK_LEVEL}} - + 动火方式： - - - - - - - - - - - - - - - - - - - - - 动火作业 @@ -80,11 +59,6 @@ - - - - - 动火人及证书编号： @@ -269,6 +243,72 @@ + + + 监护人单位 + + {{pd.GUARDIAN_DEPARTMENT_NAME?pd.GUARDIAN_DEPARTMENT_NAME:'请选择'}} + + + + + 监护人 + + + {{pd.GUARDIAN_USER_NAME?pd.GUARDIAN_USER_NAME:'请选择'}} + + + + + + + 安全交底人单位 + + {{pd.CONFESS_DEPARTMENT_NAME?pd.CONFESS_DEPARTMENT_NAME:'请选择'}} + + + + + 安全交底人 + + + {{pd.CONFESS_USER_NAME?pd.CONFESS_USER_NAME:'请选择'}} + + + + + + + 接受交底人单位 + + {{pd.ACCEPT_CONFESS_DEPARTMENT_NAME?pd.ACCEPT_CONFESS_DEPARTMENT_NAME:'请选择'}} + + + + + 接受交底人 + + + {{pd.ACCEPT_CONFESS_USER_NAME?pd.ACCEPT_CONFESS_USER_NAME:'请选择'}} + + + + 作业负责人单位 @@ -292,27 +332,6 @@ - - - - - - - - - - - - - - - - - - - - - 所在单位 @@ -400,72 +419,7 @@ - - - 监护人单位 - - {{pd.GUARDIAN_DEPARTMENT_NAME?pd.GUARDIAN_DEPARTMENT_NAME:'请选择'}} - - - - - 监护人 - - - {{pd.GUARDIAN_USER_NAME?pd.GUARDIAN_USER_NAME:'请选择'}} - - - - - - - 安全交底人单位 - - {{pd.CONFESS_DEPARTMENT_NAME?pd.CONFESS_DEPARTMENT_NAME:'请选择'}} - - - - - 安全交底人 - - - {{pd.CONFESS_USER_NAME?pd.CONFESS_USER_NAME:'请选择'}} - - - - - - - 接受交底人单位 - - {{pd.ACCEPT_CONFESS_DEPARTMENT_NAME?pd.ACCEPT_CONFESS_DEPARTMENT_NAME:'请选择'}} - - - - - 接受交底人 - - - {{pd.ACCEPT_CONFESS_USER_NAME?pd.ACCEPT_CONFESS_USER_NAME:'请选择'}} - - - - + 作业开始负责人单位 @@ -534,135 +488,134 @@ - - - 分析人： - {{pd.ANALYZE_USER_NAME}} - - - - - - 作业负责人意见 - - - - - - - - - 作业负责人 - {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - - - - - - - - - 所在单位意见 - - - - - - - - - 所在单位负责人 - {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - - - - - - - - - 安全管理部门意见 - - - - - - - - - 安全管理部门负责人 - {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - - - - - - - - - 动火审批人意见 - - - - - - - - - 动火审批人 - {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - - - - - - - - - 动火前在岗班长意见 - - - - - - - - - 动火前在岗班长 - {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - - - - - - - + - 完工验收 - + 作业负责人意见 + - 验收部门负责人 - {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} + 作业负责人 + {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - - - - {{item.ACCEPT_USER_SIGNER_TIME}} + + + + + + + + 所在单位意见 + + + + + 所在单位负责人 + {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} + + + + + + + + + 安全管理部门意见 + + + + + + 安全管理部门负责人 + {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} + + + + + + + + + 动火审批人意见 + + + + + + 动火审批人 + {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} + + + + + + + + + 动火前在岗班长意见 + + + + + + 动火前在岗班长 + {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} + + + + + + + + + + 作业开始负责人 + {{pd.WORK_START_USER_NAME}} {{pd.WORK_START_USER_SIGNER_TIME}} + + + + + + + + + + + 作业结束负责人 + {{pd.WORK_END_USER_NAME}} {{pd.WORK_END_USER_SIGNER_TIME}} + + + + + + + + + 完工验收 + + + + + 验收部门负责人 + {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} + + + + + {{item.ACCEPT_USER_SIGNER_TIME}} + - - - - - - - + + + + + + @@ -907,34 +860,6 @@ required = false } } - if(this.pd.WORK_LEVEL == '特级' || this.pd.WORK_LEVEL == '一级'){ - if(new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() >= 28800000){ - uni.showToast({ - icon: 'none', - title: '动火级别为特级或一级时，动火作业开始时间与结束时间应不超过8小时，请重新选择', - duration: 1500 - }); - required = false - } - } - if(new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() <=0){ - uni.showToast({ - icon: 'none', - title: '作业开始时间不能晚于或等于结束时间，请重新选择', - duration: 1500 - }); - required = false - } - if(this.pd.WORK_LEVEL == '二级'){ - if(new Date(this.pd.WORK_END_DATE).getTime() - new Date(this.pd.WORK_START_DATE).getTime() >= 259200000){ - uni.showToast({ - icon: 'none', - title: '动火级别为二级时，动火作业开始时间与结束时间应不超过72小时，请重新选择', - duration: 1500 - }); - required = false - } - } if (!required) { return } diff --git a/pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue new file mode 100644 index 0000000..df8df68 --- /dev/null +++ b/pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue @@ -0,0 +1,433 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue new file mode 100644 index 0000000..eea7cc4 --- /dev/null +++ b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue @@ -0,0 +1,429 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue new file mode 100644 index 0000000..26e49e0 --- /dev/null +++ b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue @@ -0,0 +1,389 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue new file mode 100644 index 0000000..7f80964 --- /dev/null +++ b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue @@ -0,0 +1,417 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue new file mode 100644 index 0000000..f4d09b9 --- /dev/null +++ b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue @@ -0,0 +1,530 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue index 7ad75bc..deaea4d 100644 --- a/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue @@ -7,61 +7,58 @@ - + 申请单位： {{pd.APPLY_DEPARTMENT_NAME}} - + 申请人： {{pd.APPLY_USER_NAME}} 编号： - + {{pd.CHECK_NO}} - - 作业内容： - + + 作业内容： + {{pd.WORK_CONTENT}} - + 动火地点及动火部位： - + {{pd.WORK_PLACE}} - + 动火作业级别： {{pd.WORK_LEVEL}} - + 动火方式： - - - - - 动火人及证书编号： - - - - - - 关联的其他特殊作业及安全作业票编号： - - - - - 风险辨识结果： - + {{pd.WORK_FUNCTION}} - - 分析人： - {{pd.ANALYZE_USER_NAME}} - + 动火人及证书编号： + {{pd.WORK_USER}} + + + + 关联的其他特殊作业及安全作业票编号： + {{pd.SPECIAL_WORK}} + + + + 风险辨识结果： + {{pd.RISK_IDENTIFICATION}} + + + + 分析人： + {{pd.ANALYZE_USER_NAME}} @@ -96,7 +93,7 @@ - + @@ -130,54 +127,8 @@ {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:';_;;_;;_;;_;;_;;_;;_;' - },// 数据 + 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:[], } @@ -229,14 +180,7 @@ 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: '错误', @@ -260,48 +204,42 @@ uni.showLoading({ title: '请稍候' }) - - if (_this.imgList.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请签字', - duration: 1500 - }); - return; - } + 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.HOTWORK_ID = this.pd.HOTWORK_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 - }); - } - }) + 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(){ @@ -322,11 +260,6 @@ } }); }, - levelChange(e){ - this.levelindex = e.detail.value; - this.pd.WORK_LEVEL=this.levelList[this.levelindex].name; - this.$forceUpdate();//强制刷新 - }, getDept() { var _this = this; uni.request({ @@ -415,9 +348,9 @@ this.imgList.splice(index,1) }, uploadImgFaults(files,signtime) { - this.imgList.map(item => { + this.imgList.map((item,index) => { var img = {} - img.name = 'file'+(files.length) + img.name = 'file'+index img.uri = item.filePath files.push(img) signtime.push(item.SIGNER_TIME) @@ -450,33 +383,6 @@ 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();//强制刷新 - }, - /* *监护人 */ @@ -504,154 +410,6 @@ 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]; // 上二级页面 diff --git a/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue new file mode 100644 index 0000000..3de8c21 --- /dev/null +++ b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue @@ -0,0 +1,434 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue index d1d5878..8e38eba 100644 --- a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue +++ b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue @@ -7,12 +7,12 @@ - + 申请单位： {{pd.APPLY_DEPARTMENT_NAME}} - + 申请人： {{pd.APPLY_USER_NAME}} @@ -24,43 +24,43 @@ 作业内容： - {{pd.WORK_CONTENT}} + {{pd.WORK_CONTENT}} - - 动火地点及动火部位： - {{pd.WORK_PLACE}} - + + 动火地点及动火部位： + {{pd.WORK_PLACE}} + - - 动火作业级别： - {{pd.WORK_LEVEL}} - + + 动火作业级别： + {{pd.WORK_LEVEL}} + - - 动火方式： - {{pd.WORK_FUNCTION}} - - - 动火人及证书编号： - {{pd.WORK_USER}} - + + 动火方式： + {{pd.WORK_FUNCTION}} + + + 动火人及证书编号： + {{pd.WORK_USER}} + - - 关联的其他特殊作业及安全作业票编号： - {{pd.SPECIAL_WORK}} - + + 关联的其他特殊作业及安全作业票编号： + {{pd.SPECIAL_WORK}} + - - 风险辨识结果： - {{pd.RISK_IDENTIFICATION}} - + + 风险辨识结果： + {{pd.RISK_IDENTIFICATION}} + - - 分析人： - {{pd.ANALYZE_USER_NAME}} - - + + 分析人： + {{pd.ANALYZE_USER_NAME}} + + @@ -73,57 +73,57 @@ 主要安全措施 - - - - - - - - 签字照片： - - - - - - - - - - + + + + + + + 签字照片： + + + + + + + + + + @@ -162,7 +162,7 @@ }, onLoad(event){ this.pd.HOTWORK_ID = event.HOTWORK_ID; - this.getData(); + this.getData(); // 初始化现场作业负责人 this.getDept(); this.getMeasures(); @@ -210,54 +210,54 @@ uni.showLoading({ title: '请稍候' }) - 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; + } + 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; + } + } - 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 - }); - } - }) + 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) { @@ -319,40 +319,40 @@ }); }, - showDeptTree(index) { - this.isUps=true - this.$refs['tkiTree'+index][0]._show(); - }, + 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); - }, + 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; - }, + 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();//强制刷新 - }, + 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 - }) - } - }, + isBlankList(i) { + if (this.measuresList[i].userList.length == 0) { + uni.showToast({ + icon: 'none', + title: '请先选择确认单位', + duration: 1500 + }) + } + }, //获取人员列表 getUserList(dept,i){ diff --git a/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue new file mode 100644 index 0000000..11dc738 --- /dev/null +++ b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue @@ -0,0 +1,461 @@ + + + + + diff --git a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue new file mode 100644 index 0000000..f2fc98f --- /dev/null +++ b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue @@ -0,0 +1,494 @@ + + + + +