From cbe2ac7d3abbfbb8b92bd4bf878596ff210d3181 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 28 Nov 2024 17:37:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81app=E7=AB=AF=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B0=94=E4=BD=93=E5=88=86=E6=9E=90=202?=
 =?UTF-8?q?=E3=80=81app=E6=89=93=E5=9B=9E=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/hot_work/apply.vue           |  4 ++--
 pages/eight_assignments/hot_work/select_operator.vue | 12 +++++-------
 utils/submitHomeworkProcess.js                       |  5 +++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index 93595dd..56f976e 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -51,7 +51,7 @@
         <u-form-item label="作业内容" prop="JOB_CONTENT" borderBottom required>
           <u-input v-model="form.JOB_CONTENT" border="none" placeholder="请输入作业内容" />
         </u-form-item>
-        <u-form-item label="动火操作人" prop="USER_NAME" borderBottom required labelPosition="top" labelWidth="auto">
+        <u-form-item v-if="false" label="动火操作人" prop="USER_NAME" borderBottom required labelPosition="top" labelWidth="auto">
           <u-button type="primary" size="mini" text="添加"
             :customStyle="{ position: 'absolute', top: '-46upx', right: '20upx', width: '90upx' }"
             @click="otherUserNameSelectShow = true" />
@@ -266,7 +266,7 @@ export default {
           eventChannel.emit("data", {
             form: this.form,
             formItems: this.formItems,
-            EW_RU_TASK_ID: this.taskId
+            taskId: this.taskId
           });
         },
       });
diff --git a/pages/eight_assignments/hot_work/select_operator.vue b/pages/eight_assignments/hot_work/select_operator.vue
index 15332ff..c1a8677 100644
--- a/pages/eight_assignments/hot_work/select_operator.vue
+++ b/pages/eight_assignments/hot_work/select_operator.vue
@@ -64,21 +64,20 @@ export default {
   mounted() {
     const eventChannel = this.getOpenerEventChannel();
     eventChannel.on('data', (data) => {
-      console.log(data)
       this.form = data.form;
       this.formItems = data.formItems;
       this.taskId = data.taskId;
-      this.hotWorkOperatorList = uni.$u.deepClone(data.form.hotWorkOperatorList);
-      if (this.hotWorkOperatorList.length === 0) this.fnAddHotWorkOperatorList();
-      else {
+      this.hotWorkOperatorList = JSON.parse(JSON.stringify(data.form.hotWorkOperatorList));
+      if (this.hotWorkOperatorList.length === 0) {
+        this.fnAddHotWorkOperatorList();
+      } else {
         for (let i = 0; i < this.hotWorkOperatorList.length; i++) {
           for (let i = 0; i < this.hotWorkOperatorList.length; i++) {
-            fnGetUserList(this.hotWorkOperatorList.value[i], i);
+            this.fnGetUserList(this.hotWorkOperatorList[i], i);
           }
         }
       }
     })
-
   },
   methods: {
     fnAddHotWorkOperatorList() {
@@ -161,7 +160,6 @@ export default {
       this.picker.show = false;
     }
   },
-
 }
 
 
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index ee5d4b6..6481662 100644
--- a/utils/submitHomeworkProcess.js
+++ b/utils/submitHomeworkProcess.js
@@ -277,8 +277,9 @@ export const getData = async (taskId) => {
         for (let i = 0; i < item.list.length; i++) {
           form[item.ITEM_NAME].push({});
           for (let j = 0; j < item.list[i].list.length; j++) {
-            form[item.ITEM_NAME][i][item.list[i].list[j].ITEM_NAME] =
-                item.list[i].list[j].ITEM_VALUE;
+            form[item.ITEM_NAME][i][item.list[i].list[j].ITEM_NAME] = item.list[i].list[j].ITEM_VALUE;
+            form[item.ITEM_NAME][i][item.list[i].list[j].FK_NAME] = item.list[i].list[j].FK_VALUE;
+            form[item.ITEM_NAME][i]['TYPE'] = item.list[i].list[j].TYPE;
           }
         }
       }