From 2d342a8ee0bacacfea579bca83d0a8af85ce78f9 Mon Sep 17 00:00:00 2001
From: Leo <leo@qi-cloud.com>
Date: Sat, 15 Nov 2025 01:45:23 +0800
Subject: [PATCH] 1

---
 src/views/system/jdorder/orderList.vue | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index 1cfbae0..8076c6d 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -7,18 +7,15 @@
           <el-form-item label="备注">
             <el-input v-model="queryParams.remark" placeholder="单据备注" clearable size="small" @keyup.enter.native="handleQuery" />
           </el-form-item>
+          <el-form-item label="订单号">
+            <el-input v-model="queryParams.orderSearch" placeholder="订单号/第三方单号/分销标识" clearable size="small" @keyup.enter.native="handleQuery" />
+          </el-form-item>
           <el-form-item label="分销标记">
             <el-input v-model="queryParams.distributionMark" placeholder="分销标记" clearable size="small" @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="型号">
             <el-input v-model="queryParams.modelNumber" placeholder="型号" clearable size="small" @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="订单号">
-            <el-input v-model="queryParams.orderId" placeholder="订单号" clearable size="small" @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="第三方单号">
-            <el-input v-model="queryParams.thirdPartyOrderNo" placeholder="第三方单号" clearable size="small" @keyup.enter.native="handleQuery" />
-          </el-form-item>
           <el-form-item label="下单人">
             <el-input v-model="queryParams.buyer" placeholder="下单人" clearable size="small" @keyup.enter.native="handleQuery" />
           </el-form-item>
@@ -427,11 +424,10 @@ export default {
         pageNum: 1,
         pageSize: 50,
         remark: undefined,
+        orderSearch: undefined,
         distributionMark: undefined,
         modelNumber: undefined,
         link: undefined,
-        orderId: undefined,
-        thirdPartyOrderNo: undefined,
         buyer: undefined,
         address: undefined,
         status: undefined,
@@ -594,11 +590,10 @@ export default {
         pageNum: 1,
         pageSize: 50,
         remark: undefined,
+        orderSearch: undefined,
         distributionMark: undefined,
         modelNumber: undefined,
         link: undefined,
-        orderId: undefined,
-        thirdPartyOrderNo: undefined,
         buyer: undefined,
         address: undefined,
         status: undefined,
@@ -1117,7 +1112,7 @@ export default {
 
     /** 准备查询参数：去除空格并在关键词搜索时清空日期 */
     prepareQueryParams() {
-      const textKeys = ['remark', 'distributionMark', 'modelNumber', 'link', 'orderId', 'thirdPartyOrderNo', 'buyer', 'address', 'status']
+      const textKeys = ['remark', 'orderSearch', 'distributionMark', 'modelNumber', 'link', 'buyer', 'address', 'status']
       let hasKeyword = false
 
       textKeys.forEach(key => {