From 5ef11fd65a9c16660418cf7eb369381b1f6dce50 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 25 Jan 2024 16:36:15 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=8A=A8=E7=81=ABapp=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-apply/hotwork-apply-detail.vue | 2971 ++++++++--------- 1 file changed, 1459 insertions(+), 1512 deletions(-) diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue index 4074af5..06180f4 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue @@ -1,353 +1,330 @@ diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail.vue new file mode 100644 index 0000000..6eaf46f --- /dev/null +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail.vue @@ -0,0 +1,838 @@ + + + + + diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue new file mode 100644 index 0000000..1f0c1d7 --- /dev/null +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue @@ -0,0 +1,754 @@ + + + + + From f6b70d4a89be4c17d8e6844be8be86ef7d26ed50 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 20:18:59 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E2=80=9C?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E5=8D=95=E4=BD=8D=E2=80=9D=E5=92=8C=E2=80=9C?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E5=8D=95=E4=BD=8D=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E2=80=9D=E4=BF=AE=E6=94=B9=E4=B8=BA=E2=80=9C=E5=B1=9E=E5=9C=B0?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E5=8D=95=E4=BD=8D=E2=80=9D=E5=92=8C=E2=80=9C?= =?UTF-8?q?=E5=B1=9E=E5=9C=B0=E7=9B=91=E7=AE=A1=E5=8D=95=E4=BD=8D=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E2=80=9D=E5=8A=9F=E8=83=BD=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/application/eight-assignments/index.vue | 2 +- .../hotwork-accept-alldetail.vue | 8 ++++---- .../hotwork-accept/hotwork-accept-detail.vue | 4 ++-- .../hotwork-accept/hotwork-accept-list.vue | 16 +++++++-------- .../hotwork-acceptconfess-detail.vue | 4 ++-- .../hotwork-acceptconfess-list.vue | 20 +++++++++---------- .../hotwork-approve-alldetail.vue | 8 ++++---- .../hotwork-approve-detail.vue | 4 ++-- .../hotwork-approve/hotwork-approve-list.vue | 16 +++++++-------- .../hotwork-audit/hotwork-audit-detail.vue | 4 ++-- .../hotwork-audit/hotwork-audit-list.vue | 16 +++++++-------- .../hotwork-confess-detail.vue | 4 ++-- .../hotwork-confess/hotwork-confess-list.vue | 20 +++++++++---------- .../hotwork-gas/hotwork-gas-list.vue | 8 ++++---- .../hotwork-guardian-detail.vue | 4 ++-- .../hotwork-guardian-list.vue | 20 +++++++++---------- .../hotwork-leader/hotwork-leader-detail.vue | 6 +++--- .../hotwork-leader/hotwork-leader-list.vue | 11 +--------- .../hotwork-monitor-detail.vue | 4 ++-- 19 files changed, 85 insertions(+), 94 deletions(-) diff --git a/pages/application/eight-assignments/index.vue b/pages/application/eight-assignments/index.vue index 2800611..83d0969 100644 --- a/pages/application/eight-assignments/index.vue +++ b/pages/application/eight-assignments/index.vue @@ -88,7 +88,7 @@ {{count.COUNTLEADER}} - 所在单位 + 属地监管单位 意见 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 9c44788..0f620d3 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue @@ -312,7 +312,7 @@ - 所在单位 + 属地监管单位 {{pd.LEADER_DEPARTMENT_NAME?pd.LEADER_DEPARTMENT_NAME:'请选择'}} @@ -324,7 +324,7 @@ @cancel="leadertreeCancel"> - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME?pd.LEADER_USER_NAME:'请选择'}} @@ -454,7 +454,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -463,7 +463,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} 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 190e50d..42f0934 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -275,7 +275,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -284,7 +284,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue index d3945ea..7cf58e2 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -212,7 +212,7 @@ }, { id: '2', - name: '所在单位待审核' + name: '属地监管单位待审核' }, { id: '4', @@ -328,7 +328,7 @@ }, { id: '2', - name: '所在单位意见', + name: '属地监管单位意见', USER_NAME: STATUS.LEADER_USER_NAME, TIME: STATUS.LEADER_USER_SIGNER_TIME }, @@ -381,7 +381,7 @@ step.REPULSE = step.REPULSE } if (this.showStatus == -4 && step.id == 0) { - step.msg = '所在单位审核打回' + step.msg = '属地监管单位审核打回' step.STATE = '待提交' step.REPULSE = step.REPULSE } @@ -416,7 +416,7 @@ if (step.name == '动火作业提交') { step.STATE = '已提交' } - if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { + if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { step.STATE = '已审核' } if (step.name == '班长验票') { @@ -435,7 +435,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '待审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '待审核' } if(step.name == '安全管理部门意见'){ @@ -458,7 +458,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '已审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '已审核' } if(step.USER_NAME == "已跳过"){ diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue index 461985d..49d1338 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue @@ -230,7 +230,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -239,7 +239,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue index 9febdab..600e113 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -188,14 +188,14 @@ {id:'',name:'请选择'}, {id:'0',name:'待提交'}, {id:'1',name:'作业负责人待审核'}, - {id:'2',name:'所在单位待确认'}, + {id:'2',name:'属地监管单位待确认'}, {id:'4',name:'安全管理部门待审核'}, {id:'5',name:'待审批'}, {id:'6',name:'班长待验票'}, {id:'7',name:'待验收'}, {id:'8',name:'验收归档'}, {id:'-2',name:'作业负责人确认打回'}, - {id:'-4',name:'所在单位确认打回'}, + {id:'-4',name:'属地监管单位确认打回'}, {id:'-5',name:'安全管理部门打回'}, {id:'-6',name:'审批打回'}, {id:'-7',name:'班长验票打回'}, @@ -214,7 +214,7 @@ }, { id: '2', - name: '所在单位待审核' + name: '属地监管单位待审核' }, { id: '4', @@ -325,7 +325,7 @@ }, { id: '2', - name: '所在单位意见', + name: '属地监管单位意见', USER_NAME: STATUS.LEADER_USER_NAME, TIME: STATUS.LEADER_USER_SIGNER_TIME }, @@ -378,7 +378,7 @@ step.REPULSE = step.REPULSE } if (this.showStatus == -4 && step.id == 0) { - step.msg = '所在单位审核打回' + step.msg = '属地监管单位审核打回' step.STATE = '待提交' step.REPULSE = step.REPULSE } @@ -413,7 +413,7 @@ if (step.name == '动火作业提交') { step.STATE = '已提交' } - if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { + if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { step.STATE = '已审核' } if (step.name == '班长验票') { @@ -432,7 +432,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '待审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '待审核' } if(step.name == '安全管理部门意见'){ @@ -455,7 +455,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '已审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '已审核' } if(step.USER_NAME == "已跳过"){ 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 bb3d380..da58b4e 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue @@ -312,7 +312,7 @@ - 所在单位 + 属地监管单位 {{pd.LEADER_DEPARTMENT_NAME?pd.LEADER_DEPARTMENT_NAME:'请选择'}} @@ -324,7 +324,7 @@ @cancel="leadertreeCancel"> - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME?pd.LEADER_USER_NAME:'请选择'}} @@ -454,7 +454,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -463,7 +463,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} 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 d0ef500..a33ebac 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue @@ -272,7 +272,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -281,7 +281,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue index de0f457..55ba276 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -212,7 +212,7 @@ }, { id: '2', - name: '所在单位待审核' + name: '属地监管单位待审核' }, { id: '4', @@ -329,7 +329,7 @@ }, { id: '2', - name: '所在单位意见', + name: '属地监管单位意见', USER_NAME: STATUS.LEADER_USER_NAME, TIME: STATUS.LEADER_USER_SIGNER_TIME }, @@ -382,7 +382,7 @@ step.REPULSE = step.REPULSE } if (this.showStatus == -4 && step.id == 0) { - step.msg = '所在单位审核打回' + step.msg = '属地监管单位审核打回' step.STATE = '待提交' step.REPULSE = step.REPULSE } @@ -417,7 +417,7 @@ if (step.name == '动火作业提交') { step.STATE = '已提交' } - if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { + if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { step.STATE = '已审核' } if (step.name == '班长验票') { @@ -436,7 +436,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '待审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '待审核' } if(step.name == '安全管理部门意见'){ @@ -459,7 +459,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '已审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '已审核' } if(step.USER_NAME == "已跳过"){ 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 fb64348..5bfdeaa 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue @@ -258,7 +258,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -267,7 +267,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue index 9944bc4..96284eb 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -212,7 +212,7 @@ }, { id: '2', - name: '所在单位待审核' + name: '属地监管单位待审核' }, { id: '4', @@ -329,7 +329,7 @@ }, { id: '2', - name: '所在单位意见', + name: '属地监管单位意见', USER_NAME: STATUS.LEADER_USER_NAME, TIME: STATUS.LEADER_USER_SIGNER_TIME }, @@ -382,7 +382,7 @@ step.REPULSE = step.REPULSE } if (this.showStatus == -4 && step.id == 0) { - step.msg = '所在单位审核打回' + step.msg = '属地监管单位审核打回' step.STATE = '待提交' step.REPULSE = step.REPULSE } @@ -417,7 +417,7 @@ if (step.name == '动火作业提交') { step.STATE = '已提交' } - if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { + if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { step.STATE = '已审核' } if (step.name == '班长验票') { @@ -436,7 +436,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '待审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '待审核' } if(step.name == '安全管理部门意见'){ @@ -459,7 +459,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '已审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '已审核' } if(step.USER_NAME == "已跳过"){ diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue index 27c0bfc..88fc2ea 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue @@ -235,7 +235,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -244,7 +244,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue index 4021136..540538e 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -188,14 +188,14 @@ {id:'',name:'请选择'}, {id:'0',name:'待提交'}, {id:'1',name:'作业负责人待审核'}, - {id:'2',name:'所在单位待确认'}, + {id:'2',name:'属地监管单位待确认'}, {id:'4',name:'安全管理部门待审核'}, {id:'5',name:'待审批'}, {id:'6',name:'班长待验票'}, {id:'7',name:'待验收'}, {id:'8',name:'验收归档'}, {id:'-2',name:'作业负责人确认打回'}, - {id:'-4',name:'所在单位确认打回'}, + {id:'-4',name:'属地监管单位确认打回'}, {id:'-5',name:'安全管理部门打回'}, {id:'-6',name:'审批打回'}, {id:'-7',name:'班长验票打回'}, @@ -214,7 +214,7 @@ }, { id: '2', - name: '所在单位待审核' + name: '属地监管单位待审核' }, { id: '4', @@ -325,7 +325,7 @@ }, { id: '2', - name: '所在单位意见', + name: '属地监管单位意见', USER_NAME: STATUS.LEADER_USER_NAME, TIME: STATUS.LEADER_USER_SIGNER_TIME }, @@ -378,7 +378,7 @@ step.REPULSE = step.REPULSE } if (this.showStatus == -4 && step.id == 0) { - step.msg = '所在单位审核打回' + step.msg = '属地监管单位审核打回' step.STATE = '待提交' step.REPULSE = step.REPULSE } @@ -413,7 +413,7 @@ if (step.name == '动火作业提交') { step.STATE = '已提交' } - if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { + if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { step.STATE = '已审核' } if (step.name == '班长验票') { @@ -432,7 +432,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '待审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '待审核' } if(step.name == '安全管理部门意见'){ @@ -455,7 +455,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '已审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '已审核' } if(step.USER_NAME == "已跳过"){ diff --git a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue index 17ba418..a698c8b 100644 --- a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue +++ b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue @@ -64,7 +64,7 @@ 审核状态： - + @@ -211,7 +211,7 @@ }, { id: '2', - name: '所在单位待审核' + name: '属地监管单位待审核' }, { id: '4', @@ -319,7 +319,7 @@ }, { id: '2', - name: '所在单位意见', + name: '属地监管单位意见', USER_NAME: STATUS.LEADER_USER_NAME, STATE: '已审核', TIME: STATUS.LEADER_USER_SIGNER_TIME @@ -374,7 +374,7 @@ step.msg = '作业负责人审核打回' } if (this.showStatus == -4 && step.id == 0) { - step.msg = '所在单位审核打回' + step.msg = '属地监管单位审核打回' } if (this.showStatus == -5 && step.id == 0) { step.msg = '安全管理部门审核打回' diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue index 7aeecbf..2e6ef43 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue @@ -235,7 +235,7 @@ - 所在单位意见 + 属地监管单位意见 @@ -244,7 +244,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue index da35772..f636f6b 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -188,14 +188,14 @@ {id:'',name:'请选择'}, {id:'0',name:'待提交'}, {id:'1',name:'作业负责人待审核'}, - {id:'2',name:'所在单位待确认'}, + {id:'2',name:'属地监管单位待确认'}, {id:'4',name:'安全管理部门待审核'}, {id:'5',name:'待审批'}, {id:'6',name:'班长待验票'}, {id:'7',name:'待验收'}, {id:'8',name:'验收归档'}, {id:'-2',name:'作业负责人确认打回'}, - {id:'-4',name:'所在单位确认打回'}, + {id:'-4',name:'属地监管单位确认打回'}, {id:'-5',name:'安全管理部门打回'}, {id:'-6',name:'审批打回'}, {id:'-7',name:'班长验票打回'}, @@ -214,7 +214,7 @@ }, { id: '2', - name: '所在单位待审核' + name: '属地监管单位待审核' }, { id: '4', @@ -325,7 +325,7 @@ }, { id: '2', - name: '所在单位意见', + name: '属地监管单位意见', USER_NAME: STATUS.LEADER_USER_NAME, TIME: STATUS.LEADER_USER_SIGNER_TIME }, @@ -378,7 +378,7 @@ step.REPULSE = step.REPULSE } if (this.showStatus == -4 && step.id == 0) { - step.msg = '所在单位审核打回' + step.msg = '属地监管单位审核打回' step.STATE = '待提交' step.REPULSE = step.REPULSE } @@ -413,7 +413,7 @@ if (step.name == '动火作业提交') { step.STATE = '已提交' } - if (step.name == '作业负责人意见' || step.name == '所在单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { + if (step.name == '作业负责人意见' || step.name == '属地监管单位意见' || step.name == '安全管理部门意见' || step.name == '动火审批人意见') { step.STATE = '已审核' } if (step.name == '班长验票') { @@ -432,7 +432,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '待审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '待审核' } if(step.name == '安全管理部门意见'){ @@ -455,7 +455,7 @@ if(step.name == '作业负责人意见'){ step.STATE = '已审核' } - if(step.name == '所在单位意见'){ + if(step.name == '属地监管单位意见'){ step.STATE = '已审核' } if(step.USER_NAME == "已跳过"){ 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 79e6ddc..f25bbe6 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue @@ -2,7 +2,7 @@ 返回 - 所在单位意见 + 属地监管单位意见 @@ -255,11 +255,11 @@ - 所在单位意见 + 属地监管单位意见 - 所在单位负责人 + 属地监管单位负责人 diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue index 32146cc..0343cdb 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue @@ -2,19 +2,10 @@ 返回 - 所在单位意见 - - - + 属地监管单位意见 - - - - - - --> - 所在单位意见 + 属地监管单位意见 @@ -286,7 +286,7 @@ - 所在单位负责人 + 属地监管单位负责人 {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} From e0e70e3585a6dda65d6ac0a3f434c39bc04df10f Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 20:37:09 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E2=80=9C?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E5=8D=95=E4=BD=8D=E2=80=9D=E5=92=8C=E2=80=9C?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E5=8D=95=E4=BD=8D=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E2=80=9D=E4=BF=AE=E6=94=B9=E4=B8=BA=E2=80=9C=E5=B1=9E=E5=9C=B0?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E5=8D=95=E4=BD=8D=E2=80=9D=E5=92=8C=E2=80=9C?= =?UTF-8?q?=E5=B1=9E=E5=9C=B0=E7=9B=91=E7=AE=A1=E5=8D=95=E4=BD=8D=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E2=80=9D=E5=8A=9F=E8=83=BD=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-accept/hotwork-accept-alldetail.vue | 12 ++++++------ .../hotwork-accept/hotwork-accept-detail.vue | 6 +++--- .../hotwork-accept/hotwork-accept-list.vue | 2 +- .../hotwork-acceptconfess-detail.vue | 6 +++--- .../hotwork-acceptconfess-list.vue | 2 +- .../hotwork-apply/hotwork-apply-detail.vue | 10 +++++----- .../hotwork_cfd/hotwork-apply/hotwork-apply-list.vue | 2 +- .../hotwork-approve/hotwork-approve-alldetail.vue | 12 ++++++------ .../hotwork-approve/hotwork-approve-list.vue | 2 +- .../hotwork-audit/hotwork-audit-alldetail.vue | 12 ++++++------ .../hotwork_cfd/hotwork-audit/hotwork-audit-list.vue | 2 +- .../hotwork-confess/hotwork-confess-detail.vue | 6 +++--- .../hotwork-confess/hotwork-confess-list.vue | 2 +- .../hotwork-confirm/hotwork-confirm-alldetail.vue | 12 ++++++------ .../hotwork-confirm/hotwork-confirm-list.vue | 2 +- .../hotwork_cfd/hotwork-gas/hotwork-gas-list.vue | 2 +- .../hotwork-guardian/hotwork-guardian-detail.vue | 6 +++--- .../hotwork-guardian/hotwork-guardian-list.vue | 2 +- .../hotwork-leader/hotwork-leader-alldetail.vue | 12 ++++++------ .../hotwork-leader/hotwork-leader-list.vue | 2 +- .../hotwork-monitor/hotwork-monitor-alldetail.vue | 12 ++++++------ .../hotwork-monitor/hotwork-monitor-detail.vue | 4 ++-- .../hotwork-monitor/hotwork-monitor-list.vue | 2 +- .../hotwork-xiang-mu/hotwork-confirm-alldetail.vue | 12 ++++++------ .../hotwork-xiang-mu/hotwork-confirm-list.vue | 2 +- 25 files changed, 73 insertions(+), 73 deletions(-) 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 0f620d3..48d58c2 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue @@ -375,7 +375,7 @@ - 动火前在岗部门 + 动火前验票部门 {{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}} @@ -387,7 +387,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}} @@ -511,16 +511,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} @@ -928,7 +928,7 @@ if(this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } 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 42f0934..1e8b792 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -330,16 +330,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue index 7cf58e2..fd22fd1 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue index 49d1338..77cfd89 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue @@ -287,16 +287,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue index 600e113..0df734b 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue index 5d47afc..e08adb0 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue @@ -437,7 +437,7 @@ - 动火前在岗部门 + 动火前验票部门 {{ pd.MONITOR_DEPARTMENT_NAME ? pd.MONITOR_DEPARTMENT_NAME : '请选择' }} @@ -451,7 +451,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 @@ -636,12 +636,12 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - 动火前在岗班长 + 动火前验票负责人 {{ pd.MONITOR_USER_NAME }} {{ pd.MONITOR_USER_SIGNER_TIME }} @@ -1266,7 +1266,7 @@ export default { if (this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue index deaaa14..a06e97a 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} 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 da58b4e..24d4555 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue @@ -375,7 +375,7 @@ - 动火前在岗部门 + 动火前验票部门 {{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}} @@ -387,7 +387,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}} @@ -511,16 +511,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} @@ -928,7 +928,7 @@ if(this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue index 55ba276..9cc6244 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} 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 6edf6df..27d5f42 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue @@ -375,7 +375,7 @@ - 动火前在岗部门 + 动火前验票部门 {{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}} @@ -387,7 +387,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}} @@ -511,16 +511,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} @@ -928,7 +928,7 @@ if(this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue index 96284eb..1cb5cd7 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue index 88fc2ea..2eec7d1 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue @@ -292,16 +292,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue index 540538e..3a8d262 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} 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 c2a38a2..6af29f8 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue @@ -375,7 +375,7 @@ - 动火前在岗部门 + 动火前验票部门 {{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}} @@ -387,7 +387,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}} @@ -511,16 +511,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} @@ -928,7 +928,7 @@ if(this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue index 9b6f8de..ad69a4f 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} diff --git a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue index a698c8b..ab2dbb9 100644 --- a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue +++ b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue index 2e6ef43..40ad4f3 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue @@ -292,16 +292,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue index f636f6b..80473bb 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} 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 6edf6df..27d5f42 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue @@ -375,7 +375,7 @@ - 动火前在岗部门 + 动火前验票部门 {{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}} @@ -387,7 +387,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}} @@ -511,16 +511,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} @@ -928,7 +928,7 @@ if(this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue index 0343cdb..3dccb66 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue @@ -47,7 +47,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} 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 6edf6df..27d5f42 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue @@ -375,7 +375,7 @@ - 动火前在岗部门 + 动火前验票部门 {{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}} @@ -387,7 +387,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}} @@ -511,16 +511,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} @@ -928,7 +928,7 @@ if(this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } 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 9d2fff0..7dae74c 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue @@ -332,11 +332,11 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - 动火前在岗班长 + 动火前验票负责人 diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue index c015b27..6ef2780 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue @@ -56,7 +56,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue index c2a38a2..6af29f8 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue @@ -375,7 +375,7 @@ - 动火前在岗部门 + 动火前验票部门 {{pd.MONITOR_DEPARTMENT_NAME?pd.MONITOR_DEPARTMENT_NAME:'请选择'}} @@ -387,7 +387,7 @@ @cancel="monitortreeCancel"> - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME?pd.MONITOR_USER_NAME:'请选择'}} @@ -511,16 +511,16 @@ - 动火前在岗班长意见 + 动火前验票负责人意见 - + - 动火前在岗班长 + 动火前验票负责人 {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} @@ -928,7 +928,7 @@ if(this.monitorUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择动火前在岗部门', + title: '请先选择动火前验票部门', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue index 1f0c1d7..1cc913a 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list.vue @@ -47,7 +47,7 @@ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} - 动火前在岗班长：{{item.MONITOR_USER_NAME}} + 动火前验票负责人：{{item.MONITOR_USER_NAME}} 验收部门负责人：{{item.ACCEPT_USER_NAME}} From eca761e86aa7e350d1e6749b927b9605dc6586f8 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 30 Jan 2024 20:54:39 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90?= =?UTF-8?q?=E7=9A=84=E5=88=86=E6=9E=90=E5=8D=95=E4=BD=8D=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90=E5=8D=95=E4=BD=8D=E5=92=8C?= =?UTF-8?q?=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90=E5=8D=95=E4=BD=8D=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue | 6 +++--- .../hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue | 6 +++--- .../hotwork-approve/hotwork-approve-alldetail.vue | 6 +++--- .../hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue | 6 +++--- .../hotwork-confirm/hotwork-confirm-alldetail.vue | 6 +++--- .../hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue | 6 +++--- .../hotwork-monitor/hotwork-monitor-alldetail.vue | 6 +++--- .../hotwork-xiang-mu/hotwork-confirm-alldetail.vue | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) 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 48d58c2..6084b4f 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue @@ -249,7 +249,7 @@ - 分析单位 + 气体分析单位 {{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}} @@ -261,7 +261,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 {{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}} @@ -874,7 +874,7 @@ if(this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue index e08adb0..1771b39 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue @@ -287,7 +287,7 @@ - 分析单位 + 气体分析单位 {{ pd.ANALYZE_DEPARTMENT_NAME ? pd.ANALYZE_DEPARTMENT_NAME : '请选择' }} @@ -301,7 +301,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 @@ -1194,7 +1194,7 @@ export default { if (this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } 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 24d4555..2b01417 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue @@ -249,7 +249,7 @@ - 分析单位 + 气体分析单位 {{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}} @@ -261,7 +261,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 {{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}} @@ -874,7 +874,7 @@ if(this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } 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 27d5f42..8607dce 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue @@ -249,7 +249,7 @@ - 分析单位 + 气体分析单位 {{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}} @@ -261,7 +261,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 {{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}} @@ -874,7 +874,7 @@ if(this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } 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 6af29f8..dff4e0f 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue @@ -249,7 +249,7 @@ - 分析单位 + 气体分析单位 {{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}} @@ -261,7 +261,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 {{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}} @@ -874,7 +874,7 @@ if(this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } 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 27d5f42..8607dce 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue @@ -249,7 +249,7 @@ - 分析单位 + 气体分析单位 {{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}} @@ -261,7 +261,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 {{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}} @@ -874,7 +874,7 @@ if(this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } 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 27d5f42..8607dce 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue @@ -249,7 +249,7 @@ - 分析单位 + 气体分析单位 {{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}} @@ -261,7 +261,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 {{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}} @@ -874,7 +874,7 @@ if(this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue index 6af29f8..dff4e0f 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail.vue @@ -249,7 +249,7 @@ - 分析单位 + 气体分析单位 {{pd.ANALYZE_DEPARTMENT_NAME?pd.ANALYZE_DEPARTMENT_NAME:'请选择'}} @@ -261,7 +261,7 @@ @cancel="analyzetreeCancel"> - 分析单位负责人 + 气体分析单位负责人 {{pd.ANALYZE_USER_NAME?pd.ANALYZE_USER_NAME:'请选择'}} @@ -874,7 +874,7 @@ if(this.analyzeUserList.length == 0) { uni.showToast({ icon: 'none', - title: '请先选择分析单位', + title: '请先选择气体分析单位', duration: 1500 }) } From d0347308ea11001a649e1e2cd33c17cecd34a81c Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 3 Feb 2024 15:29:35 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BA=A4=E5=BA=95?= =?UTF-8?q?=E4=BA=BA=E5=8D=95=E9=80=89=E5=8F=98=E5=A4=9A=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=A8=A1=E5=9D=97=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-apply/hotwork-apply-detail.vue | 243 +++++++++++++----- 1 file changed, 178 insertions(+), 65 deletions(-) diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue index 1771b39..0dc06a6 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue @@ -153,7 +153,7 @@ - + 安全防护措施 @@ -485,29 +485,39 @@ - - - 安全交底人单位 - - - {{ pd.CONFESS_DEPARTMENT_NAME ? pd.CONFESS_DEPARTMENT_NAME : '请选择' }} - + + + + - - - 安全交底人 - - - {{ pd.CONFESS_USER_NAME ? pd.CONFESS_USER_NAME : '请选择' }} + + + + + + 安全交底人单位 + + + {{ item.CONFESS_DEPARTMENT_NAME ? item.CONFESS_DEPARTMENT_NAME : '请选择' }} + - + + + + 安全交底人 + + + {{ item.CONFESS_USER_NAME ? item.CONFESS_USER_NAME : '请选择' }} + + + @@ -771,12 +781,21 @@ export default { {name: 'MONITOR_USER_ID', message: '请选择验票班长'}, {name: 'ACCEPT_USER_ID', message: '请选择验收部门负责人'}, {name: 'GUARDIAN_USER_ID', message: '请选择监护人'}, - {name: 'CONFESS_USER_ID', message: '请选择安全交底人'}, {name: 'ACCEPT_CONFESS_USER_ID', message: '请选择接受交底人'}, ], todayDate: '', otherAssignments: false, otherIdentification: false, + confessList:[ + { + CONFESS_DEPARTMENT_NAME:'', + CONFESS_DEPARTMENT_ID:'', + CONFESS_USER_NAME:'', + CONFESS_USER_ID:'', + confessUserList:[], + confessindex: -1 + } + ], } }, @@ -800,6 +819,7 @@ export default { // 初始化现场作业负责人 this.getDept(); this.getLimitSpace(); + this.getSafetyCheck(); loginSession(); }, @@ -871,7 +891,10 @@ export default { "MONITOR_USER_MEASURES": _this.pd.OTHER_PROTECTIVE_MEASURES.split(";_;")[5] }) _this.pd.OTHER_PROTECTIVE_MEASURES = '' - _this.measuresList = res.data.measuresList + // created by liu jun description: 在查看详情时如果有安全防护措施信息则用接口返回的数据，如果没有则用默认的数据 + if (res.data.measuresList && res.data.measuresList.length > 0) { + _this.measuresList = res.data.measuresList + } _this.files = res.data.imgList; _this.files1 = res.data.imgList1; let dongHuoCaoZuoRenPic = res.data.imgList2 @@ -881,7 +904,6 @@ export default { _this.pd.dongHuoCaoZuoRenPic.push(baseImgPath + dongHuoCaoZuoRenPic[i].FILEPATH) } } - console.log(this.pd.dongHuoCaoZuoRenPic) if (_this.pd.APPLY_STATUS < 1) { _this.forbidEdit = false; } @@ -895,6 +917,13 @@ export default { this.getUserList(this.pd.MONITOR_DEPARTMENT_ID, 'monitorUserList'); this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID, 'acceptUserList'); this.getWorkUserList(); + // created by liu jun description: 拼装安全交底人数据 + if (res.data.pd.confessList && res.data.pd.confessList.length > 0) { + _this.confessList = res.data.pd.confessList + for (let i = 0; i < _this.confessList.length; i++) { + this.getUserListForJiaoDiRen(_this.confessList[i].CONFESS_DEPARTMENT_ID, i); + } + } } else if ("exception" == data.result) { @@ -990,6 +1019,21 @@ export default { if (!required) { return } + console.log(this.confessList) + for (let i = 0; i < this.confessList.length; i++) { + if (!this.confessList[i].CONFESS_USER_ID) { + uni.showToast({ + icon: 'none', + title: '请选择安全交底人', + duration: 1500 + }); + required = false + } + } + // 清空非必要信息 + for (let i = 0; i < this.confessList.length; i++) { + this.confessList[i].confessUserList = [] + } } const formData = {} Object.keys(this.pd).map(key => { @@ -1005,6 +1049,7 @@ export default { formData.dongHuoCaoZuoRenPic = this.pd.dongHuoCaoZuoRenPic formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.USER_ID = loginUser.USER_ID + formData.confessList = JSON.stringify(this.confessList) this.buttonloading = true uni.request({ url: basePath + "/app/hotwork/cfd/" + _this.msg, @@ -1019,37 +1064,43 @@ export default { USER_ID: loginUser.USER_ID, }, success: (res) => { - console.log(res) - for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) { - uni.uploadFile({ - url: basePath + "/app/hotwork/cfd/uploadImg", - filePath: this.pd.dongHuoCaoZuoRenPic[i], - name: 'FFILE', - formData: { - HOTWORK_ID: res.data.HOTWORK_ID - }, - success: () => { - if(i === this.pd.dongHuoCaoZuoRenPic.length - 1){ + if (res.data.result == 'success') { + for (let i = 0; i < this.pd.dongHuoCaoZuoRenPic.length; i++) { + uni.uploadFile({ + url: basePath + "/app/hotwork/cfd/uploadImg", + filePath: this.pd.dongHuoCaoZuoRenPic[i], + name: 'FFILE', + formData: { + HOTWORK_ID: res.data.HOTWORK_ID + }, + success: () => { + if (i === this.pd.dongHuoCaoZuoRenPic.length - 1) { + uni.hideLoading(); + uni.showToast({ + title: '提交成功', + duration: 1500 + }); + _this.goback() + this.buttonloading = false + } + }, + fail: (err) => { uni.hideLoading(); - uni.showToast({ - title: '提交成功', - duration: 1500 + uni.showModal({ + content: err.errMsg, + showCancel: false }); - _this.goback() - this.buttonloading = false } - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false - }); - } - }) + }) + } + }else{ + uni.hideLoading(); + uni.showToast({ + title: res.data.message, + duration: 1500 + }); + this.buttonloading = false } - - }, fail: (err) => { uni.hideLoading(); @@ -1079,6 +1130,24 @@ export default { } }); }, + getSafetyCheck(){ + var _this = this; + uni.request({ + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + url: basePath + '/app/hotwork/cfd/getSafetyCheckItem?tm=' + new Date().getTime(), + data: { + CORPINFO_ID: loginUser.CORPINFO_ID, + USER_ID: loginUser.USER_ID, + }, + success: function (res) { + _this.measuresList = res.data.measuresList; + } + }); + }, levelChange(e) { this.levelindex = e.detail.value; this.pd.WORK_LEVEL = this.levelList[this.levelindex].name; @@ -1160,6 +1229,34 @@ export default { } }) }, + getUserListForJiaoDiRen(dept, index) { + //发送 post 请求 + var _this = this + uni.request({ + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + url: basePath + '/app/sys/listUser', + data: { + DEPARTMENT_ID: dept, + tm: new Date().getTime(), + CORPINFO_ID: loginUser.CORPINFO_ID, + USER_ID: loginUser.USER_ID, + }, + success: function (res) { + if ("success" === res.data.result) { + _this.confessList[index].confessUserList = res.data.userList; + } else { + uni.showToast({ + title: res.data.message, + duration: 2000 + }); + } + } + }) + }, getWorkUserList() { //发送 post 请求 var _this = this @@ -1292,14 +1389,14 @@ export default { } }, // 确定回调事件 - confesstreeConfirm(e) { + confesstreeConfirm(e ,index) { this.isUps = false; - this.pd.CONFESS_DEPARTMENT_ID = e[0].id; - this.pd.CONFESS_DEPARTMENT_NAME = e[0].name; - this.pd.CONFESS_USER_ID = '' - this.pd.CONFESS_USER_NAME = '' + this.confessList[index].CONFESS_DEPARTMENT_ID = e[0].id; + this.confessList[index].CONFESS_DEPARTMENT_NAME = e[0].name; + this.confessList[index].CONFESS_USER_ID = '' + this.confessList[index].CONFESS_USER_NAME = '' this.$forceUpdate();//强制刷新 - this.getUserList(e[0].id, 'confessUserList'); + this.getUserListForJiaoDiRen(e[0].id, index); }, // 确定回调事件 confesstreeAcceptconfirm(e) { @@ -1329,9 +1426,9 @@ export default { this.$refs.tkiTree_guardian._show(); }, // 显示树形选择器 - showConfessTree() { + showConfessTree(index) { this.isUps = true - this.$refs.tkiTree_confess._show(); + this.$refs.tkiTree_confess[index]._show(); }, // 显示树形选择器 showAcceptconfessTree() { @@ -1344,10 +1441,10 @@ export default { this.pd.GUARDIAN_USER_NAME = this.guardianUserList[this.guardianindex].NAME; this.$forceUpdate();//强制刷新 }, - PickerConfess(e) { - this.confessindex = e.detail.value; - this.pd.CONFESS_USER_ID = this.confessUserList[this.confessindex].USER_ID; - this.pd.CONFESS_USER_NAME = this.confessUserList[this.confessindex].NAME; + PickerConfess(e,index) { + this.confessList[index].confessindex = e.detail.value; + this.confessList[index].CONFESS_USER_ID = this.confessList[index].confessUserList[index].USER_ID; + this.confessList[index].CONFESS_USER_NAME = this.confessList[index].confessUserList[index].NAME; this.$forceUpdate();//强制刷新 }, PickerAcceptconfess(e) { @@ -1625,7 +1722,7 @@ export default { goToEdit() { this.forbidEdit = false; }, - //2024-01-25 created by liu jun + //2024-01-25 created by liu jun description: 上传动火人图片 ChooseImage() { var _this = this; uni.chooseImage({ @@ -1660,7 +1757,23 @@ export default { } } }) - } + }, + // 2024-01-31 created by liu jun description: 安全交底人多选 + addConfessUser(){ + var _this = this; + let o = { + CONFESS_DEPARTMENT_NAME:'', + CONFESS_DEPARTMENT_ID:'', + CONFESS_USER_NAME:'', + CONFESS_USER_ID:'', + confessUserList:[], + confessindex: -1 + }; + _this.confessList.push(o); + }, + removeConfessUser(index){ + this.confessList.splice(index,1); + }, } } From 25f4bb0bd1c43d2cc050f0cd817cdef8345f909a Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 3 Feb 2024 22:02:14 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BA=A4=E5=BA=95?= =?UTF-8?q?=E4=BA=BA=E5=AE=A1=E6=89=B9=E6=8E=A5=E5=8F=A3=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 18 +- pages/application/eight-assignments/index.vue | 12 +- .../hotwork-apply/hotwork-apply-detail.vue | 64 +- .../hotwork-apply/hotwork-apply-list.vue | 11 +- .../hotwork-confess-detail.vue | 2 +- .../hotwork-confess/hotwork-confess-list.vue | 4 +- .../hotwork-confirm-detail.vue | 385 +++--- .../hotwork-safety-alldetail.vue} | 0 .../hotwork-safety/hotwork-safety-detail.vue | 905 +++++++++++++ .../hotwork-safety/hotwork-safety-list.vue | 773 +++++++++++ .../hotwork-xiang-alldetail.vue | 1192 +++++++++++++++++ ...rm-detail.vue => hotwork-xiang-detail.vue} | 0 ...onfirm-list.vue => hotwork-xiang-list.vue} | 0 13 files changed, 3168 insertions(+), 198 deletions(-) rename pages/application/hotwork_cfd/{hotwork-xiang-mu/hotwork-confirm-alldetail.vue => hotwork-safety/hotwork-safety-alldetail.vue} (100%) create mode 100644 pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue create mode 100644 pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue create mode 100644 pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue rename pages/application/hotwork_cfd/hotwork-xiang-mu/{hotwork-confirm-detail.vue => hotwork-xiang-detail.vue} (100%) rename pages/application/hotwork_cfd/hotwork-xiang-mu/{hotwork-confirm-list.vue => hotwork-xiang-list.vue} (100%) diff --git a/pages.json b/pages.json index bbb77ed..a2b11e0 100644 --- a/pages.json +++ b/pages.json @@ -863,15 +863,27 @@ "style": {} }, { - "path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail", + "path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail", "style": {} }, { - "path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail", + "path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail", "style": {} }, { - "path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-list", + "path": "pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list", + "style": {} + }, + { + "path": "pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail", + "style": {} + }, + { + "path": "pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail", + "style": {} + }, + { + "path": "pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list", "style": {} }, { diff --git a/pages/application/eight-assignments/index.vue b/pages/application/eight-assignments/index.vue index 83d0969..f2d0934 100644 --- a/pages/application/eight-assignments/index.vue +++ b/pages/application/eight-assignments/index.vue @@ -52,6 +52,16 @@ 申请 + + + + {{count.safetyNum}} + + + 安全措施确认人 + 意见 + + @@ -62,7 +72,7 @@ 意见 - + {{count.xiangMuNum}} diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue index 0dc06a6..eea2afe 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue @@ -285,6 +285,31 @@ + + + 安全措施确认人单位 + + + {{ pd.SAFETY_DEPARTMENT_NAME ? pd.SAFETY_DEPARTMENT_NAME : '请选择' }} + + + + + + 安全措施确认人 + + + {{ pd.SAFETY_USER_NAME ? pd.SAFETY_USER_NAME : '请选择' }} + + + + 气体分析单位 @@ -687,7 +712,7 @@ + + + + - 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 639f03e..02fd36a 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue @@ -2,7 +2,7 @@ 返回 - 作业负责人意见 + 安全检查项人意见 @@ -63,11 +63,6 @@ {{pd.WORK_END_DATE}} - - - - - 动火人及证书编号： @@ -160,17 +155,20 @@ - - - - 安全交底人 - {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - - - - - - + + + + + 安全交底人 + {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} + + + + + + + @@ -188,14 +186,9 @@ - - 作业负责人意见 - - - 作业负责人 + 安全检查项人 - @@ -215,8 +208,8 @@ - - + + @@ -262,15 +255,15 @@ confirmindex:-1, guardianUserList:[], guardianindex:-1, - leaderUserList:[], - leaderindex:-1, + leaderUserList:[], + leaderindex:-1, auditUserList:[], auditindex:-1, approveUserList:[], approveindex:-1, - monitorUserList:[], - monitorindex:-1, - acceptUserList:[], + monitorUserList:[], + monitorindex:-1, + acceptUserList:[], acceptindex:-1, pd:{},// 数据 measuresList:[], @@ -347,6 +340,7 @@ HOTWORK_ID: _this.pd.HOTWORK_ID, CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, + showInfo:'1' }, success: (res) => { if ("success" == res.data.result) { @@ -400,96 +394,83 @@ formData.OPERATOR=loginUser.USER_ID formData.ACTION_USER=loginUser.NAME formData.APPLY_STATUS=STATUS - if(STATUS==2){ - if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) { - uni.showModal({ - title: '', - content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!', - cancelColor: "#000000", - cancelText: '取消', - confirmText: '确定', - success: res => { - this.buttonloading = false - _this.goback() - } - }) - } else { - formData.STATUS = STATUS - for (let i = 0; i < this.measuresList.length; i++) { - const measures = this.measuresList[i] - if(!measures.STATUS){ - 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; - } - if(measures.STATUS=='1' && measures.QUESTION2 && !measures.ANSWER2){ - uni.showToast({ - icon: 'none', - title: '第'+(i+1)+'项未填写第二项', - duration: 1500 - }); - return; - } - if(measures.STATUS=='1' && measures.QUESTION3 && !measures.ANSWER3){ - uni.showToast({ - icon: 'none', - title: '第'+(i+1)+'项未填写第三项', - duration: 1500 - }); - return; - } - if(measures.STATUS=='1' && measures.QUESTION4 && !measures.ANSWER4){ - uni.showToast({ - icon: 'none', - title: '第'+(i+1)+'项未填写第四项', - duration: 1500 - }); - return; - } - } - formData.measuresList = JSON.stringify(this.measuresList) - formData.CORPINFO_ID = loginUser.CORPINFO_ID - formData.USER_ID = loginUser.USER_ID - this.buttonloading = true - uni.uploadFile({ - url: basePath+'/app/hotwork/cfd/editStatus', - filePath: _this.imgList[0].filePath, - name: 'FFILE', - formData:formData, - success: (res) => { - uni.showToast({ - icon:'none', - title: '保存成功', - duration: 2000 - }); - _this.goback() - this.buttonloading = false - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false - }); - } - }) - } - }else{ + if (STATUS == 2) { + formData.STATUS = STATUS + for (let i = 0; i < this.measuresList.length; i++) { + const measures = this.measuresList[i] + if (!measures.STATUS) { + 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; + } + if (measures.STATUS == '1' && measures.QUESTION2 && !measures.ANSWER2) { + uni.showToast({ + icon: 'none', + title: '第' + (i + 1) + '项未填写第二项', + duration: 1500 + }); + return; + } + if (measures.STATUS == '1' && measures.QUESTION3 && !measures.ANSWER3) { + uni.showToast({ + icon: 'none', + title: '第' + (i + 1) + '项未填写第三项', + duration: 1500 + }); + return; + } + if (measures.STATUS == '1' && measures.QUESTION4 && !measures.ANSWER4) { + uni.showToast({ + icon: 'none', + title: '第' + (i + 1) + '项未填写第四项', + duration: 1500 + }); + return; + } + + formData.measuresList = JSON.stringify(this.measuresList) + formData.CORPINFO_ID = loginUser.CORPINFO_ID + formData.USER_ID = loginUser.USER_ID + this.buttonloading = true + } + uni.uploadFile({ + url: basePath + '/app/hotwork/cfd/safetyApproval', + filePath: _this.imgList[0].filePath, + name: 'FFILE', + formData: formData, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.goback() + this.buttonloading = false + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + } else { formData.STATUS=STATUS this.buttonloading = true uni.request({ - url: basePath + "/app/hotwork/cfd/editStatus", + url: basePath + "/app/hotwork/cfd/safetyApproval", method: 'POST', dataType: 'json', header:{ diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue index b2a6441..f8d9a7b 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue @@ -271,25 +271,11 @@ }, methods: { //跳转事件 - goToDetail(item) { - if(!item.ANALYZE_TIME || item.ANALYZE_TIME === '无'){ - uni.showModal({ - title:'提示', - content:'请进行气体检测后在审核', - showCancel:false - }) - return - } - if(item.APPLY_STATUS == '0.9') { - uni.navigateTo({ - url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail?HOTWORK_ID=' + item.HOTWORK_ID - }); - }else{ - uni.navigateTo({ - url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail?HOTWORK_ID=' + item.HOTWORK_ID - }); - } - }, + goToDetail(item) { + uni.navigateTo({ + url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail?HOTWORK_ID=' + item.HOTWORK_ID + }); + }, goToAdd(){ uni.navigateTo({ url: '/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail' @@ -521,7 +507,7 @@ title:"加载中..." });//加载中动画 uni.request({ - url: basePath +'/app/hotwork/cfd/list?showCount='+_this.showCount+'¤tPage='+_this.currentPage , + url: basePath +'/app/hotwork/cfd/safetyList?showCount='+_this.showCount+'¤tPage='+_this.currentPage , method: 'POST', dataType: 'json', header: { @@ -529,8 +515,8 @@ }, data: { CONFIRM_USER_ID:loginUser.USER_ID, - // CONFIRM_USER_ID:'6d6c37756530434382e2f14fbcafaa92', - APPLY_STATUS:'0.9', + APPLY_STATUS:'2', + TYPE:'2', tm:new Date().getTime(), KEYWORDS : _this.NameLikes, //关键字模糊查询 CORPINFO_ID:loginUser.CORPINFO_ID, From f62b6724c082df3ae2fa802e904eb6fd1960aa72 Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 17:27:29 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E7=9B=91=E7=AE=A1=E4=BA=BA=E3=80=81=E4=BA=A4=E5=BA=95=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E4=BA=A4=E5=BA=95=E4=BA=BA=E3=80=81=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E9=A1=B9=E6=A3=80=E6=9F=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-confirm-detail.vue | 125 ++++++------------ 1 file changed, 41 insertions(+), 84 deletions(-) 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 33aea7a..29ad153 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue @@ -411,7 +411,7 @@ formData.OPERATOR = loginUser.USER_ID formData.ACTION_USER = loginUser.NAME formData.APPLY_STATUS = STATUS - if (STATUS === 2) { + if (STATUS === '2') { uni.request({ url: basePath + '/app/hotwork/cfd/check', method: 'POST', @@ -424,89 +424,46 @@ success: (res) => { if ("success" === res.data.result) { uni.hideLoading(); - if (res.data.passFlag === '0') { - uni.showModal({ - title: '', - content: res.data.message, - cancelColor: "#000000", - cancelText: '取消', - confirmText: '确定', - success: res => { - this.buttonloading = false - } - }) - } else { - formData.STATUS = STATUS - for (let i = 0; i < this.measuresList.length; i++) { - const measures = this.measuresList[i] - if (!measures.STATUS) { - 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; - } - if (measures.STATUS === '1' && measures.QUESTION2 && !measures.ANSWER2) { - uni.showToast({ - icon: 'none', - title: '第' + (i + 1) + '项未填写第二项', - duration: 1500 - }); - return; - } - if (measures.STATUS === '1' && measures.QUESTION3 && !measures.ANSWER3) { - uni.showToast({ - icon: 'none', - title: '第' + (i + 1) + '项未填写第三项', - duration: 1500 - }); - return; - } - if (measures.STATUS === '1' && measures.QUESTION4 && !measures.ANSWER4) { - uni.showToast({ - icon: 'none', - title: '第' + (i + 1) + '项未填写第四项', - duration: 1500 - }); - return; - } - } - formData.measuresList = JSON.stringify(this.measuresList) - formData.CORPINFO_ID = loginUser.CORPINFO_ID - formData.USER_ID = loginUser.USER_ID - this.buttonloading = true - uni.uploadFile({ - url: basePath + '/app/hotwork/cfd/editStatus', - filePath: _this.imgList[0].filePath, - name: 'FFILE', - formData: formData, - success: (res) => { - uni.showToast({ - icon: 'none', - title: '保存成功', - duration: 2000 - }); - _this.goback() - this.buttonloading = false - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false - }); - } - }) - } + // if (res.data.passFlag === '0') { + // uni.showModal({ + // title: '', + // content: res.data.message, + // cancelColor: "#000000", + // cancelText: '取消', + // confirmText: '确定', + // success: res => { + // this.buttonloading = false + // } + // }) + // } else { + // formData.STATUS = STATUS + // formData.measuresList = JSON.stringify(this.measuresList) + // formData.CORPINFO_ID = loginUser.CORPINFO_ID + // formData.USER_ID = loginUser.USER_ID + // this.buttonloading = true + // uni.uploadFile({ + // url: basePath + '/app/hotwork/cfd/editStatus', + // filePath: _this.imgList[0].filePath, + // name: 'FFILE', + // formData: formData, + // success: (res) => { + // uni.showToast({ + // icon: 'none', + // title: '保存成功', + // duration: 2000 + // }); + // _this.goback() + // this.buttonloading = false + // }, + // fail: (err) => { + // uni.hideLoading(); + // uni.showModal({ + // content: err.errMsg, + // showCancel: false + // }); + // } + // }) + // } } else if ("exception" === data.result) { uni.showToast({ title: '错误', From 3a24d3b6691df961a8c328bcd8c65b928bbe178e Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 17:42:21 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-confirm-detail.vue | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) 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 29ad153..dbc37b0 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue @@ -226,8 +226,8 @@ - - + + @@ -411,7 +411,7 @@ formData.OPERATOR = loginUser.USER_ID formData.ACTION_USER = loginUser.NAME formData.APPLY_STATUS = STATUS - if (STATUS === '2') { + if (STATUS === '1.5') { uni.request({ url: basePath + '/app/hotwork/cfd/check', method: 'POST', @@ -424,46 +424,46 @@ success: (res) => { if ("success" === res.data.result) { uni.hideLoading(); - // if (res.data.passFlag === '0') { - // uni.showModal({ - // title: '', - // content: res.data.message, - // cancelColor: "#000000", - // cancelText: '取消', - // confirmText: '确定', - // success: res => { - // this.buttonloading = false - // } - // }) - // } else { - // formData.STATUS = STATUS - // formData.measuresList = JSON.stringify(this.measuresList) - // formData.CORPINFO_ID = loginUser.CORPINFO_ID - // formData.USER_ID = loginUser.USER_ID - // this.buttonloading = true - // uni.uploadFile({ - // url: basePath + '/app/hotwork/cfd/editStatus', - // filePath: _this.imgList[0].filePath, - // name: 'FFILE', - // formData: formData, - // success: (res) => { - // uni.showToast({ - // icon: 'none', - // title: '保存成功', - // duration: 2000 - // }); - // _this.goback() - // this.buttonloading = false - // }, - // fail: (err) => { - // uni.hideLoading(); - // uni.showModal({ - // content: err.errMsg, - // showCancel: false - // }); - // } - // }) - // } + if (res.data.passFlag === '0') { + uni.showModal({ + title: '', + content: res.data.message, + cancelColor: "#000000", + cancelText: '取消', + confirmText: '确定', + success: res => { + this.buttonloading = false + } + }) + } else { + formData.STATUS = STATUS + formData.measuresList = JSON.stringify(this.measuresList) + formData.CORPINFO_ID = loginUser.CORPINFO_ID + formData.USER_ID = loginUser.USER_ID + this.buttonloading = true + uni.uploadFile({ + url: basePath + '/app/hotwork/cfd/editStatus', + filePath: _this.imgList[0].filePath, + name: 'FFILE', + formData: formData, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.goback() + this.buttonloading = false + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + } } else if ("exception" === data.result) { uni.showToast({ title: '错误', From 960b3ffd27f5a62f9a4dbeb5643aa90339858c69 Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 4 Feb 2024 17:52:47 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=AE=A1=E6=89=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-confirm-detail.vue | 2 +- .../hotwork-xiang-mu/hotwork-xiang-detail.vue | 40 +++++++++++++------ .../hotwork-xiang-mu/hotwork-xiang-list.vue | 6 +-- 3 files changed, 32 insertions(+), 16 deletions(-) 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 dbc37b0..b5ace25 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue @@ -184,7 +184,7 @@ - + 安全项检查人 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 6eaf46f..1f3e2e3 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 @@ -174,15 +174,17 @@ - - - - 安全交底人 - {{ pd.CONFESS_USER_NAME }} {{ pd.CONFESS_USER_SIGNER_TIME }} - - - + + + + + 安全交底人 + {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} + + + + @@ -204,7 +206,21 @@ + + + + 安全项检查人 + {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}} + + + + {{pd.SAFETY_SIGNATURE_TIME}} + + + + 作业负责人意见 @@ -251,7 +267,7 @@ @@ -430,7 +446,7 @@ export default { uni.showLoading({ title: '请稍候' }) - if (STATUS === 1.5) { + if (STATUS === 2) { if (_this.imgList.length <= 0) { uni.showToast({ icon: 'none', @@ -447,7 +463,7 @@ export default { formData.CREATOR = loginUser.USER_ID formData.OPERATOR = loginUser.USER_ID formData.ACTION_USER = loginUser.NAME - formData.APPLY_STATUS = '2' + formData.APPLY_STATUS = STATUS formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.USER_ID = loginUser.USER_ID diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue index 1cc913a..a1dab75 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue @@ -2,7 +2,7 @@ 返回 - 作业负责人意见 + 项目主管部门意见 @@ -273,11 +273,11 @@ goToDetail(item) { if(item.APPLY_STATUS == '1.5') { uni.navigateTo({ - url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail?HOTWORK_ID=' + item.HOTWORK_ID + url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail?HOTWORK_ID=' + item.HOTWORK_ID }); }else{ uni.navigateTo({ - url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail?HOTWORK_ID=' + item.HOTWORK_ID + url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail?HOTWORK_ID=' + item.HOTWORK_ID }); } }, From ab9feccefedf532db5c61f78547b6f4fbdbe3cf0 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 5 Feb 2024 09:55:13 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-approve-detail.vue | 79 ++++--------------- .../hotwork-approve/hotwork-approve-list.vue | 9 --- .../hotwork-confirm-detail.vue | 2 +- .../hotwork-guardian-detail.vue | 2 +- .../hotwork-leader/hotwork-leader-detail.vue | 31 ++++---- .../hotwork-monitor/hotwork-monitor-list.vue | 19 +++-- .../hotwork-safety/hotwork-safety-detail.vue | 27 ++++++- .../hotwork-xiang-mu/hotwork-xiang-detail.vue | 8 +- 8 files changed, 73 insertions(+), 104 deletions(-) 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 a33ebac..e35e1a7 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue @@ -85,30 +85,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -207,17 +183,20 @@ - - - - 安全交底人 - {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - - - - - - + + + + + 安全交底人 + {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} + + + + + + + @@ -239,10 +218,6 @@ 作业负责人意见 - - - - 作业负责人 @@ -253,32 +228,10 @@ - - - - - - - - - - - - - - - - - - 属地监管单位意见 - - - - 属地监管单位负责人 @@ -293,10 +246,6 @@ 安全管理部门意见 - - - - 安全管理部门负责人 diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue index 9cc6244..9fe2055 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue @@ -3,18 +3,9 @@ 返回 动火审批人意见 - - - - - - - - - - + 安全项检查人 diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue index 0d9331c..af35e24 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue @@ -162,7 +162,7 @@ - + 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 f25bbe6..4d721ef 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue @@ -197,17 +197,20 @@ - - - - 安全交底人 - {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - - - - - - + + + + + 安全交底人 + {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} + + + + + + + @@ -227,15 +230,15 @@ 项目主管部门负责人意见 - + 项目主管部门负责人 - {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_USER_SIGNER_TIME}} + {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}} - + diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue index 6ef2780..dc8fbb0 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue @@ -3,18 +3,9 @@ 返回 班长验票 - - - - - - - - - 0) { + uni.showModal({ + title:'提示', + content:'动火作业已结束，不能验票', + showCancel:false, + }) + return + } if(new Date().getTime() - new Date(item.ANALYZE_TIME).getTime() <= 1800000) { if (item.APPLY_STATUS == '6') { uni.navigateTo({ @@ -608,7 +607,7 @@ } } }) - }, + } } } 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 02fd36a..c053cd7 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue @@ -340,12 +340,17 @@ HOTWORK_ID: _this.pd.HOTWORK_ID, CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, - showInfo:'1' + showInfo:'0' }, success: (res) => { if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map + if (res.data.measuresList && res.data.measuresList.length > 0) { + _this.measuresList = res.data.measuresList + }else { + _this.getSafetyCheck() + } _this.measuresList = res.data.measuresList _this.files = res.data.imgList; if(_this.pd.APPLY_STATUS < 1){ @@ -852,7 +857,25 @@ }, goToEdit(){ this.forbidEdit = false; - } + }, + getSafetyCheck(){ + var _this = this; + uni.request({ + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + url: basePath + '/app/hotwork/cfd/getSafetyCheckItem?tm=' + new Date().getTime(), + data: { + CORPINFO_ID: loginUser.CORPINFO_ID, + USER_ID: loginUser.USER_ID, + }, + success: function (res) { + _this.measuresList = res.data.measuresList; + } + }); + }, } } 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 1f3e2e3..383881b 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 @@ -460,14 +460,18 @@ export default { Object.keys(this.pd).map(key => { formData[key] = this.pd[key] }) + if (STATUS > 0){ + formData.APPROVAL_STATUS = "1" + }else { + formData.APPROVAL_STATUS = "-1" + } formData.CREATOR = loginUser.USER_ID formData.OPERATOR = loginUser.USER_ID formData.ACTION_USER = loginUser.NAME formData.APPLY_STATUS = STATUS formData.CORPINFO_ID = loginUser.CORPINFO_ID formData.USER_ID = loginUser.USER_ID - - formData.STATUS = STATUS + formData.STATUS = '2' this.buttonloading = true uni.uploadFile({ url: basePath + '/app/hotwork/cfd/editStatus', From fbea533566a6d5145fd39bee2c2266d23874a2c4 Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 5 Feb 2024 11:41:01 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=8A=A8?= =?UTF-8?q?=E7=81=AB=E5=AE=A1=E6=89=B9=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BF=A1=E6=81=AF=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-accept/hotwork-accept-detail.vue | 322 ++++++++---------- .../hotwork-leader/hotwork-leader-detail.vue | 43 +-- .../hotwork-monitor-detail.vue | 110 +++--- .../hotwork-xiang-mu/hotwork-xiang-detail.vue | 7 +- 4 files changed, 196 insertions(+), 286 deletions(-) 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 1e8b792..fa6d80c 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -62,12 +62,6 @@ > {{pd.WORK_END_DATE}} - - - - - - 动火人及证书编号： @@ -85,30 +79,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -217,17 +187,20 @@ - - - - 安全交底人 - {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - - - - - - + + + + + 安全交底人 + {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} + + + + + + + @@ -243,6 +216,19 @@ + + + + 安全项检查人 + {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}} + + + + {{pd.SAFETY_SIGNATURE_TIME}} + + + @@ -251,10 +237,6 @@ 作业负责人意见 - - - - 作业负责人 @@ -265,23 +247,25 @@ - - - - - - - - + + 项目主管部门负责人意见 + + + + + 项目主管部门负责人 + {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}} + + + + + - + + 属地监管单位意见 - - - - 属地监管单位负责人 @@ -296,10 +280,6 @@ 安全管理部门意见 - - - - 安全管理部门负责人 @@ -315,10 +295,6 @@ 动火审批人意见 - - - - 动火审批人 @@ -333,10 +309,6 @@ 动火前验票负责人意见 - - - - 动火前验票负责人 @@ -355,7 +327,6 @@ 验收部门负责人 - @@ -548,119 +519,104 @@ current: 0 }); }, - async goSubmit(STATUS){ - var _this = this; - let required = true - uni.showLoading({ - title: '请稍候' - }) - if(STATUS==8) { + async goSubmit(STATUS) { + var _this = this; + let required = true + uni.showLoading({ + title: '请稍候' + }) + if (STATUS == 8) { - if (_this.imgList.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请签字', - duration: 1500 - }); - return; - } - } - var fileList = []; - var signtime = []; - const formData={} - Object.keys(this.pd).map(key => { - formData[key]=this.pd[key] - }) - this.uploadImgFaults(fileList,signtime) - formData.SIGNTIME = signtime.join(",") - formData.CORPINFO_ID=corpinfoId - formData.CREATOR=loginUser.USER_ID - formData.OPERATOR=loginUser.USER_ID - formData.ACTION_USER=loginUser.NAME - formData.APPLY_STATUS=STATUS - if(STATUS==8){ - // if (await this.getGasFlag()) { - if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) { - uni.showModal({ - title: '', - content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!', - cancelColor: "#000000", - cancelText: '取消', - confirmText: '确定', - success: res => { - this.buttonloading = false - _this.goback() - } - }) - }else { - if(new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() >0){ - uni.showModal({ - title: '', - content: '作业未开始之前不能进行验收', - cancelColor: "#000000", - cancelText: '取消', - confirmText: '确定', - success: res => { - this.buttonloading = false - _this.goback() - } - }) - }else{ - formData.STATUS = STATUS - this.buttonloading = true - uni.uploadFile({ - url: basePath + '/app/hotwork/cfd/editAcceptStatus', - files: fileList, - formData:formData, - success: (res) => { - uni.showToast({ - icon: 'none', - title: '保存成功', - duration: 2000 - }); - _this.goback() - this.buttonloading = false - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false - }); - } - }) - } - } - }else{ - formData.STATUS=STATUS - this.buttonloading = true - uni.request({ - url: basePath + "/app/hotwork/cfd/editStatus", - method: 'POST', - dataType: 'json', - header:{ - 'Content-type':'application/x-www-form-urlencoded' - }, - data: formData, - success: (res) => { - uni.showToast({ - icon:'none', - title: '保存成功', - duration: 2000 - }); - _this.goback() - this.buttonloading = false - }, - fail: (err) => { - uni.hideLoading(); - uni.showModal({ - content: err.errMsg, - showCancel: false - }); - } - }) - } - }, + if (_this.imgList.length <= 0) { + uni.showToast({ + icon: 'none', + title: '请签字', + duration: 1500 + }); + return; + } + } + var fileList = []; + var signtime = []; + const formData = {} + Object.keys(this.pd).map(key => { + formData[key] = this.pd[key] + }) + this.uploadImgFaults(fileList, signtime) + formData.SIGNTIME = signtime.join(",") + formData.CORPINFO_ID = corpinfoId + formData.CREATOR = loginUser.USER_ID + formData.OPERATOR = loginUser.USER_ID + formData.ACTION_USER = loginUser.NAME + formData.APPLY_STATUS = STATUS + if (STATUS == 8) { + if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) { + uni.showModal({ + title: '', + content: '作业未开始之前不能进行验收', + cancelColor: "#000000", + cancelText: '取消', + confirmText: '确定', + success: res => { + this.buttonloading = false + _this.goback() + } + }) + } else { + formData.STATUS = STATUS + this.buttonloading = true + uni.uploadFile({ + url: basePath + '/app/hotwork/cfd/editAcceptStatus', + files: fileList, + formData: formData, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.goback() + this.buttonloading = false + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + } + } else { + formData.STATUS = STATUS + this.buttonloading = true + uni.request({ + url: basePath + "/app/hotwork/cfd/editStatus", + method: 'POST', + dataType: 'json', + header: { + 'Content-type': 'application/x-www-form-urlencoded' + }, + data: formData, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '保存成功', + duration: 2000 + }); + _this.goback() + this.buttonloading = false + }, + fail: (err) => { + uni.hideLoading(); + uni.showModal({ + content: err.errMsg, + showCancel: false + }); + } + }) + } + }, getGasFlag(){ return new Promise((resolve,reject)=> { if (this.gasList.length < 1) { 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 4d721ef..d34f822 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue @@ -63,11 +63,6 @@ {{pd.WORK_END_DATE}} - - - - - 动火人及证书编号： @@ -85,30 +80,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -210,6 +181,19 @@ + + + + + 安全项检查人 + {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}} + + + + {{pd.SAFETY_SIGNATURE_TIME}} + + @@ -264,7 +248,6 @@ 属地监管单位负责人 - 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 7dae74c..4aaa27e 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue @@ -85,30 +85,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -212,17 +188,20 @@ - - - - 安全交底人 - {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - - - - - - + + + + + 安全交底人 + {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }} + + + + + + + @@ -238,16 +217,26 @@ + + + + 安全项检查人 + {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}} + + + + {{pd.SAFETY_SIGNATURE_TIME}} + + + + 作业负责人意见 - - - - 作业负责人 @@ -258,32 +247,24 @@ - - - - - - - - - - - - - - - - - + + 项目主管部门负责人意见 + + + + + 项目主管部门负责人 + {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}} + + + + + 属地监管单位意见 - - - - 属地监管单位负责人 @@ -298,10 +279,6 @@ 安全管理部门意见 - - - - 安全管理部门负责人 @@ -317,10 +294,6 @@ 动火审批意见 - - - - 动火审批人 @@ -338,7 +311,6 @@ 动火前验票负责人 - 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 383881b..6f207bc 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 @@ -2,7 +2,7 @@ 返回 - 所在单位意见 + 项目主管部门意见 @@ -237,13 +237,12 @@ - - 所在单位意见 + 项目主管部门意见 - 所在单位负责人 + 项目主管部门负责人 From e973b799eeddde6ef13cd396c0e4f948b6f2e8aa Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 5 Feb 2024 12:07:27 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwork-accept/hotwork-accept-detail.vue | 2 -- .../hotwork-accept/hotwork-accept-list.vue | 26 +++++++------------ .../hotwork-acceptconfess-list.vue | 14 +++++++--- .../hotwork-apply/hotwork-apply-list.vue | 22 ++++++++++------ .../hotwork-approve/hotwork-approve-list.vue | 10 +++++-- .../hotwork-audit/hotwork-audit-list.vue | 19 ++++++-------- .../hotwork-confess/hotwork-confess-list.vue | 10 +++++-- .../hotwork-confirm/hotwork-confirm-list.vue | 10 +++++-- .../hotwork-gas/hotwork-gas-list.vue | 9 ------- .../hotwork-guardian-list.vue | 10 +++++-- .../hotwork-leader/hotwork-leader-list.vue | 10 +++++-- .../hotwork-monitor/hotwork-monitor-list.vue | 10 +++++-- .../hotwork-safety/hotwork-safety-list.vue | 10 +++++-- .../hotwork-xiang-mu/hotwork-xiang-list.vue | 10 +++++-- 14 files changed, 105 insertions(+), 67 deletions(-) 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 fa6d80c..47c40c3 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -526,7 +526,6 @@ title: '请稍候' }) if (STATUS == 8) { - if (_this.imgList.length <= 0) { uni.showToast({ icon: 'none', @@ -730,7 +729,6 @@ }, url: basePath + '/app/limitspace/listAllSpace?tm=' + new Date().getTime(), data: {CORPINFO_ID: corpinfoId}, - dataType: 'json', success: function (res) { _this.limitSpaceList = res.data.varList; } diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue index fd22fd1..bbcf7e5 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue @@ -3,18 +3,9 @@ 返回 完工验收 - - - - - - - - - 动火作业待提交 - + - - + + @@ -137,11 +128,6 @@ 安全交底人：{{CONFESS_USER_NAME}}已签字 - - - 安全交底人：{{CONFESS_USER_NAME}}未签字 - - 接受交底人：{{ACCEPT_CONFESS_USER_NAME}}已签字 @@ -326,6 +312,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue index 3cb0b6d..e0ff04a 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list.vue @@ -64,15 +64,15 @@ 审核状态： - - + + - - + + @@ -323,6 +323,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue index 51e9c1e..52fdaa5 100644 --- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue +++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list.vue @@ -65,15 +65,15 @@ 审核状态： - + + - @@ -330,6 +330,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', @@ -371,12 +377,12 @@ this.$refs[e].open() this.showStatus = STATUS.APPLY_STATUS this.APPLY_STATUS = STATUS.APPLY_STATUS - this.GUARDIAN_USER_SIGNER_TIME = STATUS.GUARDIAN_USER_SIGNER_TIME - this.GUARDIAN_USER_NAME = STATUS.GUARDIAN_USER_NAME - this.CONFESS_USER_SIGNER_TIME = STATUS.CONFESS_USER_SIGNER_TIME - this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME - this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME - this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME + this.GUARDIAN_USER_SIGNER_TIME = STATUS.GUARDIAN_USER_SIGNER_TIME + this.GUARDIAN_USER_NAME = STATUS.GUARDIAN_USER_NAME + this.CONFESS_USER_SIGNER_TIME = STATUS.CONFESS_USER_SIGNER_TIME + this.CONFESS_USER_NAME = STATUS.CONFESS_USER_NAME + this.ACCEPT_CONFESS_USER_SIGNER_TIME = STATUS.ACCEPT_CONFESS_USER_SIGNER_TIME + this.ACCEPT_CONFESS_USER_NAME = STATUS.ACCEPT_CONFESS_USER_NAME }, getShowStatus(step) { diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue index 9fe2055..8f50ad4 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue @@ -55,15 +55,15 @@ 审核状态： - + + - @@ -318,6 +318,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue index 1cb5cd7..5de80d8 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue @@ -3,18 +3,9 @@ 返回 安全管理部门意见 - - - - - - - - - 动火作业待提交 - + + - @@ -327,6 +318,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue index 076010c..7351a29 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list.vue @@ -64,15 +64,15 @@ 审核状态： - + + - @@ -323,6 +323,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue index ad69a4f..e68b0b2 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list.vue @@ -64,15 +64,15 @@ 审核状态： - + + - @@ -335,6 +335,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue index 00f7876..6b33114 100644 --- a/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue +++ b/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list.vue @@ -3,18 +3,9 @@ 返回 气体分析 - - - - - - - - - 动火作业待提交 - + + - @@ -323,6 +323,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '属地监管单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue index 3dccb66..c9b9b07 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue @@ -55,15 +55,15 @@ 审核状态： - + + - @@ -318,6 +318,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue index dc8fbb0..f62413f 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue @@ -55,15 +55,15 @@ 审核状态： - + + - @@ -335,6 +335,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue index f8d9a7b..6b177d4 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue @@ -55,15 +55,15 @@ 审核状态： - + + - @@ -312,6 +312,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见', diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue index a1dab75..b8c5180 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue @@ -55,15 +55,15 @@ 审核状态： - + + - @@ -317,6 +317,12 @@ USER_NAME: STATUS.CONFIRM_USER_NAME, TIME: STATUS.CONFIRM_USER_SIGNER_TIME }, + { + id: '1.5', + name: '项目主管部门意见', + USER_NAME: STATUS.BELONGING_USER_NAME, + TIME: STATUS.BELONGING_SIGNATURE_TIME + }, { id: '2', name: '所在单位意见',