From dd80c84ccb3d2784a016db54c4de6565368a6e97 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 五月 2024 10:39:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 231d60c..31f1926 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -178,17 +178,17 @@
}
function filterChanged(column) {
- gridOptions.loading = true
+ gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0] != undefined ? column.datas[0] : ''
+ let value = column.datas[0]!=undefined?column.datas[0]:''
value = value.trim()
//鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.') > -1) {
- const columnArr = column.property.split('.')
+ if (column.property.indexOf('.')>-1){
+ const columnArr = column.property.split('.')
filterData.value[columnArr[0]] = {
- [columnArr[1]]: value
+ [columnArr[1]]:value
}
- } else {
+ }else{
filterData.value[column.property] = value
}
@@ -198,11 +198,11 @@
request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
if(res.code==200){
- pageTotal.value=res.data.total
+ total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
+ xGrid.value.reloadData(produceList)
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
--
Gitblit v1.8.0