@lambo-design/workflow-approve 1.0.0-beta.69 → 1.0.0-beta.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.69",
+  "version": "1.0.0-beta.70",
   "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.253",
-    "@lambo-design/core": "^4.7.1-beta.158"
+    "@lambo-design/core": "^4.7.1-beta.159",
+    "@lambo-design/shared": "^1.0.0-beta.255"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/history.vue

@@ -69,9 +69,9 @@
                                 <span style="color: #005aff;; font-size: 13px;"
                                       v-else-if="item.auditResult === '30'">通过</span>
                                 <span style="color: #ed4014; font-size: 13px;"
-                                      v-else-if="item.auditResult === '40'">驳回上一节点</span>
+                                      v-else-if="item.auditResult === '40'">{{item.rejectName ? item.rejectName : '驳回'}}上一节点</span>
                                 <span style="color: #ed4014; font-size: 13px;"
-                                      v-else-if="item.auditResult === '50'">驳回到原点</span>
+                                      v-else-if="item.auditResult === '50'">{{item.rejectName ? item.rejectName : '驳回'}}到原点</span>
                                 <span style="color: #ed4014; font-size: 13px;"
                                       v-else-if="item.auditResult === '51'">流程终止</span>
                                 <span style="color: #ed4014; font-size: 13px;"
@@ -87,7 +87,7 @@
                                 <span style="color: #ed4014; font-size: 13px;"
                                       v-else-if="item.auditResult === '83'">会签减签</span>
                                 <span style="color: #19be6b; font-size: 13px;"
-                                      v-else-if="item.auditResult === '90'">驳回指定节点</span>
+                                      v-else-if="item.auditResult === '90'">{{item.rejectName ? item.rejectName : '驳回'}}指定节点</span>
                                 <span style="color: #ff9900; font-size: 13px;" v-else>{{ '待' + handleName }}</span>
                               </Col>
                               <Col span="12" style="text-align: right">

package/src/portrait.vue

@@ -206,7 +206,7 @@
              @on-current-change="selectNode">
       </Table>
       <Card v-if="showProcessControl && auditResult == '90'">
-        <p slot="title">选择驳回后流程流转方式：</p>
+        <p slot="title">驳回的节点通过后：</p>
         <RadioGroup v-model="rejectAttribute">
           <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
         </RadioGroup>
@@ -320,7 +320,7 @@
         </Form>
       </Card>
     </Modal>
-    <Modal v-model="rejectAttributesBoxShow" title="选择被驳回任务通过后流程流转方式"
+    <Modal v-model="rejectAttributesBoxShow" title="驳回的节点通过后"
            @on-cancel="rejectAttributesCancel"
            @on-ok="rejectProcessWithRejectAttributes">
       <RadioGroup v-model="rejectAttribute">
@@ -335,13 +335,13 @@
       <div>
         <slot name="footer-button"></slot>
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo70') && !isDetail && !appointTask && !rejectedTask"
-                :disabled="disable" :loading="loading" @click="audit('70')">驳回到原点
+                :disabled="disable" :loading="loading" @click="audit('70')">{{rejectName}}到原点
         </Button>
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo40') && !isDetail && !appointTask && !rejectedTask"
-                :disabled="disable" :loading="loading" @click="audit('40')">驳回上一节点
+                :disabled="disable" :loading="loading" @click="audit('40')">{{rejectName}}上一节点
         </Button>
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo90') && !isDetail && !appointTask && !rejectedTask"
-                :disabled="disable" :loading="loading" @click="audit('90')">驳回指定节点
+                :disabled="disable" :loading="loading" @click="audit('90')">{{rejectName}}指定节点
         </Button>
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo80') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('80')">跳转指定节点
@@ -457,12 +457,6 @@ export default {
       required: false,
       default: 'click',
     },
-    //驳回后是否可控制流程流转
-    showProcessControl: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     //业务表单保存方法
     businessFormSave: {
       type: Function,
@@ -517,6 +511,7 @@ export default {
       assigneeBoxData: {},
       selectedUserId: '',
       targetTaskNode: '',
+      targetTaskNodeProcessControl: '',
       allNode: [],
       auditParams: {},
       scrollElement: null,
@@ -527,6 +522,7 @@ export default {
       appointBoxShow: false,
       rejectAttributesBoxShow: false,
       rejectAttributes: {},
+      showProcessControl: false,
       autoOpenNode: '0',
       unapprovedAssigneeList: [],
       rejectAttribute: 'inSequence',
@@ -557,6 +553,7 @@ export default {
       curNodeType: 'userTask',
       handleButtons: [],
       handleName: '',
+      rejectName: '',
       auditOpinionTitle: '',
       auditResult: '',
       curAuditGroup: '',
@@ -587,9 +584,9 @@ export default {
       },
       handleButtonsNames: {
         '30': '通过',
-        '70': '驳回到原点',
-        '40': '驳回上一节点',
-        '90': '驳回指定节点',
+        '70': `${this.rejectName}到原点`,
+        '40': `${this.rejectName}上一节点`,
+        '90': `${this.rejectName}指定节点`,
         '80': '跳转指定节点',
         '82': '指定他人处理',
         '50': '直接结束流程',
@@ -728,7 +725,7 @@ export default {
                   props: {
                     color: '#ed4014'
                   }
-                }, '已驳回到上一节点')
+                }, `已${params.row.rejectName ? params.row.rejectName : '驳回'}到上一节点`)
               ])
             } else if (params.row.auditResult == '60' && params.row.taskNode != this.taskNode) {
               return h('div', [
@@ -768,7 +765,7 @@ export default {
                   props: {
                     color: '#19be6b'
                   }
-                }, '已驳回到指定节点')
+                }, `已${params.row.rejectName ? params.row.rejectName : '驳回'}到指定节点`)
               ])
             }
           }
@@ -836,10 +833,10 @@ export default {
             label = '通过'
             tagColor = 'green' // 绿色
           } else if (row.auditResult == '40') {
-            label = '驳回到上一级'
+            label = `${row.rejectName ? row.rejectName : '驳回'}到上一级`
             tagColor = 'volcano' // 火红色
           } else if (row.auditResult == '50') {
-            label = '驳回到原点'
+            label = `${row.rejectName ? row.rejectName : '驳回'}到原点`
             tagColor = 'red' // 红色
           } else if (row.auditResult == '51') {
             label = '流程终止'
@@ -863,7 +860,7 @@ export default {
             label = '会签减签'
             tagColor = 'red' // 红色
           } else if (row.auditResult == '90') {
-            label = '驳回到指定节点'
+            label = `${row.rejectName ? row.rejectName : '驳回'}到指定节点`
             tagColor = 'magenta' // 品红色
           } else {
             label = '待审核'
@@ -1077,6 +1074,7 @@ export default {
             self.curNodeType = resp.data.data[0].isSequential ? 'sequentialMultiNode' : 'multiNode'
           }
           self.handleName = resp.data.data[0].handleName ? resp.data.data[0].handleName : '审批'
+          self.rejectName = resp.data.data[0].rejectName ? resp.data.data[0].rejectName : '驳回'
           self.auditOpinionTitle = resp.data.data[0].handleName ? resp.data.data[0].handleName + '意见' : '审批意见'
           if (!self.handleButtons || (!self.handleButtons.includes('auditOpinion') && !self.handleButtons.includes('attachmentFile') && !self.handleButtons.includes('auditHistory'))) {
             self.showProcessInfo = false
@@ -1325,7 +1323,6 @@ export default {
         self.getNodesBehind()
       } else if (self.auditResult === '90') {
         //驳回到前序指定节点
-        self.showProcessControl ? self.getProcessAttributes() : ''
         self.getAllPreNodes()
       } else if (self.auditResult === '40') {
         //驳回到上一级
@@ -1336,24 +1333,27 @@ export default {
           let result = resp.data
           if (result.code == '30013' || result.code == '30014') {
             //前序节点为子流程或当前节点为子流程第一个节点不可驳回上一级节点
-            self.$Message.warning(result.message)
+            const message = self.rejectName ? self.replaceName(result.message, '驳回', self.rejectName) : result.message
+            self.$Message.warning(message)
             //避免未提示消息直接回调
             setTimeout(() => {
               self.executionCompleted(false, null, null, auditResult, self.curTaskId)
             }, 1000)
           } else if (result.code == '30010') {
+            const message = self.rejectName ? self.replaceName(result.message, '驳回', self.rejectName) : result.message
             self.$Modal.confirm({
               title: '提示',
-              content: result.message,
+              content: message,
               onOk: () => {
                 self.auditParams.auditResult = '70'
                 let url = self.smartFlowServerContext + '/manage/processTodo/audit'
                 ajax.post(url, self.auditParams).then(function (resp) {
                   let result = resp.data
+                  const auditMessage = self.rejectName ? self.replaceName(result.message, '驳回', self.rejectName) : result.message
                   if (result.code == '200') {
                     self.loading = false
                     self.disable = false
-                    self.$Message.success(result.message)
+                    self.$Message.success(auditMessage)
                     //后端没有返回数据
                     setTimeout(() => {
                       self.executionCompleted(true, null, null, auditResult, self.curTaskId)
@@ -1362,7 +1362,7 @@ export default {
                   } else {
                     self.loading = false
                     self.disable = false
-                    self.$Message.error(result.message)
+                    self.$Message.error(auditMessage)
                     setTimeout(() => {
                       self.executionCompleted(false, null, null, auditResult, self.curTaskId)
                     }, 1000)
@@ -1384,14 +1384,14 @@ export default {
               self.executionCompleted(true, null, null, auditResult, self.curTaskId)
             }, 1000)
           } else {
-            self.showProcessControl ? self.getProcessAttributes() : self.doPass()
+            self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? 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.showProcessControl && self.auditResult === '70'){
+        } else if (self.handleButtons && self.handleButtons.includes('rejectProcessControl') && self.auditResult === '70'){
           self.getProcessAttributes()
         } else {
           self.doPass()
@@ -1418,7 +1418,11 @@ export default {
           if (result.code == '200') {
             self.loading = false
             self.disable = false
-            self.$Message.success(result.message ? result.message : `${self.handleName}成功`)
+            let message = result.message ? result.message : `${self.handleName}成功`
+            if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
+              message = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}成功`
+            }
+            self.$Message.success(message)
             if (result.data) {
               let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
               setTimeout(() => {
@@ -1448,7 +1452,11 @@ export default {
           } else {
             self.loading = false
             self.disable = false
-            self.$Message.error(result.message ? result.message : `${self.handleName}失败`)
+            let failedMessage = result.message ? result.message : `${self.handleName}失败`
+            if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
+              failedMessage = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}失败`
+            }
+            self.$Message.error(failedMessage)
             setTimeout(() => {
               self.executionCompleted(false, null, null, auditResult, self.curTaskId)
             }, 1000)
@@ -1644,6 +1652,7 @@ export default {
       this.modal = false
       this.auditResult = ''
       this.rejectAttribute = 'inSequence'
+      this.targetTaskNodeProcessControl = ''
     },
     reductionModalCancel() {
       this.reductionMultitaskInstanceModal = false
@@ -1661,6 +1670,7 @@ export default {
     selectNode(currentRow, oldCurrentRow) {
       let self = this
       self.targetTaskNode = currentRow.taskNode
+      self.targetTaskNodeProcessControl = currentRow.processControl
     },
     getAllPreNodes() {
       let self = this
@@ -1858,18 +1868,20 @@ export default {
         this.$forceUpdate()
       }
     },
-    getProcessAttributes(){
+    getProcessAttributes(targetTaskNodeProcessControl){
       const self = this
       let params = {
         procId: self.procId,
         taskNode: self.taskNode
       }
-      self.rejectAttributeList = [{
+      self.rejectAttributeList = []
+      if (!targetTaskNodeProcessControl || targetTaskNodeProcessControl != 'jump'){
+        self.rejectAttributeList.push({
           _checked: true,
           type: 'inSequence',
           name: '按顺序流转'
-        }]
-
+        })
+      }
       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 || resp.data.data.preNodeGateway))){
@@ -1899,7 +1911,11 @@ export default {
                 )
               }
             }
-            if (self.auditParams.auditResult != '90') self.rejectAttributesBoxShow = true
+            if (self.auditParams.auditResult == '90'){
+              self.showProcessControl = self.rejectAttributeList.length > 0 && self.handleButtons && self.handleButtons.includes('rejectProcessControl')
+            } else {
+              self.rejectAttributesBoxShow = self.handleButtons && self.handleButtons.includes('rejectProcessControl')
+            }
           }
         } else {
           self.$Message.error(resp.data.message)
@@ -1907,6 +1923,15 @@ export default {
       }).catch((err) => {
         console.log(err)
       })
+    },
+    replaceName(originalString, replacedString, replaceString){
+      const index = originalString.indexOf(replacedString)
+      if (index != -1){
+        const regex = new RegExp(replacedString, 'g')
+        // 替换所有匹配的子字符串
+        return originalString.replace(regex, replaceString)
+      }
+      return originalString
     }
   },
   watch: {
@@ -1917,6 +1942,16 @@ export default {
       this.procId = val
       this.initData()
     },
+    targetTaskNodeProcessControl(val){
+      const self = this
+      if (self.handleButtons && self.handleButtons.includes('rejectProcessControl')) {
+        if (val == 'inSequence'){
+          self.showProcessControl = false
+          return
+        }
+        self.getProcessAttributes(val)
+      }
+    }
   }
 }
 </script>

package/src/workflow-diagram.vue

@@ -60,8 +60,8 @@
                 <Tag color="green" v-else-if="item.auditResult == '13'">办理人为空自动跳过</Tag>
                 <Tag color="green" v-else-if="item.auditResult == '14'">符合流程变量条件自动跳过</Tag>
                 <Tag color="green" v-else-if="item.auditResult == '30'">通过</Tag>
-                <Tag color="volcano" v-else-if="item.auditResult == '40'">驳回上一节点</Tag>
-                <Tag color="red" v-else-if="item.auditResult=='50'">驳回到原点</Tag>
+                <Tag color="volcano" v-else-if="item.auditResult == '40'">{{item.rejectName ? item.rejectName : '驳回'}}上一节点</Tag>
+                <Tag color="red" v-else-if="item.auditResult=='50'">{{item.rejectName ? item.rejectName : '驳回'}}到原点</Tag>
                 <Tag color="purple" v-else-if="item.auditResult=='51'">流程终止</Tag>
                 <Tag color="blue" v-else-if="item.auditResult == '60'">撤回</Tag>
                 <Tag color="green" v-else-if="item.auditResult == '61'">交回委派任务</Tag>
@@ -69,7 +69,7 @@
                 <Tag color="cyan" v-else-if="item.auditResult == '80'">跳转指定节点</Tag>
                 <Tag color="cyan" v-else-if="item.auditResult == '82'">指定他人处理</Tag>
                 <Tag color="cyan" v-else-if="item.auditResult == '83'">会签减签</Tag>
-                <Tag color="magenta" v-else-if="item.auditResult == '90'">驳回指定节点</Tag>
+                <Tag color="magenta" v-else-if="item.auditResult == '90'">{{item.rejectName ? item.rejectName : '驳回'}}指定节点</Tag>
                 <Tag color="orange" v-else>待审核</Tag>
               </FormItem>
             </i-col>
@@ -187,11 +187,11 @@ export default {
                 tagColor = 'green'; // 绿色
               }
               else if (row.auditResult == '40'){
-                label = '驳回到上一级';
+                label = `${row.rejectName ? row.rejectName : '驳回'}到上一级`;
                 tagColor = 'volcano'; // 火红色
               }
               else if (row.auditResult == '50'){
-                label = '驳回到原点';
+                label = `${row.rejectName ? row.rejectName : '驳回'}到原点`;
                 tagColor = 'red'; // 红色
               }
               else if (row.auditResult == '51'){
@@ -223,7 +223,7 @@ export default {
                 tagColor = 'red'; // 青色
               }
               else if (row.auditResult == '90'){
-                label = '驳回到指定节点';
+                label = `${row.rejectName ? row.rejectName : '驳回'}到指定节点`;
                 tagColor = 'magenta'; // 品红色
               }
               else{