From 6825ca94fffcf2da4659f0cfe40166c69849be1b Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 5 Sep 2024 18:07:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=BA=94=E6=80=A5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97app=E7=AB=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../other_security_measures.vue               |  5 ++-
 .../select_review_personnel.vue               |  4 +--
 utils/submitHomeworkProcess.js                | 32 +++++++++++--------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/pages/eight_assignments/other_security_measures.vue b/pages/eight_assignments/other_security_measures.vue
index cfd6567..1bb658b 100644
--- a/pages/eight_assignments/other_security_measures.vue
+++ b/pages/eight_assignments/other_security_measures.vue
@@ -29,6 +29,7 @@ export default {
       taskId: '',
       TYPE: '',
       CORP_ID: '',
+      vernier: '',
       form: {
         value: []
       },
@@ -40,6 +41,7 @@ export default {
     this.taskId = query.taskId
     this.TYPE = query.TYPE
     this.CORP_ID = query.CORP_ID
+    this.vernier = query.vernier
     this.fnAddValue()
   },
   methods: {
@@ -61,7 +63,8 @@ export default {
         taskId: this.taskId,
         EW_RU_JOB_ID: this.EW_RU_JOB_ID,
         CORP_ID: this.CORP_ID,
-        TYPE: this.TYPE
+        TYPE: this.TYPE,
+        vernier: this.vernier
       })
     }
   },
diff --git a/pages/eight_assignments/select_review_personnel.vue b/pages/eight_assignments/select_review_personnel.vue
index 555fcdc..86b5971 100644
--- a/pages/eight_assignments/select_review_personnel.vue
+++ b/pages/eight_assignments/select_review_personnel.vue
@@ -83,7 +83,6 @@ export default {
       this.CORP_ID = data.CORP_ID
       this.TYPE = data.TYPE
       this.initFlag = data.initFlag
-      console.log(data.initFlag)
       this.fnInitFormAndRules()
     })
   },
@@ -223,7 +222,8 @@ export default {
               list: this.list,
               taskId: this.taskId,
               CORP_ID: this.CORP_ID,
-              TYPE: this.TYPE
+              TYPE: this.TYPE,
+              vernier:this.vernier
             })
           } else {
             await addFlowInfo({
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index 19296d0..bc4a470 100644
--- a/utils/submitHomeworkProcess.js
+++ b/utils/submitHomeworkProcess.js
@@ -97,15 +97,19 @@ const processSelectedPersonnelData = (formData, list) => {
   return form
 }
 // 提交人员信息
-export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE}) => {
-  await setTaskSave({
-    data: [{jobs: processSelectedPersonnelData(form, list), task: {EW_RU_TASK_ID: taskId}}],
-    postMethod: 'application/json',
-  })
+export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE,vernier}) => {
+  await addFormInfo({
+        job:  processSelectedPersonnelData(form,list),
+        EW_RU_TASK_ID: taskId,
+        TYPE,
+        postMethod: 'application/json'
+      }
+  )
   await resolveNextOperation({
     EW_RU_TASK_ID: taskId,
     CORP_ID,
-    TYPE
+    TYPE,
+    vernier
   })
 }
 // 提交安全措施
@@ -124,7 +128,7 @@ export const setSecurityMeasures = async ({questionnaires, questionnaireInfo, ta
   })
 }
 // 提交其它安全措施
-export const setOtherSecurityMeasures = async ({value, taskId, EW_RU_JOB_ID, CORP_ID, TYPE}) => {
+export const setOtherSecurityMeasures = async ({value, taskId, EW_RU_JOB_ID, CORP_ID, TYPE, vernier}) => {
   const ADDITIONAL_COMMENT = value.map(item => item.value)
   await setOtherSecurityMeasuresSave({
     ADDITIONAL_COMMENT,
@@ -136,7 +140,8 @@ export const setOtherSecurityMeasures = async ({value, taskId, EW_RU_JOB_ID, COR
     EW_RU_TASK_ID: taskId,
     CORP_ID,
     TYPE,
-    EW_RU_JOB_ID
+    EW_RU_JOB_ID,
+    vernier
   })
 }
 // 结束当前操作人流程提交
@@ -202,7 +207,8 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
             taskId: EW_RU_TASK_ID,
             EW_RU_JOB_ID,
             TYPE,
-            CORP_ID
+            CORP_ID,
+            vernier: info.vernier
           })
         }
       })
@@ -212,7 +218,7 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
     if (info.canAddFlag === '1') {
       uni.$u.route({
         url: '/pages/eight_assignments/other_security_measures',
-        params: {taskId: EW_RU_TASK_ID, EW_RU_JOB_ID, TYPE, CORP_ID}
+        params: {taskId: EW_RU_TASK_ID, EW_RU_JOB_ID, TYPE, CORP_ID,vernier: info.vernier}
       })
       return
     }
@@ -220,7 +226,7 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
     if (info.submitFlag === '1') {
       uni.$u.route({
         url: '/pages/eight_assignments/sign',
-        params: {taskId: EW_RU_TASK_ID, EW_RU_JOB_ID, TYPE}
+        params: {taskId: EW_RU_TASK_ID, EW_RU_JOB_ID, TYPE,vernier: info.vernier}
       })
       return
     }
@@ -228,12 +234,12 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
     if (info.otherFlag !== null && info.otherFlag.redirectFlag === '1') {
       uni.$u.route({
         url: info.otherFlag.url,
-        params: {taskId: EW_RU_TASK_ID, EW_RU_JOB_ID, TYPE}
+        params: {taskId: EW_RU_TASK_ID, EW_RU_JOB_ID, TYPE,vernier: info.vernier}
       })
       return
     }
     // 没有下一步，结束流程，因为无法确定之前有多少步骤，跳转了多少页面，所以直接跳转到首页
-    await endCurrentPersonnelTechnologicalProcess({EW_RU_TASK_ID})
+    // await endCurrentPersonnelTechnologicalProcess({EW_RU_TASK_ID})
   }
   uni.$u.toast('提交成功')
   setTimeout(() => {