diff --git a/pages/eight_assignments/completed_list.vue b/pages/eight_assignments/completed_list.vue
index bbc141b..78c1f45 100644
--- a/pages/eight_assignments/completed_list.vue
+++ b/pages/eight_assignments/completed_list.vue
@@ -20,11 +20,20 @@
-
+
+
+
+
+
diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue
index 47b6927..21ea258 100644
--- a/pages/eight_assignments/confined_space/apply.vue
+++ b/pages/eight_assignments/confined_space/apply.vue
@@ -119,8 +119,8 @@ export default {
WORK_CONTENT: '',
WORK_START_DATE: '',
WORK_END_DATE: '',
- WORK_LONGITUDE: '',
- WORK_LATITUDE: '',
+ WORK_LONGITUDE: '1',
+ WORK_LATITUDE: '2',
WORK_USER: '',
SPECIAL_WORK: '',
RISK_IDENTIFICATION: '',
diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index d984d13..d7612bd 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -61,7 +61,7 @@
-
+
@@ -141,6 +141,7 @@ export default {
HOT_WORK_POSITION: '',
// 动火方法
HOT_WORK_METHOD_ID: '',
+ HOT_WORK_METHOD_NAME: '',
// 动火等级
HOT_WORK_LEVEL_ID: '',
HOT_WORK_LEVEL_INDEX: '',
@@ -258,6 +259,7 @@ export default {
*/
async fnSubmit() {
await this.$refs.formRef.validate()
+ this.form.HOT_WORK_METHOD_NAME = this.form.HOT_WORK_METHOD_ID
uni.navigateTo({
url: "/pages/eight_assignments/hot_work/select_operator",
success: ({ eventChannel }) => {
diff --git a/pages/eight_assignments/hot_work/select_position.vue b/pages/eight_assignments/hot_work/select_position.vue
new file mode 100644
index 0000000..5a39e9c
--- /dev/null
+++ b/pages/eight_assignments/hot_work/select_position.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/eight_assignments/select_review_personnel.vue b/pages/eight_assignments/select_review_personnel.vue
index a01b4fe..9f68113 100644
--- a/pages/eight_assignments/select_review_personnel.vue
+++ b/pages/eight_assignments/select_review_personnel.vue
@@ -220,6 +220,7 @@ export default {
form: this.form,
list: this.list,
taskId: this.taskId,
+ EW_RU_JOB_ID: this.EW_RU_JOB_ID,
CORP_ID: this.CORP_ID,
TYPE: this.TYPE,
vernier: this.vernier
diff --git a/pages/eight_assignments/view_info.vue b/pages/eight_assignments/view_info.vue
index 56e562c..6f54f0d 100644
--- a/pages/eight_assignments/view_info.vue
+++ b/pages/eight_assignments/view_info.vue
@@ -81,7 +81,8 @@
-
+
+
@@ -100,12 +101,16 @@ export default {
form: [],
jobs: [],
questionnaires: [],
+ isView: ''
}
},
onLoad(query) {
this.taskId = query.taskId
this.type = query.type
this.jobId = query.jobId
+ if ('1' === query.isView){
+ this.isView = '1'
+ }
this.fnGetData(query.taskId)
uni.setNavigationBarTitle({
title: query.title + '查看'
@@ -133,6 +138,9 @@ export default {
EW_RU_JOB_ID: this.jobId,
})
},
+ goBack(){
+ uni.navigateBack()
+ }
},
}
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index 5b512dd..619538b 100644
--- a/utils/submitHomeworkProcess.js
+++ b/utils/submitHomeworkProcess.js
@@ -97,7 +97,7 @@ const processSelectedPersonnelData = (formData, list) => {
return form
}
// 提交人员信息
-export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE,vernier}) => {
+export const setPersonnelForm = async ({form, list, taskId, EW_RU_JOB_ID, CORP_ID, TYPE,vernier}) => {
await addFormInfo({
job: processSelectedPersonnelData(form,list),
EW_RU_TASK_ID: taskId,
@@ -109,6 +109,7 @@ export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE,vernie
EW_RU_TASK_ID: taskId,
CORP_ID,
TYPE,
+ EW_RU_JOB_ID,
vernier
})
}
@@ -154,7 +155,7 @@ const endCurrentPersonnelTechnologicalProcess = async ({EW_RU_TASK_ID}) => {
})
}
// 在审批过程中指定下一节点人
-export const addFlowInfo = async ({form,list, taskId,EW_RU_JOB_ID, TYPE,CORP_ID, vernier}) => {
+export const addFlowInfo = async ({form, list, taskId, EW_RU_JOB_ID, TYPE,CORP_ID, vernier}) => {
// 在审批过程中添加节点信息
await addFormInfo({
job: processSelectedPersonnelData(form,list),
@@ -181,7 +182,7 @@ export const addFlowInfo = async ({form,list, taskId,EW_RU_JOB_ID, TYPE,CORP_ID,
export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TYPE = '', EW_RU_JOB_ID = '',vernier = ''}, isLastStep = true) => {
let stepNum = 0
if (isLastStep) {
- const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID, VERNIER: vernier})
+ const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID, VERNIER: vernier, REQUEST_SOURCE: '2'})
// 选人
if (info.chooseNextFlag === '1') {
uni.navigateTo({
@@ -193,7 +194,7 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
taskId: EW_RU_TASK_ID,
EW_RU_JOB_ID: EW_RU_JOB_ID,
CORP_ID,
- TYPE
+ TYPE,
})
}
})
@@ -233,6 +234,7 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
return
}
// 流程特殊权限校验
+ console.log('info', info)
if (info.otherFlag !== null && info.otherFlag.redirectFlag === '1') {
uni.$u.route({
url: info.otherFlag.url,
@@ -285,3 +287,23 @@ export const getData = async (taskId) => {
return form;
}
};
+// 针对在某些节点要新增报表信息
+export const addReport = async ({form, formItems, TYPE, CORP_ID, EW_RU_TASK_ID, EW_RU_JOB_ID, vernier}) => {
+ // 在审批过程中添加节点信息
+ await addFormInfo({
+ reports: await processFormData(form,formItems),
+ EW_RU_TASK_ID: EW_RU_TASK_ID,
+ EW_RU_JOB_ID: EW_RU_JOB_ID,
+ TYPE,
+ postMethod: 'application/json'
+ }
+ )
+ // 结束后续流程
+ await resolveNextOperation({
+ EW_RU_TASK_ID: EW_RU_TASK_ID,
+ CORP_ID,
+ TYPE,
+ EW_RU_JOB_ID,
+ vernier
+ })
+}