From 341097ef6f0cb6ef54708fa34c6636c1bc2da3ba Mon Sep 17 00:00:00 2001 From: "hongrui.an" <297504645@qq.com> Date: Wed, 4 Jun 2025 10:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90EQI=E3=80=91=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=A0=BC=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/utils/common/index.js | 11 +++++ .../logisticsPlan/supplierMrpMonth/index.vue | 21 ++++++---- .../supplierProPlaning/index.vue | 40 ++++++------------- .../logisticsPlan/supplierSaWeek/index.vue | 21 ++++++---- 4 files changed, 50 insertions(+), 43 deletions(-) create mode 100644 Web/src/utils/common/index.js diff --git a/Web/src/utils/common/index.js b/Web/src/utils/common/index.js new file mode 100644 index 0000000..c19bb11 --- /dev/null +++ b/Web/src/utils/common/index.js @@ -0,0 +1,11 @@ +// filter中空字符转义 +export function getPageParamsForFilter(pageParams){ + if(pageParams.filters && JSON.stringify(pageParams.filters) != "{}"){ + for(let i in pageParams.filters){ + if(pageParams.filters[i] == ""){ + pageParams.filters[i] = null + } + } + } + return pageParams +} \ No newline at end of file diff --git a/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue b/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue index e4d32aa..b599bd9 100644 --- a/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue +++ b/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue @@ -4,7 +4,11 @@ - + 查询 @@ -32,6 +36,7 @@ import { downloadByData } from '@/utils/download' import { ElMessageBox, ElMessage } from 'element-plus' import tablePage from '@/components/tablePage/index.vue' import EnumList from '@/utils/common/enumList' +import { getPageParamsForFilter } from '@/utils/common/index' import { useRoute } from 'vue-router' const route = useRoute() @@ -39,13 +44,13 @@ const route = useRoute() const state = reactive({ apiName:'cherysuppliermrpmonth', loading: false, - queryParams: { - materialCode: '' - }, pageParams: { page: 1, pageSize: 10, - total: 1 + total: 1, + filters: { + materialCode: null + }, }, tableColumns: [ {prop:'releaseEdition',title:'需求发布版次',width:120}, @@ -85,10 +90,10 @@ onMounted(() => { function handleQuery(page) { state.loading = true state.pageParams.page = page - getCommonPaged(state.apiName,Object.assign({}, state.queryParams, state.pageParams)) + getCommonPaged(state.apiName,Object.assign({}, getPageParamsForFilter(state.pageParams))) .then((resp) => { state.tableData = resp.data.data - state.pageParams.total = resp.data.total + state.pageParams.total = resp.data.totalPages }) .finally(() => (state.loading = false)) } @@ -96,7 +101,7 @@ function handleQuery(page) { // 导出 function handleExport(){ state.loading = true - postCommonExport(state.apiName,Object.assign({}, state.queryParams, state.pageParams)) + postCommonExport(state.apiName,Object.assign({}, getPageParamsForFilter(state.pageParams))) .then((res) => { downloadByData(res.data,route.meta.title+'.xlsx') }) diff --git a/Web/src/views/logisticsPlan/supplierProPlaning/index.vue b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue index 0f139ca..b94a69b 100644 --- a/Web/src/views/logisticsPlan/supplierProPlaning/index.vue +++ b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue @@ -4,7 +4,11 @@ - + 查询 @@ -32,6 +36,7 @@ import { downloadByData } from '@/utils/download' import { ElMessageBox, ElMessage } from 'element-plus' import tablePage from '@/components/tablePage/index.vue' import EnumList from '@/utils/common/enumList' +import { getPageParamsForFilter } from '@/utils/common/index' import { useRoute } from 'vue-router' const route = useRoute() @@ -39,13 +44,13 @@ const route = useRoute() const state = reactive({ apiName:'supplierproplaning', loading: false, - queryParams: { - materialCode: '' - }, pageParams: { page: 1, pageSize: 10, - total: 1 + total: 1, + filters: { + materialCode: null + }, }, tableColumns: [ {prop:'releaseEdition',title:'需求发布版次',width:120}, @@ -83,29 +88,10 @@ onMounted(() => { function handleQuery(page) { state.loading = true state.pageParams.page = page - getCommonPaged(state.apiName,Object.assign({}, state.queryParams, state.pageParams)) + getCommonPaged(state.apiName,Object.assign({}, getPageParamsForFilter(state.pageParams))) .then((resp) => { state.tableData = resp.data.data - state.pageParams.total = resp.data.total - // state.tableData = [ - // {id:1,isDelete:1,plant:'p'+page}, - // {id:2,isDelete:0,plant:page}, - // {id:3,isDelete:1,plant:page}, - // {id:4,isDelete:1,plant:page}, - // {id:5,isDelete:1,plant:page}, - // {id:6,isDelete:1,plant:page}, - // {id:7,isDelete:1,plant:page}, - // {id:8,isDelete:1,plant:page}, - // {id:9,isDelete:1,plant:page}, - // {id:10,isDelete:1,plant:page}, - // {id:11,isDelete:1,plant:page}, - // {id:12,isDelete:1,plant:page}, - // {id:13,isDelete:1,plant:page}, - // {id:14,isDelete:1,plant:page}, - // {id:15,isDelete:1,plant:page}, - // {id:16,isDelete:1,plant:page}, - // ] - // state.pageParams.total = state.tableData.length + state.pageParams.total = resp.data.totalPages }) .finally(() => (state.loading = false)) } @@ -113,7 +99,7 @@ function handleQuery(page) { // 导出 function handleExport(){ state.loading = true - postCommonExport(state.apiName,Object.assign({}, state.queryParams, state.pageParams)) + postCommonExport(state.apiName,Object.assign({}, getPageParamsForFilter(state.pageParams))) .then((res) => { downloadByData(res.data,route.meta.title+'.xlsx') }) diff --git a/Web/src/views/logisticsPlan/supplierSaWeek/index.vue b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue index 903e34c..086a7cc 100644 --- a/Web/src/views/logisticsPlan/supplierSaWeek/index.vue +++ b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue @@ -4,7 +4,11 @@ - + 查询 @@ -33,6 +37,7 @@ import { downloadByData } from '@/utils/download' import { ElMessageBox, ElMessage } from 'element-plus' import tablePage from '@/components/tablePage/index.vue' import EnumList from '@/utils/common/enumList' +import { getPageParamsForFilter } from '@/utils/common/index' import { useRoute } from 'vue-router' const route = useRoute() @@ -40,13 +45,13 @@ const route = useRoute() const state = reactive({ apiName:'cherysuppliersaweek', loading: false, - queryParams: { - scheduleAgreement: '' - }, pageParams: { page: 1, pageSize: 10, - total: 1 + total: 1, + filters: { + scheduleAgreement: null + }, }, tableColumns: [ {prop:'scheduleAgreement',title:'计划协议号',width:120}, @@ -75,10 +80,10 @@ onMounted(() => { function handleQuery(page) { state.loading = true state.pageParams.page = page - getCommonPaged(state.apiName,Object.assign({}, state.queryParams, state.pageParams)) + getCommonPaged(state.apiName,Object.assign({}, getPageParamsForFilter(state.pageParams))) .then((resp) => { state.tableData = resp.data.data - state.pageParams.total = resp.data.total + state.pageParams.total = resp.data.totalPages }) .finally(() => (state.loading = false)) } @@ -86,7 +91,7 @@ function handleQuery(page) { // 导出 function handleExport(){ state.loading = true - postCommonExport(state.apiName,Object.assign({}, state.queryParams, state.pageParams)) + postCommonExport(state.apiName,Object.assign({}, getPageParamsForFilter(state.pageParams))) .then((res) => { downloadByData(res.data,route.meta.title+'.xlsx') })