From 4654caed27ce88a546cfe3ce206026e723ac307d 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           | 9 +++------
 pages/eight_assignments/hot_work/select_operator.vue | 9 +++++----
 utils/submitHomeworkProcess.js                       | 5 +++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index 89ff5a0..56f976e 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="content">
+  <view class="content" style="margin-left: 10px">
     <view class="card">
       <u-form labelPosition="left" :model="form" :rules="rules" ref="formRef" labelWidth="140px">
         <u-form-item label="申请单位" prop="APPLY_DEPARTMENT_NAME" borderBottom required>
@@ -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" />
@@ -258,9 +258,6 @@ export default {
      * 下一步所触发的按钮事件
     */
     async fnSubmit() {
-      console.log('===============================')
-      console.log(this.form.IS_GAS_TESTING)
-      console.log('===============================')
       await this.$refs.formRef.validate()
       this.form.HOT_WORK_METHOD_NAME = this.form.HOT_WORK_METHOD_ID
       uni.navigateTo({
@@ -269,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 af0f092..c1a8677 100644
--- a/pages/eight_assignments/hot_work/select_operator.vue
+++ b/pages/eight_assignments/hot_work/select_operator.vue
@@ -67,12 +67,13 @@ export default {
       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);
           }
         }
       }
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index 2410d1c..c0e0cee 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;
           }
         }
       }