From 28c2126249a35ded0b816a07d80c015caa45a4f3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 11 二月 2025 09:40:27 +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 |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 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 e9d678d..b7551cd 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
@@ -34,9 +34,13 @@
   let sheetIndex = ref(-1)
   let orderType = ref("2")
   let filterData = ref({})
+  let sortData = ref({
+    field:'id',
+    order:null
+  })
   let orderList = ref([])
   let pageNum=ref(1)
-  let total = reactive({
+  let total = ref({
     pageTotal : 0,
     dataTotal : 0,
     pageSize : 50
@@ -63,6 +67,9 @@
     },
     filterConfig: {   //绛涢�夐厤缃」
       remote: true
+    },
+    sortConfig: {   //鎺掑簭閰嶇疆椤�
+      remote: true//鏄惁鏈嶅姟绔帓搴�
     },
     customConfig: {
       storage: true
@@ -164,7 +171,8 @@
           }
           const List = ["quantity",'goodsQuantity','area','perimeter','money']
           if (List.includes(column.field)) {
-            return footSum(data, column.field)
+            //return footSum(data, column.field)
+            return total.value[column.field]
           }
           return ''
         })
@@ -308,15 +316,24 @@
     },
     cellClick({ row }){
       rowClickIndex.value = row
+    },
+    sortChange ({ field, order }) {
+      sortData.value = {field,order}
+      selectOrderList()
     }
   }
 
   const getOrderList = () => {
     //鍔犺浇璇锋眰
-    request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData).then((res) => {
+    const config = {
+      filter: filterData.value,
+      sort: sortData.value
+    }
+    request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
       if(res.code==200){
-        total.dataTotal = res.data.total.total*1
-        total.pageTotal= res.data.total.pageTotal
+        total.value = res.data.total
+        /*total.dataTotal = res.data.total.dataTotal*1
+        total.pageTotal= res.data.total.pageTotal*/
         orderInfo.selectDate = res.data.selectDate
         orderList.value = deepClone(res.data.data)
         xGrid.value.loadData(orderList.value)
@@ -349,10 +366,16 @@
     }else{
       filterData.value[column.property] = value
     }
-    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`,filterData.value).then((res) => {
+
+    const config = {
+      filter: filterData.value,
+      sort: sortData.value
+    }
+    request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
       if(res.code==200){
-        total.dataTotal = res.data.total.total*1
-        total.pageTotal=parseInt(res.data.total)
+        total.value = res.data.total
+        /*total.dataTotal = res.data.total.total*1
+        total.pageTotal=parseInt(res.data.total)*/
         pageNum.value=1
         orderList.value = deepClone(res.data.data)
         xGrid.value.loadData(orderList.value)
@@ -366,11 +389,16 @@
   //鍙屽嚮琛ㄦ牸琛�
 
   const selectOrderList = ()=>{
-    request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${orderInfo.selectDate}`
-        ,filterData.value).then((res) => {
+    const config = {
+      filter: filterData.value,
+      sort: sortData.value
+    }
+    request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`
+        ,config).then((res) => {
       if(res.code==200){
-        total.dataTotal = res.data.total.total*1
-        total.pageTotal = res.data.total.pageTotal
+        total.value = res.data.total
+        /*total.dataTotal = res.data.total.total*1
+        total.pageTotal = res.data.total.pageTotal*/
         orderInfo.selectDate=res.data.selectDate
         orderList.value = deepClone(res.data.data)
         xGrid.value.loadData(orderList.value)

--
Gitblit v1.8.0