From fcf705e1f9a369cab61e60d72048c36a0e1ee793 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 07 三月 2024 13:48:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 908da1b..e480707 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -119,12 +119,18 @@
form.date1=getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
-
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
if (res.code == 200) {
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
@@ -149,6 +155,13 @@
ElMessage.warning(res.msg)
}
})
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ pageNum.value=currentPage
+ total.pageTotal = pageSize
+ selectOrderList()
}
/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
@@ -255,15 +268,14 @@
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['鎬绘暟閲�','鎬婚潰绉�','鍒嗙鏁�']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return '鍚堣:'
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
- }
+ // if (props.tableProp.footList.includes(column.field)) {
+ // return sumNum(data, column.field)
+ // }
return ''
})
]
@@ -333,7 +345,19 @@
</div>
</div>
</template>
-
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <!-- 'PrevJump','NextJump', -->
+ <vxe-pager
+ @page-change="handlePageChange"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :total="total.dataTotal"
+ >
+ </vxe-pager>
+ </template>
</vxe-grid>
</div>
--
Gitblit v1.8.0