diff --git a/api/index.js b/api/index.js
index 5e74a26..955acee 100644
--- a/api/index.js
+++ b/api/index.js
@@ -64,4 +64,5 @@ export const setTaskFile = (params) => upload("/app/util/uploadFile", params) //
export const setTaskSign = (params) => post("/app/Task/sign", params) //审批意见签字提交
export const setSecurityMeasuresSave = (params) => post("/app/Task/setQues", params) //安全措施提交
export const setOtherSecurityMeasuresSave = (params) => post("/app/Task/setOtherQues", params) //其它安全措施提交
+export const getHistoricalApprovalRecords = (params) => post("/app/Task/getHis", params); // 历史审批记录
// 结束
diff --git a/pages.json b/pages.json
index 2eb6810..1d47c17 100644
--- a/pages.json
+++ b/pages.json
@@ -241,17 +241,7 @@
{
"path": "pages/eight_assignments/hot_work/gas/list",
"style": {
- "navigationBarTitleText": "动火作业气体分析",
- "app-plus": {
- "titleNView": {
- "buttons": [{
- "text": "新建",
- "fontSize": "15",
- "float": "right",
- "width": "40px"
- }]
- }
- }
+ "navigationBarTitleText": "动火作业气体分析"
}
},
{
@@ -308,6 +298,12 @@
"navigationBarTitleText": "待办"
}
},
+ {
+ "path": "pages/eight_assignments/historical_approval_records",
+ "style": {
+ "navigationBarTitleText": "待办"
+ }
+ },
{
"path": "pages/eight_assignments/completed_list",
"style": {
diff --git a/pages/eight_assignments/historical_approval_records.vue b/pages/eight_assignments/historical_approval_records.vue
new file mode 100644
index 0000000..1ce49f1
--- /dev/null
+++ b/pages/eight_assignments/historical_approval_records.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+ 部门:{{ item.JOB_DEPARTMENT_NAME }}
+ 人员:{{ item.JOB_NAME }}
+
+ 审批结果:{{ item.PASS_FLAG === 0 ? "不通过" : "通过" }}
+
+
+
+ 审批意见:{{ item.APPROVAL_OPINIONS }}
+ 时间:{{ item.CREATE_TIME }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
index 6564063..95f6351 100644
--- a/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
+++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
@@ -1,8 +1,8 @@
-
-
-
+
+
+
@@ -20,9 +20,8 @@
-
- 完成延时监火
+
+ 完成延时监火
@@ -40,7 +39,8 @@ export default {
STATE: '',
EW_RU_TASK_ID: '',
EW_RU_JOB_ID: '',
- TYPE: ''
+ TYPE: '',
+ isView: '1'
}
},
onLoad(event) {
diff --git a/pages/eight_assignments/hot_work/gas/add.vue b/pages/eight_assignments/hot_work/gas/add.vue
index 50dc21d..97a2d8e 100644
--- a/pages/eight_assignments/hot_work/gas/add.vue
+++ b/pages/eight_assignments/hot_work/gas/add.vue
@@ -67,7 +67,6 @@ export default {
this.form.EW_RU_TASK_ID = query.EW_RU_TASK_ID
this.TYPE = query.TYPE
this.form.EW_RU_JOB_ID = query.EW_RU_JOB_ID
- this.getData()
},
methods: {
fnDateTimePickerClick(event) {
diff --git a/pages/eight_assignments/hot_work/gas/list.vue b/pages/eight_assignments/hot_work/gas/list.vue
index 423b85b..c197ea8 100644
--- a/pages/eight_assignments/hot_work/gas/list.vue
+++ b/pages/eight_assignments/hot_work/gas/list.vue
@@ -1,5 +1,8 @@
+
+
+
@@ -14,10 +17,10 @@
分析人:{{ item.ANALYZE_USER_NAME }}
-
+
-
+
@@ -27,7 +30,7 @@