From c3cb02c9c4260342b284df5eff72c353415be5fa Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Thu, 22 Feb 2024 11:39:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E7=94=A8=E7=94=B5=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8A=A8=E5=9C=9F=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/other-select/index.vue | 4 + pages.json | 102 +- pages/application/break-ground/home.vue | 0 .../breakground-apply-detail.vue | 1584 +++++++++++++++++ .../breakground/breakground-detail/index.vue | 609 +++++++ .../breakground/breakground-list/index.vue | 579 ++++++ .../breakground-measures-confirm-detail.vue | 407 +++++ .../breakground-measures-detail.vue | 379 ++++ .../breakground-workuser-detail.vue | 473 +++++ pages/application/breakground/home.vue | 314 ++++ .../confinedspace-apply-detail.vue | 15 +- .../confinedspace-detail/index.vue | 2 +- .../confinedspace-gas/gas-detail.vue | 3 +- .../confinedspace-list/index.vue | 4 +- .../confinedspace-measures-confirm-detail.vue | 28 +- pages/application/confinedspace/home.vue | 8 +- pages/application/dangerous_options/index.vue | 3 - pages/application/eight-assignments.vue | 2 +- .../electricity-accept-detail.vue | 482 +++++ .../electricity-acceptconfess-detail.vue | 327 ++++ .../electricity-apply-detail.vue | 11 +- .../electricity-approve-detail.vue | 320 ++++ .../electricity-audit-detail.vue} | 29 +- .../electricity-confess-detail.vue | 405 +++++ .../electricity-confirm-detail.vue | 332 ++++ .../electricity/electricity-detail/index.vue | 594 +++++++ .../electricity-endwork-detail.vue | 358 ++++ .../electricity-guardian-detail.vue | 393 ++++ .../electricity/electricity-list/index.vue | 6 +- .../electricity-measures-confirm-detail.vue | 407 +++++ .../electricity-measures-detail.vue | 379 ++++ .../electricity-startwork-detail.vue | 337 ++++ .../electricity-user-detail.vue | 388 ++++ .../electricity-workuser-detail.vue | 336 ++++ pages/application/electricity/home.vue | 33 +- .../highwork-apply/highwork-apply-detail.vue | 2 +- .../highwork/highwork-detail/index.vue | 2 +- .../highwork/highwork-list/index.vue | 4 +- .../highwork-measures-confirm-detail.vue | 28 +- pages/application/highwork/home.vue | 8 +- pages/application/hotwork/home.vue | 19 +- .../hotwork-apply/hotwork-apply-detail.vue | 99 +- .../hotwork/hotwork-gas/gas-detail.vue | 1 + .../hotwork/hotwork-list/index.vue | 9 +- .../hotwork-measures-confirm-detail.vue | 29 +- 45 files changed, 9661 insertions(+), 193 deletions(-) delete mode 100644 pages/application/break-ground/home.vue create mode 100644 pages/application/breakground/breakground-apply/breakground-apply-detail.vue create mode 100644 pages/application/breakground/breakground-detail/index.vue create mode 100644 pages/application/breakground/breakground-list/index.vue create mode 100644 pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail.vue create mode 100644 pages/application/breakground/breakground-measures/breakground-measures-detail.vue create mode 100644 pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue create mode 100644 pages/application/breakground/home.vue create mode 100644 pages/application/electricity/electricity-accept/electricity-accept-detail.vue create mode 100644 pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail.vue create mode 100644 pages/application/electricity/electricity-approve/electricity-approve-detail.vue rename pages/application/{hotwork/hotwork-safety/hotwork-safety-detail.vue => electricity/electricity-audit/electricity-audit-detail.vue} (91%) create mode 100644 pages/application/electricity/electricity-confess/electricity-confess-detail.vue create mode 100644 pages/application/electricity/electricity-confirm/electricity-confirm-detail.vue create mode 100644 pages/application/electricity/electricity-detail/index.vue create mode 100644 pages/application/electricity/electricity-endwork/electricity-endwork-detail.vue create mode 100644 pages/application/electricity/electricity-guardian/electricity-guardian-detail.vue create mode 100644 pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail.vue create mode 100644 pages/application/electricity/electricity-measures/electricity-measures-detail.vue create mode 100644 pages/application/electricity/electricity-startwork/electricity-startwork-detail.vue create mode 100644 pages/application/electricity/electricity-user/electricity-user-detail.vue create mode 100644 pages/application/electricity/electricity-workuser/electricity-workuser-detail.vue diff --git a/components/other-select/index.vue b/components/other-select/index.vue index 83fe98f..ebbe839 100644 --- a/components/other-select/index.vue +++ b/components/other-select/index.vue @@ -94,6 +94,10 @@ export default { lists[i].CHECK_NO = "受限作业" + ' ' + lists[i].CHECK_NO }else if(lists[i].WORK_TYPE == "HIGHWORK"){ lists[i].CHECK_NO = "高处作业" + ' ' + lists[i].CHECK_NO + }else if(lists[i].WORK_TYPE == "ELECTRICITY"){ + lists[i].CHECK_NO = "临时用电" + ' ' + lists[i].CHECK_NO + }else if(lists[i].WORK_TYPE == "BREAKGROUND"){ + lists[i].CHECK_NO = "动土作业" + ' ' + lists[i].CHECK_NO } console.log(lists[i].CHECK_NO) } diff --git a/pages.json b/pages.json index ec08c67..53a697e 100644 --- a/pages.json +++ b/pages.json @@ -543,7 +543,102 @@ "path": "pages/application/highwork/highwork-accept/highwork-accept-detail", "style": {} }, - + { + "path": "pages/application/electricity/home", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-list/index", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-apply/electricity-apply-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-gas/gas-list", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-gas/gas-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-measures/electricity-measures-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-guardian/electricity-guardian-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-user/electricity-user-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-confess/electricity-confess-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-confirm/electricity-confirm-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-workuser/electricity-workuser-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-audit/electricity-audit-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-approve/electricity-approve-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-startwork/electricity-startwork-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-endwork/electricity-endwork-detail", + "style": {} + }, + { + "path": "pages/application/electricity/electricity-accept/electricity-accept-detail", + "style": {} + }, + { + "path": "pages/application/breakground/home", + "style": {} + }, + { + "path": "pages/application/breakground/breakground-list/index", + "style": {} + }, + { + "path": "pages/application/breakground/breakground-apply/breakground-apply-detail", + "style": {} + }, + { + "path": "pages/application/breakground/breakground-workuser/breakground-workuser-detail", + "style": {} + }, + { + "path": "pages/application/breakground/breakground-measures/breakground-measures-detail", + "style": {} + }, + { + "path": "pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail", + "style": {} + }, { "path": "pages/application/hotwork/home", "style": {} @@ -588,10 +683,7 @@ "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/break-ground/home.vue b/pages/application/break-ground/home.vue deleted file mode 100644 index e69de29..0000000 diff --git a/pages/application/breakground/breakground-apply/breakground-apply-detail.vue b/pages/application/breakground/breakground-apply/breakground-apply-detail.vue new file mode 100644 index 0000000..0053fb2 --- /dev/null +++ b/pages/application/breakground/breakground-apply/breakground-apply-detail.vue @@ -0,0 +1,1584 @@ + + + + + diff --git a/pages/application/breakground/breakground-detail/index.vue b/pages/application/breakground/breakground-detail/index.vue new file mode 100644 index 0000000..914f5f7 --- /dev/null +++ b/pages/application/breakground/breakground-detail/index.vue @@ -0,0 +1,609 @@ + + + + + diff --git a/pages/application/breakground/breakground-list/index.vue b/pages/application/breakground/breakground-list/index.vue new file mode 100644 index 0000000..935d50b --- /dev/null +++ b/pages/application/breakground/breakground-list/index.vue @@ -0,0 +1,579 @@ + + + + + diff --git a/pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail.vue b/pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail.vue new file mode 100644 index 0000000..75b758d --- /dev/null +++ b/pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail.vue @@ -0,0 +1,407 @@ + + + + + diff --git a/pages/application/breakground/breakground-measures/breakground-measures-detail.vue b/pages/application/breakground/breakground-measures/breakground-measures-detail.vue new file mode 100644 index 0000000..e466e51 --- /dev/null +++ b/pages/application/breakground/breakground-measures/breakground-measures-detail.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue new file mode 100644 index 0000000..b007efa --- /dev/null +++ b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue @@ -0,0 +1,473 @@ + + + + diff --git a/pages/application/breakground/home.vue b/pages/application/breakground/home.vue new file mode 100644 index 0000000..e02644f --- /dev/null +++ b/pages/application/breakground/home.vue @@ -0,0 +1,314 @@ + + + + + diff --git a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue index 89e43fd..5dae0c6 100644 --- a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue +++ b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue @@ -70,9 +70,12 @@ - - 分析人: - {{pd.ANALYZE_USER_NAME}} + + + + 分析人: + {{pd.ANALYZE_USER_NAME}} + @@ -142,7 +145,7 @@ 其他安全措施 签字 - + {{item.DESCR}} @@ -558,8 +561,8 @@ - - + + diff --git a/pages/application/confinedspace/confinedspace-detail/index.vue b/pages/application/confinedspace/confinedspace-detail/index.vue index 4e9a555..776d7c8 100644 --- a/pages/application/confinedspace/confinedspace-detail/index.vue +++ b/pages/application/confinedspace/confinedspace-detail/index.vue @@ -122,7 +122,7 @@ 其他安全措施 签字 - + {{item.DESCR}} diff --git a/pages/application/confinedspace/confinedspace-gas/gas-detail.vue b/pages/application/confinedspace/confinedspace-gas/gas-detail.vue index d835327..9947c10 100644 --- a/pages/application/confinedspace/confinedspace-gas/gas-detail.vue +++ b/pages/application/confinedspace/confinedspace-gas/gas-detail.vue @@ -46,7 +46,7 @@ 分析地点: - + @@ -112,6 +112,7 @@ {name:'ANALYZE_TIME',message:'请输入取样分析时间'}, {name:'ANALYZE_PART',message:'请输入分析部位'}, {name:'OXYGEN_CONTENT',message:'请输入氧气含量'}, + {name:'ANALYZE_PLACE',message:'请输入分析地点'}, ], GAS_NAME1:'', GAS_NAME2:'', diff --git a/pages/application/confinedspace/confinedspace-list/index.vue b/pages/application/confinedspace/confinedspace-list/index.vue index 9fe6a7f..04e23f9 100644 --- a/pages/application/confinedspace/confinedspace-list/index.vue +++ b/pages/application/confinedspace/confinedspace-list/index.vue @@ -197,7 +197,7 @@ uni.navigateTo({ url: '/pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail?CONFINEDSPACE_ID='+e }); - }else if(this.flow === '接受安全交底人签字'){ + }else if(this.flow === '接受交底人签字'){ uni.navigateTo({ url: '/pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-detail?CONFINEDSPACE_ID='+e }); @@ -213,7 +213,7 @@ uni.navigateTo({ url: '/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail?CONFINEDSPACE_ID='+e }); - }else if(this.flow === '开始进行作业'){ + }else if(this.flow === '开始作业'){ uni.navigateTo({ url: '/pages/application/confinedspace/confinedspace-startwork/confinedspace-startwork-detail?CONFINEDSPACE_ID='+e }); diff --git a/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue b/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue index dced07f..205f415 100644 --- a/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue +++ b/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue @@ -18,7 +18,7 @@ 主要安全措施 - 操作 + 操作 @@ -106,6 +108,7 @@ measuresList:[], modalName:null, imgList:[], + } }, onLoad(event){ @@ -119,13 +122,12 @@ // 监听事件 mounted() { uni.$on('dangerous_options_submit', (data) => { - console.log(data) - this.measuresList[data.index].SIGN_PATH = data.signImgList[0].filePath - this.measuresList[data.index].SIGN_TIME = data.signImgList[0].SIGNER_TIME - this.measuresList[data.index].IMG_PATH = data.imgList.map(item => { - return item.filePath - }).join(",") - this.measuresList[data.index].STATUS = data.STATUS + this.$set(this.measuresList[data.index],'SIGN_PATH',data.signImgList[0].filePath) + this.$set(this.measuresList[data.index],'SIGN_TIME',data.signImgList[0].SIGNER_TIME) + this.$set(this.measuresList[data.index],'IMG_PATH',data.imgList.map(item => { + return item.filePath + }).join(",")) + this.$set(this.measuresList[data.index],'STATUS',data.STATUS) }) }, // 取消监听 @@ -201,6 +203,14 @@ return; } if (APPLY_STATUS == 1) { + if(!this.pd.DESCR){ + 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){ diff --git a/pages/application/confinedspace/home.vue b/pages/application/confinedspace/home.vue index fd066cb..a8a8137 100644 --- a/pages/application/confinedspace/home.vue +++ b/pages/application/confinedspace/home.vue @@ -87,13 +87,13 @@ 意见 - + {{count.ACCEPT_CONFESS}} - 接受安全交底人 + 接受交底人 意见 @@ -128,13 +128,13 @@ 意见 - + {{count.WORK_START}} - 开始进行作业时间 + 开始作业时间 diff --git a/pages/application/dangerous_options/index.vue b/pages/application/dangerous_options/index.vue index 294d16c..60ccb32 100644 --- a/pages/application/dangerous_options/index.vue +++ b/pages/application/dangerous_options/index.vue @@ -112,8 +112,6 @@ export default { onLoad(event) { this.imgList = JSON.parse(event.imgList) || []; this.signImgList = JSON.parse(event.signImgList) || []; - console.log(this.signImgList) - console.log(JSON.parse(event.signImgList) ) this.currentIndex = event.index || 0; this.STATUS = event.STATUS || 1; }, @@ -212,7 +210,6 @@ export default { }, goSubmit() { if(this.buttonloading) return; - console.log(this.signImgList) if(this.signImgList.length === 0) { uni.showToast({ title: '请签字', diff --git a/pages/application/eight-assignments.vue b/pages/application/eight-assignments.vue index 12a16a0..b1763bc 100644 --- a/pages/application/eight-assignments.vue +++ b/pages/application/eight-assignments.vue @@ -39,7 +39,7 @@ 盲板抽堵作业 - + {{eight_work_count.BREAK_GROUND_COUNT}} diff --git a/pages/application/electricity/electricity-accept/electricity-accept-detail.vue b/pages/application/electricity/electricity-accept/electricity-accept-detail.vue new file mode 100644 index 0000000..720e910 --- /dev/null +++ b/pages/application/electricity/electricity-accept/electricity-accept-detail.vue @@ -0,0 +1,482 @@ + + + + + diff --git a/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail.vue b/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail.vue new file mode 100644 index 0000000..79940d6 --- /dev/null +++ b/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail.vue @@ -0,0 +1,327 @@ + + + + + diff --git a/pages/application/electricity/electricity-apply/electricity-apply-detail.vue b/pages/application/electricity/electricity-apply/electricity-apply-detail.vue index d00723a..80c225c 100644 --- a/pages/application/electricity/electricity-apply/electricity-apply-detail.vue +++ b/pages/application/electricity/electricity-apply/electricity-apply-detail.vue @@ -76,10 +76,11 @@ - - - 分析人: - {{pd.ANALYZE_USER_NAME}} + + + 分析人: + {{pd.ANALYZE_USER_NAME}} + @@ -138,7 +139,7 @@ 其他安全措施 签字 - + {{item.DESCR}} diff --git a/pages/application/electricity/electricity-approve/electricity-approve-detail.vue b/pages/application/electricity/electricity-approve/electricity-approve-detail.vue new file mode 100644 index 0000000..37c8ec7 --- /dev/null +++ b/pages/application/electricity/electricity-approve/electricity-approve-detail.vue @@ -0,0 +1,320 @@ + + + + diff --git a/pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue b/pages/application/electricity/electricity-audit/electricity-audit-detail.vue similarity index 91% rename from pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue rename to pages/application/electricity/electricity-audit/electricity-audit-detail.vue index 70cd4f5..8612c02 100644 --- a/pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue +++ b/pages/application/electricity/electricity-audit/electricity-audit-detail.vue @@ -2,22 +2,22 @@ 返回 - 安全副总意见 + 用电单位意见 - + - 安全副总意见 + 用电单位意见 - 安全副总 + 用电单位负责人 - + @@ -59,7 +59,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/electricity/electricity-detail/index' export default { components: { tkiTree,ruiDatePicker,writingBoard,detail @@ -82,8 +82,8 @@ }, 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.pd.ELECTRICITY_ID = event.ELECTRICITY_ID; + if(this.pd.ELECTRICITY_ID){ this.msg="edit"; this.getData(); }else { @@ -104,7 +104,7 @@ //跳转事件 goToDetail(e) { uni.navigateTo({ - url: '/pages/application/hotwork/hotwork-gas/gas-list?HOTWORK_ID='+e + url: '/pages/application/electricity/electricity-gas/gas-list?ELECTRICITY_ID='+e }); }, getData() { @@ -113,13 +113,13 @@ title: '请稍候' }) uni.request({ - url: basePath + '/app/hotwork/findById', + url: basePath + '/app/electricity/findById', method: 'POST', header: { 'Content-type': 'application/x-www-form-urlencoded' }, data: { - HOTWORK_ID: _this.pd.HOTWORK_ID, + ELECTRICITY_ID: _this.pd.ELECTRICITY_ID, CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, }, @@ -176,13 +176,13 @@ var signtime = []; const formData={} this.uploadImgFaults(files,signtime) - formData.SIGNTIME = signtime - formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.SIGNTIME = signtime.join(",") + formData.ELECTRICITY_ID = _this.pd.ELECTRICITY_ID formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ - url: basePath+'app/hotwork/nextStep', + url: basePath+'app/electricity/nextStep', files: files, formData:formData, success: (res) => { @@ -278,7 +278,6 @@ }, //完成 subCanvas(e) { - this.imgList.splice(0,this.imgList.length); this.imgList.push(e); e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm') this.hideModal() diff --git a/pages/application/electricity/electricity-confess/electricity-confess-detail.vue b/pages/application/electricity/electricity-confess/electricity-confess-detail.vue new file mode 100644 index 0000000..14a4171 --- /dev/null +++ b/pages/application/electricity/electricity-confess/electricity-confess-detail.vue @@ -0,0 +1,405 @@ + + + + + diff --git a/pages/application/electricity/electricity-confirm/electricity-confirm-detail.vue b/pages/application/electricity/electricity-confirm/electricity-confirm-detail.vue new file mode 100644 index 0000000..a696910 --- /dev/null +++ b/pages/application/electricity/electricity-confirm/electricity-confirm-detail.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/pages/application/electricity/electricity-detail/index.vue b/pages/application/electricity/electricity-detail/index.vue new file mode 100644 index 0000000..d2933fc --- /dev/null +++ b/pages/application/electricity/electricity-detail/index.vue @@ -0,0 +1,594 @@ + + + + + diff --git a/pages/application/electricity/electricity-endwork/electricity-endwork-detail.vue b/pages/application/electricity/electricity-endwork/electricity-endwork-detail.vue new file mode 100644 index 0000000..587d394 --- /dev/null +++ b/pages/application/electricity/electricity-endwork/electricity-endwork-detail.vue @@ -0,0 +1,358 @@ + + + + + diff --git a/pages/application/electricity/electricity-guardian/electricity-guardian-detail.vue b/pages/application/electricity/electricity-guardian/electricity-guardian-detail.vue new file mode 100644 index 0000000..f175556 --- /dev/null +++ b/pages/application/electricity/electricity-guardian/electricity-guardian-detail.vue @@ -0,0 +1,393 @@ + + + + + diff --git a/pages/application/electricity/electricity-list/index.vue b/pages/application/electricity/electricity-list/index.vue index 247ba41..61513b2 100644 --- a/pages/application/electricity/electricity-list/index.vue +++ b/pages/application/electricity/electricity-list/index.vue @@ -35,7 +35,7 @@ 申请人:{{item.APPLY_USER_NAME}} - 分析人:{{item.ANALYZE_USER_NAME}} + 分析人:{{item.ANALYZE_USER_NAME}} 监护人:{{item.GUARDIAN_USER_NAME}} @@ -203,7 +203,7 @@ uni.navigateTo({ url: '/pages/application/electricity/electricity-confess/electricity-confess-detail?ELECTRICITY_ID='+e }); - }else if(this.flow === '接受安全交底人签字'){ + }else if(this.flow === '接受交底人签字'){ uni.navigateTo({ url: '/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail?ELECTRICITY_ID='+e }); @@ -223,7 +223,7 @@ uni.navigateTo({ url: '/pages/application/electricity/electricity-approve/electricity-approve-detail?ELECTRICITY_ID='+e }); - }else if(this.flow === '开始进行作业'){ + }else if(this.flow === '开始作业'){ uni.navigateTo({ url: '/pages/application/electricity/electricity-startwork/electricity-startwork-detail?ELECTRICITY_ID='+e }); diff --git a/pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail.vue b/pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail.vue new file mode 100644 index 0000000..21140d0 --- /dev/null +++ b/pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail.vue @@ -0,0 +1,407 @@ + + + + + diff --git a/pages/application/electricity/electricity-measures/electricity-measures-detail.vue b/pages/application/electricity/electricity-measures/electricity-measures-detail.vue new file mode 100644 index 0000000..533fe8e --- /dev/null +++ b/pages/application/electricity/electricity-measures/electricity-measures-detail.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/pages/application/electricity/electricity-startwork/electricity-startwork-detail.vue b/pages/application/electricity/electricity-startwork/electricity-startwork-detail.vue new file mode 100644 index 0000000..2cff405 --- /dev/null +++ b/pages/application/electricity/electricity-startwork/electricity-startwork-detail.vue @@ -0,0 +1,337 @@ + + + + + diff --git a/pages/application/electricity/electricity-user/electricity-user-detail.vue b/pages/application/electricity/electricity-user/electricity-user-detail.vue new file mode 100644 index 0000000..91a1412 --- /dev/null +++ b/pages/application/electricity/electricity-user/electricity-user-detail.vue @@ -0,0 +1,388 @@ + + + + + diff --git a/pages/application/electricity/electricity-workuser/electricity-workuser-detail.vue b/pages/application/electricity/electricity-workuser/electricity-workuser-detail.vue new file mode 100644 index 0000000..e9ebfea --- /dev/null +++ b/pages/application/electricity/electricity-workuser/electricity-workuser-detail.vue @@ -0,0 +1,336 @@ + + + + diff --git a/pages/application/electricity/home.vue b/pages/application/electricity/home.vue index bd622e1..68b6c34 100644 --- a/pages/application/electricity/home.vue +++ b/pages/application/electricity/home.vue @@ -61,6 +61,15 @@ 意见 + + + + {{count.ELECTRICITY}} + + + 用电人意见 + + @@ -71,13 +80,13 @@ 意见 - + {{count.ACCEPT_CONFESS}} - 接受安全交底人 + 接受交底人 意见 @@ -102,23 +111,33 @@ - + - {{count.LEADER}} + {{count.AUDIT}} - 所在单位 + 用电单位 意见 - + + + + {{count.APPROVE}} + + + 配送电单位 + 意见 + + + {{count.WORK_START}} - 开始进行作业时间 + 开始作业时间 diff --git a/pages/application/highwork/highwork-apply/highwork-apply-detail.vue b/pages/application/highwork/highwork-apply/highwork-apply-detail.vue index 2e6af20..dbf285d 100644 --- a/pages/application/highwork/highwork-apply/highwork-apply-detail.vue +++ b/pages/application/highwork/highwork-apply/highwork-apply-detail.vue @@ -120,7 +120,7 @@ 其他安全措施 签字 - + {{item.DESCR}} diff --git a/pages/application/highwork/highwork-detail/index.vue b/pages/application/highwork/highwork-detail/index.vue index cfc449e..fe65f69 100644 --- a/pages/application/highwork/highwork-detail/index.vue +++ b/pages/application/highwork/highwork-detail/index.vue @@ -116,7 +116,7 @@ 其他安全措施 签字 - + {{item.DESCR}} diff --git a/pages/application/highwork/highwork-list/index.vue b/pages/application/highwork/highwork-list/index.vue index dcb7172..9c9860c 100644 --- a/pages/application/highwork/highwork-list/index.vue +++ b/pages/application/highwork/highwork-list/index.vue @@ -200,7 +200,7 @@ uni.navigateTo({ url: '/pages/application/highwork/highwork-confess/highwork-confess-detail?HIGHWORK_ID='+e }); - }else if(this.flow === '接受安全交底人签字'){ + }else if(this.flow === '接受交底人签字'){ uni.navigateTo({ url: '/pages/application/highwork/highwork-acceptconfess/highwork-acceptconfess-detail?HIGHWORK_ID='+e }); @@ -224,7 +224,7 @@ uni.navigateTo({ url: '/pages/application/highwork/highwork-approve/highwork-approve-detail?HIGHWORK_ID='+e }); - }else if(this.flow === '开始进行作业'){ + }else if(this.flow === '开始作业'){ uni.navigateTo({ url: '/pages/application/highwork/highwork-startwork/highwork-startwork-detail?HIGHWORK_ID='+e }); diff --git a/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue b/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue index a2a067c..d3d1024 100644 --- a/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue +++ b/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue @@ -18,7 +18,7 @@ 主要安全措施 - 操作 + 操作 @@ -110,6 +112,7 @@ measuresList:[], modalName:null, imgList:[], + } }, onLoad(event){ @@ -123,13 +126,12 @@ // 监听事件 mounted() { uni.$on('dangerous_options_submit', (data) => { - console.log(data) - this.measuresList[data.index].SIGN_PATH = data.signImgList[0].filePath - this.measuresList[data.index].SIGN_TIME = data.signImgList[0].SIGNER_TIME - this.measuresList[data.index].IMG_PATH = data.imgList.map(item => { - return item.filePath - }).join(",") - this.measuresList[data.index].STATUS = data.STATUS + this.$set(this.measuresList[data.index],'SIGN_PATH',data.signImgList[0].filePath) + this.$set(this.measuresList[data.index],'SIGN_TIME',data.signImgList[0].SIGNER_TIME) + this.$set(this.measuresList[data.index],'IMG_PATH',data.imgList.map(item => { + return item.filePath + }).join(",")) + this.$set(this.measuresList[data.index],'STATUS',data.STATUS) }) }, // 取消监听 @@ -205,6 +207,14 @@ return; } if (APPLY_STATUS == 1) { + if(!this.pd.DESCR){ + 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){ diff --git a/pages/application/highwork/home.vue b/pages/application/highwork/home.vue index fe25223..20b8cb6 100644 --- a/pages/application/highwork/home.vue +++ b/pages/application/highwork/home.vue @@ -62,13 +62,13 @@ 意见 - + {{count.ACCEPT_CONFESS}} - 接受安全交底人 + 接受交底人 意见 @@ -124,13 +124,13 @@ - + {{count.WORK_START}} - 开始进行作业时间 + 开始作业时间 diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue index 54762e7..512d4fb 100644 --- a/pages/application/hotwork/home.vue +++ b/pages/application/hotwork/home.vue @@ -70,13 +70,13 @@ 意见 - + {{count.ACCEPT_CONFESS}} - 接受安全交底人 + 接受交底人 意见 @@ -110,16 +110,7 @@ 意见 - - - - {{count.SAFETY}} - - - 安全副总 - 意见 - - + @@ -140,13 +131,13 @@ 当班班长验票 - + {{count.WORK_START}} - 开始进行作业时间 + 开始作业时间 diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue index 9739585..d6fec0b 100644 --- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue @@ -166,7 +166,7 @@ 其他安全措施 签字 - + {{item.DESCR}} @@ -340,34 +340,13 @@ + - - 安全副总部门 - + + 动火审批单位 + 清除 - - {{pd.SAFETY_DEPARTMENT_NAME?pd.SAFETY_DEPARTMENT_NAME:'请选择'}} - - - - - 安全副总 - - - {{pd.SAFETY_USER_NAME?pd.SAFETY_USER_NAME:'请选择'}} - - - - - - - 动火审批单位 {{pd.APPROVE_DEPARTMENT_NAME?pd.APPROVE_DEPARTMENT_NAME:'请选择'}} @@ -378,7 +357,7 @@ @confirm="approvetreeConfirm" @cancel="approvetreeCancel"> - + 动火审批负责人 @@ -605,25 +584,6 @@ - - - 安全副总意见 - - - - - 安全副总 - {{pd.SAFETY_USER_NAME}} - - - - - {{signs.SAFETY[0].SIGN_TIME[index]}} - - - - @@ -1357,15 +1317,15 @@ 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) + if(dept == 'approve'){ + this.pd.APPROVE_DEPARTMENT_ID = '' + this.pd.APPROVE_DEPARTMENT_NAME = '' + this.pd.APPROVE_USER_ID = '' + this.pd.APPROVE_USER_NAME = '' + this.approveUserList = [] + this.approveindex = -1 + this.$refs.tkiTree_approve._reTreeList() + this.$refs.tkiTree_approve._initTree(this.treeNode) } }, @@ -1641,35 +1601,6 @@ }, - /* - *安全副总 - */ - // 确定回调事件 - 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-gas/gas-detail.vue b/pages/application/hotwork/hotwork-gas/gas-detail.vue index c18b05a..08ee94f 100644 --- a/pages/application/hotwork/hotwork-gas/gas-detail.vue +++ b/pages/application/hotwork/hotwork-gas/gas-detail.vue @@ -89,6 +89,7 @@ {name:'ANALYZE_TIME',message:'请输入分析时间'}, {name:'ANALYZE_GAS',message:'请输入代表性气体'}, {name:'ANALYZE_RESULT',message:'请输入分析结果'}, + {name:'ANALYZE_PLACE',message:'请输入分析地点'}, ], currentTime:formatDate(new Date(),'yyyy-MM-dd hh:mm') } diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue index b497624..dba290d 100644 --- a/pages/application/hotwork/hotwork-list/index.vue +++ b/pages/application/hotwork/hotwork-list/index.vue @@ -54,7 +54,6 @@ - 安全副总:{{item.SAFETY_USER_NAME}} 审批部门负责人:{{item.APPROVE_USER_NAME}} @@ -208,7 +207,7 @@ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-confess/hotwork-confess-detail?HOTWORK_ID='+e }); - }else if(this.flow === '接受安全交底人签字'){ + }else if(this.flow === '接受交底人签字'){ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail?HOTWORK_ID='+e }); @@ -224,10 +223,6 @@ 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 @@ -236,7 +231,7 @@ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail?HOTWORK_ID='+e }); - }else if(this.flow === '开始进行作业'){ + }else if(this.flow === '开始作业'){ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail?HOTWORK_ID='+e }); 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 6efa99c..2d8c586 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 @@ -18,7 +18,7 @@ 主要安全措施 - 操作 + 操作 @@ -110,6 +112,7 @@ measuresList:[], modalName:null, imgList:[], + } }, onLoad(event){ @@ -123,13 +126,12 @@ // 监听事件 mounted() { uni.$on('dangerous_options_submit', (data) => { - console.log(data) - this.measuresList[data.index].SIGN_PATH = data.signImgList[0].filePath - this.measuresList[data.index].SIGN_TIME = data.signImgList[0].SIGNER_TIME - this.measuresList[data.index].IMG_PATH = data.imgList.map(item => { - return item.filePath - }).join(",") - this.measuresList[data.index].STATUS = data.STATUS + this.$set(this.measuresList[data.index],'SIGN_PATH',data.signImgList[0].filePath) + this.$set(this.measuresList[data.index],'SIGN_TIME',data.signImgList[0].SIGNER_TIME) + this.$set(this.measuresList[data.index],'IMG_PATH',data.imgList.map(item => { + return item.filePath + }).join(",")) + this.$set(this.measuresList[data.index],'STATUS',data.STATUS) }) }, // 取消监听 @@ -205,6 +207,15 @@ return; } if (APPLY_STATUS == 1) { + + if(!this.pd.DESCR){ + 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){