@lambo-design/workflow-approve 1.0.0-beta.140 → 1.0.0-beta.142

package/src/portrait.vue

@@ -134,37 +134,53 @@
     <Modal v-model="modal1" title="选择节点"
            @on-cancel="cancel"
            @on-ok="doJump">
-      <Table border
-             :data="allNode"
-             :columns="nodeColumn"
-             highlight-row
-             @on-current-change="selectNode">
-      </Table>
-      <Card class="reject-attribute-card" dis-hover v-if="showRejectToSelected && auditResult == '90'">
-        <p slot="title">
-          选择驳回人员
-          <Tooltip max-width="350" placement="right" content="驳回节点为会签节点，可选择驳回部分办理人员">
-            <Icon type="ios-information-circle" />
-          </Tooltip>
-          ：
-        </p>
-        <span>{{ rejectUsers.name }}</span>
-        <Button size="small" class="reject-user-button" @click="handleSelectRejectUser">选择</Button>
-      </Card>
-      <Card class="reject-attribute-card" dis-hover v-if="showRejectOption && auditResult == '90'">
-        <p slot="title">驳回给：</p>
-        <RadioGroup v-model="rejectToTakeOver">
-          <Radio label="original">原办理人</Radio>
-          <Radio label="actual">实际办理人</Radio>
-        </RadioGroup>
-      </Card>
-      <Card class="reject-attribute-card" dis-hover 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>
-        <Alert v-if="rejectAttribute == 'returnToCurrentNode'" type="warning" show-icon style="margin-top: 3px">本节点人员有：{{taskAuditUserList.join(',')}}</Alert>
-      </Card>
+      <template v-if="rejectNodeModalMode === 'prototype'">
+        <RejectNodeTable
+            :nodes="allNode"
+            :current-task-node="taskNode"
+            :default-reject-to-take-over="defaultRejectToTakeOver"
+            :visible="modal1 && rejectNodeModalMode === 'prototype'"
+            @selection-change="handleRejectNodeSelectionChange"/>
+      </template>
+
+      <template v-else>
+        <Table border
+               :data="allNode"
+               :columns="nodeColumn"
+               highlight-row
+               @on-current-change="selectNode">
+        </Table>
+        <Card class="reject-attribute-card" dis-hover v-if="showRejectToSelected && auditResult == '90'">
+          <p slot="title">
+            选择驳回人员
+            <Tooltip max-width="350" placement="right" content="驳回节点为会签节点，可选择驳回部分办理人员">
+              <Icon type="ios-information-circle" />
+            </Tooltip>
+            ：
+          </p>
+          <span>{{ rejectUsers.name }}</span>
+          <Button size="small" class="reject-user-button" @click="handleSelectRejectUser">选择</Button>
+        </Card>
+        <Card class="reject-attribute-card" dis-hover v-if="showRejectOption && auditResult == '90'">
+          <p slot="title">驳回给：</p>
+          <RadioGroup v-model="rejectToTakeOver">
+            <Radio label="original">原办理人</Radio>
+            <Radio label="actual">实际办理人</Radio>
+          </RadioGroup>
+        </Card>
+        <Card class="reject-attribute-card" dis-hover 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>
+          <Alert v-if="rejectAttribute == 'returnToCurrentNode'" type="warning" show-icon style="margin-top: 3px">本节点人员有：{{taskAuditUserList.join(',')}}</Alert>
+        </Card>
+      </template>
+
+      <template slot="footer">
+        <Button @click="cancel">取消</Button>
+        <Button type="primary" @click="doJump">确定</Button>
+      </template>
     </Modal>
     <!--  指定他人处理弹框  -->
     <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted" :show-confirm-box="showConfirmBox"
@@ -362,6 +378,7 @@ import processHistory from './components/history'
 import assigneeBox from './components/assignee-box'
 import CandidateGroupsHelpBox from './components/candidate-groups-box'
 import CountersingersBox from './components/countersigners-box'
+import RejectNodeTable from './components/reject-node-table'
 import { timestampToTime } from '@lambo-design/shared/utils/date'
 import ProcessInfo from './components/process-info'
 import { NodeType, WorkflowInfoButtons } from './utils/const'
@@ -502,6 +519,7 @@ export default {
     LamboIndicatorCard,
     CandidateGroupsHelpBox,
     CountersingersBox,
+    RejectNodeTable,
     ProcessInfo,
   },
   data() {
@@ -532,6 +550,14 @@ export default {
       targetTaskNode: '',
       targetTaskNodeProcessControl: '',
       allNode: [],
+      rejectNodeModalMode: 'legacy',
+      rejectNodeSelection: {
+        taskNodes: [],
+        taskNames: [],
+        pathKeys: [],
+        pathEntries: [],
+        rejectToTakeOver: this.defaultRejectToTakeOver ? 'actual' : 'original'
+      },
       taskAuditUserList: [],
       auditParams: {},
       scrollElement: null,
@@ -721,8 +747,15 @@ export default {
         {
           id: 'auditTo90',
           label: `${this.rejectName}指定节点`,
-          condition: this.handleButtons?.includes('auditTo90') && !this.displayedOperButton.includes('auditTo90') && showButtons,
-          action: () => this.audit('90'),
+          condition: this.handleButtons?.includes('auditTo90') && !this.handleButtons?.includes('auditTo92') && !this.displayedOperButton.includes('auditTo90') && showButtons,
+          action: () => this.startRejectNodeAudit('legacy'),
+          disabled: this.disable
+        },
+        {
+          id: 'auditTo92',
+          label: `${this.rejectName}指定节点`,
+          condition: this.handleButtons?.includes('auditTo92') && !this.displayedOperButton.includes('auditTo92') && showButtons,
+          action: () => this.startRejectNodeAudit('prototype'),
           disabled: this.disable
         },
         {
@@ -1641,6 +1674,12 @@ export default {
       self.submit()
     },
 
+    startRejectNodeAudit(mode) {
+      this.rejectNodeModalMode = mode
+      this.clearRejectNodeSelection()
+      this.audit('90')
+    },
+
     // 通过并继续审批
     passContinueAudit: function () {
       let self = this
@@ -1823,7 +1862,24 @@ export default {
         self.getNodesBehind()
       } else if (self.auditResult === '90') {
         //驳回到前序指定节点
-        self.getAllPreNodes()
+        const usePrototype = self.rejectNodeModalMode === 'prototype'
+        self.targetTaskNode = ''
+        self.clearRejectNodeSelection()
+        self.targetTaskNodeProcessControl = 'inSequence'
+        self.showRejectToSelected = false
+        self.showRejectOption = false
+        self.showProcessControl = false
+        self.rejectAttributesBoxShow = false
+        self.selectRejectUserModal = false
+        self.rejectAttribute = 'inSequence'
+        self.rejectUsers = { name: '全部办理人', id: 'all' }
+        self.rejectToTakeOver = self.defaultRejectToTakeOver ? 'actual' : 'original'
+        self.selectedRejectUserList = []
+        if (usePrototype) {
+          self.getAllPreNodesByPath()
+        } else {
+          self.getAllPreNodes()
+        }
       } else if (self.auditResult === '40') {
         //驳回到上一级
         self.loading = true
@@ -1916,6 +1972,7 @@ export default {
         name: self.isPassContinue ? self.handleButtonsNames['passContinue'] : self.handleButtonsNames[self.auditResult]
       }
       if (!self.showConfirmBox) {
+        self.modal1 = false;
         self.$Spin.show();
         self.executePass(auditResult)
         return;
@@ -1925,6 +1982,7 @@ export default {
         title: '提示',
         content: '确定要' + auditResult.name + '吗？',
         onOk: () => {
+          self.modal1 = false;
           self.$Spin.show();
           self.executePass(auditResult)
         },
@@ -1938,19 +1996,32 @@ export default {
     },
     executePass(auditResult) {
       const self = this
-      if ((self.auditResult === '90' || self.auditResult === '80') && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
+      const isRejectAnyNodesMode = self.auditResult === '90' && self.rejectNodeModalMode === 'prototype'
+      const selectedTaskNodes = Array.from(new Set((self.rejectNodeSelection?.taskNodes || []).filter(Boolean)))
+      if (isRejectAnyNodesMode && selectedTaskNodes.length === 0) {
         self.auditResult = ''
-        self.$Message.error(`请选择${self.auditResult === '90' ? self.rejectName : '跳转'}节点！`)
+        self.$Message.error(`请选择${self.rejectName}节点！`)
+        self.loading = false
+        self.$Spin.hide();
+        return
+      }
+      if (!isRejectAnyNodesMode && (self.auditResult === '90' || self.auditResult === '80') && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
+        const auditResultCode = self.auditResult
+        self.auditResult = ''
+        self.$Message.error(`请选择${auditResultCode === '90' ? self.rejectName : '跳转'}节点！`)
         self.loading = false
         self.$Spin.hide();
       } else {
         self.loading = true
         self.disable = true
-        self.auditParams.targetTaskNode = self.targetTaskNode
+        self.auditParams.targetTaskNode = isRejectAnyNodesMode ? selectedTaskNodes.join(',') : self.targetTaskNode
+        self.auditParams.auditResult = isRejectAnyNodesMode ? '92' : self.auditResult
         if (self.rejectUsers.id != 'all'){
           self.auditParams.rejectUsers = self.rejectUsers.id
         }
-        self.auditParams.rejectToTakeOver = self.rejectToTakeOver && self.rejectToTakeOver != 'original'
+        self.auditParams.rejectToTakeOver = isRejectAnyNodesMode
+          ? self.rejectNodeSelection?.rejectToTakeOver && self.rejectNodeSelection.rejectToTakeOver != 'original'
+          : self.rejectToTakeOver && self.rejectToTakeOver != 'original'
         let url = self.smartFlowServerContext + '/manage/processTodo/audit'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
@@ -2178,8 +2249,10 @@ export default {
 
     cancel() {
       this.modal = false
+      this.modal1 = false
       this.auditResult = ''
-      this.targetTaskNode = ''
+      this.clearRejectNodeSelection()
+      this.rejectNodeModalMode = 'legacy'
       this.rejectAttribute = 'inSequence'
       this.targetTaskNodeProcessControl = 'inSequence'
       this.showProcessControl = false
@@ -2214,7 +2287,7 @@ export default {
     rejectAttributesCancel() {
       this.rejectAttributesBoxShow = false
       this.rejectAttribute = 'inSequence'
-      this.targetTaskNode = ''
+      this.clearRejectNodeSelection()
       this.loading = false
       this.disable = false
       this.showProcessControl = false
@@ -2230,8 +2303,32 @@ export default {
     selectRejectUser(selection) {
       this.selectedRejectUserList = selection
     },
+    clearRejectNodeSelection() {
+      this.targetTaskNode = ''
+      this.rejectNodeSelection = this.createEmptyRejectNodeSelection()
+      this.rejectToTakeOver = this.rejectNodeSelection.rejectToTakeOver
+    },
+    createEmptyRejectNodeSelection() {
+      return {
+        taskNodes: [],
+        taskNames: [],
+        pathKeys: [],
+        pathEntries: [],
+        rejectToTakeOver: this.defaultRejectToTakeOver ? 'actual' : 'original'
+      }
+    },
+    handleRejectNodeSelectionChange(selection) {
+      this.rejectNodeSelection = selection || this.createEmptyRejectNodeSelection()
+      this.rejectToTakeOver = this.rejectNodeSelection.rejectToTakeOver
+    },
     selectNode(currentRow, oldCurrentRow) {
       let self = this
+      if (!currentRow) {
+        return
+      }
+      if (currentRow.type === 'group') {
+        return
+      }
       self.targetTaskNode = currentRow.taskNode
       self.rejectUsers = { name: '全部办理人', id: 'all' }
       self.targetTaskNodeProcessControl = currentRow.processControl
@@ -2278,6 +2375,7 @@ export default {
         if (resp.data.code === '200') {
           if (resp.data.data.length > 0) {
             self.allNode = resp.data.data.filter(node => !self.displayedPreNodes.includes(node.taskNode))
+            self.clearRejectNodeSelection()
             self.modal1 = true
           } else {
             self.$Message.warning('当前流程无前序节点')
@@ -2287,6 +2385,28 @@ export default {
         }
       })
     },
+    getAllPreNodesByPath() {
+      let self = this
+      let params = {
+        processDefId: self.procId,
+        taskId: self.curTaskId,
+      }
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getAllPreNodesByPath', {params: params}).then(function (resp) {
+        if (resp.data.code === '200') {
+          if (resp.data.data.length > 0) {
+            self.allNode = resp.data.data.filter(node => !self.displayedPreNodes.includes(node.taskNode))
+            self.clearRejectNodeSelection()
+            self.modal1 = true
+          } else {
+            self.$Message.warning('当前流程无前序节点')
+          }
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     getNodesBehind() {
       let self = this
       let params = {
@@ -2297,6 +2417,8 @@ export default {
         if (resp.data.code === '200') {
           if (resp.data.data.length > 0) {
             self.allNode = resp.data.data
+            self.rejectNodeModalMode = 'legacy'
+            self.clearRejectNodeSelection()
             self.modal1 = true
           } else {
             self.$Message.warning('当前流程无后续节点')