n20-common-lib 2.20.15 → 2.20.16

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 (13) hide show
  1. package/package.json +1 -1
  2. package/src/components/ApprovalButtons/index.vue +31 -5
  3. package/theme/blue.css +1 -1
  4. package/theme/cctcRed.css +1 -1
  5. package/theme/fonts/iconfont.0aa2107d.ttf +0 -0
  6. package/theme/fonts/iconfont.3a1f3ab9.woff2 +0 -0
  7. package/theme/fonts/iconfont.5306406d.woff +0 -0
  8. package/theme/green.css +1 -1
  9. package/theme/lightBlue.css +1 -1
  10. package/theme/orange.css +1 -1
  11. package/theme/purple.css +1 -1
  12. package/theme/red.css +1 -1
  13. package/theme/yellow.css +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.20.15",
3
+ "version": "2.20.16",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
package/src/components/ApprovalButtons/index.vue CHANGED
@@ -577,12 +577,38 @@ export default {
577
577
  noMsg: true
578
578
  }
579
579
  )
580
- // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
581
- if (res.code === 200 && res.data && (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)) {
582
- this.setSpr = true
583
- this.selectSprList = res.data
580
+ res.data.addTaskTip = true
581
+ // addTaskTip 是否给出加签提示
582
+ if (res.code === 200 && res.data && res.data.addTaskTip) {
583
+ this.$confirm('请确定是否向后加签', $lc('提示'), {
584
+ confirmButtonText: $lc('确定'),
585
+ cancelButtonText: $lc('取消'),
586
+ type: 'warning'
587
+ }).then(() => {
588
+ // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
589
+ if (
590
+ res.code === 200 &&
591
+ res.data &&
592
+ (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)
593
+ ) {
594
+ this.setSpr = true
595
+ this.selectSprList = res.data
596
+ } else {
597
+ this.checkFlowFn()
598
+ }
599
+ })
584
600
  } else {
585
- this.checkFlowFn()
601
+ // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
602
+ if (
603
+ res.code === 200 &&
604
+ res.data &&
605
+ (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)
606
+ ) {
607
+ this.setSpr = true
608
+ this.selectSprList = res.data
609
+ } else {
610
+ this.checkFlowFn()
611
+ }
586
612
  }
587
613
  } catch (error) {
588
614
  console.log(error)