From 7a0527e207c59cdcce0b1f7a41bd7457a236ab23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index edf7802..b99f723 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -99,7 +99,7 @@
},
{
prefixIcon: 'vxe-icon-repeat',
- name: '涓�閿��鍥�',
+ name: t('order.oneClickReturn'),
children: [
// { code: 'sheet1', name: '妯増-鏅��' },
{ code: 'back1', name: t('searchOrder.createOrder'),disabled:true },
@@ -401,13 +401,13 @@
}
- const getOrderList = () => {
+ const getOrderList = async () => {
//鍔犺浇璇锋眰
const config = {
filter: filterData.value,
sort: sortData.value
}
- request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
+ await request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
if(res.code==200){
total.value = res.data.total
/*total.dataTotal = res.data.total.dataTotal*1
@@ -420,8 +420,12 @@
}
})
}
- onMounted(() => {
- getOrderList()
+ onMounted(async () => {
+ filterData.value = orderInfo.searchOrderFilter.data
+ await getOrderList()
+ orderInfo.searchOrderFilter.list.forEach(item =>{
+ xGrid.value.getColumnByField(item.field).filters = item.column.filters
+ })
})
const changeFilterEvent = (event, option, $panel) => {
@@ -430,7 +434,6 @@
}
function filterChanged(column){
- //console.log(column)
gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
let value = column.datas[0]!=undefined?column.datas[0]:''
@@ -458,6 +461,8 @@
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
gridOptions.loading=false
+ orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
+ orderInfo.searchOrderFilter.data = filterData.value
}else{
ElMessage.warning(res.msg)
}
--
Gitblit v1.8.0