|
@@ -97,7 +97,7 @@
|
|
|
margin-top: 20px;
|
|
|
margin-bottom: 30px;"
|
|
|
>
|
|
|
- <i class="el-icon-loading"></i>
|
|
|
+ <i v-if="loading" class="el-icon-loading"></i>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -141,7 +141,8 @@ export default {
|
|
|
newArr: [],
|
|
|
busy: true,
|
|
|
page: 1,
|
|
|
- pageSize: 15
|
|
|
+ pageSize: 15,
|
|
|
+ loading: false
|
|
|
};
|
|
|
},
|
|
|
components: {
|
|
@@ -200,7 +201,7 @@ export default {
|
|
|
},
|
|
|
init() {
|
|
|
this.appealsIng();
|
|
|
- this.auditCompletedIng(true);
|
|
|
+ this.auditCompletedIng();
|
|
|
this.InAuditIng();
|
|
|
},
|
|
|
// 可申诉的未执行策略
|
|
@@ -251,7 +252,7 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
- console.log(this.appealsArr);
|
|
|
+ // console.log(this.appealsArr);
|
|
|
});
|
|
|
},
|
|
|
// 审核完成、超时未申诉
|
|
@@ -274,12 +275,16 @@ export default {
|
|
|
queryWorkflow(params).then(res => {
|
|
|
// this.auditCompletedArr = res.content ? res.content : [];
|
|
|
if (flag) {
|
|
|
+ this.loading = true;
|
|
|
// 多次加载数据
|
|
|
- this.auditCompletedArr = this.auditCompletedArr.concat(res.content);
|
|
|
- if (res.content.length == 0) {
|
|
|
- this.busy = true;
|
|
|
- } else {
|
|
|
+ this.auditCompletedArr = this.auditCompletedArr.concat(
|
|
|
+ res.content || []
|
|
|
+ );
|
|
|
+ if (res.content && res.content.length > 0) {
|
|
|
this.busy = false;
|
|
|
+ } else {
|
|
|
+ this.loading = false;
|
|
|
+ this.busy = true;
|
|
|
}
|
|
|
} else {
|
|
|
this.auditCompletedArr = res.content;
|
|
@@ -289,6 +294,7 @@ export default {
|
|
|
},
|
|
|
loadMore: function() {
|
|
|
this.busy = true;
|
|
|
+ this.loading = true;
|
|
|
setTimeout(() => {
|
|
|
this.page++;
|
|
|
this.auditCompletedIng(true);
|