vue2-client 1.12.10 → 1.12.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.12.10",
+  "version": "1.12.11",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: '9'
+      workflowId: '194'
     })
   },
   methods: {
@@ -18,13 +18,28 @@ export default {
      */
     success ({ note, form, workflowId }) {
       console.log('success', note, form, workflowId)
+    },
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId 工作流id
+     * @param formStepId 起ID
+     * @param toStepId 往ID
+     * @param successStepId 完成步骤id
+     * @param successStep 完成步骤名称
+     * @param formStep 起步骤名称
+     * @param toStep 往步骤名称
+     */
+    nextClick ({ note, form, workflowId, formStepId, toStepId, formStep, toStep, successStepId, successStep }) {
+      console.log('success', note, form, workflowId, formStepId, toStepId, formStep, toStep, successStepId, successStep)
     }
   }
 }
 </script>
 
 <template>
-  <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
+  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
 </template>
 
 <style scoped lang="less">

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -36,6 +36,7 @@
                 :details="details"
                 @refresh="stepChanged"
                 @success="success"
+                @nextClick="nextClick"
               />
             </a-tab-pane>
             <a-tab-pane key="2" tab="任务流转记录">
@@ -193,6 +194,10 @@ export default {
     success (res) {
       this.visible = false
       this.$emit('success', res)
+    },
+    // 提交完成后事件
+    nextClick (res) {
+      this.$emit('nextClick', res)
     }
   }
 }

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -456,7 +456,7 @@ export default {
         this.submitForm(res)
         postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
-            res => {
+            () => {
               const extra = {
                 setHandler: this.getStepHandler(),
                 setDeadline: this.deadline,
@@ -466,6 +466,7 @@ export default {
               this.$message.success('提交成功')
               this.loading = true
               this.loadingHistory = true
+              this.$emit('nextClick', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId, ...this.generateStepChange(this.currentStepId, this.nextBtnTo) })
               this.$emit('refresh')
               this.onClose()
               this.init()
@@ -512,7 +513,7 @@ export default {
         this.submitForm(res)
         postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
-            res => {
+            () => {
               const extra = {
                 setHandler: this.getStepHandler(),
                 setDeadline: this.deadline,
@@ -520,6 +521,7 @@ export default {
               }
               this.saveWorkflowLog('跳过', this.generateStepChangeText(this.currentStepId, this.stepNextBtnTo), extra)
               this.$message.success('提交成功')
+              this.$emit('nextClick', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId, ...this.generateStepChange(this.currentStepId, this.stepNextBtnTo) })
               this.loading = true
               this.loadingHistory = true
               this.$emit('refresh')
@@ -577,8 +579,6 @@ export default {
     },
     // 根据步骤id获取步骤名称
     getStepNameByStepId (stepId) {
-      console.log('stepId==', stepId)
-      console.log('this.stepsDefine==', this.stepsDefine)
       return this.stepsDefine[stepId - 1].name
     },
     // 表单提交的回调
@@ -766,6 +766,16 @@ export default {
     generateStepChangeText (formStepId, toStepId) {
       return `第${formStepId}步: ${this.getStepNameByStepId(formStepId)} --> 第${toStepId}步: ${this.getStepNameByStepId(toStepId)}`
     },
+    generateStepChange (formStepId, toStepId) {
+      return {
+        formStepId,
+        toStepId,
+        formStep: this.getStepNameByStepId(formStepId),
+        toStep: this.getStepNameByStepId(toStepId),
+        successStepId: this.stepsDefine[this.stepsDefine.length - 1].id,
+        successStep: this.stepsDefine[this.stepsDefine.length - 1].name,
+      }
+    },
     // 保存工作流日志
     saveWorkflowLog (operation, desc, extra) {
       postByServiceName(workFlowViewApi.saveWorkFlowLog, {

package/src/router/async/router.map.js

@@ -54,13 +54,13 @@ routerResource.example = {
   name: '示例主页面',
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),