From 69fc1d651639333600cf9f10abce46b64754a33e Mon Sep 17 00:00:00 2001
From: mengfanliang <mengfanliang@zcloudchina.com>
Date: Fri, 30 Aug 2024 14:13:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=97=E9=99=90=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BD=9C=E4=B8=9A=E5=BE=85=E5=8A=9E=E7=9A=84?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BF=AE=E8=A1=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/confined_space/apply.vue | 12 +++++++++---
 pages/eight_assignments/to_do_list.vue           |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

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 }
       })
     }
   },