diff --git a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue index 998cda5..9706c09 100644 --- a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue @@ -6,207 +6,8 @@ + - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{pd.CHECK_NO}} - - - - 作业内容： - {{pd.WORK_CONTENT}} - - - - 动火地点及动火部位： - {{pd.WORK_PLACE}} - - - - 动火作业级别： - {{pd.WORK_LEVEL}} - - - 作业开始时间： - {{pd.WORK_START_DATE}} - - - 作业结束时间： - {{pd.WORK_END_DATE}} - - - 动火方式： - {{pd.WORK_FUNCTION}} - - - 动火人及证书编号： - {{pd.WORK_USER}} - - - - 关联的其他特殊作业及安全作业票编号： - {{pd.SPECIAL_WORK}} - - - - 风险辨识结果： - {{pd.RISK_IDENTIFICATION}} - - - - 分析人： - {{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}} - - - - - - - - 作业负责人意见 - - - - - 作业负责人 - {{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.WORK_START_USER_NAME}} {{pd.WORK_START_USER_SIGNER_TIME}} - - - - - - - - - - - 作业结束负责人 - {{pd.WORK_END_USER_NAME}} {{pd.WORK_END_USER_SIGNER_TIME}} - - - - - - 完工验收 @@ -260,9 +61,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { @@ -362,15 +164,25 @@ }); return; } - - if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){ - uni.showToast({ - icon: 'none', - title: '请在作业结束30分钟内完成验收', - duration: 1500 - }); - return; + if(APPLY_STATUS == 1){ + if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){ + uni.showToast({ + icon: 'none', + title: '请在作业结束30分钟内完成验收', + duration: 1500 + }); + return; + } + if(!this.pd.ACCEPT_TIME){ + uni.showToast({ + icon: 'none', + title: '请选择验收时间', + duration: 1500 + }); + return; + } } + const formData={} var files = []; var signtime = []; diff --git a/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue index 1e3c688..4026bfe 100644 --- a/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue +++ b/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue @@ -6,97 +6,7 @@ - - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - 监护人 - {{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}} - - - - - - - + 接受交底人 @@ -143,9 +53,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue index 9c8725e..67af87a 100644 --- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue @@ -62,7 +62,7 @@ 动火人及证书编号： - + 请选择 @@ -706,18 +706,18 @@ 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:{},// 数据 - signs:{}, + signs:{}, measuresList:[], rules:[ // {name:'CHECK_NO',message:'请输入编号'}, @@ -766,13 +766,10 @@ 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.getWorkUserList(); } // 初始化现场作业负责人 this.getDept(); - this.getLimitSpace(); loginSession(); }, @@ -1006,25 +1003,7 @@ } }) }, - // 获取动火列表 - 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; @@ -1115,7 +1094,7 @@ header: { 'Content-type':'application/x-www-form-urlencoded' }, - url: basePath+'/app/personnelmanagement/list', + url: basePath+'/app/hotwork/namelist', data: { tm:new Date().getTime(), CORPINFO_ID:loginUser.CORPINFO_ID, @@ -1246,17 +1225,7 @@ break } }, - /* - *监护人 - */ - // // 确定回调事件 - // 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'); - // }, + /* *安全交底人 */ @@ -1405,10 +1374,10 @@ this.$forceUpdate();//强制刷新 }, PickerWorkuser(e) { - this.workuserindex = e.detail.value; - this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID; - this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME; - this.$forceUpdate();//强制刷新 + this.workuserindex = e.detail.value; + this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID; + this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME; + this.$forceUpdate();//强制刷新 }, /* diff --git a/pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue index 0ad9f9a..8baeae8 100644 --- a/pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue +++ b/pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue @@ -6,145 +6,8 @@ + - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - - 监护人 - {{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}} - - - - - - - - 作业负责人意见 - - - - - 作业负责人 - {{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}} - - - - - - - 动火审批人意见 @@ -188,9 +51,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { diff --git a/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue index b065260..8a39800 100644 --- a/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue +++ b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue @@ -6,135 +6,8 @@ + - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - - 监护人 - {{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}} - - - - - - - - 作业负责人意见 - - - - - - - - - 作业负责人 - {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - - - - - - - - 所在单位意见 - - - - - 所在单位负责人 - {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - - - - - - 安全管理部门意见 @@ -178,9 +51,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { diff --git a/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue index 9b39a9c..91a7fac 100644 --- a/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue +++ b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue @@ -6,86 +6,7 @@ - - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - 监护人 - {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - - - - - - - - - - 安全交底人 - {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - - - - - - - + 安全交底人 @@ -125,9 +46,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { diff --git a/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue index 529537f..e92d103 100644 --- a/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue @@ -5,129 +5,34 @@ 作业负责人意见 - - - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - - 监护人 - {{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}} + + + - - - - - 作业负责人意见 - - - - 作业负责人 - - - - - - 签字照片： - - - - - + + - - - - - + @@ -146,9 +51,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { diff --git a/pages/application/hotwork/hotwork-detail/index.vue b/pages/application/hotwork/hotwork-detail/index.vue index 83f6a85..47b6baf 100644 --- a/pages/application/hotwork/hotwork-detail/index.vue +++ b/pages/application/hotwork/hotwork-detail/index.vue @@ -11,68 +11,55 @@ {{pd.APPLY_USER_NAME}} - + 编号： {{pd.CHECK_NO}} - - 作业内容： - + + 作业内容： + {{pd.WORK_CONTENT}} 动火地点及动火部位： - + {{pd.WORK_PLACE}} 动火作业级别： - {{pd.WORK_LEVEL}} + {{pd.WORK_LEVEL}} + + + 作业开始时间： + {{pd.WORK_START_DATE}} + + + 作业结束时间： + {{pd.WORK_END_DATE}} + + + 动火方式： + {{pd.WORK_FUNCTION}} + + + 动火人及证书编号： + {{pd.WORK_USER}} - 动火方式： - + 关联的其他特殊作业及安全作业票编号： + {{pd.SPECIAL_WORK}} - - - 动火作业 - 实施时间： - - - {{pd.WORK_START_DATE}} - 至 - {{pd.WORK_END_DATE?pd.WORK_END_DATE : '--'}} - + + 风险辨识结果： + {{pd.RISK_IDENTIFICATION}} - - - 动火人及证书编号： - - - - - - - 关联的其他特殊作业及安全作业票编号 - - - - - - - 风险辨识结果 - - - - - - 分析人： - {{pd.ANALYZE_USER_NAME}} - + + 分析人： + {{pd.ANALYZE_USER_NAME}} diff --git a/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue index 97d1525..6f3cef9 100644 --- a/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue +++ b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue @@ -6,192 +6,8 @@ + - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{pd.CHECK_NO}} - - - - 作业内容： - {{pd.WORK_CONTENT}} - - - - 动火地点及动火部位： - {{pd.WORK_PLACE}} - - - - 动火作业级别： - {{pd.WORK_LEVEL}} - - - 作业开始时间： - {{pd.WORK_START_DATE}} - - - 动火方式： - {{pd.WORK_FUNCTION}} - - - 动火人及证书编号： - {{pd.WORK_USER}} - - - - 关联的其他特殊作业及安全作业票编号： - {{pd.SPECIAL_WORK}} - - - - 风险辨识结果： - {{pd.RISK_IDENTIFICATION}} - - - - 分析人： - {{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}} - - - - - - - - 作业负责人意见 - - - - - - 作业负责人 - {{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.WORK_START_USER_NAME}} {{pd.WORK_START_USER_SIGNER_TIME}} - - - - - - - 作业结束时间 @@ -241,9 +57,10 @@ import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; import moment from 'moment'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { @@ -337,7 +154,44 @@ uni.showLoading({ title: '请稍候' }) - + if(APPLY_STATUS == 1){ + if (!this.pd.WORK_END_DATE) { + uni.showToast({ + icon: 'none', + title: '请选择作业结束时间', + duration: 1500 + }); + return; + } + 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 + }); + return; + } + 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 + }); + return; + } + } + 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 + }); + return; + } + } + } if (_this.imgList.length <= 0) { uni.showToast({ icon: 'none', @@ -346,34 +200,7 @@ }); return; } - 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 - }); - return; - } - 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 - }); - return; - } - } - 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 - }); - return; - } - } + var files = []; var signtime = []; const formData={} diff --git a/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue index c87aa2e..52b7d34 100644 --- a/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue @@ -55,7 +55,7 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; - import detail from '@/pages/application/hotwork/hotwork-detail/index' + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { tkiTree,ruiDatePicker,writingBoard,detail diff --git a/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue index 59503de..8d42b79 100644 --- a/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue @@ -6,121 +6,8 @@ + - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - 监护人 - {{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}} - - - - - - - - 作业负责人意见 - - - - - - - - - - 作业负责人 - {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - - - - - - 所在单位意见 @@ -164,9 +51,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue index 96409d0..a695a8f 100644 --- a/pages/application/hotwork/hotwork-list/index.vue +++ b/pages/application/hotwork/hotwork-list/index.vue @@ -62,7 +62,7 @@ 审核状态： - + @@ -136,9 +136,9 @@ totalPage:0,//分页参数--分页数量 KEYWORDS : '', noClick:true, - stepList:[], + stepList:[], sindex:-1, - STEP_ID:'', + STEP_ID:'', flowList:[], } }, @@ -314,9 +314,8 @@ }, data: { CREATOR:_this.flow === '提交申请'?loginUser.USER_ID : '', - GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '', - STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow, - STEP_ID: _this.STEP_ID, + GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '', + STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow, KEYWORDS : _this.KEYWORDS, //关键字模糊查询 CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, diff --git a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue index 6638726..d2579dc 100644 --- a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue +++ b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue @@ -5,79 +5,83 @@ 安全措施确认人意见 - - + + - - - 安全防护措施 - - - - - - 主要安全措施 - - 操作 - - - + + + + 其他安全措施： + + + + + + + + + 签字照片： + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - @@ -187,69 +191,70 @@ }); }, - goSubmit(APPLY_STATUS){ - var _this = this; - uni.showLoading({ - title: '请稍候' - }) + goSubmit(APPLY_STATUS) { + var _this = this; + uni.showLoading({ + title: '请稍候' + }) if (_this.imgList.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请签字', - duration: 1500 - }); - return; + uni.showToast({ + icon: 'none', + title: '请签字', + duration: 1500 + }); + return; } - for (let i = 0; i < this.measuresList.length; i++) { - const measures = this.measuresList[i] - if(!measures.SIGN_PATH){ - uni.showToast({ - icon: 'none', - title: '第'+(i+1)+'项未签字', - duration: 1500 - }); - return; + if (APPLY_STATUS == 1) { + for (let i = 0; i < this.measuresList.length; i++) { + const measures = this.measuresList[i] + if(!measures.SIGN_PATH){ + 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; + } } - 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; - } - } const formData={} var files = []; var signtime = []; this.uploadImgFaults(files,signtime) - formData.APPLY_STATUS = APPLY_STATUS + formData.APPLY_STATUS = APPLY_STATUS formData.HOTWORK_ID = _this.pd.HOTWORK_ID formData.SIGNTIME = signtime.join(",") formData.USER_ID = loginUser.USER_ID diff --git a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue index 41ffaf2..cb0ee79 100644 --- a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue +++ b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue @@ -164,18 +164,19 @@ }); 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(APPLY_STATUS == 1){ + 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 = []; diff --git a/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue index e345679..28a8f7f 100644 --- a/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue @@ -6,161 +6,8 @@ + - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - - 监护人 - {{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}} - - - - - - - - 作业负责人意见 - - - - - 作业负责人 - {{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}} - - - - - - 动火前在岗班长意见 @@ -204,9 +51,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { diff --git a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue index bc22aa2..8868a2d 100644 --- a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue +++ b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue @@ -6,187 +6,8 @@ + - - 申请单位： - {{pd.APPLY_DEPARTMENT_NAME}} - - - - 申请人： - {{pd.APPLY_USER_NAME}} - - - - 编号： - {{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}} - - - - - - - - - 监护人 - {{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}} - - - - - - - - - - 作业负责人意见 - - - - - 作业负责人 - {{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}} - - - - - - - - - 作业开始时间 - - - 填写作业开始时间负责人 @@ -226,9 +47,10 @@ import writingBoard from "@/components/writing-board/writing-board.vue" import gcoord from '@/common/gcoord.js' import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'; + import detail from '@/pages/application/hotwork/hotwork-detail/index' export default { components: { - tkiTree,ruiDatePicker,writingBoard + tkiTree,ruiDatePicker,writingBoard,detail }, data() { return { @@ -326,14 +148,25 @@ }); return; } - if(new Date(this.pd.WORK_START_DATE).getTime() - new Date(this.pd.ANALYZE_TIME).getTime() >= 3600000){ - uni.showToast({ - icon: 'none', - title: '气体分析时间与开始时间间隔超过30分钟，请重新上传气体检测结果', - duration: 1500 - }); - return; + if(APPLY_STATUS == 1){ + if (!this.pd.WORK_START_DATE) { + uni.showToast({ + icon: 'none', + title: '请选择作业开始时间', + duration: 1500 + }); + return; + } + if(new Date(this.pd.WORK_START_DATE).getTime() - new Date(this.pd.ANALYZE_TIME).getTime() >= 3600000){ + uni.showToast({ + icon: 'none', + title: '气体分析时间与开始时间间隔超过30分钟，请重新上传气体检测结果', + duration: 1500 + }); + return; + } } + var files = []; var signtime = []; const formData={}