diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 3439653a2..d4bd69fbf 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -180,18 +180,18 @@ } .ant-table-column-title { - font-weight: bold!important; + font-weight: bold !important; } .ant-table-thead > tr > th { - background: #f3f6f6!important; - padding-top: 12px!important; - padding-bottom: 12px!important; + background: #f3f6f6 !important; + padding-top: 12px !important; + padding-bottom: 12px !important; } .ant-table-tbody > tr > td { - padding-top: 12px!important; - padding-bottom: 12px!important; + padding-top: 12px !important; + padding-bottom: 12px !important; } .ant-tooltip-inner { @@ -206,4 +206,13 @@ .ant-menu-inline-collapsed-tooltip a { color: #333 !important; } + + .page .ant-select-selection--single { + height: 32px !important; + line-height: 32px !important; + } + .page .ant-select-selection__rendered{ + height: 32px !important; + line-height: 32px !important; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 1b8c32b24..8caae84e1 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -314,9 +314,22 @@ -- -
- {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}} +
+
+ + +
@@ -403,6 +416,9 @@ orderBy: '1', istable: true, orderByField: '', + pageNo: 1, + pageSize: 50, + total: 0, downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download', dataSourceFile: [], @@ -424,7 +440,7 @@ url: { addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy', queryConditionInventory: '/dummy/dummyInventoryInfoEO/queryConditionInventory', - list: '/dummy/dummyInventoryInfoEO/list', + list: '/dummy/dummyInventoryInfoEO/page', addModel: '/dummy/dummyInventoryInfoEO/add', editModel: '/dummy/dummyInventoryInfoEO/edit', deleteBatch: '/dummy/dummyInventoryInfoEO/deleteBatch', @@ -1231,6 +1247,15 @@ } }) }, + onChangeSize(page, pageSize) { + this.pageNo = page + this.getList() + }, + SizeChange(page, pageSize) { + this.pageNo = 1 + this.pageSize = pageSize + this.getList() + }, getList() { if (this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String && this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String instanceof Array) { this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String = this.queryParam.xin1Che1Xing2Shi2Shi1Ri4Qi1String.join(',') @@ -1243,12 +1268,21 @@ ...this.queryParamQuery, orderBy: this.orderBy, orderByField: this.orderByField, - dummyInventoryBaseId: this.$route.query.id + dummyInventoryBaseId: this.$route.query.id, + pageNo: this.pageNo, + pageSize: this.pageSize } this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { - this.dataSource = res.result || [] + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } + this.dataSource = res.result.records || [] + this.total = res.result.total + // this.dataSource = res.result || [] if (this.dataSource.length == 0) { this.$nextTick(() => { let anttablebody = document.getElementsByClassName('ant-table-body') @@ -1727,6 +1761,11 @@ padding-left: 16px!important; border-right: 1px solid #e8e8e8; } + .page { + text-align: right; + margin-top: 20px; + margin-bottom: 20px; + } \ No newline at end of file