diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue index f5273b3..69eae6f 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue @@ -181,42 +181,57 @@ - - 其他安全措施: - - - + + + + + + + + + 作业负责人: + {{ pd.CONFIRM_OTHER_CONTENT}} - - - 作业单位: - {{ pd.CONFIRM_USER_MEASURES}} - - - - 车间: - {{ pd.LEADER_USER_MEASURES}} - + + + 项目责任负责人: + {{ pd.BELONGING_USER_MEASURES}} + 安全管理部门: {{ pd.AUDIT_USER_MEASURES}} - - - 审批部门: - {{ pd.APPROVE_USER_MEASURES}} - - - - 班长: - {{ pd.MONITOR_USER_MEASURES}} - + + + 属地监管单位: + {{ pd.GUARDIAN_USER_MEASURES}} + + + + 安全管理部门: + {{ pd.LEADER_USER_MEASURES}} + + + + 动火审批人: + {{ pd.AUDIT_USER_MEASURES}} + + + + 动火前验票: + {{ pd.APPROVE_USER_MEASURES}} + + + + 班长: + {{ pd.MONITOR_USER_MEASURES}} + @@ -784,6 +799,7 @@ success: (res) => { if ("success" == res.data.result) { uni.hideLoading(); + console.log(res.data.pd,'1111111111111111111111111') _this.pd = res.data.pd; //参数map if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { _this.pd.APPROVAL_SIGNATURE = res.data.pd.confessList[0].APPROVAL_SIGNATURE; diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue index f9b4eb5..d7464b1 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -148,10 +148,10 @@ - - 其他安全措施: - - + + + + @@ -159,11 +159,11 @@ - - - - - + + + 作业负责人: + {{ pd.CONFIRM_OTHER_CONTENT}} + 项目责任负责人: @@ -689,6 +689,7 @@ export default { formData.FIRE_COMPLETED = this.pd.FIRE_COMPLETED; formData.SITE_CLEANED = this.pd.SITE_CLEANED; formData.NO_REMAINING_EMBERS = this.pd.NO_REMAINING_EMBERS; + formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES if (STATUS == 8) { if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) { diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue index 0d2326a..6a329fe 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue @@ -184,34 +184,49 @@ 其他安全措施: - + - - - 作业单位: - {{ pd.CONFIRM_USER_MEASURES}} - + + + 作业负责人: + {{ pd.CONFIRM_OTHER_CONTENT}} + + + + 项目责任负责人: + {{ pd.BELONGING_USER_MEASURES}} + + + + 属地监管单位: + {{ pd.GUARDIAN_USER_MEASURES}} + + + + 安全管理部门: + {{ pd.LEADER_USER_MEASURES}} + - - - 车间: - {{ pd.LEADER_USER_MEASURES}} - - - - 安全管理部门: - {{ pd.AUDIT_USER_MEASURES}} - - - - 审批人: - {{ pd.APPROVE_USER_MEASURES}} - + + + + + + + + + + + + + 动火前验票: + {{ pd.APPROVE_USER_MEASURES}} + 班长: diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue index d2b8c12..1920f9e 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue @@ -156,7 +156,7 @@ 其他安全措施: - + @@ -579,6 +579,7 @@ formData.OPERATOR=loginUser.USER_ID formData.ACTION_USER=loginUser.NAME formData.APPLY_STATUS=STATUS + formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES if(STATUS==6){ formData.STATUS = STATUS this.buttonloading = true diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue index 2f0a21b..1241df8 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue @@ -184,39 +184,49 @@ 其他安全措施: - + - - - 作业单位: - {{ pd.CONFIRM_USER_MEASURES}} - + + + 作业负责人: + {{ pd.CONFIRM_OTHER_CONTENT}} + + + + 项目责任负责人: + {{ pd.BELONGING_USER_MEASURES}} + + + + 属地监管单位: + {{ pd.GUARDIAN_USER_MEASURES}} + - - - 车间: - {{ pd.LEADER_USER_MEASURES}} - - - - 安全管理部门: - {{ pd.AUDIT_USER_MEASURES}} - - - - 审批部门: - {{ pd.APPROVE_USER_MEASURES}} - - - - 班长: - {{ pd.MONITOR_USER_MEASURES}} - + + + + + + + + 动火审批人: + {{ pd.AUDIT_USER_MEASURES}} + + + + 动火前验票: + {{ pd.APPROVE_USER_MEASURES}} + + + + 班长: + {{ pd.MONITOR_USER_MEASURES}} + diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue index 37ccead..1cf8a96 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue @@ -180,7 +180,7 @@ 其他安全措施: - + @@ -205,16 +205,16 @@ 属地监管单位: {{ pd.GUARDIAN_USER_MEASURES}} - - - 动火前验票: - {{ pd.LEADER_USER_MEASURES}} - 安全管理部门: {{ pd.AUDIT_USER_MEASURES}} + + + 动火前验票: + {{ pd.LEADER_USER_MEASURES}} + 动火审批人: @@ -617,6 +617,7 @@ formData.APPLY_STATUS=STATUS formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.USER_ID = loginUser.USER_ID + formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES if(STATUS==5){ formData.STATUS = STATUS if (!_this.validStr(this.pd.APPROVE_USER_ID)) { diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue index f394a83..19d35bb 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue @@ -187,36 +187,41 @@ - - - 作业单位: - {{ pd.CONFIRM_USER_MEASURES}} - - - - - - - - - 车间: - {{ pd.LEADER_USER_MEASURES}} - - - - 安全管理部门: - {{ pd.AUDIT_USER_MEASURES}} - - - - 审批人: - {{ pd.APPROVE_USER_MEASURES}} - - - - 班长: - {{ pd.MONITOR_USER_MEASURES}} - + + + + + + + + 项目责任负责人: + {{ pd.BELONGING_USER_MEASURES}} + + + + 属地监管单位: + {{ pd.GUARDIAN_USER_MEASURES}} + + + + 安全管理部门: + {{ pd.LEADER_USER_MEASURES}} + + + + 动火审批人: + {{ pd.AUDIT_USER_MEASURES}} + + + + 动火前验票: + {{ pd.APPROVE_USER_MEASURES}} + + + + 班长: + {{ pd.MONITOR_USER_MEASURES}} + diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue index 37f0b5f..ecd3a98 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue @@ -157,11 +157,11 @@ - - - 作业负责人: - {{ pd.CONFIRM_OTHER_CONTENT}} - + + + + + 项目责任负责人: diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue index 28513f7..12b8b3c 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue @@ -183,40 +183,45 @@ 其他安全措施: - - + + - - - 作业单位: - {{ pd.CONFIRM_USER_MEASURES}} - + + + 作业负责人: + {{ pd.CONFIRM_OTHER_CONTENT}} + + + + 项目责任负责人: + {{ pd.BELONGING_USER_MEASURES}} + - - - 车间: - {{ pd.LEADER_USER_MEASURES}} - - - - 安全管理部门: - {{ pd.AUDIT_USER_MEASURES}} - - - - 审批部门: - {{ pd.APPROVE_USER_MEASURES}} - - - - 班长: - {{ pd.MONITOR_USER_MEASURES}} - + + + 安全管理部门: + {{ pd.LEADER_USER_MEASURES}} + + + + 动火审批人: + {{ pd.AUDIT_USER_MEASURES}} + + + + 动火前验票: + {{ pd.APPROVE_USER_MEASURES}} + + + + 班长: + {{ pd.MONITOR_USER_MEASURES}} + diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue index 7817f3e..35d07b2 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue @@ -151,7 +151,7 @@ 其他安全措施: - + @@ -171,11 +171,11 @@ 项目责任负责人: {{ pd.BELONGING_USER_MEASURES}} - - - 属地监管单位: - {{ pd.GUARDIAN_USER_MEASURES}} - + + + + + 动火前验票: @@ -554,6 +554,7 @@ formData.APPLY_STATUS=STATUS formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.USER_ID = loginUser.USER_ID + formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES; if(STATUS==4){ formData.STATUS = STATUS diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue index ae152a4..f8aec09 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue @@ -187,31 +187,36 @@ - - - 作业单位: - {{ pd.CONFIRM_USER_MEASURES}} - + + + 作业负责人: + {{ pd.CONFIRM_OTHER_CONTENT}} + + + + 项目责任负责人: + {{ pd.BELONGING_USER_MEASURES}} + - - - 车间: - {{ pd.LEADER_USER_MEASURES}} - - - - 安全管理部门: - {{ pd.AUDIT_USER_MEASURES}} - - - - 审批部门: - {{ pd.APPROVE_USER_MEASURES}} - + + + 属地监管单位: + {{ pd.GUARDIAN_USER_MEASURES}} + + + + 安全管理部门: + {{ pd.LEADER_USER_MEASURES}} + + + + 动火审批人: + {{ pd.AUDIT_USER_MEASURES}} + 班长: diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue index d3d25fc..0876cde 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue @@ -156,7 +156,7 @@ 其他安全措施: - + @@ -597,6 +597,7 @@ formData.OPERATOR = loginUser.USER_ID formData.ACTION_USER = loginUser.NAME formData.APPLY_STATUS = STATUS + formData.OTHER_PROTECTIVE_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES if (STATUS == 7) { formData.STATUS = STATUS this.buttonloading = true diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue index cc7e51e..31aeaa6 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue @@ -187,36 +187,46 @@ - - - 作业单位: - {{ pd.CONFIRM_USER_MEASURES}} - + + + 作业负责人: + {{ pd.CONFIRM_OTHER_CONTENT}} + + + + + + - - - 车间: - {{ pd.LEADER_USER_MEASURES}} - - - - 安全管理部门: - {{ pd.AUDIT_USER_MEASURES}} - - - - 审批人: - {{ pd.APPROVE_USER_MEASURES}} - - - - 班长: - {{ pd.MONITOR_USER_MEASURES}} - + + + 属地监管单位: + {{ pd.GUARDIAN_USER_MEASURES}} + + + + 安全管理部门: + {{ pd.LEADER_USER_MEASURES}} + + + + 动火审批人: + {{ pd.AUDIT_USER_MEASURES}} + + + + 动火前验票: + {{ pd.APPROVE_USER_MEASURES}} + + + + 班长: + {{ pd.MONITOR_USER_MEASURES}} + diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue index f76e3b8..6ccaf86 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue @@ -168,11 +168,6 @@ 作业负责人: {{ pd.CONFIRM_OTHER_CONTENT}} - - - 项目责任负责人: - {{ pd.BELONGING_USER_MEASURES}} - 属地监管单位: @@ -199,18 +194,18 @@ {{ pd.MONITOR_USER_MEASURES}} - - - 作业单位: - - {{ pd.CONFIRM_USER_MEASURES }} - - - - 动火点属地监管单位负责人: - - {{ pd.GUARDIAN_USER_MEASURES }} - + + + + + + + + + + + +