Commit 7ef8c149ab6cb4ab5e380ee89a390e7ae3bb1dc3
Merge branch 'zwl-develop' into 'develop'
fix: 审核通过bug修复 See merge request !28
Showing
1 changed file
with
3 additions
and
2 deletions
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
| @@ -365,7 +365,8 @@ | @@ -365,7 +365,8 @@ | ||
| 365 | disabled: isReviewed, // 如果已发放则禁用 | 365 | disabled: isReviewed, // 如果已发放则禁用 |
| 366 | onClick: () => { | 366 | onClick: () => { |
| 367 | if (!isReviewed) { | 367 | if (!isReviewed) { |
| 368 | - if (hasCommission) { | 368 | + // 如果提成金额为0或者任意值，则可以审核通过 |
| 369 | + if ( hasCommission || hasCommission==0 ) { | ||
| 369 | Modal.destroyAll(); | 370 | Modal.destroyAll(); |
| 370 | handleStatus(record, 'approved'); // 已发放 | 371 | handleStatus(record, 'approved'); // 已发放 |
| 371 | } else { | 372 | } else { |
| @@ -382,7 +383,7 @@ | @@ -382,7 +383,7 @@ | ||
| 382 | disabled: isReviewed || isSentButNotPaid, // 如果已发放或应发但不发则禁用 | 383 | disabled: isReviewed || isSentButNotPaid, // 如果已发放或应发但不发则禁用 |
| 383 | onClick: () => { | 384 | onClick: () => { |
| 384 | if (!isReviewed && !isSentButNotPaid) { | 385 | if (!isReviewed && !isSentButNotPaid) { |
| 385 | - if (hasCommission) { | 386 | + if ( hasCommission || hasCommission==0 ) { |
| 386 | Modal.destroyAll(); | 387 | Modal.destroyAll(); |
| 387 | handleStatus(record, 'sentButNotPaid'); // 应发但不发 | 388 | handleStatus(record, 'sentButNotPaid'); // 应发但不发 |
| 388 | } else { | 389 | } else { |