From 25f4bb0bd1c43d2cc050f0cd817cdef8345f909a Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 3 Feb 2024 22:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BA=A4=E5=BA=95=E4=BA=BA?= =?UTF-8?q?=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 @@ + +