@lambo-design/workflow-approve 1.0.0-beta.132 → 1.0.0-beta.133

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.132",
+  "version": "1.0.0-beta.133",
   "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.173",
-    "@lambo-design/shared": "^1.0.0-beta.332"
+    "@lambo-design/shared": "^1.0.0-beta.346",
+    "@lambo-design/core": "^4.7.1-beta.176"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/portrait.vue

@@ -140,7 +140,18 @@
              highlight-row
              @on-current-change="selectNode">
       </Table>
-      <Card v-if="showProcessControl && auditResult == '90'">
+      <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="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>
@@ -265,12 +276,40 @@
         <Button type="primary" @click="appointOk">确定</Button>
       </template>
     </Modal>
-    <Modal v-model="rejectAttributesBoxShow" title="驳回的节点通过后"
+    <!--  驳回设置弹框  -->
+    <Modal v-model="rejectAttributesBoxShow" :title="showRejectToSelected ? '驳回设置' : '驳回的节点通过后'"
            @on-cancel="rejectAttributesCancel"
            @on-ok="rejectProcessWithRejectAttributes">
-      <RadioGroup v-model="rejectAttribute">
-        <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
-      </RadioGroup>
+      <Form :label-width="150">
+        <FormItem v-if="showProcessControl" :label="showRejectToSelected ? '驳回的节点通过后：' : ''" :label-width="showRejectToSelected ? 150 : 0">
+          <RadioGroup v-model="rejectAttribute">
+            <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem v-if="showRejectToSelected">
+          <template slot="label">
+            <span>
+              选择驳回人员
+              <Tooltip max-width="200" content="上一节点为会签节点，可选择驳回部分办理人员">
+                <Icon type="ios-information-circle" />
+              </Tooltip>
+              ：
+            </span>
+          </template>
+          <span>{{ rejectUsers.name }}</span>
+          <Button size="small" class="reject-user-button" @click="handleSelectRejectUser">选择</Button>
+        </FormItem>
+      </Form>
+    </Modal>
+    <!--  选择驳回人员弹框  -->
+    <Modal v-model="selectRejectUserModal" title="选择驳回人员"
+           @on-cancel="rejectUserClose('cancel')"
+           @on-ok="rejectUserClose('ok')">
+      <Table border
+             :data="rejectUserList"
+             :columns="rejectUserColumn"
+             @on-selection-change="selectRejectUser">
+      </Table>
     </Modal>
     <candidateGroupsHelpBox ref="candidateGroupsHelpBox" :show="candidateGroupsHelpBoxShow"
                             @update-cand-groups="updateCandGroups"
@@ -479,13 +518,21 @@ export default {
       candidateGroupsHelpBoxShow: false,
       appointBoxShow: false,
       rejectAttributesBoxShow: false,
+      selectRejectUserModal: false,
       rejectAttributes: {},
       showProcessControl: false,
+      showRejectToSelected: false,
+      rejectUsers: {
+        name: '全部办理人',
+        id: 'all'
+      },
       autoOpenNode: '0',
       unapprovedAssigneeList: [],
       rejectAttribute: 'inSequence',
       rejectAttributeList: [],
       reductionAssigneeList: [],
+      rejectUserList: [],
+      selectedRejectUserList: [],
       nextNodesOldSettings: [],
       nextNodesFormList: [],
       hisNode: [],
@@ -974,6 +1021,17 @@ export default {
       column.push({ title: '姓名', key: 'auditName', align: 'center' })
       return column
     },
+    rejectUserColumn: function () {
+      let column = []
+      column.push({ title: '#', key: 'selectId', type: 'selection', align: 'center', width: 55 })
+      column.push({ title: '姓名', key: 'auditName', align: 'center' })
+      column.push({ title: '部门', key: 'auditUserOrgan', align: 'center',
+        render: (h, params) => {
+          return h('div', {}, `${params.row.auditUserOrgan?.split(':')[1]}`)
+        }, })
+      column.push({ title: '审批意见', key: 'auditComment', align: 'center' })
+      return column
+    },
     diagramTableColumns: function () {
       let column = []
       column.push({
@@ -1796,7 +1854,14 @@ export default {
               self.executionCompleted(true, null, null, auditResult, self.curTaskId)
             }, 1000)
           } else {
-            self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? self.getProcessAttributes() : self.doPass()
+            // 前序节点只有一个会签节点才可选择驳回人员
+            self.showRejectToSelected = result.data.length === 1 && result.data[0].handleButtons?.includes('rejectToSelected')
+            self.targetTaskNode = result.data[0].taskNode
+            if (self.showRejectToSelected && !self.handleButtons?.includes('rejectProcessControl')) {
+              self.rejectAttributesBoxShow = true
+            } else {
+              self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? self.getProcessAttributes() : self.doPass()
+            }
           }
         })
       } else {
@@ -1838,14 +1903,17 @@ export default {
     },
     executePass(auditResult) {
       const self = this
-      if (self.auditResult === '82' && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
+      if ((self.auditResult === '90' || self.auditResult === '80') && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
         self.auditResult = ''
-        self.$Message.error(`请选择${self.handleName}节点！`)
+        self.$Message.error(`请选择${self.auditResult === '90' ? self.rejectName : '跳转'}节点！`)
         self.loading = false
       } else {
         self.loading = true
         self.disable = true
         self.auditParams.targetTaskNode = self.targetTaskNode
+        if (self.rejectUsers.id != 'all'){
+          self.auditParams.rejectUsers = self.rejectUsers.id
+        }
         let url = self.smartFlowServerContext + '/manage/processTodo/audit'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
@@ -2071,8 +2139,31 @@ export default {
     cancel() {
       this.modal = false
       this.auditResult = ''
+      this.targetTaskNode = ''
       this.rejectAttribute = 'inSequence'
-      this.targetTaskNodeProcessControl = ''
+      this.targetTaskNodeProcessControl = 'inSequence'
+      this.showProcessControl = false
+      this.showRejectToSelected = false
+      this.selectedRejectUserList = []
+      this.rejectUsers = { name: '全部办理人', id: 'all' }
+    },
+    rejectUserClose(actionType) {
+      if (actionType === 'cancel') {
+        this.selectedRejectUserList = []
+        this.selectRejectUserModal = false
+        return;
+      }
+      if (this.selectedRejectUserList.length === 0){
+        this.rejectUsers = {
+          name: '全部办理人',
+          id: 'all'
+        }
+        this.selectRejectUserModal = false
+        return
+      }
+      this.rejectUsers.name = this.selectedRejectUserList.map(item => item.auditName).join(',')
+      this.rejectUsers.userId = this.selectedRejectUserList.map(item => item.auditId).join(',')
+      this.selectRejectUserModal = false
     },
     reductionModalCancel() {
       this.reductionMultitaskInstanceModal = false
@@ -2081,16 +2172,55 @@ export default {
     rejectAttributesCancel() {
       this.rejectAttributesBoxShow = false
       this.rejectAttribute = 'inSequence'
+      this.targetTaskNode = ''
       this.loading = false
       this.disable = false
+      this.showProcessControl = false
+      this.showRejectToSelected = false
+      this.selectedRejectUserList = []
+      this.rejectUsers = { name: '全部办理人', id: 'all' }
     },
     selectAssignee(selection) {
       this.reductionAssigneeList = selection
     },
+    selectRejectUser(selection) {
+      this.selectedRejectUserList = selection
+    },
     selectNode(currentRow, oldCurrentRow) {
       let self = this
       self.targetTaskNode = currentRow.taskNode
+      self.rejectUsers = { name: '全部办理人', id: 'all' }
       self.targetTaskNodeProcessControl = currentRow.processControl
+      self.showRejectToSelected = currentRow.rejectToSelected
+    },
+    handleSelectRejectUser() {
+      let self = this
+      const params = {
+        taskNode: self.targetTaskNode,
+        applyId: self.applyId,
+      }
+      ajax.get(self.smartFlowServerContext + '/manage/processDone/getDoneDetail', {params}).then(function (resp) {
+        if (resp.data.code === '200') {
+          const data = resp.data.data.rows
+          const latestAudit = data.reduce((max, current) => {
+            return current.auditDate > max.auditDate ? current : max;
+          });
+          const seenNames = new Set();
+          self.rejectUserList = data.filter(item => {
+            if (item.parentExecutionId !== latestAudit.parentExecutionId) {
+              return false;
+            }
+            if (seenNames.has(item.auditName)) {
+              return false;
+            }
+            seenNames.add(item.auditName);
+            return true;
+          });
+          self.selectRejectUserModal = true
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      })
     },
     getAllPreNodes() {
       let self = this
@@ -2377,6 +2507,10 @@ 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 || resp.data.data.preNodeGateway))) {
+            if (self.showRejectToSelected) {
+              self.rejectAttributesBoxShow = true
+              return
+            }
             self.doPass()
             return
           } else {
@@ -2422,9 +2556,8 @@ export default {
                     )
                   }
                 }
-                if (self.auditParams.auditResult == '90') {
-                  self.showProcessControl = self.rejectAttributeList.length > 0 && self.handleButtons && self.handleButtons.includes('rejectProcessControl')
-                } else if (self.auditParams.auditResult == '70' || self.auditParams.auditResult == '40') {
+                self.showProcessControl = self.rejectAttributeList.length > 0 && self.handleButtons && self.handleButtons.includes('rejectProcessControl')
+                if (self.auditParams.auditResult == '70' || self.auditParams.auditResult == '40') {
                   self.rejectAttributesBoxShow = self.handleButtons && self.handleButtons.includes('rejectProcessControl')
                 }
               }

package/src/styles/css/index.less

@@ -387,3 +387,11 @@
   margin-left: 10px;
   margin-right: 10px;
 }
+
+.reject-user-button {
+  margin-left: 20px;
+}
+
+.reject-attribute-card {
+  margin-top: 10px;
+}