From 9600c64f3f21d38daaec8f03d2153a058d2ddb4e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 6 Sep 2024 10:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=90=E4=BA=A4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=9A=E5=8A=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/security_measures.vue |  9 +++++---
 pages/eight_assignments/sign.vue              | 19 ++++++++++++++++-
 utils/submitHomeworkProcess.js                | 21 ++++++++++++-------
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/pages/eight_assignments/security_measures.vue b/pages/eight_assignments/security_measures.vue
index f6dfbb0..ce33c72 100644
--- a/pages/eight_assignments/security_measures.vue
+++ b/pages/eight_assignments/security_measures.vue
@@ -44,10 +44,12 @@ export default {
       TYPE: '',
       CORP_ID: '',
       questionnaireInfo: {},
-      items: []
+      items: [],
+      vernier: ''
     }
   },
-  onLoad() {
+  onLoad(event) {
+    this.vernier  = event.vernier
     const eventChannel = this.getOpenerEventChannel();
     eventChannel.on('questionnaire', (data) => {
       this.EW_RU_JOB_ID = data.EW_RU_JOB_ID
@@ -88,7 +90,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/sign.vue b/pages/eight_assignments/sign.vue
index 52e73b9..aaf1f0f 100644
--- a/pages/eight_assignments/sign.vue
+++ b/pages/eight_assignments/sign.vue
@@ -46,6 +46,7 @@ export default {
       EW_RU_JOB_ID: '',
       TYPE: '',
       taskId: '',
+      CORP_ID: '',
       signVisible: false,
       form: {
         APPROVAL_RESULTS: '',
@@ -63,6 +64,16 @@ export default {
     this.EW_RU_JOB_ID = query.EW_RU_JOB_ID
     this.TYPE = query.TYPE
     this.taskId = query.taskId
+    this.vernier = query.vernier
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.on('nextNodes', (data) => {
+      this.taskId = data.taskId
+      this.EW_RU_JOB_ID = data.EW_RU_JOB_ID
+      this.CORP_ID = data.CORP_ID
+      this.TYPE = data.TYPE
+    })
+    console.log(query)
+    console.log(this.CORP_ID)
   },
   methods: {
     fnSign(event) {
@@ -80,7 +91,13 @@ export default {
             EW_RU_JOB_ID: this.EW_RU_JOB_ID,
             EW_RU_TASK_ID: this.taskId
           })
-          await resolveNextOperation({}, false)
+          await resolveNextOperation({
+            EW_RU_TASK_ID: this.taskId,
+            CORP_ID: this.CORP_ID,
+            TYPE: this.TYPE,
+            EW_RU_JOB_ID:this.EW_RU_JOB_ID,
+            vernier
+          }, false)
         } catch {
         }
       } catch {
diff --git a/utils/submitHomeworkProcess.js b/utils/submitHomeworkProcess.js
index bc4a470..66b860c 100644
--- a/utils/submitHomeworkProcess.js
+++ b/utils/submitHomeworkProcess.js
@@ -113,7 +113,7 @@ export const setPersonnelForm = async ({form, list, taskId, CORP_ID, TYPE,vernie
   })
 }
 // 提交安全措施
-export const setSecurityMeasures = async ({questionnaires, questionnaireInfo, taskId, EW_RU_JOB_ID, CORP_ID, TYPE}) => {
+export const setSecurityMeasures = async ({questionnaires, questionnaireInfo, taskId, EW_RU_JOB_ID, CORP_ID, TYPE, vernier}) => {
   await setSecurityMeasuresSave({
     questionnaires: [{items: questionnaires, questionnaire: questionnaireInfo}],
     EW_RU_JOB_ID,
@@ -124,7 +124,8 @@ export const setSecurityMeasures = async ({questionnaires, questionnaireInfo, ta
     EW_RU_TASK_ID: taskId,
     CORP_ID,
     TYPE,
-    EW_RU_JOB_ID
+    EW_RU_JOB_ID,
+    vernier
   })
 }
 // 提交其它安全措施
@@ -178,6 +179,7 @@ export const addFlowInfo = async ({form,list, taskId,EW_RU_JOB_ID, TYPE,CORP_ID,
 // EW_RU_JOB_ID当前操作节点的人员id
 // isLastStep是否还有下一步，纯前端确定，不去后台获取
 export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TYPE = '', EW_RU_JOB_ID = '',vernier = ''}, isLastStep = true) => {
+  let stepNum = 0
   if (isLastStep) {
     const {info} = await getCurrentNextOperation({EW_RU_TASK_ID, EW_RU_JOB_ID, VERNIER: vernier})
     // 选人
@@ -200,7 +202,7 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
     // 填写安全措施
     if (info.completeFlag === '1') {
       uni.navigateTo({
-        url: '/pages/eight_assignments/security_measures',
+        url: '/pages/eight_assignments/security_measures?vernier=' + info.vernier,
         success: ({eventChannel}) => {
           eventChannel.emit('questionnaire', {
             questionnaire: info.questionnaire[0],
@@ -238,13 +240,16 @@ export const resolveNextOperation = async ({EW_RU_TASK_ID = '', CORP_ID = '', TY
       })
       return
     }
-    // 没有下一步，结束流程，因为无法确定之前有多少步骤，跳转了多少页面，所以直接跳转到首页
-    // await endCurrentPersonnelTechnologicalProcess({EW_RU_TASK_ID})
+    // 根据后端返回的页数退回到指定页面
+    stepNum = info.stepNum
   }
+
   uni.$u.toast('提交成功')
   setTimeout(() => {
-    uni.switchTab({
-      url: '/pages/index/index'
-    })
+    uni.navigateBack(
+        {
+          delta: stepNum
+        }
+    )
   }, 1500)
 }