@lambo-design/workflow-approve 1.0.0-beta.91 → 1.0.0-beta.93

package/index.js

@@ -1,9 +1,12 @@
 import WorkflowHorizontalApprove from "./src/horizontal";
 import WorkflowPortraitApprove from "./src/portrait";
 import WorkflowDiagram from "./src/workflow-diagram";
+import { WorkflowOperationButtons, WorkflowInfoButtons } from "./src/utils/const";
 
 export {
     WorkflowHorizontalApprove,
     WorkflowPortraitApprove,
-    WorkflowDiagram
+    WorkflowDiagram,
+    WorkflowOperationButtons,
+    WorkflowInfoButtons
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.91",
+  "version": "1.0.0-beta.93",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.168",
-    "@lambo-design/shared": "^1.0.0-beta.295"
+    "@lambo-design/core": "^4.7.1-beta.169",
+    "@lambo-design/shared": "^1.0.0-beta.297"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -11,8 +11,8 @@
           </div>
         </div>
         <div class="org-detil">
-          <LamboPagingTable ref="selection" :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
-                            @on-selection-change="onSelectionChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers">
+          <LamboPagingTable ref="selection" highlight-row :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
+                            @on-selection-change="onSelectionChange" @on-current-change="onCurrentChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers">
             <div slot="search" v-if="!useTransferRangeUsers">
               <Form :label-width="60">
                 <Row>
@@ -139,13 +139,16 @@ export default {
     tableColumn () {
       let columns = []
       let self = this
-      columns.push({
-        title: '#',
-        key: 'selectId',
-        type: 'selection',
-        align: 'center',
-        width: 55
-      })
+      // 加签/选择候选人可多选
+      if (this.helpBoxType === 'addMultitaskInstance' || this.helpBoxType === 'appointHandlerWithCandGroups'){
+        columns.push({
+          title: '#',
+          key: 'selectId',
+          type: 'selection',
+          align: 'center',
+          width: 55
+        })
+      }
       columns.push({
         title: '账号',
         key: 'userId',
@@ -338,15 +341,21 @@ export default {
     doSearch: function () {
       this.tableSearchParams = Object.assign({}, this.form)
     },
+    // 加签、选择下一环节候选人
     onSelectionChange: function (selection) {
       let self = this
-      // self.idSelectedArr = []
-      if (self.helpBoxType !== 'addMultitaskInstance' && self.helpBoxType !== 'appointHandlerWithCandGroups' && selection.length > 1) {
-        self.$Message.info('只能选择一条记录！')
-        this.$refs.selection.selectAll(false);
+      if (self.helpBoxType === 'addMultitaskInstance' || self.helpBoxType === 'appointHandlerWithCandGroups') {
+        for (let item of selection) {
+          self.idSelectedArr.push(item.userId + ',' + item.userName)
+        }
       }
-      for (let item of selection) {
-        self.idSelectedArr.push(item.userId + ',' + item.userName)
+    },
+    // 转办、委派、选择下一环节办理人
+    onCurrentChange(selection) {
+      let self = this
+      if (self.helpBoxType !== 'addMultitaskInstance' && self.helpBoxType !== 'appointHandlerWithCandGroups') {
+        self.idSelectedArr = []
+        self.idSelectedArr.push(selection.userId + ',' + selection.userName)
       }
     },
     loadData (node, callback) {

package/src/components/process-info.vue

@@ -239,7 +239,7 @@ export default {
     //组件宽度
     portraitWidth: {
       type: Number,
-      default: 0
+      default: 400
     },
     //是否显示竖向布局
     inHorizontal: {

package/src/portrait.vue

@@ -1,5 +1,5 @@
 <template>
-  <LamboPageContainer style="overflow: hidden">
+  <LamboPageContainer style="overflow: hidden" :footer-height="footerHeight">
     <template slot="page-title">
       <Tabs v-if="processTraceInTab" value="business" @on-click="changeTab">
         <TabPane :label="title" name="business"></TabPane>
@@ -80,7 +80,7 @@
 
     <!--  竖版  -->
     <div v-if="!inHorizontal" class="portrait-lambo-indicator-card"
-         :style="{paddingBottom: '50px', position: 'absolute', top: '55px', height: 'calc(100% - 50px)', left: '0', width: isExpanded && showProcessInfo ? `calc(100% - ${portraitWidth+10}px)` : '99%'}">
+         :style="{...pageContainerWithoutPadding, left: '0', width: isExpanded && showProcessInfo ? `calc(100% - ${portraitWidth+10}px)` : '99%'}">
       <!--   业务内容区插槽   -->
       <slot v-if="currentTab === 'business'" name="business-content"></slot>
       <div ref="processTraceTab" v-if="currentTab === 'processTrace'">
@@ -94,14 +94,14 @@
     </div>
     <!--   流程信息区   -->
     <a v-if="showProcessInfo && !inHorizontal" @click="isExpanded = !isExpanded" class="arrow-button-container"
-       :style="{right: isExpanded ? portraitWidth+10 + 'px' : '10px'}">
+       :style="{right: isExpanded ? portraitWidth-5 + 'px' : '5px'}">
       <Icon class="icon-class" v-if="isExpanded" type="ios-arrow-forward"/>
       <Icon class="icon-class" v-if="!isExpanded" type="ios-arrow-back"/>
     </a>
     <transition style="position: relative; overflow-x: hidden" v-if="showProcessInfo && !inHorizontal" name="draw" @before-enter="beforeFlowInfoEnter" @enter="flowInfoEnter"
                 @before-leave="beforeFlowInfoLeave" @leave="flowInfoLeave">
       <lamboIndicatorCard v-show="isExpanded" class="portrait-lambo-indicator-card"
-                          :style="{width: portraitWidth + 'px', paddingBottom: '50px', position: 'absolute', top: '55px', right: '0', height: 'calc(100% - 50px)'}" :hasExtend="false">
+                          :style="{width: portraitWidth + 'px', right: '0', ...pageContainerWithoutPadding}" :hasExtend="false">
         <div slot="content-title">流程信息</div>
         <ProcessInfo ref="processInfo"
                      v-model="form.auditOpinion"
@@ -275,7 +275,7 @@
             :key="button.id"
             style="margin-left: 10px;"
             v-if="button.condition"
-            :disabled="button.disabled || disable"
+            :disabled="button.disabled"
             :loading="loading"
             :type="button.type || 'default'"
             @click="button.action"
@@ -301,7 +301,7 @@ import CandidateGroupsHelpBox from './components/candidate-groups-box'
 import CountersingersBox from './components/countersigners-box'
 import { timestampToTime } from '@lambo-design/shared/utils/date'
 import ProcessInfo from './components/process-info'
-import { nodeType } from './utils/const'
+import { NodeType } from './utils/const'
 
 export default {
   props: {
@@ -332,23 +332,59 @@ export default {
       required: false,
       default: '',
     },
+    //业务表单保存方法
+    businessFormSave: {
+      type: Function,
+      required: false
+    },
+    //按钮执行完毕回调方法
+    executionCompleted: {
+      type: Function,
+      required: false,
+      default: () => {}
+    },
+    smartFlowServerContext: {
+      type: String,
+      default: '/api/smart-flow-server',
+    },
+    upmsServerContext: {
+      type: String,
+      default: '/api/upms-server',
+    },
+    //标题
+    title: {
+      type: String,
+      default: '流程办理'
+    },
+    //审批人来源
     auditGroup: {
       type: String,
       required: false,
       default: '',
     },
+    //默认审批意见
     defaultAuditOpinion: {
       type: String,
       required: false,
       default: '',
     },
-    //详情页催办按钮
+    //是否显示竖向布局
+    inHorizontal: {
+      type: Boolean,
+      default: false
+    },
+    //强制不展示的流程操作按钮
+    displayedOperButton: {
+      type: Array,
+      default: () => ([])
+    },
+    //是否展示详情页催办按钮
     pushButton: {
       type: Boolean,
       required: false,
       default: true,
     },
-    //流程跟踪图附件列
+    //是否展示流程跟踪图附件列
     showAttachmentFile: {
       type: Boolean,
       required: false,
@@ -360,40 +396,11 @@ export default {
       required: false,
       default: 'click',
     },
-    //业务表单保存方法
-    businessFormSave: {
-      type: Function,
-      required: false
-    },
-    //按钮执行完毕回调方法
-    executionCompleted: {
-      type: Function,
-      required: false,
-      default: () => {
-      }
-    },
-    //是否显示竖向布局
-    inHorizontal: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: '流程办理'
-    },
     //流程跟踪图以tab形式展示
     processTraceInTab: {
       type: Boolean,
       default: false
     },
-    smartFlowServerContext: {
-      type: String,
-      default: '/api/smart-flow-server',
-    },
-    upmsServerContext: {
-      type: String,
-      default: '/api/upms-server',
-    },
   },
   components: {
     Title,
@@ -409,6 +416,7 @@ export default {
   data() {
     return {
       isExpanded: true,
+      footerHeight: 55,
       showProcessInfo: true,
       portraitWidth: 0,
       openProcessInfo: true,
@@ -470,7 +478,7 @@ export default {
       appointTask: false,
       instanceId: '',
       curTaskId: '',
-      curNodeType: nodeType.userTask,
+      curNodeType: NodeType.UserTask,
       handleButtons: [],
       handleName: '审批',
       passName: '通过',
@@ -566,102 +574,127 @@ export default {
     window.removeEventListener('resize', this.handleWindowResize);
   },
   computed: {
+    pageContainerWithoutPadding(){
+      const top = 55
+      let style = {
+        position: 'absolute',
+        top: `${top}px`,
+        height: `calc(100% - ${top + this.footerHeight}px)`,
+      }
+      return style
+    },
     buttons() {
       const showButtons = !this.isDetail && !this.appointTask && !this.rejectedTask
       return [
         {
           id: 'auditTo70',
           label: `${this.rejectName}到原点`,
-          condition: this.handleButtons?.includes('auditTo70') && showButtons,
-          action: () => this.audit('70')
+          condition: this.handleButtons?.includes('auditTo70') && !this.displayedOperButton.includes('auditTo70') && showButtons,
+          action: () => this.audit('70'),
+          disabled: this.disable
         },
         {
           id: 'auditTo40',
           label: `${this.rejectName}上一节点`,
-          condition: this.handleButtons?.includes('auditTo40') && showButtons,
-          action: () => this.audit('40')
+          condition: this.handleButtons?.includes('auditTo40') && !this.displayedOperButton.includes('auditTo40') && showButtons,
+          action: () => this.audit('40'),
+          disabled: this.disable
         },
         {
           id: 'auditTo90',
           label: `${this.rejectName}指定节点`,
-          condition: this.handleButtons?.includes('auditTo90') && showButtons,
-          action: () => this.audit('90')
+          condition: this.handleButtons?.includes('auditTo90') && !this.displayedOperButton.includes('auditTo90') && showButtons,
+          action: () => this.audit('90'),
+          disabled: this.disable
         },
         {
           id: 'auditTo80',
           label: '跳转指定节点',
-          condition: this.handleButtons?.includes('auditTo80') && showButtons,
-          action: () => this.audit('80')
+          condition: this.handleButtons?.includes('auditTo80') && !this.displayedOperButton.includes('auditTo80') && showButtons,
+          action: () => this.audit('80'),
+          disabled: this.disable
         },
         {
           id: 'auditTo82',
           label: '指定他人处理',
-          condition: this.handleButtons?.includes('auditTo82') && showButtons,
-          action: () => this.audit('82')
+          condition: this.handleButtons?.includes('auditTo82') && !this.displayedOperButton.includes('auditTo82') && showButtons,
+          action: () => this.audit('82'),
+          disabled: this.disable
         },
         {
           id: 'delegateTask',
           label: '委派',
-          condition: this.curNodeType === nodeType.userTask &&
-              this.handleButtons?.includes('delegateTask') &&
+          condition: this.curNodeType === NodeType.UserTask &&
+              this.handleButtons?.includes('delegateTask')  &&
+              !this.displayedOperButton.includes('delegateTask') &&
               showButtons,
-          action: () => this.audit('84')
+          action: () => this.audit('84'),
+          disabled: this.disable
         },
         {
           id: 'addMultitaskInstance',
           label: '加签',
-          condition: this.curNodeType === nodeType.multiNode &&
+          condition: this.curNodeType === NodeType.MultiNode &&
               this.handleButtons?.includes('addMultitaskInstance') &&
+              !this.displayedOperButton.includes('addMultitaskInstance') &&
               showButtons,
-          action: () => this.showUpdateMultitaskInstanceModal('81')
+          action: () => this.showUpdateMultitaskInstanceModal('81'),
+          disabled: this.disable
         },
         {
           id: 'reductionMultitaskInstance',
           label: '减签',
-          condition: this.curNodeType === nodeType.multiNode &&
+          condition: this.curNodeType === NodeType.MultiNode &&
               this.handleButtons?.includes('reductionMultitaskInstance') &&
+              !this.displayedOperButton.includes('reductionMultitaskInstance') &&
               showButtons,
-          action: () => this.showUpdateMultitaskInstanceModal('83')
+          action: () => this.showUpdateMultitaskInstanceModal('83'),
+          disabled: this.disable
         },
         {
           id: 'auditTo50',
           label: '直接结束流程',
-          condition: this.handleButtons?.includes('auditTo50') && showButtons,
-          action: () => this.audit('50')
+          condition: this.handleButtons?.includes('auditTo50') && !this.displayedOperButton.includes('auditTo50') && showButtons,
+          action: () => this.audit('50'),
+          disabled: this.disable
         },
         {
           id: 'processTrace',
           label: '流程跟踪图',
-          condition: this.handleButtons?.includes('processTrace') && !this.processTraceInTab,
-          action: () => this.processPrint()
+          condition: this.handleButtons?.includes('processTrace') && !this.displayedOperButton.includes('processTrace') && !this.processTraceInTab,
+          action: () => this.processPrint(),
+          disabled: this.disable
         },
         {
           id: 'auditTo30',
           label: this.passName,
-          condition: this.handleButtons?.includes('auditTo30') && !this.isDetail && !this.appointTask,
+          condition: this.handleButtons?.includes('auditTo30') && !this.displayedOperButton.includes('auditTo30') && !this.isDetail && !this.appointTask,
           action: () => this.audit('30'),
-          type: 'primary'
+          type: 'primary',
+          disabled: this.disable
         },
         {
           id: 'passContinue',
           label: `${this.passName}并继续`,
-          condition: this.handleButtons?.includes('passContinue') && !this.isDetail && !this.appointTask,
+          condition: this.handleButtons?.includes('passContinue') && !this.displayedOperButton.includes('passContinue') && !this.isDetail && !this.appointTask,
           action: () => this.passContinueAudit(),
-          type: 'primary'
+          type: 'primary',
+          disabled: this.disable
         },
         {
           id: 'revokeDelegateTask',
           label: '撤回委派',
-          condition: this.revokeDelegateTask,
+          condition: this.revokeDelegateTask && !this.displayedOperButton.includes('revokeDelegateTask'),
           action: () => this.audit('62'),
           disabled: !this.revokeDelegateTask
         },
         {
           id: 'appointTask',
           label: '交回',
-          condition: this.appointTask,
+          condition: this.appointTask && !this.displayedOperButton.includes('appointTask'),
           action: () => this.audit('61'),
-          type: 'primary'
+          type: 'primary',
+          disabled: this.disable
         }
       ];
     },
@@ -869,6 +902,9 @@ export default {
           } else if (row.auditResult == '62') {
             label = '委派任务被撤回'
             tagColor = 'blue' // 蓝色
+          } else if (row.auditResult == '63') {
+            label = '委派任务'
+            tagColor = 'green' // 绿色
           } else if (row.auditResult == '80') {
             label = '跳转到指定节点'
             tagColor = 'cyan' // 青色
@@ -1158,7 +1194,7 @@ export default {
         if (resp.data.code === '200') {
           self.handleButtons = resp.data.data[0].handleButtons ? resp.data.data[0].handleButtons : ["processTrace","auditHistory","auditOpinion","attachmentFile","auditTo30","auditTo70","auditTo40","auditTo90","auditTo80","auditTo82","auditTo50"];
           if (resp.data.data[0].hasOwnProperty('isSequential')) {
-            self.curNodeType = resp.data.data[0].isSequential ? nodeType.sequentialMultiNode : nodeType.multiNode;
+            self.curNodeType = resp.data.data[0].isSequential ? NodeType.SequentialMultiNode : NodeType.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 : '驳回';
@@ -1397,7 +1433,7 @@ export default {
           self.businessFormSave ? self.businessFormSave(self.handleSaveResult, auditResult) : self.handleSaveResult(true)
           return
         }
-        if ((!self.handleButtons || self.handleButtons.includes('auditOpinion')) && self.auditResult !== '84') {
+        if ((!self.handleButtons || self.handleButtons.includes('auditOpinion')) && self.auditResult !== '84' && self.auditResult !== '62') {
           self.$Message.error(`请输入${self.handleName}意见！`)
           return
         } else {

package/src/utils/const.js

@@ -1,89 +1,36 @@
-export const nodeType = {
-  userTask: 'userTask',
-  multiNode: 'multiNode',
-  sequentialMultiNode: 'sequentialMultiNode'
+export const NodeType = {
+  UserTask: 'userTask',
+  MultiNode: 'multiNode',
+  SequentialMultiNode: 'sequentialMultiNode'
 }
 
-export const handleButtons = {
-  //流程信息按钮
-  processTrace: {
-    id: 'processTrace',
-    name: '流程跟踪图',
-  },
-  auditHistory: {
-    id: 'auditHistory',
-    name: '审批历史',
-  },
-  auditOpinion: {
-    id: 'auditOpinion',
-    name: '处理意见',
-  },
-  attachmentFile: {
-    id: 'attachmentFile',
-    name: '上传附件',
-  },
-  //流程操作按钮
-  auditTo30: {
-    id: 'auditTo30',
-    name: '同意',
-    auditResult: '30',
-  },
-  auditTo70: {
-    id: 'auditTo70',
-    name: '驳回原点',
-    auditResult: '70',
-  },
-  auditTo40: {
-    id: 'auditTo40',
-    name: '驳回上一节点',
-    auditResult: '40',
-  },
-  auditTo90: {
-    id: 'auditTo90',
-    name: '驳回指定节点',
-    auditResult: '90',
-  },
-  auditTo80: {
-    id: 'auditTo80',
-    name: '跳转指定节点',
-    auditResult: '80',
-  },
-  auditTo82: {
-    id: 'auditTo82',
-    name: '转办',
-    auditResult: '82',
-  },
-  auditTo50: {
-    id: 'auditTo50',
-    name: '人工终止',
-    auditResult: '50',
-  },
-  delegateTask: {
-    id: 'delegateTask',
-    name: '委派',
-    auditResult: 'delegateTask',
-  },
-  addMultitaskInstance: {
-    id: 'addMultitaskInstance',
-    name: '加签',
-    auditResult: 'addMultitaskInstance',
-  },
-  reductionMultitaskInstance: {
-    id: 'reductionMultitaskInstance',
-    name: '减签',
-    auditResult: 'reductionMultitaskInstance',
-  },
-  //后续操作按钮
-  rejectProcessControl: {
-    id: 'rejectProcessControl',
-    name: '允许驳回时控制流转',
-  },
-  appointHandler: {
-    id: 'appointHandler',
-    name: '指定下一环节的办理人',
-  },
-  appointTimeoutTime: {
-    id: 'appointTimeoutTime',
-    name: '指定下一环节办理时限（含预警时间）',
-  },
+// 流程信息按钮
+export const WorkflowInfoButtons = {
+  ProcessTrace: 'processTrace',// 流程跟踪图
+  AuditHistory: 'auditHistory',// 审批历史
+  AuditOpinion: 'auditOpinion',// 审批意见
+  AttachmentFile: 'attachmentFile',// 附件
+}
+
+// 流程操作按钮
+export const WorkflowOperationButtons = {
+  AuditTo30: 'auditTo30',// 通过
+  AuditTo70: 'auditTo70',// 驳回原点
+  AuditTo40: 'auditTo40',// 驳回上一节点
+  AuditTo90: 'auditTo90',// 驳回指定节点
+  AuditTo80: 'auditTo80',// 跳转指定节点
+  AuditTo82: 'auditTo82',// 转办
+  AuditTo50: 'auditTo50',// 人工终止
+  DelegateTask: 'delegateTask',// 委派
+  RevokeDelegateTask: 'revokeDelegateTask',// 撤回委派
+  AppointTask: 'appointTask',// 交回委派
+  AddMultitaskInstance: 'addMultitaskInstance',// 会签加签
+  ReductionMultitaskInstance: 'reductionMultitaskInstance',// 会签减签
+}
+
+// 流程流转控制按钮
+export const WorkflowControlButtons = {
+  RejectProcessControl: 'rejectProcessControl',// 允许驳回时控制流转
+  AppointHandler: 'appointHandler',// 指定下一环节的办理人
+  AppointTimeoutTime: 'appointTimeoutTime',// 指定下一环节办理时限（含预警时间）
 }