钉钉端转件成功后自动关闭

client_h5/src/pages/contract-invoice/index.vue

@@ -444,15 +444,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/contract-out/index.vue

@@ -175,17 +175,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
-
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/contract-sub/index.vue

@@ -165,15 +165,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/contract/index.vue

@@ -358,16 +358,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/interview/index.vue

@@ -319,15 +319,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

client_h5/src/pages/outsourcing-apply/index.vue

@@ -213,15 +213,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/project/index.vue

@@ -186,15 +186,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)

client_h5/src/pages/regular/index.vue

@@ -178,15 +178,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/resign/index.vue

@@ -113,15 +113,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/staff/index.vue

@@ -226,15 +226,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)
   if (keys.length > 0) {

client_h5/src/pages/transfer/index.vue

@@ -97,15 +97,11 @@ const activityData: FlowDTO = {
   participantId: participant,
   flowOpinion: ''
 }
-const submitNextActivity = async (activeOpinion: any) => {
+const submitNextActivity = async (NextActivity: ()=>Promise<any>) => {
   form.value.validate().then(async () => {
-    //工作流转件
-    activityData.activityInstanceId = activityInstanceId
-    activityData.participantId = participant
-    activityData.flowOpinion = JSON.stringify(activeOpinion)
-    const result = await getNextActivity(jsonToFormData(activityData))
+    NextActivity();
   });
-}
+};
 
 const jsonToFormData = (json: any): FormData | null => {
   const keys: string[] = Object.keys(json)