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 5d774da..ae51c24 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue @@ -428,10 +428,10 @@ - - 作业负责人意见 - - + + 作业负责人意见 + + @@ -454,11 +454,23 @@ + + + + 项目主管部门负责意见 + + + + + 项目主管部门负责人 + {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + + - - 属地监管单位意见 - - + + 属地监管单位意见 + + @@ -474,10 +486,10 @@ - - 安全管理部门意见 - - + + 安全管理部门意见 + + @@ -493,10 +505,10 @@ - - 动火审批人意见 - - + + 动火审批人意见 + + @@ -512,10 +524,10 @@ - - 动火前验票负责人意见 - - + + 动火前验票负责人意见 + + @@ -639,6 +651,26 @@ } }, + computed: { + formattedConfirmContent() { + return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意'; + }, + formattedExamineApprovalOpinions() { + return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意'; + }, + formattedLeaderContent() { + return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意'; + }, + formattedAuditContent() { + return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意'; + }, + formattedApproveContent() { + return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意'; + }, + formattedMonitorContent() { + return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意'; + } + }, onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; @@ -704,6 +736,9 @@ if ("success" == res.data.result) { uni.hideLoading(); _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; + } _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[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 a2bd760..53d7c51 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue @@ -428,10 +428,10 @@ - - 作业负责人意见 - - + + 作业负责人意见 + + @@ -446,6 +446,18 @@ + + + + 项目主管部门负责意见 + + + + + 项目主管部门负责人 + {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + + @@ -455,10 +467,10 @@ - - 属地监管单位意见 - - + + 属地监管单位意见 + + @@ -474,10 +486,10 @@ - - 安全管理部门意见 - - + + 安全管理部门意见 + + @@ -493,10 +505,10 @@ - - 动火审批人意见 - - + + 动火审批人意见 + + @@ -512,10 +524,10 @@ - - 动火前验票负责人意见 - - + + 动火前验票负责人意见 + + @@ -639,6 +651,26 @@ } }, + computed: { + formattedConfirmContent() { + return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意'; + }, + formattedExamineApprovalOpinions() { + return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意'; + }, + formattedLeaderContent() { + return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意'; + }, + formattedAuditContent() { + return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意'; + }, + formattedApproveContent() { + return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意'; + }, + formattedMonitorContent() { + return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意'; + } + }, onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; @@ -704,6 +736,9 @@ if ("success" == res.data.result) { uni.hideLoading(); _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; + } _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], 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 9a0eb76..4f879ca 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue @@ -428,10 +428,10 @@ - - 作业负责人意见 - - + + 作业负责人意见 + + @@ -454,30 +454,39 @@ - - - 属地监管单位意见 - - - - - - - - - 属地监管单位负责人 - {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - - - - - - + + + + 项目主管部门负责意见 + + + + + 项目主管部门负责人 + {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + + + + + 属地监管单位意见 + + + + + + + + + 属地监管单位负责人 + {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} + + + - - 安全管理部门意见 - - + + 安全管理部门意见 + + @@ -493,10 +502,10 @@ - - 动火审批人意见 - - + + 动火审批人意见 + + @@ -512,10 +521,10 @@ - - 动火前验票负责人意见 - - + + 动火前验票负责人意见 + + @@ -639,6 +648,26 @@ } }, + computed: { + formattedConfirmContent() { + return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意'; + }, + formattedExamineApprovalOpinions() { + return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意'; + }, + formattedLeaderContent() { + return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意'; + }, + formattedAuditContent() { + return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意'; + }, + formattedApproveContent() { + return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意'; + }, + formattedMonitorContent() { + return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意'; + } + }, onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; @@ -704,6 +733,9 @@ if ("success" == res.data.result) { uni.hideLoading(); _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; + } _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], 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 aa0996d..861643c 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue @@ -136,10 +136,12 @@ + 序 号 主要安全措施 操作 + {{ index + 1 }} {{item.PROTECTIVE_MEASURES}} @@ -426,10 +428,10 @@ - - 作业负责人意见 - - + + 作业负责人意见 + + 作业负责人 @@ -440,11 +442,11 @@ - + 项目主管部门负责意见 - + @@ -463,7 +465,7 @@ 属地监管单位意见 - + @@ -476,10 +478,10 @@ - - 安全管理部门意见 - - + + 安全管理部门意见 + + @@ -495,10 +497,10 @@ - - 动火审批人意见 - - + + 动火审批人意见 + + @@ -514,10 +516,10 @@ - - 动火前验票负责人意见 - - + + 动火前验票负责人意见 + + @@ -638,9 +640,28 @@ {name:'GUARDIAN_USER',message:'请输入监护人'}, ], todayDate:'', - } }, + computed: { + formattedConfirmContent() { + return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意'; + }, + formattedExamineApprovalOpinions() { + return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意'; + }, + formattedLeaderContent() { + return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意'; + }, + formattedAuditContent() { + return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意'; + }, + formattedApproveContent() { + return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意'; + }, + formattedMonitorContent() { + return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意'; + } + }, onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; @@ -706,6 +727,9 @@ if ("success" == res.data.result) { uni.hideLoading(); _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; + } _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], 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 ba3002c..8053f0e 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue @@ -428,10 +428,10 @@ - - 作业负责人意见 - - + + 作业负责人意见 + + @@ -447,18 +447,14 @@ - - 项目主管部门负责人 - {{pd.EXAMINE_USER_NAME}} - - 负责人意见 - + 项目主管部门负责意见 + - 审批时间 - {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + 项目主管部门负责人 + {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} @@ -473,7 +469,7 @@ 属地监管单位意见 - + @@ -487,10 +483,10 @@ - - 安全管理部门意见 - - + + 安全管理部门意见 + + @@ -506,10 +502,10 @@ - - 动火审批人意见 - - + + 动火审批人意见 + + @@ -525,10 +521,10 @@ - - 动火前验票负责人意见 - - + + 动火前验票负责人意见 + + @@ -652,6 +648,26 @@ } }, + computed: { + formattedConfirmContent() { + return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意'; + }, + formattedExamineApprovalOpinions() { + return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意'; + }, + formattedLeaderContent() { + return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意'; + }, + formattedAuditContent() { + return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '' ? this.pd.AUDIT_CONTENT : '同意'; + }, + formattedApproveContent() { + return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意'; + }, + formattedMonitorContent() { + return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意'; + } + }, onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; 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 429e3dd..6868f17 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue @@ -264,19 +264,6 @@ - - 项目主管部门负责人意见 - - - - - 项目主管部门负责人 - {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}} - - - - - 作业负责人意见 @@ -291,7 +278,19 @@ - + + 项目主管部门负责人意见 + + + + + 项目主管部门负责人 + {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}} + + + + + 属地监管单位意见 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 e5795de..be85b84 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue @@ -426,10 +426,10 @@ - - 作业负责人意见 - - + + 作业负责人意见 + + @@ -452,11 +452,23 @@ + + + + 项目主管部门负责意见 + + + + + 项目主管部门负责人 + {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} + + - - 属地监管单位意见 - - + + 属地监管单位意见 + + @@ -472,10 +484,10 @@ - - 安全管理部门意见 - - + + 安全管理部门意见 + + @@ -491,10 +503,10 @@ - - 动火审批人意见 - - + + 动火审批人意见 + + @@ -510,10 +522,10 @@ - - 动火前验票负责人意见 - - + + 动火前验票负责人意见 + + @@ -637,6 +649,26 @@ } }, + computed: { + formattedConfirmContent() { + return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意'; + }, + formattedExamineApprovalOpinions() { + return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意'; + }, + formattedLeaderContent() { + return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意'; + }, + formattedAuditContent() { + return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意'; + }, + formattedApproveContent() { + return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意'; + }, + formattedMonitorContent() { + return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '无' ? this.pd.MONITOR_CONTENT : '同意'; + } + }, onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; @@ -702,6 +734,9 @@ if ("success" == res.data.result) { uni.hideLoading(); _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; + } _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0], diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue index 139b124..8cd5ef8 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue @@ -102,10 +102,12 @@ + 序 号 主要安全措施 操作 + {{ index + 1 }} {{item.PROTECTIVE_MEASURES}} 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 53fc800..26fe6db 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 @@ -428,10 +428,10 @@ - - 作业负责人意见 - - + + 作业负责人意见 + + @@ -446,11 +446,11 @@ - + 项目主管部门负责意见 - + @@ -467,10 +467,10 @@ - - 属地监管单位意见 - - + + 属地监管单位意见 + + @@ -483,10 +483,10 @@ - - 安全管理部门意见 - - + + 安全管理部门意见 + + @@ -502,10 +502,10 @@ - - 动火审批人意见 - - + + 动火审批人意见 + + @@ -521,10 +521,10 @@ - - 动火前验票负责人意见 - - + + 动火前验票负责人意见 + + @@ -648,6 +648,26 @@ } }, + computed: { + formattedConfirmContent() { + return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意'; + }, + formattedExamineApprovalOpinions() { + return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意'; + }, + formattedLeaderContent() { + return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意'; + }, + formattedAuditContent() { + return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '' ? this.pd.AUDIT_CONTENT : '同意'; + }, + formattedApproveContent() { + return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意'; + }, + formattedMonitorContent() { + return this.pd.MONITOR_CONTENT && this.pd.MONITOR_CONTENT !== '' ? this.pd.MONITOR_CONTENT : '同意'; + } + }, onLoad(event){ this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); this.pd.HOTWORK_ID = event.HOTWORK_ID; @@ -713,6 +733,9 @@ if ("success" == res.data.result) { uni.hideLoading(); _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; + } _this.pd = Object.assign(_this.pd, { "CONFIRM_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[0],