From d5129650dedce4c9c1c00614d68cf717c8dbb5e1 Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Fri, 1 Mar 2024 17:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BD=9C=E4=B8=9A=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E4=BA=BA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blindboard-apply-detail.vue | 30 +++---- .../blindboard/blindboard-detail/index.vue | 2 +- .../breakground-apply-detail.vue | 87 ++++++++++--------- .../breakground/breakground-detail/index.vue | 43 +++------ .../confinedspace-apply-detail.vue | 32 ++++--- .../confinedspace-detail/index.vue | 2 +- .../cutroad-apply/cutroad-apply-detail.vue | 24 +++-- .../cutroad/cutroad-detail/index.vue | 2 +- pages/application/eight-assignments.vue | 17 ++-- .../electricity-apply-detail.vue | 45 ++++++---- .../electricity/electricity-detail/index.vue | 2 +- .../hidden-danger-no-change.vue | 6 +- .../highwork-apply/highwork-apply-detail.vue | 34 ++++---- .../highwork/highwork-detail/index.vue | 2 +- .../hoisting-apply/hoisting-apply-detail.vue | 38 ++++---- .../hoisting/hoisting-detail/index.vue | 16 +--- .../hoisting-measures-confirm-detail.vue | 25 +++++- .../hotwork-apply/hotwork-apply-detail.vue | 40 ++++----- .../hotwork/hotwork-detail/index.vue | 2 +- 19 files changed, 236 insertions(+), 213 deletions(-) diff --git a/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue b/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue index 19e6829..f5056f9 100644 --- a/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue +++ b/pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue @@ -303,7 +303,7 @@ 作业人 - {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} + {{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}} @@ -475,7 +475,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} @@ -643,16 +643,23 @@ [ {name:'NAME',message:'请输入设备管线名'}, {name:'WORK_TYPE',message:'请选择作业类别'}, - {name:'WORK_USER_ID',message:'请输入作业人'}, + {name:'WORK_USER_USER_ID',message:'请选择作业人'}, + {name:'PLS_ID',message:'请选择作业区域'}, + {name:'WORK_START_USER_ID',message:'请选择实际作业开始负责人'}, + {name:'WORKSHOP_USER_ID',message:'请选择车间人员'}, {name:'MEDIUM',message:'请输入介质'}, {name:'TEMPERATURE',message:'请输入温度'}, {name:'PRESSURE',message:'请输入压力'}, - {name:'LEADER_USER_ID',message:'请选择单位领导'}, + // {name:'BOARD_MATERIAL',message:'请输入材质'}, + // {name:'BOARD_SPECIFICATION',message:'请输入规格'}, + // {name:'BOARD_NO',message:'请输入编号'}, + {name:'LEADER_USER_ID',message:'请选择所在单位'}, {name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}, {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'}, + {name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'}, {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, - {name:'CONFESS_USER_ID',message:'请输入安全交底人'}, - {name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'}, + {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, + {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, { name: 'CONFIRM_USER_ID', message: '请选择作业负责人' @@ -980,8 +987,8 @@ }, PickerWorkusers(e) { this.workusersindex = e.detail.value; - this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID; - this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME; + this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID; + this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME; this.$forceUpdate();//强制刷新 }, @@ -1214,13 +1221,6 @@ }, - 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();//强制刷新 - }, - /* *确认人 */ diff --git a/pages/application/blindboard/blindboard-detail/index.vue b/pages/application/blindboard/blindboard-detail/index.vue index 5eafe46..6f9225a 100644 --- a/pages/application/blindboard/blindboard-detail/index.vue +++ b/pages/application/blindboard/blindboard-detail/index.vue @@ -237,7 +237,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} diff --git a/pages/application/breakground/breakground-apply/breakground-apply-detail.vue b/pages/application/breakground/breakground-apply/breakground-apply-detail.vue index 987e9bb..d1f0f90 100644 --- a/pages/application/breakground/breakground-apply/breakground-apply-detail.vue +++ b/pages/application/breakground/breakground-apply/breakground-apply-detail.vue @@ -162,7 +162,7 @@ 作业人 - {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} + {{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}} @@ -408,7 +408,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} @@ -516,12 +516,12 @@ - 有关部门意见 + 有关水、电、汽、工艺、设备、消防、安全等部门意见 - 有关部门负责人 + 有关水、电、汽、工艺、设备、消防、安全等部门负责人 {{pd.SAFETY_USER_NAME}} @@ -683,44 +683,56 @@ plxIndex:-1, rules: [ - // { - // name: 'CHECK_NO', - // message: '请输入编号' - // }, - // { - // name: 'WORK_START_DATE', - // message: '请输入作业开始时间' - // }, - // { - // name: 'WORK_END_DATE', - // message: '请输入作业结束时间' - // }, - { - name: 'WORK_PLACE', - message: '请输入作业地点' + { + name: 'SPECIAL_WORK', + message: '请输入关联的其他特殊作业及安全作业票编号' }, - // { - // name: 'WORK_CONTENT', - // message: '请输入作业内容、范围、方式' - // }, - - { - name: 'JOB_CONTENT', - message: '请输入作业内容' - }, - {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, - {name:'CONFESS_USER_ID',message:'请输入安全交底人'}, - {name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'}, - { name: 'RISK_IDENTIFICATION', message: '请输入风险辨识结果' }, + { + name: 'WORK_PLACE', + message: '请输入作业地点' + }, + { + name: 'JOB_CONTENT', + message: '请输入作业内容' + }, + {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, + {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, + {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, + + { + name: 'WORK_USER_USER_ID', + message: '请选择作业人' + }, + { name: 'CONFIRM_USER_ID', message: '请选择作业负责人' }, + { + name: 'SAFETY_USER_ID', + message: '请选择有关部门负责人' + }, + { + name: 'LEADER_USER_ID', + message: '请选择所在单位负责人' + }, + { + name: 'APPROVE_USER_ID', + message: '请选择审批部门负责人' + }, + { + name: 'WORK_START_USER_ID', + message: '请选择作业开始负责人' + }, + { + name: 'WORK_END_USER_ID', + message: '请选择作业结束负责人' + }, { name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人' @@ -1054,8 +1066,8 @@ }, PickerWorkusers(e) { this.workusersindex = e.detail.value; - this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID; - this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME; + this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID; + this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME; this.$forceUpdate();//强制刷新 }, @@ -1329,12 +1341,7 @@ this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME; 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();//强制刷新 - }, + /* *确认人 diff --git a/pages/application/breakground/breakground-detail/index.vue b/pages/application/breakground/breakground-detail/index.vue index 914f5f7..ee34af6 100644 --- a/pages/application/breakground/breakground-detail/index.vue +++ b/pages/application/breakground/breakground-detail/index.vue @@ -156,7 +156,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} @@ -223,7 +223,6 @@ - 作业负责人意见 @@ -263,21 +262,21 @@ - + - 审核部门意见 - + 有关水、电、汽、工艺、设备、消防、安全等部门意见 + - 审核部门负责人 - {{pd.AUDIT_USER_NAME}} + 有关水、电、汽、工艺、设备、消防、安全等部门负责人 + {{pd.SAFETY_USER_NAME}} - + - - {{signs.AUDIT[0].SIGN_TIME[index]}} + {{signs.SAFETY[0].SIGN_TIME[index]}} @@ -285,12 +284,12 @@ - 审批人意见 + 审批部门意见 - 审批负责人 + 审批部门负责人 {{pd.APPROVE_USER_NAME}} @@ -303,25 +302,7 @@ - - - 动火前在岗班长意见 - - - - - 动火前在岗班长 - {{pd.MONITOR_USER_NAME}} - - - - - {{signs.MONITOR[0].SIGN_TIME[index]}} - - - - + diff --git a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue index 58f0501..9f8db65 100644 --- a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue +++ b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue @@ -267,7 +267,7 @@ 作业人 - {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} + {{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}} @@ -457,7 +457,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} @@ -631,13 +631,24 @@ {name:'LIMITSPACE_ID',message:'请选择受限空间名称'}, {name:'WORK_CONTENT',message:'请输入作业内容'}, {name:'MEDIUM_NAME',message:'请输入受限空间内原有介质名称'}, + {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'}, + {name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'}, + + {name:'ANALYZE_USER_ID',message:'请选择分析单位负责人'}, + {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, - // {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'}, - {name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'}, + {name:'WORK_USER_USER_ID',message:'请选择作业人'}, {name:'CONFIRM_USER_ID',message:'请选择作业负责人'}, - {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, {name:'LEADER_USER_ID',message:'请选择所在单位负责人'}, + { + name: 'WORK_START_USER_ID', + message: '请选择作业开始负责人' + }, + { + name: 'WORK_END_USER_ID', + message: '请选择作业结束负责人' + }, {name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}, {name:'PLS_ID',message:'请选择电子围栏'}, ], @@ -1220,12 +1231,7 @@ this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME; 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();//强制刷新 - }, + /* *确认人 @@ -1280,8 +1286,8 @@ }, PickerWorkusers(e) { this.workusersindex = e.detail.value; - this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID; - this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME; + this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID; + this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME; this.$forceUpdate();//强制刷新 }, diff --git a/pages/application/confinedspace/confinedspace-detail/index.vue b/pages/application/confinedspace/confinedspace-detail/index.vue index 776d7c8..0a9e6d1 100644 --- a/pages/application/confinedspace/confinedspace-detail/index.vue +++ b/pages/application/confinedspace/confinedspace-detail/index.vue @@ -200,7 +200,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} diff --git a/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue b/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue index 580e750..46c34a5 100644 --- a/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue +++ b/pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue @@ -693,14 +693,6 @@ name: 'WORK_REASON', message: '请输入断路原因' }, - - {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, - {name:'CONFESS_USER_ID',message:'请输入安全交底人'}, - {name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'}, - {name:'PROJECT_MANAGER_USER_ID',message:'请输入作业项目负责人'}, - {name:'APPROVE_USER_ID',message:'请输入审批人'}, - {name:'AUDIT_USER_ID',message:'请输入消防、安全管理部门负责人'}, - {name:'LEADER_USER_ID',message:'请输入所在单位负责人'}, { name: 'RISK_IDENTIFICATION', message: '请输入风险辨识结果' @@ -709,11 +701,25 @@ name: 'SPECIAL_WORK', message: '请输入关联的其他特殊作业及安全作业票编号' }, - + {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, + {name:'CONFESS_USER_ID',message:'请输入安全交底人'}, + {name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'}, + {name:'PROJECT_MANAGER_USER_ID',message:'请输入作业项目负责人'}, + {name:'APPROVE_USER_ID',message:'请输入审批人'}, + {name:'AUDIT_USER_ID',message:'请输入消防、安全管理部门负责人'}, + {name:'LEADER_USER_ID',message:'请输入所在单位负责人'}, { name: 'CONFIRM_USER_ID', message: '请选择作业负责人' }, + { + name: 'WORK_START_USER_ID', + message: '请选择作业开始负责人' + }, + { + name: 'WORK_END_USER_ID', + message: '请选择作业结束负责人' + }, { name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人' diff --git a/pages/application/cutroad/cutroad-detail/index.vue b/pages/application/cutroad/cutroad-detail/index.vue index 361edec..c91fa6e 100644 --- a/pages/application/cutroad/cutroad-detail/index.vue +++ b/pages/application/cutroad/cutroad-detail/index.vue @@ -156,7 +156,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} diff --git a/pages/application/eight-assignments.vue b/pages/application/eight-assignments.vue index 588459e..0c91119 100644 --- a/pages/application/eight-assignments.vue +++ b/pages/application/eight-assignments.vue @@ -12,13 +12,14 @@ 八项作业 --> - + + - - {{eight_work_count.BREAKGROUND_COUNT}} + + {{eight_work_count.HOTWORK_COUNT}} - 动土作业 + 动火作业 @@ -53,13 +54,13 @@ - + - - {{eight_work_count.HOTWORK_COUNT}} + + {{eight_work_count.BREAKGROUND_COUNT}} - 动火作业 + 动土作业 diff --git a/pages/application/electricity/electricity-apply/electricity-apply-detail.vue b/pages/application/electricity/electricity-apply/electricity-apply-detail.vue index 3d7dd9c..7a7b70e 100644 --- a/pages/application/electricity/electricity-apply/electricity-apply-detail.vue +++ b/pages/application/electricity/electricity-apply/electricity-apply-detail.vue @@ -298,7 +298,7 @@ 作业人 - {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} + {{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}} @@ -529,7 +529,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} @@ -727,12 +727,33 @@ rules:[ {name:'WORK_PLACE',message:'请输入作业地点'}, {name:'WORK_CONTENT',message:'请输入作业内容'}, - // {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'}, + {name:'CARD_NO',message:'请输入电工证号'}, {name:'ALLOW_POWER',message:'请输入电源接入点及许可用电功率'}, {name:'RATED_POWER',message:'请输入用电设备名称及额定功率'}, {name:'WORK_VOLTAGE',message:'请输入工作电压'}, + {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'}, + {name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'}, + {name:'LEADER_CARD_NO',message:'请输入负责人电工号'}, {name:'CONFIRM_USER_ID',message:'请选择作业负责人'}, {name:'LEADER_CARD_NO',message:'请输入负责人电工号'}, + {name:'ELECTRICITY_USER_ID',message:'请选择用电人'}, + {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, + {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, + {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, + {name:'WORK_USER_USER_ID',message:'请选择作业人'}, + {name:'CONFIRM_USER_ID',message:'请选择作业负责人'}, + {name:'AUDIT_USER_ID',message:'请选择用电单位负责人'}, + {name:'APPROVE_USER_ID',message:'请选择配送电单负责人'}, + { + name: 'WORK_START_USER_ID', + message: '请选择作业开始负责人' + }, + { + name: 'WORK_END_USER_ID', + message: '请选择作业结束负责人' + }, + {name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}, + {name:'PLS_ID',message:'请选择电子围栏'}, ], todayDate:'', otherAssignments:false, @@ -813,8 +834,7 @@ this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID,'acceptUserList'); this.getUserList(this.pd.WORK_START_DEPARTMENT_ID,'workstartUserList'); this.getUserList(this.pd.WORK_END_DEPARTMENT_ID,'workendUserList'); - this.getUserList(this.pd.WORK_DEPARTMENT_ID,'workusersUserList'); - this.getUserList(this.pd.WORK_USER_DEPARTMENT_ID,'workUsersList'); + this.getUserList(this.pd.WORK_DEPARTMENT_ID,'workUsersList'); }else{ this.getSigns() this.getMeasures() @@ -1343,12 +1363,7 @@ this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME; 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();//强制刷新 - }, + /* *确认人 @@ -1387,8 +1402,8 @@ this.isUps=false; this.pd.WORK_DEPARTMENT_ID=e[0].id; this.pd.WORK_DEPARTMENT_NAME=e[0].name; - this.pd.WORK_USER_ID = '' - this.pd.WORK_USER_NAME = '' + this.pd.WORK_USER_USER_ID = '' + this.pd.WORK_USER_USER_NAME = '' this.$forceUpdate();//强制刷新 this.getUserList(e[0].id,'workUsersList'); }, @@ -1403,8 +1418,8 @@ }, PickerWorkusers(e) { this.workusersindex = e.detail.value; - this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID; - this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME; + this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID; + this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME; this.$forceUpdate();//强制刷新 }, diff --git a/pages/application/electricity/electricity-detail/index.vue b/pages/application/electricity/electricity-detail/index.vue index d2933fc..e0030ec 100644 --- a/pages/application/electricity/electricity-detail/index.vue +++ b/pages/application/electricity/electricity-detail/index.vue @@ -125,7 +125,7 @@ 其他安全措施 签字 - + {{item.DESCR}} diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue index 9021b25..1be6e66 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue @@ -133,12 +133,12 @@ USERDEPT:loginUser.DEPARTMENT_ID, SELFUSERID:loginUserId, HIDDENDESCR:_this.name, - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, }, success: (res) => { // console.info(res.data); - console.log("打印数据:",res.data.varList) + console.log("打印数据:",res.data.varList) if (res.data.result == 'success') { uni.hideLoading(); _this.total = res.data.page.totalResult; diff --git a/pages/application/highwork/highwork-apply/highwork-apply-detail.vue b/pages/application/highwork/highwork-apply/highwork-apply-detail.vue index ca3d185..6de0584 100644 --- a/pages/application/highwork/highwork-apply/highwork-apply-detail.vue +++ b/pages/application/highwork/highwork-apply/highwork-apply-detail.vue @@ -19,7 +19,7 @@ 作业高度（米）： - + 高处作业级别： @@ -221,7 +221,7 @@ 作业人 - {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} + {{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}} @@ -457,7 +457,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} @@ -685,16 +685,20 @@ {name:'WORK_HIGH',message:'请输入作业高度'}, {name:'WORK_LEVEL',message:'请输入高处作业级别'}, {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, - {name:'CONFESS_USER_ID',message:'请输入安全交底人'}, - {name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'}, + {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, + {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, {name:'WORK_CONTENT',message:'请输入作业内容'}, {name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'}, - // {name:'CONSTRUCTION_USER_ID',message:'请选择作业负责人'}, - // {name:'LEADER_USER_ID',message:'请选择所在单位负责人'}, - // {name:'AUDIT_USER_ID',message:'请选择审核部门'}, - // {name:'APPROVE_USER_ID',message:'请选择审批部门'}, + {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'}, + {name:'CONFIRM_USER_ID',message:'请选择作业负责人'}, + {name:'LEADER_USER_ID',message:'请选择所在单位负责人'}, + {name:'AUDIT_USER_ID',message:'请选择审核部门'}, + {name:'APPROVE_USER_ID',message:'请选择审批部门'}, {name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}, - // {name:'CONFESS_USER',message:'请输入安全交底人'}, + {name:'WORK_END_USER_ID',message:'请选择作业结束负责人'}, + {name:'WORK_START_USER_ID',message:'请选择作业开始负责人'}, + {name:'WORK_USER_USER_ID',message:'请选择作业人'}, + {name:'PLS_ID',message:'请选择作业区域'}, ], todayDate:'', otherAssignments:false, @@ -1078,8 +1082,8 @@ }, PickerWorkusers(e) { this.workusersindex = e.detail.value; - this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID; - this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME; + this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID; + this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME; this.$forceUpdate();//强制刷新 }, @@ -1378,12 +1382,6 @@ this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME; 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();//强制刷新 - }, /* *确认人 diff --git a/pages/application/highwork/highwork-detail/index.vue b/pages/application/highwork/highwork-detail/index.vue index fe65f69..b0e50c6 100644 --- a/pages/application/highwork/highwork-detail/index.vue +++ b/pages/application/highwork/highwork-detail/index.vue @@ -194,7 +194,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} diff --git a/pages/application/hoisting/hoisting-apply/hoisting-apply-detail.vue b/pages/application/hoisting/hoisting-apply/hoisting-apply-detail.vue index e55d8df..8976378 100644 --- a/pages/application/hoisting/hoisting-apply/hoisting-apply-detail.vue +++ b/pages/application/hoisting/hoisting-apply/hoisting-apply-detail.vue @@ -91,6 +91,10 @@ + + {{item.QUESTION1}} + {{item.ANSWER1?item.ANSWER1:0}} + @@ -244,7 +248,7 @@ 作业人 - {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}} + {{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}} @@ -520,7 +524,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} @@ -748,20 +752,25 @@ // {name:'CHECK_NO',message:'请输入编号'}, {name:'WORK_PLACE',message:'请输入吊装地点'}, {name:'TOOL_NAME',message:'请输入吊具名称'}, - {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, - {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, - {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, {name:'PART_WEIGHT',message:'请输入吊物质量(吨)'}, {name:'WORK_LEVEL',message:'请选择作业级别'}, {name:'WORK_CONTENT',message:'请输入吊物内容'}, {name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'}, + {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'}, + {name:'SISUO_USER_ID',message:'请选择司索人'}, + {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, + {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, + {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, + {name:'WORK_USER_USER_ID',message:'请选择作业人'}, + {name:'CONFIRM_USER_ID',message:'请输入作业单位负责人'}, + {name:'PROJECT_MANAGER_USER_ID',message:'请选择吊装指挥负责人'}, + {name:'LEADER_USER_ID',message:'请输入所在单位负责人'}, + {name:'AUDIT_USER_ID',message:'请选择审核部门负责人'}, {name:'WORK_START_USER_ID',message:'请输入作业开始负责人'}, {name:'WORK_END_USER_ID',message:'请输入作业结束负责人'}, - {name:'LEADER_USER_ID',message:'请输入所在单位负责人'}, - {name:'CONFIRM_USER_ID',message:'请输入作业单位负责人'}, - {name:'AUDIT_USER_ID',message:'请选择审核部门负责人'}, - {name:'LEADER_USER_ID',message:'请选择作业指挥负责人'}, {name:'ACCEPT_USER_ID',message:'请选择完工验收部门负责人'}, + {name:'PLS_ID',message:'请选择电子围栏'}, + ], todayDate:'', otherAssignments:false, @@ -1124,8 +1133,8 @@ }, PickerWorkusers(e) { this.workusersindex = e.detail.value; - this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID; - this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME; + this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID; + this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME; this.$forceUpdate();//强制刷新 }, @@ -1421,13 +1430,6 @@ 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();//强制刷新 - }, - /* *确认人 */ diff --git a/pages/application/hoisting/hoisting-detail/index.vue b/pages/application/hoisting/hoisting-detail/index.vue index 779c70b..bba9a92 100644 --- a/pages/application/hoisting/hoisting-detail/index.vue +++ b/pages/application/hoisting/hoisting-detail/index.vue @@ -81,21 +81,7 @@ {{item.QUESTION1}} {{item.ANSWER1?item.ANSWER1:0}} - - {{item.QUESTION2}} - {{item.ANSWER2?item.ANSWER2:0}} - - - {{item.QUESTION3}} - {{item.ANSWER3?item.ANSWER3:0}} - - - - {{item.QUESTION4}} - {{item.ANSWER4?item.ANSWER4:0}} - - @@ -219,7 +205,7 @@ 作业人 - {{pd.WORK_USER_NAME}} + {{pd.WORK_USER_USER_NAME}} diff --git a/pages/application/hoisting/hoisting-measures-confirm/hoisting-measures-confirm-detail.vue b/pages/application/hoisting/hoisting-measures-confirm/hoisting-measures-confirm-detail.vue index 98ddd1e..9251eb2 100644 --- a/pages/application/hoisting/hoisting-measures-confirm/hoisting-measures-confirm-detail.vue +++ b/pages/application/hoisting/hoisting-measures-confirm/hoisting-measures-confirm-detail.vue @@ -27,7 +27,10 @@ {{item.PROTECTIVE_MEASURES}} - + + {{item.QUESTION1}} + + @@ -191,6 +194,7 @@ return; } if (APPLY_STATUS == 1) { + if(!this.pd.DESCR){ uni.showToast({ icon: 'none', @@ -199,6 +203,25 @@ }); 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(measures.STATUS=='1' && measures.QUESTION1 && !measures.ANSWER1){ + uni.showToast({ + icon: 'none', + title: '第'+(i+1)+'项未填写第一项', + duration: 1500 + }); + return; + } + } } const formData={} diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue index d6fec0b..a46bb2d 100644 --- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue @@ -754,33 +754,31 @@ plsList:[], plxIndex:-1, 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_END_DATE',message:'请选择工作结束时间'}, - // {name:'WORK_MANAGER',message:'请输入作业负责人'}, {name:'WORK_USER',message:'请输入动火人及证书编号'}, - // {name:'SPECIAL_WORK',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:'请选择验收部门负责人'}, - {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, - {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, + {name:'ANALYZE_USER_ID',message:'请选择分析人'}, + {name:'GUARDIAN_USER_ID',message:'请选择监护人'}, + {name:'CONFESS_USER_ID',message:'请选择安全交底人'}, {name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'}, - {name:'PLS_ID',message:'请选择电子围栏'}, + {name:'CONFIRM_USER_ID',message:'请选择作业负责人'}, + {name:'LEADER_USER_ID',message:'请选择所在单位负责人'}, + {name:'MONITOR_USER_ID',message:'请选择动火前在岗班长'}, + + { + name: 'WORK_START_USER_ID', + message: '请选择作业开始负责人' + }, + { + name: 'WORK_END_USER_ID', + message: '请选择作业结束负责人' + }, + {name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}, + {name:'PLS_ID',message:'请选择电子围栏'}, ], todayDate:'', otherAssignments:false, @@ -1020,7 +1018,7 @@ } this.buttonloading = true uni.request({ - url: basePath + "app/hotwork/"+_this.msg, + url: basePath + "app/hotwork/"+_this.msg, method: 'POST', dataType: 'json', header:{ diff --git a/pages/application/hotwork/hotwork-detail/index.vue b/pages/application/hotwork/hotwork-detail/index.vue index 1819b06..9c46a7f 100644 --- a/pages/application/hotwork/hotwork-detail/index.vue +++ b/pages/application/hotwork/hotwork-detail/index.vue @@ -133,7 +133,7 @@ 其他安全措施 签字 - + {{item.DESCR}}