Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhn
2022-04-29 17:55:08 +08:00
@@ -642,7 +642,7 @@
if (this.dataSource && this.dataSource.length > 0) {
let isTrue
for (let i = 0; i < this.dataSource.length; i++) {
if (this.dataSource[i].taskAffirmStatus == 'rejected' && this.dataSource[i].inventoryAffirmStatus == 'rejected') {
if (this.dataSource[i].taskAffirmStatus == 'accepted' && this.dataSource[i].inventoryAffirmStatus == 'accepted') {
isTrue = true
} else {
isTrue = false