Browse Source

refactor(订单模块): 替换订单列表接口并优化查询参数处理

yz 1 month ago
parent
commit
0f49a167b9
1 changed files with 19 additions and 7 deletions
  1. 19 7
      src/views/order/order/index-avue.vue

+ 19 - 7
src/views/order/order/index-avue.vue

@@ -114,7 +114,9 @@
 
 <script>
 import { option } from './option'
-import { getList, add, update, getDetail } from '@/api/order/order'
+// 原接口: import { getList, add, update, getDetail } from '@/api/order/order'
+import { add, update, getDetail } from '@/api/order/order'
+import { getOrderList } from '@/api/order/sales-order'
 import { submitOrderToU9 } from '@/api/order/sales-order'
 import { getUnification } from '@/api/common'
 import {
@@ -125,7 +127,7 @@ import {
   getOrderStatusLabel,
   getOrderStatusTagType
 } from '@/constants'
-import OrderItemTable from '@/components/order-item-table'
+import OrderItemTable from '@/components/order-item-table/index.vue'
 import OrderForm from '@/components/order-form/order-form.vue'
 import { ORDER_FORM_EVENTS } from '@/components/order-form/events'
 import { mapGetters } from 'vuex'
@@ -183,7 +185,20 @@ export default {
      */
     onLoad(page, params = {}) {
       this.loading = true
-      getList(page.currentPage, page.pageSize, params).then(res => {
+      // 仅映射销售订单接口支持的查询参数,并兼容 Avue 日期范围
+      const query = {
+        orderCode: params.orderCode,
+        orgName: params.orgName,
+        customerName: params.customerName,
+        receiverName: params.receiverName,
+        receiverPhone: params.receiverPhone,
+        createTimeStart: params.createTimeStart || (Array.isArray(params.createTime) ? params.createTime[0] : undefined),
+        createTimeEnd: params.createTimeEnd || (Array.isArray(params.createTime) ? params.createTime[1] : undefined)
+      }
+      // 移除 undefined 字段,避免向后端传递空参数
+      Object.keys(query).forEach(k => query[k] === undefined && delete query[k])
+
+      getOrderList(page.currentPage, page.pageSize, query).then(res => {
         const data = res.data.data
         this.data = data.records
         this.page.total = data.total
@@ -480,8 +495,5 @@ export default {
   border-bottom: 1px solid #e4e7ed;
 }
 
-.order-item-dialog .el-dialog__title {
-  color: #303133;
-  font-weight: 600;
-}
+
 </style>