vue2-client 1.15.18 → 1.15.20

package/package.json

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

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

@@ -229,7 +229,7 @@
           <a-form layout="vertical">
             <a-form-item label="退回原因" :wrapper-col="{ span: 24 }" required>
               <a-textarea
-                v-model="note"
+                v-model="backNote"
                 :auto-size="{ minRows: 4, maxRows: 10 }"
                 placeholder="请填写退回原因 / 备注"
               />
@@ -480,6 +480,7 @@ export default {
       formValid: false,
       // 备忘
       note: '',
+      backNote: '', // 新增退回原因专用变量
       // 是否是最后一步
       lastStep: false,
       // 存储每一步骤填表人和时间数据
@@ -754,7 +755,7 @@ export default {
       })
     },
     async preClick () {
-      const notes = this.note.trim()
+      const notes = this.backNote.trim()
       if (!notes) {
         this.$message.error('退回请在备注中填写理由')
         return
@@ -768,8 +769,11 @@ export default {
           res => {
             this.saveWorkflowLog('退回', this.generateStepChangeText(this.currentStepId, this.preBtnTo), { notes })
             this.$message.success('退回成功')
+            this.backNote = '' // 退回成功后清空退回原因
             this.loading = true
             this.loadingHistory = true
+            this.currentStepId = this.preBtnTo
+            this.activeStepId = this.preBtnTo
             this.$emit('refresh')
             this.onClose()
             this.init()
@@ -920,6 +924,19 @@ export default {
     },
     // 根据当前节点，判断之后流程，以及按钮的显示
     workflowControl () {
+      // 重置所有控制数据为默认值，避免之前状态的影响
+      this.showNextBtn = false
+      this.nextBtnTo = undefined
+      this.nextBtnTitle = ''
+      this.showStepNextBtn = false
+      this.stepNextBtnTo = undefined
+      this.stepNextBtnTitle = ''
+      this.stepNextBtnText = []
+      this.showPrevBtn = false
+      this.preBtnTo = undefined
+      this.preBtnTitle = ''
+      this.preBtnText = []
+
       // 分类收集不同类型的actions
       const submitActions = this.currentDirections.filter(item => item.type === 'submit')
       const conditionalActions = this.currentDirections.filter(item => item.type === 'conditionalBranch')

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>