diff --git a/components/other-select/index.vue b/components/other-select/index.vue
index 83fe98f..ebbe839 100644
--- a/components/other-select/index.vue
+++ b/components/other-select/index.vue
@@ -94,6 +94,10 @@ export default {
lists[i].CHECK_NO = "受限作业" + ' ' + lists[i].CHECK_NO
}else if(lists[i].WORK_TYPE == "HIGHWORK"){
lists[i].CHECK_NO = "高处作业" + ' ' + lists[i].CHECK_NO
+ }else if(lists[i].WORK_TYPE == "ELECTRICITY"){
+ lists[i].CHECK_NO = "临时用电" + ' ' + lists[i].CHECK_NO
+ }else if(lists[i].WORK_TYPE == "BREAKGROUND"){
+ lists[i].CHECK_NO = "动土作业" + ' ' + lists[i].CHECK_NO
}
console.log(lists[i].CHECK_NO)
}
diff --git a/pages.json b/pages.json
index ec08c67..53a697e 100644
--- a/pages.json
+++ b/pages.json
@@ -543,7 +543,102 @@
"path": "pages/application/highwork/highwork-accept/highwork-accept-detail",
"style": {}
},
-
+ {
+ "path": "pages/application/electricity/home",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-list/index",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-apply/electricity-apply-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-gas/gas-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-gas/gas-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-measures/electricity-measures-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-guardian/electricity-guardian-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-user/electricity-user-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-confess/electricity-confess-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-confirm/electricity-confirm-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-workuser/electricity-workuser-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-audit/electricity-audit-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-approve/electricity-approve-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-startwork/electricity-startwork-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-endwork/electricity-endwork-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/electricity/electricity-accept/electricity-accept-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/breakground/home",
+ "style": {}
+ },
+ {
+ "path": "pages/application/breakground/breakground-list/index",
+ "style": {}
+ },
+ {
+ "path": "pages/application/breakground/breakground-apply/breakground-apply-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/breakground/breakground-workuser/breakground-workuser-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/breakground/breakground-measures/breakground-measures-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail",
+ "style": {}
+ },
{
"path": "pages/application/hotwork/home",
"style": {}
@@ -588,10 +683,7 @@
"path": "pages/application/hotwork/hotwork-audit/hotwork-audit-detail",
"style": {}
},
- {
- "path": "pages/application/hotwork/hotwork-safety/hotwork-safety-detail",
- "style": {}
- },
+
{
"path": "pages/application/hotwork/hotwork-approve/hotwork-approve-detail",
"style": {}
diff --git a/pages/application/break-ground/home.vue b/pages/application/break-ground/home.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/pages/application/breakground/breakground-apply/breakground-apply-detail.vue b/pages/application/breakground/breakground-apply/breakground-apply-detail.vue
new file mode 100644
index 0000000..0053fb2
--- /dev/null
+++ b/pages/application/breakground/breakground-apply/breakground-apply-detail.vue
@@ -0,0 +1,1584 @@
+
+
+
+ 返回
+ 动土作业申请
+
+
+
+
+
+ 编号：
+ {{pd.CHECK_NO}}
+
+
+
+ 申请部门：
+ {{pd.APPLY_DEPARTMENT_NAME}}
+
+
+
+ 作业地点：
+
+
+
+ 作业内容：
+
+
+
+
+ 作业内容、范围、方式：
+ {{pd.WORK_CONTENT}}
+
+
+
+ 作业内容、范围、方式简图：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关联的其他特殊作业及安全作业票编号
+
+
+
+
+
+
+
+ 风险辨识结果
+
+
+
+
+
+
+ 作业开始时间：
+ {{pd.WORK_START_DATE}}
+
+
+ 作业结束时间：
+ {{pd.WORK_END_DATE}}
+
+
+
+
+
+
+ 安全防护措施
+
+
+
+
+
+ 主要安全措施
+ 操作
+
+
+
+
+ {{item.PROTECTIVE_MEASURES}}
+
+
+
+ {{item.SIGN_TIME}}
+
+
+
+
+
+
+ 不涉及
+
+
+ 涉 及
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 其他安全防护措施
+
+
+
+
+ 其他安全措施
+ 签字
+
+
+
+
+ {{item.DESCR}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 作业人单位
+
+ {{pd.WORK_USER_DEPARTMENT_NAME?pd.WORK_USER_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 作业人
+
+
+ {{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 监护人单位
+
+ {{pd.GUARDIAN_DEPARTMENT_NAME?pd.GUARDIAN_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 监护人
+
+
+ {{pd.GUARDIAN_USER_NAME?pd.GUARDIAN_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 安全交底人单位
+
+ {{pd.CONFESS_DEPARTMENT_NAME?pd.CONFESS_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 安全交底人
+
+
+ {{pd.CONFESS_USER_NAME?pd.CONFESS_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 接受交底人单位
+
+ {{pd.ACCEPT_CONFESS_DEPARTMENT_NAME?pd.ACCEPT_CONFESS_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 接受交底人
+
+
+ {{pd.ACCEPT_CONFESS_USER_NAME?pd.ACCEPT_CONFESS_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 作业负责人单位
+
+ {{pd.CONFIRM_DEPARTMENT_NAME?pd.CONFIRM_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 作业负责人
+
+
+ {{pd.CONFIRM_USER_NAME?pd.CONFIRM_USER_NAME:'请选择'}}
+
+
+
+
+
+
+
+ 所在单位
+
+ {{pd.LEADER_DEPARTMENT_NAME?pd.LEADER_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 所在单位负责人
+
+
+ {{pd.LEADER_USER_NAME?pd.LEADER_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 有关部门
+
+ {{pd.SAFETY_DEPARTMENT_NAME?pd.SAFETY_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 有关部门负责人
+
+
+ {{pd.SAFETY_USER_NAME?pd.SAFETY_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 审批部门
+
+ {{pd.APPROVE_DEPARTMENT_NAME?pd.APPROVE_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 审批部门负责人
+
+
+ {{pd.APPROVE_USER_NAME?pd.APPROVE_USER_NAME:'请选择'}}
+
+
+
+
+
+
+
+ 作业开始负责人单位
+
+ {{pd.WORK_START_DEPARTMENT_NAME?pd.WORK_START_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 作业开始负责人
+
+
+ {{pd.WORK_START_USER_NAME?pd.WORK_START_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 作业结束负责人单位
+
+ {{pd.WORK_END_DEPARTMENT_NAME?pd.WORK_END_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 作业结束负责人
+
+
+ {{pd.WORK_END_USER_NAME?pd.WORK_END_USER_NAME:'请选择'}}
+
+
+
+
+
+
+ 验收部门
+
+ {{pd.ACCEPT_DEPARTMENT_NAME?pd.ACCEPT_DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 验收部门负责人
+
+
+ {{pd.ACCEPT_USER_NAME?pd.ACCEPT_USER_NAME:'请选择'}}
+
+
+
+
+
+ 作业区域
+
+ {{pd.PLS_NAME?pd.PLS_NAME:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 作业人
+ {{pd.WORK_USER_NAME}}
+
+
+
+
+ {{signs.WORK_USER[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 监护人
+ {{pd.GUARDIAN_USER_NAME}}
+
+
+
+
+ {{signs.GUARDIAN[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 安全交底人
+ {{pd.CONFESS_USER_NAME}}
+
+
+
+
+
+
+
+
+
+
+
+ {{signs.CONFESS[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 接受交底人
+ {{pd.ACCEPT_CONFESS_USER_NAME}}
+
+
+
+
+ {{signs.ACCEPT_CONFESS[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+
+ 作业负责人意见
+
+
+
+
+ 作业负责人
+ {{pd.CONFIRM_USER_NAME}}
+
+
+
+
+ {{signs.CONFIRM[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 所在单位意见
+
+
+
+
+ 所在单位负责人
+ {{pd.LEADER_USER_NAME}}
+
+
+
+
+ {{signs.LEADER[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+ 有关部门意见
+
+
+
+
+ 有关部门负责人
+ {{pd.SAFETY_USER_NAME}}
+
+
+
+
+ {{signs.SAFETY[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 审批部门意见
+
+
+
+
+ 审批部门负责人
+ {{pd.APPROVE_USER_NAME}}
+
+
+
+
+ {{signs.APPROVE[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+
+ 作业开始负责人
+ {{pd.WORK_START_USER_NAME}}
+
+
+
+
+ {{signs.WORK_START[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+ 作业结束负责人
+ {{pd.WORK_END_USER_NAME}}
+
+
+
+
+ {{signs.WORK_END[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+ 完工验收
+
+
+
+
+ 验收部门负责人
+ {{pd.ACCEPT_USER_NAME}}
+
+
+
+
+ {{signs.ACCEPT[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/breakground/breakground-detail/index.vue b/pages/application/breakground/breakground-detail/index.vue
new file mode 100644
index 0000000..914f5f7
--- /dev/null
+++ b/pages/application/breakground/breakground-detail/index.vue
@@ -0,0 +1,609 @@
+
+
+
+
+ 编号：
+ {{pd.CHECK_NO}}
+
+
+ 申请部门：
+ {{pd.APPLY_DEPARTMENT_NAME}}
+
+
+
+ 作业地点：
+ {{pd.WORK_PLACE}}
+
+
+
+ 作业内容：
+ {{pd.JOB_CONTENT}}
+
+
+
+ 作业内容、范围、方式：
+ {{pd.WORK_CONTENT}}
+
+
+
+ 作业内容、范围、方式简图：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 作业开始时间：
+ {{pd.WORK_START_DATE}}
+
+
+ 作业结束时间：
+ {{pd.WORK_END_DATE}}
+
+
+
+
+
+ 关联的其他特殊作业及安全作业票编号：
+ {{pd.SPECIAL_WORK}}
+
+
+
+ 风险辨识结果：
+ {{pd.RISK_IDENTIFICATION}}
+
+
+
+
+
+ 安全防护措施
+
+
+
+
+
+ 主要安全措施
+ 操作
+
+
+
+
+ {{item.PROTECTIVE_MEASURES}}
+
+
+
+ {{item.SIGN_TIME}}
+
+
+
+
+ {{item.QUESTION1}}
+ {{item.ANSWER1?item.ANSWER1:0}}
+
+
+ {{item.QUESTION2}}
+ {{item.ANSWER2?item.ANSWER2:0}}
+
+
+
+ {{item.QUESTION3}}
+ {{item.ANSWER3?item.ANSWER3:0}}
+
+
+
+ {{item.QUESTION4}}
+ {{item.ANSWER4?item.ANSWER4:0}}
+
+
+
+
+
+ 不涉及
+
+
+ 涉 及
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 其他安全防护措施
+
+
+
+
+ 其他安全措施
+ 签字
+
+
+
+
+ {{item.DESCR}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 作业人
+ {{pd.WORK_USER_NAME}}
+
+
+
+
+ {{signs.WORK_USER[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 监护人
+ {{pd.GUARDIAN_USER_NAME}}
+
+
+
+
+ {{signs.GUARDIAN[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 安全交底人
+ {{pd.CONFESS_USER_NAME}}
+
+
+
+
+
+
+
+
+
+
+
+ {{signs.CONFESS[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 接受交底人
+ {{pd.ACCEPT_CONFESS_USER_NAME}}
+
+
+
+
+ {{signs.ACCEPT_CONFESS[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+
+
+ 作业负责人意见
+
+
+
+
+ 作业负责人
+ {{pd.CONFIRM_USER_NAME}}
+
+
+
+
+ {{signs.CONFIRM[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 所在单位意见
+
+
+
+
+ 所在单位负责人
+ {{pd.LEADER_USER_NAME}}
+
+
+
+
+ {{signs.LEADER[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+ 审核部门意见
+
+
+
+
+ 审核部门负责人
+ {{pd.AUDIT_USER_NAME}}
+
+
+
+
+ {{signs.AUDIT[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 审批人意见
+
+
+
+
+ 审批负责人
+ {{pd.APPROVE_USER_NAME}}
+
+
+
+
+ {{signs.APPROVE[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 动火前在岗班长意见
+
+
+
+
+ 动火前在岗班长
+ {{pd.MONITOR_USER_NAME}}
+
+
+
+
+ {{signs.MONITOR[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 作业开始负责人
+ {{pd.WORK_START_USER_NAME}}
+
+
+
+
+ {{signs.WORK_START[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+ 作业结束负责人
+ {{pd.WORK_END_USER_NAME}}
+
+
+
+
+ {{signs.WORK_END[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+ 完工验收
+
+
+
+
+ 验收部门负责人
+ {{pd.ACCEPT_USER_NAME}}
+
+
+
+
+ {{signs.ACCEPT[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/breakground/breakground-list/index.vue b/pages/application/breakground/breakground-list/index.vue
new file mode 100644
index 0000000..935d50b
--- /dev/null
+++ b/pages/application/breakground/breakground-list/index.vue
@@ -0,0 +1,579 @@
+
+
+
+ 返回
+ 动土作业{{ flow }}
+
+ 申请
+
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编号:{{item.CHECK_NO}}
+
+
+
+ 申请人:{{item.APPLY_USER_NAME}}
+ 监护人：{{item.GUARDIAN_USER_NAME}}
+
+
+ 安全交底人：{{item.CONFESS_USER_NAME}}
+ 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}
+
+
+ 作业负责人：{{item.CONFIRM_USER_NAME}}
+ 所在单位负责人：{{item.LEADER_USER_NAME}}
+
+
+ 有关水、电、汽、工艺、设备、消防安全等部门：{{item.SAFETY_USER_NAME}}
+
+
+ 审批部门负责人：{{item.APPROVE_USER_NAME}}
+ 验收部门负责人：{{item.ACCEPT_USER_NAME}}
+
+
+
+
+ 审核状态：
+ 暂存
+ 气体检测打回
+ {{ item.NEXT_STEP_NAME }}
+ {{ item.STEP_NAME }}打回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{background[dataFlag].msg}}
+
+
+
+
+
+
+
+
+
+ 查看流程图
+
+
+
+
+
+
+
+
+ {{item.STEP_NAME}}
+ {{item.SIGN_USER || item.FINISHED_SIGN_USER || item.ACT_USER_NAME }}
+ {{item.ACT_TIME}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail.vue b/pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail.vue
new file mode 100644
index 0000000..75b758d
--- /dev/null
+++ b/pages/application/breakground/breakground-measures-confirm/breakground-measures-confirm-detail.vue
@@ -0,0 +1,407 @@
+
+
+
+ 返回
+ 安全措施确认人意见
+
+
+
+
+
+
+
+ 安全防护措施
+
+
+
+
+
+ 主要安全措施
+
+ 操作
+
+
+
+
+
+
+ {{item.PROTECTIVE_MEASURES}}
+
+
+
+
+
+
+ {{!item.SIGN_PATH ? '签字' : '已签字'}}
+
+
+
+
+
+
+
+ 其他安全措施：
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/breakground/breakground-measures/breakground-measures-detail.vue b/pages/application/breakground/breakground-measures/breakground-measures-detail.vue
new file mode 100644
index 0000000..e466e51
--- /dev/null
+++ b/pages/application/breakground/breakground-measures/breakground-measures-detail.vue
@@ -0,0 +1,379 @@
+
+
+
+ 返回
+ 安全措施确认人意见
+
+
+
+
+
+
+
+ 安全防护措施
+
+
+
+
+
+ 主要安全措施
+
+
+
+
+
+ {{item.PROTECTIVE_MEASURES}}
+
+
+
+ 确认单位：
+
+ {{measuresList[index].DEPARTMENT_NAME?measuresList[index].DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+
+ 确认人
+
+
+ {{measuresList[index].USER_NAME?measuresList[index].USER_NAME:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue
new file mode 100644
index 0000000..b007efa
--- /dev/null
+++ b/pages/application/breakground/breakground-workuser/breakground-workuser-detail.vue
@@ -0,0 +1,473 @@
+
+
+
+ 返回
+ 作业人意见
+
+
+
+
+
+
+ 作业内容、范围、方式：
+
+
+
+
+ 作业内容、范围、方式简图：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 作业人
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/breakground/home.vue b/pages/application/breakground/home.vue
new file mode 100644
index 0000000..e02644f
--- /dev/null
+++ b/pages/application/breakground/home.vue
@@ -0,0 +1,314 @@
+
+
+
+ 返回
+ 动土作业
+
+
+
+
+
+
+ 动土作业审批管理
+
+
+
+
+
+ {{count.CREATE}}
+
+
+ 动土作业
+ 申请
+
+
+
+
+
+ {{count.WORK_USER}}
+
+
+ 作业人
+ 意见
+
+
+
+
+
+ {{count.MEASURES_SET}}
+
+
+ 设置安全
+ 措施确认人
+
+
+
+
+
+ {{count.MEASURES_CONFIRM}}
+
+
+ 安全措施确认
+
+
+
+
+
+ {{count.GUARDIAN}}
+
+
+ 监护人
+ 意见
+
+
+
+
+
+ {{count.CONFESS}}
+
+
+ 安全交底人
+ 意见
+
+
+
+
+
+ {{count.ACCEPT_CONFESS}}
+
+
+ 接受交底人
+ 意见
+
+
+
+
+
+
+ {{count.CONFIRM}}
+
+
+ 作业负责人
+ 意见
+
+
+
+
+
+
+ {{count.LEADER}}
+
+
+ 所在单位
+ 意见
+
+
+
+
+
+ {{count.SAFETY}}
+
+
+ 有关水、电、
+ 汽、工艺、设
+ 备、消防安全等部门意见
+
+
+
+
+
+ {{count.APPROVE}}
+
+
+ 审批部门
+ 意见
+
+
+
+
+
+
+ {{count.WORK_START}}
+
+
+ 开始作业时间
+
+
+
+
+
+ {{count.WORK_END}}
+
+
+ 结束作业时间
+
+
+
+
+
+ {{count.ACCEPT}}
+
+
+ 验收归档
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue
index 89e43fd..5dae0c6 100644
--- a/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue
+++ b/pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue
@@ -70,9 +70,12 @@
-
- 分析人：
- {{pd.ANALYZE_USER_NAME}}
+
+
+
+ 分析人：
+ {{pd.ANALYZE_USER_NAME}}
+
@@ -142,7 +145,7 @@
其他安全措施
签字
-
+
{{item.DESCR}}
@@ -558,8 +561,8 @@
-
-
+
+
diff --git a/pages/application/confinedspace/confinedspace-detail/index.vue b/pages/application/confinedspace/confinedspace-detail/index.vue
index 4e9a555..776d7c8 100644
--- a/pages/application/confinedspace/confinedspace-detail/index.vue
+++ b/pages/application/confinedspace/confinedspace-detail/index.vue
@@ -122,7 +122,7 @@
其他安全措施
签字
-
+
{{item.DESCR}}
diff --git a/pages/application/confinedspace/confinedspace-gas/gas-detail.vue b/pages/application/confinedspace/confinedspace-gas/gas-detail.vue
index d835327..9947c10 100644
--- a/pages/application/confinedspace/confinedspace-gas/gas-detail.vue
+++ b/pages/application/confinedspace/confinedspace-gas/gas-detail.vue
@@ -46,7 +46,7 @@
分析地点：
-
+
@@ -112,6 +112,7 @@
{name:'ANALYZE_TIME',message:'请输入取样分析时间'},
{name:'ANALYZE_PART',message:'请输入分析部位'},
{name:'OXYGEN_CONTENT',message:'请输入氧气含量'},
+ {name:'ANALYZE_PLACE',message:'请输入分析地点'},
],
GAS_NAME1:'',
GAS_NAME2:'',
diff --git a/pages/application/confinedspace/confinedspace-list/index.vue b/pages/application/confinedspace/confinedspace-list/index.vue
index 9fe6a7f..04e23f9 100644
--- a/pages/application/confinedspace/confinedspace-list/index.vue
+++ b/pages/application/confinedspace/confinedspace-list/index.vue
@@ -197,7 +197,7 @@
uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-confess/confinedspace-confess-detail?CONFINEDSPACE_ID='+e
});
- }else if(this.flow === '接受安全交底人签字'){
+ }else if(this.flow === '接受交底人签字'){
uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-detail?CONFINEDSPACE_ID='+e
});
@@ -213,7 +213,7 @@
uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail?CONFINEDSPACE_ID='+e
});
- }else if(this.flow === '开始进行作业'){
+ }else if(this.flow === '开始作业'){
uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-startwork/confinedspace-startwork-detail?CONFINEDSPACE_ID='+e
});
diff --git a/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue b/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue
index dced07f..205f415 100644
--- a/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue
+++ b/pages/application/confinedspace/confinedspace-measures-confirm/confinedspace-measures-confirm-detail.vue
@@ -18,7 +18,7 @@
主要安全措施
- 操作
+ 操作
@@ -43,7 +43,9 @@
- 签字
+
+ {{!item.SIGN_PATH ? '签字' : '已签字'}}
+
@@ -106,6 +108,7 @@
measuresList:[],
modalName:null,
imgList:[],
+
}
},
onLoad(event){
@@ -119,13 +122,12 @@
// 监听事件
mounted() {
uni.$on('dangerous_options_submit', (data) => {
- console.log(data)
- this.measuresList[data.index].SIGN_PATH = data.signImgList[0].filePath
- this.measuresList[data.index].SIGN_TIME = data.signImgList[0].SIGNER_TIME
- this.measuresList[data.index].IMG_PATH = data.imgList.map(item => {
- return item.filePath
- }).join(",")
- this.measuresList[data.index].STATUS = data.STATUS
+ this.$set(this.measuresList[data.index],'SIGN_PATH',data.signImgList[0].filePath)
+ this.$set(this.measuresList[data.index],'SIGN_TIME',data.signImgList[0].SIGNER_TIME)
+ this.$set(this.measuresList[data.index],'IMG_PATH',data.imgList.map(item => {
+ return item.filePath
+ }).join(","))
+ this.$set(this.measuresList[data.index],'STATUS',data.STATUS)
})
},
// 取消监听
@@ -201,6 +203,14 @@
return;
}
if (APPLY_STATUS == 1) {
+ if(!this.pd.DESCR){
+ uni.showToast({
+ icon: 'none',
+ title: '请输入其他安全措施,没有请填“无”',
+ duration: 1500
+ });
+ return;
+ }
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(!measures.SIGN_PATH){
diff --git a/pages/application/confinedspace/home.vue b/pages/application/confinedspace/home.vue
index fd066cb..a8a8137 100644
--- a/pages/application/confinedspace/home.vue
+++ b/pages/application/confinedspace/home.vue
@@ -87,13 +87,13 @@
意见
-
+
{{count.ACCEPT_CONFESS}}
- 接受安全交底人
+ 接受交底人
意见
@@ -128,13 +128,13 @@
意见
-
+
{{count.WORK_START}}
- 开始进行作业时间
+ 开始作业时间
diff --git a/pages/application/dangerous_options/index.vue b/pages/application/dangerous_options/index.vue
index 294d16c..60ccb32 100644
--- a/pages/application/dangerous_options/index.vue
+++ b/pages/application/dangerous_options/index.vue
@@ -112,8 +112,6 @@ export default {
onLoad(event) {
this.imgList = JSON.parse(event.imgList) || [];
this.signImgList = JSON.parse(event.signImgList) || [];
- console.log(this.signImgList)
- console.log(JSON.parse(event.signImgList) )
this.currentIndex = event.index || 0;
this.STATUS = event.STATUS || 1;
},
@@ -212,7 +210,6 @@ export default {
},
goSubmit() {
if(this.buttonloading) return;
- console.log(this.signImgList)
if(this.signImgList.length === 0) {
uni.showToast({
title: '请签字',
diff --git a/pages/application/electricity/electricity-accept/electricity-accept-detail.vue b/pages/application/electricity/electricity-accept/electricity-accept-detail.vue
new file mode 100644
index 0000000..720e910
--- /dev/null
+++ b/pages/application/electricity/electricity-accept/electricity-accept-detail.vue
@@ -0,0 +1,482 @@
+
+
+
+ 返回
+ 完工验收
+
+
+
+
+
+
+ 完工验收
+
+
+
+
+ 验收时间
+
+
+
+
+
+ 验收视频
+
+
+ {{videoList.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 验收部门负责人
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail.vue b/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail.vue
new file mode 100644
index 0000000..79940d6
--- /dev/null
+++ b/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail.vue
@@ -0,0 +1,327 @@
+
+
+
+ 返回
+ 接受交底人签字确认
+
+
+
+
+
+
+ 接受交底人
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-apply/electricity-apply-detail.vue b/pages/application/electricity/electricity-apply/electricity-apply-detail.vue
index d00723a..80c225c 100644
--- a/pages/application/electricity/electricity-apply/electricity-apply-detail.vue
+++ b/pages/application/electricity/electricity-apply/electricity-apply-detail.vue
@@ -76,10 +76,11 @@
-
-
- 分析人：
- {{pd.ANALYZE_USER_NAME}}
+
+
+ 分析人：
+ {{pd.ANALYZE_USER_NAME}}
+
@@ -138,7 +139,7 @@
其他安全措施
签字
-
+
{{item.DESCR}}
diff --git a/pages/application/electricity/electricity-approve/electricity-approve-detail.vue b/pages/application/electricity/electricity-approve/electricity-approve-detail.vue
new file mode 100644
index 0000000..37c8ec7
--- /dev/null
+++ b/pages/application/electricity/electricity-approve/electricity-approve-detail.vue
@@ -0,0 +1,320 @@
+
+
+
+ 返回
+ 配送电单位意见
+
+
+
+
+
+
+ 配送电单位意见
+
+
+
+
+ 配送电负责人
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue b/pages/application/electricity/electricity-audit/electricity-audit-detail.vue
similarity index 91%
rename from pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue
rename to pages/application/electricity/electricity-audit/electricity-audit-detail.vue
index 70cd4f5..8612c02 100644
--- a/pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue
+++ b/pages/application/electricity/electricity-audit/electricity-audit-detail.vue
@@ -2,22 +2,22 @@
返回
- 安全副总意见
+ 用电单位意见
-
+
- 安全副总意见
+ 用电单位意见
- 安全副总
+ 用电单位负责人
-
+
@@ -59,7 +59,7 @@
import writingBoard from "@/components/writing-board/writing-board.vue"
import gcoord from '@/common/gcoord.js'
import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
- import detail from '@/pages/application/hotwork/hotwork-detail/index'
+ import detail from '@/pages/application/electricity/electricity-detail/index'
export default {
components: {
tkiTree,ruiDatePicker,writingBoard,detail
@@ -82,8 +82,8 @@
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
- this.pd.HOTWORK_ID = event.HOTWORK_ID;
- if(this.pd.HOTWORK_ID){
+ this.pd.ELECTRICITY_ID = event.ELECTRICITY_ID;
+ if(this.pd.ELECTRICITY_ID){
this.msg="edit";
this.getData();
}else {
@@ -104,7 +104,7 @@
//跳转事件
goToDetail(e) {
uni.navigateTo({
- url: '/pages/application/hotwork/hotwork-gas/gas-list?HOTWORK_ID='+e
+ url: '/pages/application/electricity/electricity-gas/gas-list?ELECTRICITY_ID='+e
});
},
getData() {
@@ -113,13 +113,13 @@
title: '请稍候'
})
uni.request({
- url: basePath + '/app/hotwork/findById',
+ url: basePath + '/app/electricity/findById',
method: 'POST',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
- HOTWORK_ID: _this.pd.HOTWORK_ID,
+ ELECTRICITY_ID: _this.pd.ELECTRICITY_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
@@ -176,13 +176,13 @@
var signtime = [];
const formData={}
this.uploadImgFaults(files,signtime)
- formData.SIGNTIME = signtime
- formData.HOTWORK_ID = _this.pd.HOTWORK_ID
+ formData.SIGNTIME = signtime.join(",")
+ formData.ELECTRICITY_ID = _this.pd.ELECTRICITY_ID
formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
- url: basePath+'app/hotwork/nextStep',
+ url: basePath+'app/electricity/nextStep',
files: files,
formData:formData,
success: (res) => {
@@ -278,7 +278,6 @@
},
//完成
subCanvas(e) {
- this.imgList.splice(0,this.imgList.length);
this.imgList.push(e);
e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
this.hideModal()
diff --git a/pages/application/electricity/electricity-confess/electricity-confess-detail.vue b/pages/application/electricity/electricity-confess/electricity-confess-detail.vue
new file mode 100644
index 0000000..14a4171
--- /dev/null
+++ b/pages/application/electricity/electricity-confess/electricity-confess-detail.vue
@@ -0,0 +1,405 @@
+
+
+
+ 返回
+ 安全交底人签字确认
+
+
+
+
+
+
+
+ 上传图片
+
+
+ {{ aqimgList.length }}/2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 安全交底人
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-confirm/electricity-confirm-detail.vue b/pages/application/electricity/electricity-confirm/electricity-confirm-detail.vue
new file mode 100644
index 0000000..a696910
--- /dev/null
+++ b/pages/application/electricity/electricity-confirm/electricity-confirm-detail.vue
@@ -0,0 +1,332 @@
+
+
+
+ 返回
+ 作业负责人意见
+
+
+
+
+
+
+ 作业负责人意见
+
+
+
+ 作业负责人
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-detail/index.vue b/pages/application/electricity/electricity-detail/index.vue
new file mode 100644
index 0000000..d2933fc
--- /dev/null
+++ b/pages/application/electricity/electricity-detail/index.vue
@@ -0,0 +1,594 @@
+
+
+
+
+ 申请单位：
+ {{pd.APPLY_DEPARTMENT_NAME}}
+
+
+
+ 申请人：
+ {{pd.APPLY_USER_NAME}}
+
+
+
+ 编号：
+ {{pd.CHECK_NO}}
+
+
+
+ 作业内容：
+ {{pd.WORK_CONTENT}}
+
+
+
+ 作业地点：
+ {{pd.WORK_PLACE}}
+
+
+
+ 作业开始时间：
+ {{pd.WORK_START_DATE}}
+
+
+ 作业结束时间：
+ {{pd.WORK_END_DATE}}
+
+
+ 电源接入点及许可用电功率：
+ {{pd.ALLOW_POWER}}
+
+
+ 用电设备名称及额定功率：
+ {{pd.RATED_POWER}}
+
+
+ 工作电压：
+ {{pd.WORK_VOLTAGE}}
+
+
+ 电工证号：
+ {{pd.CARD_NO}}
+
+
+
+ 负责人电工号：
+ {{pd.LEADER_CARD_NO}}
+
+
+ 关联的其他特殊作业及安全作业票编号：
+ {{pd.SPECIAL_WORK}}
+
+
+
+ 风险辨识结果：
+ {{pd.RISK_IDENTIFICATION}}
+
+
+
+ 分析人：
+ {{pd.ANALYZE_USER_NAME}}
+
+
+
+
+
+
+ 安全防护措施
+
+
+
+
+
+ 主要安全措施
+ 操作
+
+
+
+
+ {{item.PROTECTIVE_MEASURES}}
+
+
+
+ {{item.SIGN_TIME}}
+
+
+
+
+
+
+ 不涉及
+
+
+ 涉 及
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 其他安全防护措施
+
+
+
+
+ 其他安全措施
+ 签字
+
+
+
+
+ {{item.DESCR}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 监护人
+ {{pd.GUARDIAN_USER_NAME}}
+
+
+
+
+ {{signs.GUARDIAN[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 安全交底人
+ {{pd.CONFESS_USER_NAME}}
+
+
+
+
+
+
+
+
+
+
+
+ {{signs.CONFESS[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 接受交底人
+ {{pd.ACCEPT_CONFESS_USER_NAME}}
+
+
+
+
+ {{signs.ACCEPT_CONFESS[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+
+ 作业负责人意见
+
+
+
+
+ 作业负责人
+ {{pd.CONFIRM_USER_NAME}}
+
+
+
+
+ {{signs.CONFIRM[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+ 所在单位意见
+
+
+
+
+ 所在单位负责人
+ {{pd.LEADER_USER_NAME}}
+
+
+
+
+ {{signs.LEADER[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+ 安全管理部门意见
+
+
+
+
+ 安全管理部门负责人
+ {{pd.AUDIT_USER_NAME}}
+
+
+
+
+ {{signs.AUDIT[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 动火审批人意见
+
+
+
+
+ 动火审批人
+ {{pd.APPROVE_USER_NAME}}
+
+
+
+
+ {{signs.APPROVE[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 动火前在岗班长意见
+
+
+
+
+ 动火前在岗班长
+ {{pd.MONITOR_USER_NAME}}
+
+
+
+
+ {{signs.MONITOR[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+ 作业开始负责人
+ {{pd.WORK_START_USER_NAME}}
+
+
+
+
+ {{signs.WORK_START[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+ 作业结束负责人
+ {{pd.WORK_END_USER_NAME}}
+
+
+
+
+ {{signs.WORK_END[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+ 完工验收
+
+
+
+
+ 验收部门负责人
+ {{pd.ACCEPT_USER_NAME}}
+
+
+
+
+ {{signs.ACCEPT[0].SIGN_TIME[index]}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-endwork/electricity-endwork-detail.vue b/pages/application/electricity/electricity-endwork/electricity-endwork-detail.vue
new file mode 100644
index 0000000..587d394
--- /dev/null
+++ b/pages/application/electricity/electricity-endwork/electricity-endwork-detail.vue
@@ -0,0 +1,358 @@
+
+
+
+ 返回
+ 作业结束时间选择
+
+
+
+
+
+
+
+ 作业结束时间
+
+
+
+
+ 填写作业结束时间负责人
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-guardian/electricity-guardian-detail.vue b/pages/application/electricity/electricity-guardian/electricity-guardian-detail.vue
new file mode 100644
index 0000000..f175556
--- /dev/null
+++ b/pages/application/electricity/electricity-guardian/electricity-guardian-detail.vue
@@ -0,0 +1,393 @@
+
+
+
+ 返回
+ 监护人签字确认
+
+
+
+
+
+
+
+
+ 监护人
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-list/index.vue b/pages/application/electricity/electricity-list/index.vue
index 247ba41..61513b2 100644
--- a/pages/application/electricity/electricity-list/index.vue
+++ b/pages/application/electricity/electricity-list/index.vue
@@ -35,7 +35,7 @@
申请人:{{item.APPLY_USER_NAME}}
- 分析人:{{item.ANALYZE_USER_NAME}}
+ 分析人:{{item.ANALYZE_USER_NAME}}
监护人：{{item.GUARDIAN_USER_NAME}}
@@ -203,7 +203,7 @@
uni.navigateTo({
url: '/pages/application/electricity/electricity-confess/electricity-confess-detail?ELECTRICITY_ID='+e
});
- }else if(this.flow === '接受安全交底人签字'){
+ }else if(this.flow === '接受交底人签字'){
uni.navigateTo({
url: '/pages/application/electricity/electricity-acceptconfess/electricity-acceptconfess-detail?ELECTRICITY_ID='+e
});
@@ -223,7 +223,7 @@
uni.navigateTo({
url: '/pages/application/electricity/electricity-approve/electricity-approve-detail?ELECTRICITY_ID='+e
});
- }else if(this.flow === '开始进行作业'){
+ }else if(this.flow === '开始作业'){
uni.navigateTo({
url: '/pages/application/electricity/electricity-startwork/electricity-startwork-detail?ELECTRICITY_ID='+e
});
diff --git a/pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail.vue b/pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail.vue
new file mode 100644
index 0000000..21140d0
--- /dev/null
+++ b/pages/application/electricity/electricity-measures-confirm/electricity-measures-confirm-detail.vue
@@ -0,0 +1,407 @@
+
+
+
+ 返回
+ 安全措施确认人意见
+
+
+
+
+
+
+
+ 安全防护措施
+
+
+
+
+
+ 主要安全措施
+
+ 操作
+
+
+
+
+
+
+ {{item.PROTECTIVE_MEASURES}}
+
+
+
+
+
+
+ {{!item.SIGN_PATH ? '签字' : '已签字'}}
+
+
+
+
+
+
+
+ 其他安全措施：
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-measures/electricity-measures-detail.vue b/pages/application/electricity/electricity-measures/electricity-measures-detail.vue
new file mode 100644
index 0000000..533fe8e
--- /dev/null
+++ b/pages/application/electricity/electricity-measures/electricity-measures-detail.vue
@@ -0,0 +1,379 @@
+
+
+
+ 返回
+ 安全措施确认人意见
+
+
+
+
+
+
+
+ 安全防护措施
+
+
+
+
+
+ 主要安全措施
+
+
+
+
+
+ {{item.PROTECTIVE_MEASURES}}
+
+
+
+ 确认单位：
+
+ {{measuresList[index].DEPARTMENT_NAME?measuresList[index].DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+
+ 确认人
+
+
+ {{measuresList[index].USER_NAME?measuresList[index].USER_NAME:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-startwork/electricity-startwork-detail.vue b/pages/application/electricity/electricity-startwork/electricity-startwork-detail.vue
new file mode 100644
index 0000000..2cff405
--- /dev/null
+++ b/pages/application/electricity/electricity-startwork/electricity-startwork-detail.vue
@@ -0,0 +1,337 @@
+
+
+
+ 返回
+ 作业开始时间选择
+
+
+
+
+
+
+
+ 作业开始时间
+
+
+
+
+ 填写作业开始时间负责人
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-user/electricity-user-detail.vue b/pages/application/electricity/electricity-user/electricity-user-detail.vue
new file mode 100644
index 0000000..91a1412
--- /dev/null
+++ b/pages/application/electricity/electricity-user/electricity-user-detail.vue
@@ -0,0 +1,388 @@
+
+
+
+ 返回
+ 用电人签字确认
+
+
+
+
+
+
+
+
+ 用电人
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/electricity-workuser/electricity-workuser-detail.vue b/pages/application/electricity/electricity-workuser/electricity-workuser-detail.vue
new file mode 100644
index 0000000..e9ebfea
--- /dev/null
+++ b/pages/application/electricity/electricity-workuser/electricity-workuser-detail.vue
@@ -0,0 +1,336 @@
+
+
+
+ 返回
+ 作业人意见
+
+
+
+
+
+
+ 作业人
+
+
+
+
+
+
+
+
+
+ 签字照片：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/electricity/home.vue b/pages/application/electricity/home.vue
index bd622e1..68b6c34 100644
--- a/pages/application/electricity/home.vue
+++ b/pages/application/electricity/home.vue
@@ -61,6 +61,15 @@
意见
+
+
+
+ {{count.ELECTRICITY}}
+
+
+ 用电人意见
+
+
@@ -71,13 +80,13 @@
意见
-
+
{{count.ACCEPT_CONFESS}}
- 接受安全交底人
+ 接受交底人
意见
@@ -102,23 +111,33 @@
-
+
- {{count.LEADER}}
+ {{count.AUDIT}}
- 所在单位
+ 用电单位
意见
-
+
+
+
+ {{count.APPROVE}}
+
+
+ 配送电单位
+ 意见
+
+
+
{{count.WORK_START}}
- 开始进行作业时间
+ 开始作业时间
diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
index b503475..69fdb0d 100644
--- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
+++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
@@ -327,7 +327,7 @@
计划图片
-
+
diff --git a/pages/application/highwork/highwork-apply/highwork-apply-detail.vue b/pages/application/highwork/highwork-apply/highwork-apply-detail.vue
index 2e6af20..dbf285d 100644
--- a/pages/application/highwork/highwork-apply/highwork-apply-detail.vue
+++ b/pages/application/highwork/highwork-apply/highwork-apply-detail.vue
@@ -120,7 +120,7 @@
其他安全措施
签字
-
+
{{item.DESCR}}
diff --git a/pages/application/highwork/highwork-detail/index.vue b/pages/application/highwork/highwork-detail/index.vue
index cfc449e..fe65f69 100644
--- a/pages/application/highwork/highwork-detail/index.vue
+++ b/pages/application/highwork/highwork-detail/index.vue
@@ -116,7 +116,7 @@
其他安全措施
签字
-
+
{{item.DESCR}}
diff --git a/pages/application/highwork/highwork-list/index.vue b/pages/application/highwork/highwork-list/index.vue
index dcb7172..9c9860c 100644
--- a/pages/application/highwork/highwork-list/index.vue
+++ b/pages/application/highwork/highwork-list/index.vue
@@ -200,7 +200,7 @@
uni.navigateTo({
url: '/pages/application/highwork/highwork-confess/highwork-confess-detail?HIGHWORK_ID='+e
});
- }else if(this.flow === '接受安全交底人签字'){
+ }else if(this.flow === '接受交底人签字'){
uni.navigateTo({
url: '/pages/application/highwork/highwork-acceptconfess/highwork-acceptconfess-detail?HIGHWORK_ID='+e
});
@@ -224,7 +224,7 @@
uni.navigateTo({
url: '/pages/application/highwork/highwork-approve/highwork-approve-detail?HIGHWORK_ID='+e
});
- }else if(this.flow === '开始进行作业'){
+ }else if(this.flow === '开始作业'){
uni.navigateTo({
url: '/pages/application/highwork/highwork-startwork/highwork-startwork-detail?HIGHWORK_ID='+e
});
diff --git a/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue b/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue
index a2a067c..d3d1024 100644
--- a/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue
+++ b/pages/application/highwork/highwork-measures-confirm/highwork-measures-confirm-detail.vue
@@ -18,7 +18,7 @@
主要安全措施
- 操作
+ 操作
@@ -47,7 +47,9 @@
- 签字
+
+ {{!item.SIGN_PATH ? '签字' : '已签字'}}
+
@@ -110,6 +112,7 @@
measuresList:[],
modalName:null,
imgList:[],
+
}
},
onLoad(event){
@@ -123,13 +126,12 @@
// 监听事件
mounted() {
uni.$on('dangerous_options_submit', (data) => {
- console.log(data)
- this.measuresList[data.index].SIGN_PATH = data.signImgList[0].filePath
- this.measuresList[data.index].SIGN_TIME = data.signImgList[0].SIGNER_TIME
- this.measuresList[data.index].IMG_PATH = data.imgList.map(item => {
- return item.filePath
- }).join(",")
- this.measuresList[data.index].STATUS = data.STATUS
+ this.$set(this.measuresList[data.index],'SIGN_PATH',data.signImgList[0].filePath)
+ this.$set(this.measuresList[data.index],'SIGN_TIME',data.signImgList[0].SIGNER_TIME)
+ this.$set(this.measuresList[data.index],'IMG_PATH',data.imgList.map(item => {
+ return item.filePath
+ }).join(","))
+ this.$set(this.measuresList[data.index],'STATUS',data.STATUS)
})
},
// 取消监听
@@ -205,6 +207,14 @@
return;
}
if (APPLY_STATUS == 1) {
+ if(!this.pd.DESCR){
+ uni.showToast({
+ icon: 'none',
+ title: '请输入其他安全措施,没有请填“无”',
+ duration: 1500
+ });
+ return;
+ }
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(!measures.SIGN_PATH){
diff --git a/pages/application/highwork/home.vue b/pages/application/highwork/home.vue
index fe25223..20b8cb6 100644
--- a/pages/application/highwork/home.vue
+++ b/pages/application/highwork/home.vue
@@ -62,13 +62,13 @@
意见
-
+
{{count.ACCEPT_CONFESS}}
- 接受安全交底人
+ 接受交底人
意见
@@ -124,13 +124,13 @@
-
+
{{count.WORK_START}}
- 开始进行作业时间
+ 开始作业时间
diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue
index 54762e7..512d4fb 100644
--- a/pages/application/hotwork/home.vue
+++ b/pages/application/hotwork/home.vue
@@ -70,13 +70,13 @@
意见
-
+
{{count.ACCEPT_CONFESS}}
- 接受安全交底人
+ 接受交底人
意见
@@ -110,16 +110,7 @@
意见
-
-
-
- {{count.SAFETY}}
-
-
- 安全副总
- 意见
-
-
+
@@ -140,13 +131,13 @@
当班班长验票
-
+
{{count.WORK_START}}
- 开始进行作业时间
+ 开始作业时间
diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
index 9739585..d6fec0b 100644
--- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
+++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
@@ -166,7 +166,7 @@
其他安全措施
签字
-
+
{{item.DESCR}}
@@ -340,34 +340,13 @@
+
-
- 安全副总部门
-
+
+ 动火审批单位
+
清除
-
- {{pd.SAFETY_DEPARTMENT_NAME?pd.SAFETY_DEPARTMENT_NAME:'请选择'}}
-
-
-
-
- 安全副总
-
-
- {{pd.SAFETY_USER_NAME?pd.SAFETY_USER_NAME:'请选择'}}
-
-
-
-
-
-
- 动火审批单位
{{pd.APPROVE_DEPARTMENT_NAME?pd.APPROVE_DEPARTMENT_NAME:'请选择'}}
@@ -378,7 +357,7 @@
@confirm="approvetreeConfirm"
@cancel="approvetreeCancel">
-
+
动火审批负责人
@@ -605,25 +584,6 @@
-
-
- 安全副总意见
-
-
-
-
- 安全副总
- {{pd.SAFETY_USER_NAME}}
-
-
-
-
- {{signs.SAFETY[0].SIGN_TIME[index]}}
-
-
-
-
@@ -1357,15 +1317,15 @@
this.$refs.tkiTree_audit._reTreeList()
this.$refs.tkiTree_audit._initTree(this.treeNode)
}
- if(dept == 'safety'){
- this.pd.SAFETY_DEPARTMENT_ID = ''
- this.pd.SAFETY_DEPARTMENT_NAME = ''
- this.pd.SAFETY_USER_ID = ''
- this.pd.SAFETY_USER_NAME = ''
- this.safetyUserList = []
- this.safetyindex = -1
- this.$refs.tkiTree_safety._reTreeList()
- this.$refs.tkiTree_safety._initTree(this.treeNode)
+ if(dept == 'approve'){
+ this.pd.APPROVE_DEPARTMENT_ID = ''
+ this.pd.APPROVE_DEPARTMENT_NAME = ''
+ this.pd.APPROVE_USER_ID = ''
+ this.pd.APPROVE_USER_NAME = ''
+ this.approveUserList = []
+ this.approveindex = -1
+ this.$refs.tkiTree_approve._reTreeList()
+ this.$refs.tkiTree_approve._initTree(this.treeNode)
}
},
@@ -1641,35 +1601,6 @@
},
- /*
- *安全副总
- */
- // 确定回调事件
- safetytreeConfirm(e) {
- this.isUps=false;
- this.pd.SAFETY_DEPARTMENT_ID=e[0].id;
- this.pd.SAFETY_DEPARTMENT_NAME=e[0].name;
- this.pd.SAFETY_USER_ID = ''
- this.pd.SAFETY_USER_NAME = ''
- this.$forceUpdate();//强制刷新
- this.getUserList(e[0].id,'safetyUserList');
- },
- // 取消回调事件
- safetytreeCancel(e) {
- this.isUps=false;
- },
- // 显示树形选择器
- showSafetyTree() {
- this.isUps=true
- this.$refs.tkiTree_safety._show();
- },
- PickerSafety(e) {
- this.safetyindex = e.detail.value;
- this.pd.SAFETY_USER_ID=this.safetyUserList[this.safetyindex].USER_ID;
- this.pd.SAFETY_USER_NAME=this.safetyUserList[this.safetyindex].NAME;
- this.$forceUpdate();//强制刷新
- },
-
/*
*审批人
*/
diff --git a/pages/application/hotwork/hotwork-gas/gas-detail.vue b/pages/application/hotwork/hotwork-gas/gas-detail.vue
index c18b05a..08ee94f 100644
--- a/pages/application/hotwork/hotwork-gas/gas-detail.vue
+++ b/pages/application/hotwork/hotwork-gas/gas-detail.vue
@@ -89,6 +89,7 @@
{name:'ANALYZE_TIME',message:'请输入分析时间'},
{name:'ANALYZE_GAS',message:'请输入代表性气体'},
{name:'ANALYZE_RESULT',message:'请输入分析结果'},
+ {name:'ANALYZE_PLACE',message:'请输入分析地点'},
],
currentTime:formatDate(new Date(),'yyyy-MM-dd hh:mm')
}
diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue
index b497624..dba290d 100644
--- a/pages/application/hotwork/hotwork-list/index.vue
+++ b/pages/application/hotwork/hotwork-list/index.vue
@@ -54,7 +54,6 @@
- 安全副总：{{item.SAFETY_USER_NAME}}
审批部门负责人：{{item.APPROVE_USER_NAME}}
@@ -208,7 +207,7 @@
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-confess/hotwork-confess-detail?HOTWORK_ID='+e
});
- }else if(this.flow === '接受安全交底人签字'){
+ }else if(this.flow === '接受交底人签字'){
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail?HOTWORK_ID='+e
});
@@ -224,10 +223,6 @@
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-audit/hotwork-audit-detail?HOTWORK_ID='+e
});
- }else if(this.flow === '安全副总签字'){
- uni.navigateTo({
- url: '/pages/application/hotwork/hotwork-safety/hotwork-safety-detail?HOTWORK_ID='+e
- });
}else if(this.flow === '审批人签字'){
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-approve/hotwork-approve-detail?HOTWORK_ID='+e
@@ -236,7 +231,7 @@
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail?HOTWORK_ID='+e
});
- }else if(this.flow === '开始进行作业'){
+ }else if(this.flow === '开始作业'){
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail?HOTWORK_ID='+e
});
diff --git a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
index 6efa99c..2d8c586 100644
--- a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
+++ b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
@@ -18,7 +18,7 @@
主要安全措施
- 操作
+ 操作
@@ -47,7 +47,9 @@
- 签字
+
+ {{!item.SIGN_PATH ? '签字' : '已签字'}}
+
@@ -110,6 +112,7 @@
measuresList:[],
modalName:null,
imgList:[],
+
}
},
onLoad(event){
@@ -123,13 +126,12 @@
// 监听事件
mounted() {
uni.$on('dangerous_options_submit', (data) => {
- console.log(data)
- this.measuresList[data.index].SIGN_PATH = data.signImgList[0].filePath
- this.measuresList[data.index].SIGN_TIME = data.signImgList[0].SIGNER_TIME
- this.measuresList[data.index].IMG_PATH = data.imgList.map(item => {
- return item.filePath
- }).join(",")
- this.measuresList[data.index].STATUS = data.STATUS
+ this.$set(this.measuresList[data.index],'SIGN_PATH',data.signImgList[0].filePath)
+ this.$set(this.measuresList[data.index],'SIGN_TIME',data.signImgList[0].SIGNER_TIME)
+ this.$set(this.measuresList[data.index],'IMG_PATH',data.imgList.map(item => {
+ return item.filePath
+ }).join(","))
+ this.$set(this.measuresList[data.index],'STATUS',data.STATUS)
})
},
// 取消监听
@@ -205,6 +207,15 @@
return;
}
if (APPLY_STATUS == 1) {
+
+ if(!this.pd.DESCR){
+ uni.showToast({
+ icon: 'none',
+ title: '请输入其他安全措施,没有请填“无”',
+ duration: 1500
+ });
+ return;
+ }
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(!measures.SIGN_PATH){
diff --git a/pages/application/key-project-management/hidden-management/detail-list.vue b/pages/application/key-project-management/hidden-management/detail-list.vue
index 9c0568a..fdda509 100644
--- a/pages/application/key-project-management/hidden-management/detail-list.vue
+++ b/pages/application/key-project-management/hidden-management/detail-list.vue
@@ -55,19 +55,23 @@
-
+
@@ -98,7 +102,7 @@
-
+
@@ -242,6 +246,12 @@
'&OUTSOURCED_ID=' + this.OUTSOURCED_ID + '&TabCur=' + (this.TabCur + 1)
});
},
+ goToDetailView(e) {
+ uni.navigateTo({
+ url: '/pages/application/key-project-management/hidden-management/detail?HIDDEN_ID=' + e +
+ '&OUTSOURCED_ID=' + this.OUTSOURCED_ID + '&TabCur=2'
+ });
+ },
getQuery() { //搜索按钮事件
var _this = this;
_this.showCount = 10;
@@ -338,8 +348,17 @@
OPERATOR: loginUserId,
},
success: (res) => {
-
+
if ("success" == res.data.result) {
+ _this.punishForm= {
+ HIDDEN_ID: '',
+ ISPUNISH: '',
+ RECTIFICATIONDEPT_NAME: '',
+ RECTIFICATIONOR_NAME: '',
+ REASON: '',
+ AMOUT: '',
+ DATE: formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
+ },
_this.editHiddenIspunish(1)
} else {
uni.showToast({
@@ -352,7 +371,7 @@
}else {
_this.editHiddenIspunish(2)
}
-
+
},
editHiddenIspunish(Ispunish){
// 如果不处罚 修改隐患
diff --git a/pages/application/key-project-management/hidden-management/detail.vue b/pages/application/key-project-management/hidden-management/detail.vue
index dd0987c..36704fb 100644
--- a/pages/application/key-project-management/hidden-management/detail.vue
+++ b/pages/application/key-project-management/hidden-management/detail.vue
@@ -7,128 +7,176 @@
-
-
- 隐患照片
-
-
-
-
-
-
-
-
-
-
-
- 隐患视频
-
-
-
-
-
-
-
-
-
-
- 隐患描述
-
-
-
- 隐患部位
-
- {{ hiddenForm.HIDDENPART }}
-
-
-
- 隐患级别
-
- {{ hiddenForm.HIDDENLEVEL_NAME }}
-
-
-
- 隐患类型
-
- {{ hiddenForm.HIDDENTYPE_NAME }}
-
-
-
- 隐患处置：
- 限期整改
-
-
- 整改期限：
- {{ hiddenForm.RECTIFICATIONDEADLINE }}
-
-
-
- 整改部门：
-
-
- {{ hiddenForm.RECTIFICATIONDEPT_NAME }}
-
-
-
- 整改人：
- {{ hiddenForm.RECTIFICATIONOR_NAME }}
-
-
- 整改时间：
- {{ hiddenForm.RECTIFICATIONTIME }}
-
-
-
- 整改照片
-
-
-
-
-
-
-
-
-
-
- 验收时间：
-
- {{hiddenForm.CHECKTIME}}
-
-
-
- 验收照片
-
-
- {{hiddenForm.ysImgs.length}}/4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 隐患照片
+
+
+
+
+
+
+
+
+
+
+
+ 隐患视频
+
+
+
+
+
+
+
+
+
+
+ 隐患描述
+
+
+
+ 隐患部位
+
+ {{ hiddenForm.HIDDENPART }}
+
+
+
+ 隐患级别
+
+ {{ hiddenForm.HIDDENLEVEL_NAME }}
+
+
+
+ 隐患类型
+
+ {{ hiddenForm.HIDDENTYPE_NAME }}
+
+
+
+ 隐患处置：
+ 限期整改
+
+
+ 整改期限：
+ {{ hiddenForm.RECTIFICATIONDEADLINE }}
+
+
+
+ 整改部门：
+
+
+ {{ hiddenForm.RECTIFICATIONDEPT_NAME }}
+
+
+
+ 整改人：
+ {{ hiddenForm.RECTIFICATIONOR_NAME }}
+
+
+ 整改时间：
+ {{ hiddenForm.RECTIFICATIONTIME }}
+
+
+
+ 整改照片
+
+
+
+
+
+
+
+
+
+
+ 验收时间：
+
+ {{hiddenForm.CHECKTIME}}
+
+
+
+ 验收照片
+
+
+ {{hiddenForm.ysImgs.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 处罚信息
+
+
+
+ 处罚原因：
+ {{ punishForm.REASON }}
+
+
+ 处罚金额：
+ {{ punishForm.AMOUT }}元
+
+
+ 被处罚单位：
+ {{ punishForm.UNITS_NAME }}
+
+
+ 被处罚人：
+ {{ punishForm.PERSON_NAME }}
+
+
+ 下发人：
+ {{ punishForm.CREATOR_NAME }}
+
+
+ 下发处罚时间：
+ {{ punishForm.DATE }}
+
+
+
+ 罚款缴纳单
+
+
+
+
+
+
+
+
+
+
+ 是否缴纳罚款：
+ {{punishForm.HANDLED === '1' ? '已缴' : '未缴' }}
+
+
+ 处罚处理人：
+ {{punishForm.PERSON_NAME}}
+
+
+ 处罚处理时间：
+ {{punishForm.HANLDE_TIME}}
+
+
@@ -175,6 +223,7 @@ export default {
ysImgs:[],
CHECKTIME :formatDate(new Date(), 'yyyy-MM-dd hh:mm')
},
+ punishForm:{},
videoSrc:'',
modalShow:false,
todayDate:formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
@@ -207,10 +256,22 @@ export default {
uni.hideLoading();//结束加载中动画
if (res.data != null) {
this.hiddenForm = res.data.pd
+ if(res.data.pd.punishForm){
+ this.punishForm = res.data.pd.punishForm
+ }else{
+ this.punishForm = null;
+ }
}
}
})
},
+ viewImagePunish(e) {
+ let files = [];
+ files.push(this.baseImgPath + this.punishForm.HANDLE_IMG)
+ uni.previewImage({
+ urls: files
+ });
+ },
ViewImage(e) {
let files = [];
for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) {
@@ -293,6 +354,17 @@ export default {
}
});
},
+ fnImagePreview(list, index) {
+ const urls = [];
+ for (let i = 0; i < list.length; i++) {
+ urls.push(list[i].url);
+ }
+ const current = urls[index];
+ uni.previewImage({
+ urls,
+ current
+ })
+ },
changeRadioGroup(e){
if(this.TabCur == 2) return
this.hiddenForm.ISPUNISH = e.detail.value
@@ -306,13 +378,13 @@ export default {
})
return
}
- if(this.hiddenForm.ysImgs.length === 0){
- uni.showToast({
- title: `请上传验收图片`,
- icon: 'none'
- })
- return
- }
+ //if(this.hiddenForm.ysImgs.length === 0){
+ // uni.showToast({
+ // title: `请上传验收图片`,
+ // icon: 'none'
+ // })
+ // return
+ //}
// if(!this.hiddenForm.ISPUNISH){
// uni.showToast({
// title: `请选择是否进行罚款`,
@@ -384,5 +456,8 @@ export default {
diff --git a/pages/application/key-project-management/hidden-management/list.vue b/pages/application/key-project-management/hidden-management/list.vue
index 298bd63..e1003c5 100644
--- a/pages/application/key-project-management/hidden-management/list.vue
+++ b/pages/application/key-project-management/hidden-management/list.vue
@@ -20,10 +20,20 @@
-
{{item.OUTSOURCED_NAME}}
+
+
+ {{item.co}}
+
+
@@ -32,7 +42,7 @@
- 监督部门：{{ item.Q_DEPARTMENT_NAME }}
+ 监督部门：{{ item.DEPARTMENT_NAME }}
@@ -52,7 +62,7 @@
-
diff --git a/pages/application/key-project-management/index/index.vue b/pages/application/key-project-management/index/index.vue
index 0477f37..aaf330e 100644
--- a/pages/application/key-project-management/index/index.vue
+++ b/pages/application/key-project-management/index/index.vue
@@ -11,15 +11,15 @@
重点工程管理
-
-
-
- {{count.GC_COUNT}}
-
-
- 重点工程管理
-
-
+
+
+
+ {{count.GC_COUNT}}
+
+
+ 重点工程管理
+
+
@@ -41,7 +41,7 @@
-
+ {{count.HIDDEN_COUNT}}
处罚管理
diff --git a/pages/application/key-project-management/penalty-management/detail-list.vue b/pages/application/key-project-management/penalty-management/detail-list.vue
index 3b10b40..f0fe7e6 100644
--- a/pages/application/key-project-management/penalty-management/detail-list.vue
+++ b/pages/application/key-project-management/penalty-management/detail-list.vue
@@ -19,24 +19,31 @@
- {{item.OUTSOURCED_NAME}}
+ {{item.HIDDENDESCR}}
被处罚单位：{{ item.UNITS_NAME }}
- 被处罚人：{{ item.PERSON_NAME }}
+ 被处罚人：{{ item.PERSON_NAME }}
-
+
处罚原因：{{ item.REASON }}
-
+
下发人：{{ item.CREATOR_NAME }}
+ 是否处罚：{{ item.ISPUNISH == "2" ? "否":"是" }}
- 处罚处理状态：{{ (TabCur + 1) == "1" ? "待处理" : "已处理" }}
+ 处罚处理状态：{{ item.ISPUNISH == "2" ? "不处罚":item.HANDLED == "1" ?"已完成":item.ISPUNISH == "1" ? "待反馈" : "待处罚" }}
-
+
+
@@ -52,6 +59,57 @@
+
+
+
+ 处罚
+
+
+
+
+
+
+ 是否进行罚款：
+
+
+
+
+
+
+
+ 处罚原因
+
+
+
+ 处罚金额(元)
+
+
+
+ 被处罚单位
+
+
+
+ 被处罚人
+
+
+
+ 下发处罚时间
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -84,6 +142,16 @@ export default {
TabCur: 0,
scrollLeft: 0,
tabNav: ['待反馈处罚', '已完成处罚'],
+ modalShow: false,
+ punishForm: {
+ HIDDEN_ID: '',
+ ISPUNISH: '',
+ RECTIFICATIONDEPT_NAME: '',
+ RECTIFICATIONOR_NAME: '',
+ REASON: '',
+ AMOUT: '',
+ DATE: formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
+ },
}
},
onReady() {
@@ -119,12 +187,24 @@ export default {
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
this.getQuery();
},
- //跳转事件
- goToDetail(e) {
- uni.navigateTo({
- url: '/pages/application/key-project-management/penalty-management/detail?KEYPROJECTPUNISH_ID='+e + '&OUTSOURCED_ID=' + this.OUTSOURCED_ID + '&TabCur=' + (this.TabCur+1)
- });
- },
+ //跳转事件
+ goToDetail(e) {
+ uni.navigateTo({
+ url: '/pages/application/key-project-management/hidden-management/detail?HIDDEN_ID=' + e +
+ '&OUTSOURCED_ID=' + this.OUTSOURCED_ID + '&TabCur=2'
+ });
+ },
+ fnModalShow(item) {
+ this.punishForm.HIDDEN_ID = item.HIDDEN_ID
+ this.punishForm.RECTIFICATIONDEPT_NAME = item.UNITS_NAME
+ this.punishForm.RECTIFICATIONOR_NAME = item.RECTIFICATIONOR_NAME
+ this.punishForm.ISPUNISH = '2'
+ this.modalShow = true
+ },
+ changeStartDate(e) {
+ this.punishForm.DATE = e
+ this.$forceUpdate(); //强制刷新
+ },
getQuery(){ //搜索按钮事件
var _this = this;
_this.showCount = 10;
@@ -154,7 +234,7 @@ export default {
title:"加载中..."
});//加载中动画
uni.request({
- url: basePath +'/app/keyprojectpunish/list?showCount='+_this.showCount+'¤tPage='+_this.currentPage,
+ url: basePath +'/app/keyprojectcheck/punishlist?showCount='+_this.showCount+'¤tPage='+_this.currentPage,
method: 'POST',
dataType: 'json',
header: {
@@ -183,6 +263,91 @@ export default {
}
})
},
+ fnSubmit() {
+ var _this = this
+ console.log(this.punishForm)
+ //如果处罚，添加罚单
+ if (this.punishForm.ISPUNISH === "1") {
+ for (const key in this.punishRules) {
+ if (!this.punishForm[key]) {
+ uni.showToast({
+ title: this.punishRules[key],
+ icon: 'none'
+ })
+ return
+ }
+ }
+ uni.request({
+ url: basePath + '/app/keyprojectpunish/add',
+ method: 'POST',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ ...this.punishForm,
+ CORPINFO_ID: corpinfoId,
+ CREATOR: loginUserId,
+ OPERATOR: loginUserId,
+ },
+ success: (res) => {
+
+ if ("success" == res.data.result) {
+ _this.editHiddenIspunish(1);
+ _this.punishForm= {
+ HIDDEN_ID: '',
+ ISPUNISH: '',
+ RECTIFICATIONDEPT_NAME: '',
+ RECTIFICATIONOR_NAME: '',
+ REASON: '',
+ AMOUT: '',
+ DATE: formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
+ }
+ } else {
+ uni.showToast({
+ title: res.data.msaesge,
+ duration: 2000
+ });
+ }
+ }
+ });
+ }else {
+ _this.editHiddenIspunish(2)
+ }
+
+ },
+ editHiddenIspunish(Ispunish){
+ // 如果不处罚 修改隐患
+ uni.request({
+ url: basePath + '/app/keyprojectcheck/editHiddenIspunish',
+ method: 'POST',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: {
+ ...this.punishForm,
+ ISPUNISH:Ispunish,
+ PUNISH_PERSON:loginUserId
+ },
+ success: (res) => {
+ this.modalShow = false
+ this.getQuery()
+ }
+ });
+ },
+ changeRadioGroup(e){
+ if(this.TabCur == 2) return
+ this.punishForm.ISPUNISH = e.detail.value
+ },
+ checkNumber(e){
+ var reg = /^[0-9]+(\.[0-9]{1,2})?$/;
+ if(!(reg.test(e.detail.value))){
+ uni.showToast({
+ title: "处罚金额只能输入整数或两位小数",
+ icon: 'none'
+ })
+ this.punishForm.AMOUT = 0;
+ }
+ }
}
}
diff --git a/pages/application/key-project-management/penalty-management/list.vue b/pages/application/key-project-management/penalty-management/list.vue
index 67addf4..f88a91e 100644
--- a/pages/application/key-project-management/penalty-management/list.vue
+++ b/pages/application/key-project-management/penalty-management/list.vue
@@ -23,6 +23,16 @@
{{item.OUTSOURCED_NAME}}
+
+
+ {{item.cfcount}}
+
+
@@ -31,7 +41,7 @@
- 监督部门：{{ item.Q_DEPARTMENT_NAME }}
+ 监督部门：{{ item.DEPARTMENT_NAME }}
@@ -161,7 +171,7 @@ export default {
title:"加载中..."
});//加载中动画
uni.request({
- url: basePath +'/app/keyProjects/listOutsourced?showCount='+_this.showCount+'¤tPage='+_this.currentPage ,
+ url: basePath +'/app/keyProjects/getPUNISHlist?showCount='+_this.showCount+'¤tPage='+_this.currentPage ,
method: 'POST',
dataType: 'json',
header: {
@@ -170,7 +180,7 @@ export default {
data: {
KEYWORDS : _this.NameLikes, //关键字模糊查询
CORPINFO_ID:corpinfoId,
- UserId:loginUserId
+ PUNISHUser:loginUserId
},
success: (res) => {
uni.hideLoading();//结束加载中动画
diff --git a/pages/application/key-project-management/positioning_management/index.vue b/pages/application/key-project-management/positioning_management/index.vue
index 5e9c8fc..f65c287 100644
--- a/pages/application/key-project-management/positioning_management/index.vue
+++ b/pages/application/key-project-management/positioning_management/index.vue
@@ -67,7 +67,7 @@
-
+
diff --git a/pages/application/key-project-management/safety-environmental-inspection/detail.vue b/pages/application/key-project-management/safety-environmental-inspection/detail.vue
index 574dc5f..abb45b4 100644
--- a/pages/application/key-project-management/safety-environmental-inspection/detail.vue
+++ b/pages/application/key-project-management/safety-environmental-inspection/detail.vue
@@ -25,19 +25,10 @@
{{form.INSPECTION_CATEGORY}}现场检查记录
-
+
被检查单位：
-
-
-
- {{ form.UNITS_NAME || '请选择' }}
-
-
-
-
- {{ form.UNITS_NAME }}
+ {{ form.UNITS_NAME }}
被检查单位现场负责人：
@@ -244,7 +235,7 @@
-
+
+
+ 隐患类型
+
+ {{hiddenForm.HIDDENTYPE_NAME?hiddenForm.HIDDENTYPE_NAME:'请选择'}}
+
+
+
隐患处置：
@@ -403,6 +407,7 @@
},
data() {
return {
+ hiddenTypeList: [],
// 罚单开关
punishFormType: false,
baseImgPath: baseImgPath,
@@ -600,10 +605,30 @@
// 初始化现场作业负责人
this.getDept()
this.getDict()
+ this.getHiddenType();
loginSession();
},
methods: {
+ showZgTree2(){
+ this.isUps=true
+ this.$refs.tkiTree2._show();
+ },
+ zgtreeConfirm2(e){
+ this.isUps=false;
+ if(e[0]?.parents.length === 1){
+ this.hiddenForm.HIDDENTYPE = [e[0]?.parents[0]?.id || '', e[0]?.id || ''];
+ this.hiddenForm.HIDDENTYPE_NAME = [e[0]?.parents[0]?.name || '', e[0]?.name || ''].join('/')
+ }else if(e[0]?.parents.length === 2) {
+ this.hiddenForm.HIDDENTYPE = [e[0]?.parents[0]?.id || '', e[0]?.parents[1]?.id || '', e[0]?.id || ''];
+ this.hiddenForm.HIDDENTYPE_NAME = [e[0]?.parents[0]?.name || '', e[0]?.parents[1]?.name || '', e[0]?.name || ''].join('/')
+ }else{
+ this.hiddenForm.HIDDENTYPE = [e[0]?.id || ''];
+ this.hiddenForm.HIDDENTYPE_NAME = [e[0]?.name || ''].join('/');
+ }
+ this.$forceUpdate();//强制刷新
+ },
+
getData() {
var _this = this;
uni.showLoading({
@@ -1074,7 +1099,7 @@
return;
}
if (this.hiddenForm.RECTIFICATIONTYPE === '2') {
- if (!this.hiddenForm.RECTIFICATIONDEADLINE) {
+ if (!this.hiddenForm.RECTIFICATIONDEADLINE || this.hiddenForm.RECTIFICATIONDEADLINE === '请选择') {
uni.showToast({
title: '请选择整改期限',
icon: "none"
@@ -1390,6 +1415,51 @@
}
});
},
+ getHiddenType: function () {
+ var _this = this;
+ uni.request({
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ url: basePath + '/dictionaries/getLevels',
+ data: {
+ DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff8',
+ CORPINFO_ID:loginUser.CORPINFO_ID,
+ USER_ID:loginUser.USER_ID,
+ },
+ success: function ({data}) {
+ for (let i = 0; i < data.list.length; i++) {
+ if (data.list[i].BIANMA.indexOf(loginUser.PROVINCE) > -1) {
+ _this.getTrainDicList(data.list[i].DICTIONARIES_ID)
+ break
+ }
+ }
+ }
+ });
+ },
+ getTrainDicList(parentId) { // trainDicList
+ var _this = this;
+ uni.request({
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ url: basePath + '/dictionaries/listAllDictToParId',
+ data: {
+ parentId,
+ CORPINFO_ID:loginUser.CORPINFO_ID,
+ USER_ID:loginUser.USER_ID,
+ },
+ success: function ({data}) {
+ let zTreeNodes = data.zTreeNodes
+ zTreeNodes = zTreeNodes.replace(/"nodes":\[/g, '"children":[')
+ _this.hiddenTypeList = JSON.parse(zTreeNodes)
+ }
+ });
+ },
playVideo(e) {
if (e.currentTarget.dataset.src) {
this.videoSrc = e.currentTarget.dataset.src
@@ -1440,9 +1510,13 @@
success: (res) => {
if ("success" == res.data.result) {
_this.treeNode = res.data.varList;
- _this.form.UNITS_NAME = _this.treeNode[0].UNITS_NAME
- _this.form.UNITS_ID = _this.treeNode[0].UNITS_ID
- _this.getUserList('inspectedSiteuserList', _this.treeNode[0].UNITS_ID)
+ if(!_this.form.UNITS_NAME) {
+ _this.form.UNITS_NAME = _this.treeNode[0].UNITS_NAME
+ }
+ if(!_this.form.UNITS_ID) {
+ _this.form.UNITS_ID = _this.treeNode[0].UNITS_ID
+ }
+ _this.getUserList('inspectedSiteuserList', _this.form.UNITS_ID)
} else {
uni.showToast({
title: res.data.message,
@@ -1452,7 +1526,7 @@
}
});
},
-
+
//获取人员列表
getUserList(list, dept, i) {
//发送 post 请求
@@ -1498,7 +1572,8 @@
},
success: function(res) {
if ("success" == res.data.result) {
- console.log(res.data.pd);
+ _this.form.UNITS_NAME = res.data.pd.UNITS_NAME
+ _this.form.UNITS_ID = res.data.pd.UNITS_ID
_this.form.PERSONNELMANAGEMENT_ID = res.data.pd.PERSONNELMANAGEMENT_ID;
_this.form.PERSON_NAME = res.data.pd.NAME;
} else {
diff --git a/pages/application/safety-environmental-inspection/archive/detail-check.vue b/pages/application/safety-environmental-inspection/archive/detail-check.vue
index 47baff6..b2636b4 100644
--- a/pages/application/safety-environmental-inspection/archive/detail-check.vue
+++ b/pages/application/safety-environmental-inspection/archive/detail-check.vue
@@ -344,7 +344,7 @@
-
+
计划图片
diff --git a/pages/application/safety-environmental-inspection/archive/detail-hidden.vue b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue
index f37f015..f514a07 100644
--- a/pages/application/safety-environmental-inspection/archive/detail-hidden.vue
+++ b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue
@@ -2,7 +2,7 @@
返回
- 安全环保检查指派确认人
+ 安全环保检查指派
@@ -332,7 +332,7 @@
整改期限
-
+
{{ form.RECTIFICATIONDEADLINE ? form.RECTIFICATIONDEADLINE : '请选择' }}
@@ -398,6 +398,7 @@
HIDDEN_STATUS: '', // 检查ID
principalList: [],
form: {
+ RECTIFICATIONORNAME:'',
HIDDENDESCR: '', // 隐患描述
CREATORNAME: '', // 隐患责任人
HIDDENLEVELNAME: '', // 隐患级别
diff --git a/pages/application/safety-environmental-inspection/inspector/detail.vue b/pages/application/safety-environmental-inspection/inspector/detail.vue
index df8d3ab..1168752 100644
--- a/pages/application/safety-environmental-inspection/inspector/detail.vue
+++ b/pages/application/safety-environmental-inspection/inspector/detail.vue
@@ -464,7 +464,7 @@
if ("success" == res.data.result) {
uni.hideLoading();
_this.form = res.data.pd; //参数map
- _this.form.hiddenForm = res.data.hiddenList[0];
+ _this.form.hiddenForm = res.data.pd.hiddenList[0];
for (let i = 0; i < _this.form.inspectorList.length; i++) {
_this.inspectorList.push([])
_this.getUserList('inspectorList', _this.form.inspectorList[i].INSPECTION_DEPARTMENT_ID, i)
diff --git a/pages/application/safetymeeting/info.vue b/pages/application/safetymeeting/info.vue
index 62a5175..8db9a6b 100644
--- a/pages/application/safetymeeting/info.vue
+++ b/pages/application/safetymeeting/info.vue
@@ -38,7 +38,7 @@
- 核实意见
+ 反馈意见