diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue index 824b747..40bcf5e 100644 --- a/pages/eight_assignments/hot_work/apply.vue +++ b/pages/eight_assignments/hot_work/apply.vue @@ -172,7 +172,11 @@ export default { methods: { async fnGetData(taskId) { let resData = await getTaskInfo({EW_RU_TASK_ID: taskId}) - console.log('resData :>> ', resData); + if (resData.list.form && resData.list.form.length > 0) { + resData.list.form.forEach((sos, index) => { + this.form[sos.ITEM_NAME] = sos.ITEM_VALUE; + }) + } }, fnDateTimePickerClick(event) { this.dateTimePicker.type = event diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js index fa0fe94..5773fb3 100644 --- a/utils/submitHomeworkProcess.js +++ b/utils/submitHomeworkProcess.js @@ -211,7 +211,7 @@ export const resolveNextOperation = async ( return } // 有限空间作业气体分析 - if (info.otherFlag.redirectFlag === '1') { + if (info.otherFlag !== null && info.otherFlag.redirectFlag === '1') { uni.$u.route({ url: info.otherFlag.url, params: {taskId: EW_RU_TASK_ID, EW_RU_JOB_ID, TYPE}