@lambo-design/workflow-approve 1.0.0-beta.67 → 1.0.0-beta.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.67",
+  "version": "1.0.0-beta.68",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/shared": "^1.0.0-beta.252",
-    "@lambo-design/core": "^4.7.1-beta.158"
+    "@lambo-design/core": "^4.7.1-beta.158",
+    "@lambo-design/shared": "^1.0.0-beta.253"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/portrait.vue

@@ -205,11 +205,11 @@
              highlight-row
              @on-current-change="selectNode">
       </Table>
-      <Card  v-if="auditResult == '90'">
-          <p slot="title">选择驳回后流程流转方式：</p>
-          <RadioGroup v-model="rejectAttribute">
-            <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
-          </RadioGroup>
+      <Card v-if="showProcessControl && auditResult == '90'">
+        <p slot="title">选择驳回后流程流转方式：</p>
+        <RadioGroup v-model="rejectAttribute">
+          <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
+        </RadioGroup>
       </Card>
     </Modal>
     <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
@@ -457,6 +457,12 @@ export default {
       required: false,
       default: 'click',
     },
+    //驳回后是否可控制流程流转
+    showProcessControl: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
     //业务表单保存方法
     businessFormSave: {
       type: Function,
@@ -1319,7 +1325,7 @@ export default {
         self.getNodesBehind()
       } else if (self.auditResult === '90') {
         //驳回到前序指定节点
-        self.getProcessAttributes()
+        self.showProcessControl ? self.getProcessAttributes() : ''
         self.getAllPreNodes()
       } else if (self.auditResult === '40') {
         //驳回到上一级
@@ -1378,14 +1384,14 @@ export default {
               self.executionCompleted(true, null, null, auditResult, self.curTaskId)
             }, 1000)
           } else {
-            self.getProcessAttributes()
+            self.showProcessControl ? self.getProcessAttributes() : self.doPass()
           }
         })
       } else {
         if (self.auditResult === '30' && !self.rejectedTask && (!self.handleButtons || self.handleButtons.includes('appointHandler') || self.handleButtons.includes('appointTimeoutTime'))) {
           self.getNextNodes()
           self.appointBoxShow = true
-        } else if (self.auditResult === '70'){
+        } else if (self.showProcessControl && self.auditResult === '70'){
           self.getProcessAttributes()
         } else {
           self.doPass()
@@ -1866,7 +1872,7 @@ export default {
 
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessAttributes', { params: params }).then(function (resp) {
         if (resp.data.code === '200') {
-          if ((self.auditParams.auditResult == '70' && !resp.data.data.jumpFirstNode) || (self.auditParams.auditResult == '40' && resp.data.data.multiNode)){
+          if ((self.auditParams.auditResult == '70' && !resp.data.data.jumpFirstNode) || (self.auditParams.auditResult == '40' && (resp.data.data.multiNode || resp.data.data.preNodeGateway))){
             self.doPass()
             return
           } else {