From c436c4ac5d21005203bbe18ad40368858a264a67 Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Mon, 5 Feb 2024 15:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4=E5=92=8C?= =?UTF-8?q?=E9=AB=98=E5=A4=84=E4=BD=9C=E4=B8=9A=E6=84=8F=E8=A7=81=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=BF=85=E5=A1=AB=EF=BC=8C=E6=B0=94=E4=BD=93=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=8A=A0=E5=88=86=E6=9E=90=E5=9C=B0=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E5=8A=A8=E7=81=AB=E5=8A=A0=E5=AE=89=E5=85=A8=E5=89=AF=E6=80=BB?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 6 + .../confinedspace-accept-detail.vue | 10 +- .../confinedspace-apply-detail.vue | 76 ++-- .../confinedspace-confirm-detail.vue | 12 +- .../confinedspace-detail/index.vue | 31 +- .../confinedspace-gas/gas-detail.vue | 8 +- .../confinedspace-gas/gas-list.vue | 3 +- .../confinedspace-leader-detail.vue | 12 +- .../confinedspace-list/index.vue | 8 +- pages/application/confinedspace/home.vue | 21 +- .../highwork-accept-detail.vue | 8 + .../highwork-approve-detail.vue | 10 +- .../highwork-audit/highwork-audit-detail.vue | 10 +- .../highwork-confirm-detail.vue | 10 +- .../highwork/highwork-detail/index.vue | 31 +- .../highwork-leader-detail.vue | 10 +- .../highwork/highwork-list/index.vue | 8 +- pages/application/highwork/home.vue | 25 +- pages/application/hotwork/home.vue | 10 + .../hotwork-accept/hotwork-accept-detail.vue | 8 + .../hotwork-apply/hotwork-apply-detail.vue | 116 +++++- .../hotwork-audit/hotwork-audit-detail.vue | 8 + .../hotwork-confirm-detail.vue | 8 + .../hotwork/hotwork-gas/gas-detail.vue | 9 +- .../hotwork/hotwork-gas/gas-list.vue | 3 +- .../hotwork-leader/hotwork-leader-detail.vue | 8 + .../hotwork/hotwork-list/index.vue | 7 +- .../hotwork-monitor-detail.vue | 8 + .../hotwork-safety/hotwork-safety-detail.vue | 335 ++++++++++++++++++ 29 files changed, 704 insertions(+), 115 deletions(-) create mode 100644 pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue diff --git a/pages.json b/pages.json index 8d632bd..78667f5 100644 --- a/pages.json +++ b/pages.json @@ -439,6 +439,7 @@ "path": "pages/application/highwork/highwork-workuser/highwork-workuser-detail", "style": {} }, + { "path": "pages/application/highwork/highwork-leader/highwork-leader-detail", "style": {} @@ -447,6 +448,7 @@ "path": "pages/application/highwork/highwork-audit/highwork-audit-detail", "style": {} }, + { "path": "pages/application/highwork/highwork-approve/highwork-approve-detail", "style": {} @@ -508,6 +510,10 @@ "path": "pages/application/hotwork/hotwork-audit/hotwork-audit-detail", "style": {} }, + { + "path": "pages/application/hotwork/hotwork-safety/hotwork-safety-detail", + "style": {} + }, { "path": "pages/application/hotwork/hotwork-approve/hotwork-approve-detail", "style": {} diff --git a/pages/application/confinedspace/confinedspace-accept/confinedspace-accept-detail.vue b/pages/application/confinedspace/confinedspace-accept/confinedspace-accept-detail.vue index 79a56e9..7003324 100644 --- a/pages/application/confinedspace/confinedspace-accept/confinedspace-accept-detail.vue +++ b/pages/application/confinedspace/confinedspace-accept/confinedspace-accept-detail.vue @@ -165,6 +165,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + 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({ @@ -191,7 +199,7 @@ formData.SIGNTIME = signtime.join(",") formData.ACCEPT_TIME = _this.pd.ACCEPT_TIME formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID - formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" + formData.DESCR = _this.pd.DESCR formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue index 06bc99a..89e43fd 100644 --- a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue +++ b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue @@ -247,6 +247,28 @@ + + + 作业人单位 + + {{pd.WORK_USER_DEPARTMENT_NAME?pd.WORK_USER_DEPARTMENT_NAME:'请选择'}} + + + + + 作业人 + + + {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} + + + + 作业负责人单位 @@ -269,28 +291,7 @@ - - - 作业人单位 - - {{pd.WORK_USER_DEPARTMENT_NAME?pd.WORK_USER_DEPARTMENT_NAME:'请选择'}} - - - - - 作业人 - - - {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} - - - - + 所在单位 @@ -449,6 +450,21 @@ + + + + 作业人 + {{pd.WORK_USER_NAME}} + + + + + {{signs.WORK_USER[0].SIGN_TIME[index]}} + + + + 作业负责人意见 @@ -468,21 +484,7 @@ - - - - 作业人 - {{pd.WORK_USER_NAME}} - - - - - {{signs.WORK_USER[0].SIGN_TIME[index]}} - - - - + 所在单位意见 diff --git a/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail.vue b/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail.vue index a0c576a..2c985a4 100644 --- a/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail.vue +++ b/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail.vue @@ -9,7 +9,7 @@ - 作业负责人意见 + 作业负责人意见 @@ -162,6 +162,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} @@ -169,7 +177,7 @@ this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID - formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" + formData.DESCR = _this.pd.DESCR formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/confinedspace/confinedspace-detail/index.vue b/pages/application/confinedspace/confinedspace-detail/index.vue index bd9f01b..4e9a555 100644 --- a/pages/application/confinedspace/confinedspace-detail/index.vue +++ b/pages/application/confinedspace/confinedspace-detail/index.vue @@ -196,6 +196,21 @@ + + + + 作业人 + {{pd.WORK_USER_NAME}} + + + + + {{signs.WORK_USER[0].SIGN_TIME[index]}} + + + + 作业负责人意见 @@ -215,21 +230,7 @@ - - - - 作业人 - {{pd.WORK_USER_NAME}} - - - - - {{signs.WORK_USER[0].SIGN_TIME[index]}} - - - - + 所在单位意见 diff --git a/pages/application/confinedspace/confinedspace-gas/gas-detail.vue b/pages/application/confinedspace/confinedspace-gas/gas-detail.vue index efc5cbb..d835327 100644 --- a/pages/application/confinedspace/confinedspace-gas/gas-detail.vue +++ b/pages/application/confinedspace/confinedspace-gas/gas-detail.vue @@ -37,13 +37,17 @@ 分析部位： - + 氧气含量： + + 分析地点： + + @@ -106,7 +110,7 @@ pd:{},// 数据 rules:[ {name:'ANALYZE_TIME',message:'请输入取样分析时间'}, - {name:'ANALYZE_PLACE',message:'请输入分析部位'}, + {name:'ANALYZE_PART',message:'请输入分析部位'}, {name:'OXYGEN_CONTENT',message:'请输入氧气含量'}, ], GAS_NAME1:'', diff --git a/pages/application/confinedspace/confinedspace-gas/gas-list.vue b/pages/application/confinedspace/confinedspace-gas/gas-list.vue index f960893..60d12ed 100644 --- a/pages/application/confinedspace/confinedspace-gas/gas-list.vue +++ b/pages/application/confinedspace/confinedspace-gas/gas-list.vue @@ -14,7 +14,7 @@ 分析时间:{{item.ANALYZE_TIME}} - 分析地点:{{item.ANALYZE_PLACE}} + 分析部位:{{item.ANALYZE_PART}} {{ GAS_NAME1 }}：{{item.DATA1}} @@ -26,6 +26,7 @@ 含氧量：{{item.OXYGEN_CONTENT}} + 分析地点:{{item.ANALYZE_PLACE}} 分析人：{{item.ANALYZE_USER}} diff --git a/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail.vue b/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail.vue index 7ebf945..df7a1cc 100644 --- a/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail.vue +++ b/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail.vue @@ -9,7 +9,7 @@ - 所在单位负责人意见 + 所在单位负责人意见 @@ -164,6 +164,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} @@ -171,7 +179,7 @@ this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime.join(",") formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID - formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" + formData.DESCR = _this.pd.DESCR formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/confinedspace/confinedspace-list/index.vue b/pages/application/confinedspace/confinedspace-list/index.vue index 3fd08a5..064b9e8 100644 --- a/pages/application/confinedspace/confinedspace-list/index.vue +++ b/pages/application/confinedspace/confinedspace-list/index.vue @@ -201,14 +201,14 @@ uni.navigateTo({ url: '/pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-detail?CONFINEDSPACE_ID='+e }); - }else if(this.flow === '作业负责人签字'){ - uni.navigateTo({ - url: '/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail?CONFINEDSPACE_ID='+e - }); }else if(this.flow === '作业人签字'){ uni.navigateTo({ url: '/pages/application/confinedspace/confinedspace-workuser/confinedspace-workuser-detail?CONFINEDSPACE_ID='+e }); + }else if(this.flow === '作业负责人签字'){ + uni.navigateTo({ + url: '/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail?CONFINEDSPACE_ID='+e + }); }else if(this.flow === '所在单位签字'){ uni.navigateTo({ url: '/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail?CONFINEDSPACE_ID='+e diff --git a/pages/application/confinedspace/home.vue b/pages/application/confinedspace/home.vue index 3c7b344..fd066cb 100644 --- a/pages/application/confinedspace/home.vue +++ b/pages/application/confinedspace/home.vue @@ -97,16 +97,6 @@ 意见 - - - - {{count.CONFIRM}} - - - 作业负责人 - 意见 - - @@ -117,6 +107,17 @@ 意见 + + + + {{count.CONFIRM}} + + + 作业负责人 + 意见 + + + diff --git a/pages/application/highwork/highwork-accept/highwork-accept-detail.vue b/pages/application/highwork/highwork-accept/highwork-accept-detail.vue index 88679cc..8834110 100644 --- a/pages/application/highwork/highwork-accept/highwork-accept-detail.vue +++ b/pages/application/highwork/highwork-accept/highwork-accept-detail.vue @@ -165,6 +165,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + 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({ diff --git a/pages/application/highwork/highwork-approve/highwork-approve-detail.vue b/pages/application/highwork/highwork-approve/highwork-approve-detail.vue index 3cfa84f..850449a 100644 --- a/pages/application/highwork/highwork-approve/highwork-approve-detail.vue +++ b/pages/application/highwork/highwork-approve/highwork-approve-detail.vue @@ -163,6 +163,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} @@ -170,7 +178,7 @@ this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime.join(",") formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID - formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" + formData.DESCR = _this.pd.DESCR formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/highwork/highwork-audit/highwork-audit-detail.vue b/pages/application/highwork/highwork-audit/highwork-audit-detail.vue index 62aecc3..9a408db 100644 --- a/pages/application/highwork/highwork-audit/highwork-audit-detail.vue +++ b/pages/application/highwork/highwork-audit/highwork-audit-detail.vue @@ -164,13 +164,21 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime.join(",") formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID - formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" + formData.DESCR = _this.pd.DESCR formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/highwork/highwork-confirm/highwork-confirm-detail.vue b/pages/application/highwork/highwork-confirm/highwork-confirm-detail.vue index f625b7b..bcd2b29 100644 --- a/pages/application/highwork/highwork-confirm/highwork-confirm-detail.vue +++ b/pages/application/highwork/highwork-confirm/highwork-confirm-detail.vue @@ -162,6 +162,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} @@ -169,7 +177,7 @@ this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID - formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" + formData.DESCR = _this.pd.DESCR formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/highwork/highwork-detail/index.vue b/pages/application/highwork/highwork-detail/index.vue index a7dc070..cfc449e 100644 --- a/pages/application/highwork/highwork-detail/index.vue +++ b/pages/application/highwork/highwork-detail/index.vue @@ -190,6 +190,21 @@ + + + + 作业人 + {{pd.WORK_USER_NAME}} + + + + + {{signs.WORK_USER[0].SIGN_TIME[index]}} + + + + 作业负责人意见 @@ -209,21 +224,7 @@ - - - - 作业人 - {{pd.WORK_USER_NAME}} - - - - - {{signs.WORK_USER[0].SIGN_TIME[index]}} - - - - + 所在单位意见 diff --git a/pages/application/highwork/highwork-leader/highwork-leader-detail.vue b/pages/application/highwork/highwork-leader/highwork-leader-detail.vue index a73c6bf..3fea7e6 100644 --- a/pages/application/highwork/highwork-leader/highwork-leader-detail.vue +++ b/pages/application/highwork/highwork-leader/highwork-leader-detail.vue @@ -164,6 +164,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} @@ -171,7 +179,7 @@ this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime.join(",") formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID - formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" + formData.DESCR = _this.pd.DESCR formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/highwork/highwork-list/index.vue b/pages/application/highwork/highwork-list/index.vue index 8bd0e6a..3023d3d 100644 --- a/pages/application/highwork/highwork-list/index.vue +++ b/pages/application/highwork/highwork-list/index.vue @@ -204,14 +204,14 @@ uni.navigateTo({ url: '/pages/application/highwork/highwork-acceptconfess/highwork-acceptconfess-detail?HIGHWORK_ID='+e }); - }else if(this.flow === '作业负责人签字'){ - uni.navigateTo({ - url: '/pages/application/highwork/highwork-confirm/highwork-confirm-detail?HIGHWORK_ID='+e - }); }else if(this.flow === '作业人签字'){ uni.navigateTo({ url: '/pages/application/highwork/highwork-workuser/highwork-workuser-detail?HIGHWORK_ID='+e }); + }else if(this.flow === '作业负责人签字'){ + uni.navigateTo({ + url: '/pages/application/highwork/highwork-confirm/highwork-confirm-detail?HIGHWORK_ID='+e + }); }else if(this.flow === '所在单位签字'){ uni.navigateTo({ url: '/pages/application/highwork/highwork-leader/highwork-leader-detail?HIGHWORK_ID='+e diff --git a/pages/application/highwork/home.vue b/pages/application/highwork/home.vue index 873f47c..fe25223 100644 --- a/pages/application/highwork/home.vue +++ b/pages/application/highwork/home.vue @@ -72,16 +72,6 @@ 意见 - - - - {{count.CONFIRM}} - - - 作业负责人 - 意见 - - @@ -92,6 +82,17 @@ 意见 + + + + {{count.CONFIRM}} + + + 作业负责人 + 意见 + + + @@ -108,7 +109,7 @@ {{count.AUDIT}} - 安全管理部门 + 审核部门 意见 @@ -118,7 +119,7 @@ {{count.APPROVE}} - 审批人 + 审批部门 意见 diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue index 9c1299e..54762e7 100644 --- a/pages/application/hotwork/home.vue +++ b/pages/application/hotwork/home.vue @@ -110,6 +110,16 @@ 意见 + + + + {{count.SAFETY}} + + + 安全副总 + 意见 + + diff --git a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue index efa5183..2a824ae 100644 --- a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue @@ -165,6 +165,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + 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({ diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue index b4ca171..2da120c 100644 --- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue @@ -316,8 +316,11 @@ - + 安全管理部门 + + 清除 + {{pd.AUDIT_DEPARTMENT_NAME?pd.AUDIT_DEPARTMENT_NAME:'请选择'}} @@ -328,7 +331,7 @@ @confirm="audittreeConfirm" @cancel="audittreeCancel"> - + 安全管理部门负责人 @@ -337,6 +340,31 @@ + + + 安全副总部门 + + 清除 + + + {{pd.SAFETY_DEPARTMENT_NAME?pd.SAFETY_DEPARTMENT_NAME:'请选择'}} + + + + + 安全副总 + + + {{pd.SAFETY_USER_NAME?pd.SAFETY_USER_NAME:'请选择'}} + + + + 动火审批单位 @@ -577,6 +605,26 @@ + + + 安全副总意见 + + + + + 安全副总 + {{pd.SAFETY_USER_NAME}} + + + + + {{signs.SAFETY[0].SIGN_TIME[index]}} + + + + + 动火审批人意见 @@ -732,6 +780,8 @@ leaderindex:-1, auditUserList:[], auditindex:-1, + safetyindex:-1, + safetyUserList:[], approveUserList:[], approveindex:-1, monitorUserList:[], @@ -848,6 +898,7 @@ this.getUserList(this.pd.CONFIRM_DEPARTMENT_ID,'confirmUserList'); this.getUserList(this.pd.LEADER_DEPARTMENT_ID,'leaderUserList'); this.getUserList(this.pd.AUDIT_DEPARTMENT_ID,'auditUserList'); + this.getUserList(this.pd.AUDIT_DEPARTMENT_ID,'safetyUserList'); this.getUserList(this.pd.APPROVE_DEPARTMENT_ID,'approveUserList'); this.getUserList(this.pd.MONITOR_DEPARTMENT_ID,'monitorUserList'); this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID,'acceptUserList'); @@ -957,6 +1008,7 @@ required = false } }) + if(this.pd.WORK_LEVEL != '二级'){ if(!this.pd.AUDIT_USER_ID){ uni.showToast({ @@ -1033,6 +1085,7 @@ levelChange(e){ this.levelindex = e.detail.value; this.pd.WORK_LEVEL=this.levelList[this.levelindex].name; + console.log(e.detail.value) if(e.detail.value == '2'){ this.pd.AUDIT_DEPARTMENT_ID=''; this.pd.AUDIT_DEPARTMENT_NAME=''; @@ -1049,6 +1102,12 @@ this.pd.APPROVE_USER_ID=''; this.pd.APPROVE_USER_NAME=''; } + if(e.detail.value == '0'){ + this.pd.SAFETY_DEPARTMENT_ID=''; + this.pd.SAFETY_DEPARTMENT_NAME=''; + this.pd.SAFETY_USER_ID=''; + this.pd.SAFETY_USER_NAME=''; + } this.$forceUpdate();//强制刷新 }, getDept() { @@ -1248,6 +1307,7 @@ }) } break + case 'approve': if(this.approveUserList.length == 0) { uni.showToast({ @@ -1277,6 +1337,28 @@ break } }, + cancelSelect(dept) { + if (dept == 'audit') { + this.pd.AUDIT_DEPARTMENT_ID = '' + this.pd.AUDIT_DEPARTMENT_NAME = '' + this.pd.AUDIT_USER_ID = '' + this.pd.AUDIT_USER_NAME = '' + this.auditUserList = [] + this.auditindex = -1 + this.$refs.tkiTree_audit._reTreeList() + this.$refs.tkiTree_audit._initTree(this.treeNode) + } + if(dept == 'safety'){ + this.pd.SAFETY_DEPARTMENT_ID = '' + this.pd.SAFETY_DEPARTMENT_NAME = '' + this.pd.SAFETY_USER_ID = '' + this.pd.SAFETY_USER_NAME = '' + this.safetyUserList = [] + this.safetyindex = -1 + this.$refs.tkiTree_safety._reTreeList() + this.$refs.tkiTree_safety._initTree(this.treeNode) + } + }, /* *安全交底人 @@ -1549,6 +1631,36 @@ this.$forceUpdate();//强制刷新 }, + + /* + *安全副总 + */ + // 确定回调事件 + safetytreeConfirm(e) { + this.isUps=false; + this.pd.SAFETY_DEPARTMENT_ID=e[0].id; + this.pd.SAFETY_DEPARTMENT_NAME=e[0].name; + this.pd.SAFETY_USER_ID = '' + this.pd.SAFETY_USER_NAME = '' + this.$forceUpdate();//强制刷新 + this.getUserList(e[0].id,'safetyUserList'); + }, + // 取消回调事件 + safetytreeCancel(e) { + this.isUps=false; + }, + // 显示树形选择器 + showSafetyTree() { + this.isUps=true + this.$refs.tkiTree_safety._show(); + }, + PickerSafety(e) { + this.safetyindex = e.detail.value; + this.pd.SAFETY_USER_ID=this.safetyUserList[this.safetyindex].USER_ID; + this.pd.SAFETY_USER_NAME=this.safetyUserList[this.safetyindex].NAME; + this.$forceUpdate();//强制刷新 + }, + /* *审批人 */ diff --git a/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue index 5459d34..f882512 100644 --- a/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue +++ b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue @@ -164,6 +164,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} diff --git a/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue index 308e15b..3204aec 100644 --- a/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue @@ -162,6 +162,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} diff --git a/pages/application/hotwork/hotwork-gas/gas-detail.vue b/pages/application/hotwork/hotwork-gas/gas-detail.vue index 55f966b..c18b05a 100644 --- a/pages/application/hotwork/hotwork-gas/gas-detail.vue +++ b/pages/application/hotwork/hotwork-gas/gas-detail.vue @@ -18,13 +18,18 @@ 代表性气体： - + 分析结果： + + + 分析地点： + + 分析人： @@ -82,7 +87,7 @@ pd:{},// 数据 rules:[ {name:'ANALYZE_TIME',message:'请输入分析时间'}, - {name:'ANALYZE_PLACE',message:'请输入分析点'}, + {name:'ANALYZE_GAS',message:'请输入代表性气体'}, {name:'ANALYZE_RESULT',message:'请输入分析结果'}, ], currentTime:formatDate(new Date(),'yyyy-MM-dd hh:mm') diff --git a/pages/application/hotwork/hotwork-gas/gas-list.vue b/pages/application/hotwork/hotwork-gas/gas-list.vue index 00f7827..a9d2d58 100644 --- a/pages/application/hotwork/hotwork-gas/gas-list.vue +++ b/pages/application/hotwork/hotwork-gas/gas-list.vue @@ -13,10 +13,11 @@ 分析时间:{{item.ANALYZE_TIME}} - 代表性气体:{{item.ANALYZE_PLACE}} + 代表性气体:{{item.ANALYZE_GAS}} 分析数据：{{item.ANALYZE_RESULT}} + 分析地点:{{item.ANALYZE_PLACE}} 分析人： diff --git a/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue index aca04e9..9ddc40c 100644 --- a/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue @@ -164,6 +164,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue index e1a664c..e46f5f5 100644 --- a/pages/application/hotwork/hotwork-list/index.vue +++ b/pages/application/hotwork/hotwork-list/index.vue @@ -50,10 +50,11 @@ 动火点所在单位负责人：{{item.LEADER_USER_NAME}} + 安全管理部门负责人：{{item.AUDIT_USER_NAME}} - 安全管理部门负责人：{{item.AUDIT_USER_NAME}} + 安全副总：{{item.SAFETY_USER_NAME}} 审批部门负责人：{{item.APPROVE_USER_NAME}} @@ -223,6 +224,10 @@ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-audit/hotwork-audit-detail?HOTWORK_ID='+e }); + }else if(this.flow === '安全副总签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-safety/hotwork-safety-detail?HOTWORK_ID='+e + }); }else if(this.flow === '审批人签字'){ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-approve/hotwork-approve-detail?HOTWORK_ID='+e diff --git a/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue index 78d367a..ded885d 100644 --- a/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue @@ -150,6 +150,14 @@ }); return; } + if (!_this.pd.DESCR) { + uni.showToast({ + icon: 'none', + title: '请输入负责人意见', + duration: 1500 + }); + return; + } var files = []; var signtime = []; const formData={} diff --git a/pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue new file mode 100644 index 0000000..70cd4f5 --- /dev/null +++ b/pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue @@ -0,0 +1,335 @@ + + + +