diff --git a/pages/eight_assignments/confined_space/apply.vue b/pages/eight_assignments/confined_space/apply.vue index d458ad8..8a1f909 100644 --- a/pages/eight_assignments/confined_space/apply.vue +++ b/pages/eight_assignments/confined_space/apply.vue @@ -184,11 +184,17 @@ export default { }, methods: { async fnGetData(taskId) { - let resData = await getTaskInfo({EW_RU_TASK_ID: taskId}); + let resData = await getTaskInfo({ EW_RU_TASK_ID: taskId }) if (resData.list.form && resData.list.form.length > 0) { + let newFormData = { ...this.form }; + resData.list.form.forEach((sos, index) => { - this.form[sos.ITEM_NAME] = sos.ITEM_VALUE; - }) + newFormData[sos.ITEM_NAME] = sos.ITEM_VALUE; + if (sos.FK_NAME) { + newFormData[sos.FK_NAME] = sos.FK_VALUE; + } + }); + this.form = newFormData; } }, async fnGetConfinedSpaceSelectList() { diff --git a/pages/eight_assignments/to_do_list.vue b/pages/eight_assignments/to_do_list.vue index d29452a..c8b2c41 100644 --- a/pages/eight_assignments/to_do_list.vue +++ b/pages/eight_assignments/to_do_list.vue @@ -88,7 +88,7 @@ export default { let tempUrlStr = this.type.replace(/([a-z])([A-Z])/g, '\$1_\$2').toLowerCase() uni.$u.route({ url: `/pages/eight_assignments/${tempUrlStr}/apply`, - params: { taskId: value.taskId } + params: { taskId: value.taskId, CORPINFO_ID: value.corpId } }) } },