diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index d7070a83..7d4b0d01 100644 --- a/src/components/ProcessDetailList.vue +++ b/src/components/ProcessDetailList.vue @@ -39,6 +39,7 @@ :columns="columns" :dataSource="dataSource" :can-drag="true" + :loading="loading" :rowKey="record => {return record.id + ',' + (record.taskId || '')}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="ipagination" @@ -252,6 +253,11 @@ export default { if (res.success) { // update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ this.dataSource = res.result.records || res.result + if (res.result.total) { + this.ipagination.total = res.result.total + } else { + this.ipagination.total = 0 + } // update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ } else { this.$message.warning(res.message)