From 3afca1fdf17c91cec282b0d5a3581fdfa643804d Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 11 Sep 2024 13:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9Abu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/hot_work/apply.vue    |  7 +++--
 .../hot_work/delay_fire_monitoring/delay.vue  | 27 ++-----------------
 .../select_review_personnel.vue               | 15 +++++------
 pages/eight_assignments/sign.vue              |  2 +-
 utils/submitHomeworkProcess.js                |  4 +--
 5 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/pages/eight_assignments/hot_work/apply.vue b/pages/eight_assignments/hot_work/apply.vue
index 703aea9..6ad093c 100644
--- a/pages/eight_assignments/hot_work/apply.vue
+++ b/pages/eight_assignments/hot_work/apply.vue
@@ -184,7 +184,8 @@ export default {
       /** 存储作业类型选中态 */
       jobTypeNameArr: [],
       /** 存储动火等级选中态 */
-      hotWorkLevelNameArr: []
+      hotWorkLevelNameArr: [],
+      taskId: null
     }
   },
   onLoad(options) {
@@ -192,6 +193,7 @@ export default {
     this.form.CORP_NAME = options.CORP_NAME
     this.type = options.type
     if (options.taskId) {
+      this.taskId = options.taskId
       this.fnGetData(options.taskId)
     }
   },
@@ -264,7 +266,8 @@ export default {
             form: this.form,
             formItems: this.formItems,
             TYPE: this.type,
-            CORP_ID: this.form.CORP_ID
+            CORP_ID: this.form.CORP_ID,
+            EW_RU_TASK_ID: this.taskId
           })
         } catch { }
       } catch (err) {
diff --git a/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue b/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
index 6863ebc..6564063 100644
--- a/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
+++ b/pages/eight_assignments/hot_work/delay_fire_monitoring/delay.vue
@@ -31,35 +31,12 @@
 </template>
 
 <script>
-import {getHotWorkGasAll, getHotWorkRecord, setTaskSign} from "../../../../api";
+import { getHotWorkRecord, setTaskSign} from "../../../../api";
 
 export default {
   data() {
     return {
-      list: [
-        {
-          ISDELETE: 0,
-          HOTWORKAPPLICATION_ID: "f71420d5f2d74b60aabebe8429d5bf34",
-          HOTWORKAPPLICATIONDELAYED_ID: "50d8f530ee544aaa833b48471702ed0e",
-          CREATOR: "2c797704caaf48efa62ea1c6d2c967e1",
-          USER_ID: "2c797704caaf48efa62ea1c6d2c967e1",
-          FILEPATH: "/uploadFiles/yhtp/13cf0f4ec77e4d98ae8cdd9c3386ae0c/20240830/bb9685a4099c46c99c795ea7417f8f71.png",
-          TIME: "2024-08-30 18:14",
-          userName: "孙海官",
-          CREATTIME: "2024-08-30 18:14:13"
-        },
-        {
-          ISDELETE: 0,
-          HOTWORKAPPLICATION_ID: "f71420d512d74b60aabebe8429d5bf34",
-          HOTWORKAPPLICATIONDELAYED_ID: "50d8f530ee544aaa233b48471702ed0e",
-          CREATOR: "2c797704caaf48efa62ea1c6d2c96751",
-          USER_ID: "2c797704caaf48efa62ea1c6d2c967e1",
-          FILEPATH: "/uploadFiles/yhtp/13cf0f4ec77e4d98ae8cdd9c3386ae0c/20240830/bb9685a4099c46c99c795ea7417f8f71.png",
-          TIME: "2024-09-03 18:11",
-          userName: "孙去来",
-          CREATTIME: "2024-08-30 18:14:13"
-        }
-      ],
+      list: [],
       STATE: '',
       EW_RU_TASK_ID: '',
       EW_RU_JOB_ID: '',
diff --git a/pages/eight_assignments/select_review_personnel.vue b/pages/eight_assignments/select_review_personnel.vue
index 86b5971..a01b4fe 100644
--- a/pages/eight_assignments/select_review_personnel.vue
+++ b/pages/eight_assignments/select_review_personnel.vue
@@ -170,15 +170,14 @@ export default {
       }
     },
     fnSelectDepartment(key_name, key_id, value) {
-      const guid = key_name.substring(key_name.indexOf('&&'))
       uni.navigateTo({
         url: `/pages/eight_assignments/select_department?CORP_ID=${this.CORP_ID}`,
         events: {
           confirm: (event) => {
             this.form[key_name] = event.DEPARTMENT_NAME
             this.form[key_id] = event.DEPARTMENT_ID
-            this.form[value + '_USER_ID' + guid] = ''
-            this.form[value + '_USER_NAME' + guid] = ''
+            this.form[value + '_USER_ID'] = ''
+            this.form[value + '_USER_NAME'] = ''
             this.picker.columnsAll[value] = []
             this.fnGetUserList(event, value)
           }
@@ -216,27 +215,27 @@ export default {
       try {
         await this.$refs.formRef.validate()
         try {
-          if (!this.initFlag || this.initFlag === '1'){
+          if (!this.initFlag || this.initFlag === '1') {
             await setPersonnelForm({
               form: this.form,
               list: this.list,
               taskId: this.taskId,
               CORP_ID: this.CORP_ID,
               TYPE: this.TYPE,
-              vernier:this.vernier
+              vernier: this.vernier
             })
           } else {
             await addFlowInfo({
-              form:this.form,
+              form: this.form,
               list: this.list,
               taskId: this.taskId,
               EW_RU_JOB_ID: this.EW_RU_JOB_ID,
               TYPE: this.TYPE,
               CORP_ID: this.CORP_ID,
-              vernier:this.vernier
+              vernier: this.vernier
             })
           }
-        } catch(e) {
+        } catch (e) {
           console.log(e)
         }
       } catch {
diff --git a/pages/eight_assignments/sign.vue b/pages/eight_assignments/sign.vue
index 8a18905..ddc8d3d 100644
--- a/pages/eight_assignments/sign.vue
+++ b/pages/eight_assignments/sign.vue
@@ -89,7 +89,7 @@ export default {
             TYPE: this.TYPE,
             EW_RU_JOB_ID:this.EW_RU_JOB_ID,
             vernier: this.vernier
-          }, false)
+          })
         } catch(e) {
           console.log(e)
         }
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index 66b860c..9c914c8 100644
--- a/utils/submitHomeworkProcess.js
+++ b/utils/submitHomeworkProcess.js
@@ -62,9 +62,9 @@ const processFormData = async (formData, formItems) => {
   return form
 }
 // 提交表单基础信息
-export const setSubmitForm = async ({form, formItems, TYPE, CORP_ID}) => {
+export const setSubmitForm = async ({form, formItems, TYPE, CORP_ID, EW_RU_TASK_ID}) => {
   const {taskIds} = await setTaskSave({
-    data: [{form: await processFormData(form, formItems)}],
+    data: [{form: await processFormData(form, formItems),task:{EW_RU_TASK_ID:EW_RU_TASK_ID}}],
     TYPE,
     postMethod: 'application/json',
   })