@lambo-design/workflow-approve 1.0.0-beta.122 → 1.0.0-beta.124

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +2 -2
  2. package/src/components/history.vue +9 -1
  3. package/src/portrait.vue +22 -8
  4. package/src/workflow-diagram.vue +10 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lambo-design/workflow-approve",
3
- "version": "1.0.0-beta.122",
3
+ "version": "1.0.0-beta.124",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "author": "lambo",
@@ -13,7 +13,7 @@
13
13
  "axios": "^0.24.0",
14
14
  "axios-cache-plugin": "^0.1.0",
15
15
  "@lambo-design/core": "^4.7.1-beta.171",
16
- "@lambo-design/shared": "^1.0.0-beta.317"
16
+ "@lambo-design/shared": "^1.0.0-beta.318"
17
17
  },
18
18
  "dependencies": {
19
19
  "bpmn-js": "^7.3.1",
package/src/components/history.vue CHANGED
@@ -158,6 +158,10 @@
158
158
  v-else-if="item.auditResult === '14'">符合流程变量条件自动跳过</span>
159
159
  <span style="color: #52c41a; font-size: 13px;"
160
160
  v-else-if="item.auditResult === '30'">通过</span>
161
+ <span style="color: #52c41a; font-size: 13px;"
162
+ v-else-if="item.auditResult === '31'">{{item.passName ? item.passName : '通过'}}</span>
163
+ <span style="color: #fa541c; font-size: 13px;"
164
+ v-else-if="item.auditResult === '32'">不{{item.passName ? item.passName : '通过'}}</span>
161
165
  <!-- volcano fa541c // 火红色-->
162
166
  <span style="color: #fa541c; font-size: 13px;"
163
167
  v-else-if="item.auditResult === '40'">{{item.rejectName ? item.rejectName : '驳回'}}上一节点</span>
@@ -265,6 +269,10 @@
265
269
  v-else-if="item.auditResult === '14'">符合流程变量条件自动跳过</span>
266
270
  <span style="color: #52c41a; font-size: 13px;"
267
271
  v-else-if="item.auditResult === '30'">通过</span>
272
+ <span style="color: #52c41a; font-size: 13px;"
273
+ v-else-if="item.auditResult === '31'">会签表决{{item.passName ? item.passName : '通过'}}</span>
274
+ <span style="color: #fa541c; font-size: 13px;"
275
+ v-else-if="item.auditResult === '32'">会签表决不{{item.passName ? item.passName : '通过'}}</span>
268
276
  <!-- volcano fa541c // 火红色-->
269
277
  <span style="color: #fa541c; font-size: 13px;"
270
278
  v-else-if="item.auditResult === '40'">{{item.rejectName ? item.rejectName : '驳回'}}上一节点</span>
@@ -409,7 +417,7 @@ export default {
409
417
  setModals: {
410
418
  modals: []
411
419
  },
412
- auditPassStatus:['00', '10', '11', '12', '13', '14', '30', '40', '50', '51', '60', '61', '62', '80', '82', '83', '90'],
420
+ auditPassStatus:['00', '10', '11', '12', '13', '14', '30', '31', '32', '40', '50', '51', '60', '61', '62', '80', '82', '83', '90'],
413
421
  showModal: false,
414
422
  fileList: [],
415
423
  modalImg: false,
package/src/portrait.vue CHANGED
@@ -157,7 +157,7 @@
157
157
  :upms-server-context="upmsServerContext"/>
158
158
  <!-- 流程跟踪图弹框 -->
159
159
  <Modal v-if="!processTraceInTab" ref="processTraceModal" v-model="modalBoxShow" width="1000" title="流程跟踪图">
160
- <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId" :current-task-id="taskId"
160
+ <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId" :current-task-id="taskId" :handle-name="handleName"
161
161
  :procId="process.procId" :table-columns="diagramTableColumns" :scroll-element="scrollElement"
162
162
  :tableData="process.tableData" :hisAudit="hisAudit"
163
163
  :approve-detail-show-way="approveDetailShowWay"
@@ -546,7 +546,8 @@ export default {
546
546
  },
547
547
  handleButtonsNames: {
548
548
  '30': '通过',
549
- '31': '不通过',
549
+ '31': '通过',
550
+ '32': '不通过',
550
551
  '70': `驳回到原点`,
551
552
  '40': `驳回上一节点`,
552
553
  '90': `驳回指定节点`,
@@ -701,10 +702,18 @@ export default {
701
702
  disabled: this.disable
702
703
  },
703
704
  {
704
- id: 'auditTo31',
705
+ id: 'auditTo32',
705
706
  label: `不${this.passName}`,
706
- condition: this.curNodeType === NodeType.MultiNode && this.handleButtons?.includes('auditTo31') && !this.displayedOperButton.includes('auditTo31') && !this.isDetail && !this.appointTask,
707
+ condition: this.curNodeType === NodeType.MultiNode && this.handleButtons?.includes('coSignVoting') && !this.displayedOperButton.includes('coSignVoting') && !this.isDetail,
708
+ action: () => this.audit('32'),
709
+ disabled: this.disable
710
+ },
711
+ {
712
+ id: 'auditTo31',
713
+ label: `${this.passName}`,
714
+ condition: this.curNodeType === NodeType.MultiNode && this.handleButtons?.includes('coSignVoting') && !this.displayedOperButton.includes('coSignVoting') && !this.isDetail,
707
715
  action: () => this.audit('31'),
716
+ type: 'primary',
708
717
  disabled: this.disable
709
718
  },
710
719
  {
@@ -985,6 +994,12 @@ export default {
985
994
  } else if (row.auditResult == '30') {
986
995
  label = '通过'
987
996
  tagColor = 'green' // 绿色
997
+ } else if (row.auditResult == '31'){
998
+ label = `${row.passName ? row.passName : '通过'}`;
999
+ tagColor = 'green'; // 绿色
1000
+ } else if (row.auditResult == '32'){
1001
+ label = `不${row.passName ? row.passName : '通过'}`;
1002
+ tagColor = 'volcano'; // 红色
988
1003
  } else if (row.auditResult == '40') {
989
1004
  label = `${row.rejectName ? row.rejectName : '驳回'}到上一级`
990
1005
  tagColor = 'volcano' // 火红色
@@ -1321,7 +1336,8 @@ export default {
1321
1336
  }
1322
1337
  self.handleButtonsNames = {
1323
1338
  '30': `${self.passName}`,
1324
- '31': `不${self.passName}`,
1339
+ '31': `${self.passName}`,
1340
+ '32': `不${self.passName}`,
1325
1341
  '70': `${self.rejectName}到原点`,
1326
1342
  '40': `${self.rejectName}上一节点`,
1327
1343
  '90': `${self.rejectName}指定节点`,
@@ -1584,7 +1600,7 @@ export default {
1584
1600
  name: self.handleButtonsNames[self.auditResult]
1585
1601
  }
1586
1602
  if (self.form.auditOpinion == '' || self.form.auditOpinion == null) {
1587
- if (self.auditResult === '30') {
1603
+ if (self.auditResult === '30' || self.auditResult === '31') {
1588
1604
  self.form.auditOpinion = '通过'
1589
1605
  self.auditParams.auditOpinion = '通过'
1590
1606
  self.businessFormSave ? self.businessFormSave(self.handleSaveResult, auditResult) : self.handleSaveResult(true)
@@ -1730,8 +1746,6 @@ export default {
1730
1746
  self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? self.getProcessAttributes() : self.doPass()
1731
1747
  }
1732
1748
  })
1733
- } else if (self.auditResult === '31') {
1734
- self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? self.getProcessAttributes() : self.doPass()
1735
1749
  } else {
1736
1750
  if (self.auditResult === '30' && !self.rejectedTask && (!self.handleButtons || self.handleButtons.includes('appointHandler') || self.handleButtons.includes('appointTimeoutTime'))) {
1737
1751
  self.getNextNodes()
package/src/workflow-diagram.vue CHANGED
@@ -88,6 +88,8 @@
88
88
  <Tag color="green" v-else-if="item.auditResult == '13'">办理人为空自动跳过</Tag>
89
89
  <Tag color="green" v-else-if="item.auditResult == '14'">符合流程变量条件自动跳过</Tag>
90
90
  <Tag color="green" v-else-if="item.auditResult == '30'">{{item.handleName ? item.handleName : '通过'}}</Tag>
91
+ <Tag color="green" v-else-if="item.auditResult == '31'">{{`${item.handleName ? item.handleName : '通过'}`}}</Tag>
92
+ <Tag color="volcano" v-else-if="item.auditResult == '32'">{{`不${item.handleName ? item.handleName : '通过'}`}}</Tag>
91
93
  <Tag color="volcano" v-else-if="item.auditResult == '40'">{{item.rejectName ? item.rejectName : '驳回'}}上一节点</Tag>
92
94
  <Tag color="red" v-else-if="item.auditResult=='50'">{{item.rejectName ? item.rejectName : '驳回'}}到原点</Tag>
93
95
  <Tag color="purple" v-else-if="item.auditResult=='51'">流程终止</Tag>
@@ -233,6 +235,14 @@ export default {
233
235
  label = '通过';
234
236
  tagColor = 'green'; // 绿色
235
237
  }
238
+ else if (row.auditResult == '31'){
239
+ label = `${row.passName ? row.passName : '通过'}`;
240
+ tagColor = 'green'; // 绿色
241
+ }
242
+ else if (row.auditResult == '32'){
243
+ label = `不${row.passName ? row.passName : '通过'}`;
244
+ tagColor = 'volcano'; // 红色
245
+ }
236
246
  else if (row.auditResult == '40'){
237
247
  label = `${row.rejectName ? row.rejectName : '驳回'}到上一级`;
238
248
  tagColor = 'volcano'; // 火红色