From aa7cd5b28360f6b40a9ab498191e42e06344ab90 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 27 十一月 2024 14:43:05 +0800
Subject: [PATCH] 1

---
 pages/order/list/index.vue |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index 01e2980..f61a996 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -84,8 +84,10 @@
           },
           { label: '订单金额(元)', prop: 'totalAmount', minWidth: 150 },
           { label: '底价(元)', prop: 'supplierAmount', minWidth: 150 },
+          { label: '销售扎数', prop: 'saleNum', minWidth: 150 },
           { label: '订单状态', prop: 'statusBackendStr', minWidth: 120 },
           { label: '下单时间', prop: 'createTime', minWidth: 180 },
+          { label: '支付时间', prop: 'paymentTime', minWidth: 180 },
           { label: '合伙人', prop: 'partnerName', minWidth: 120 },
           { label: '库位', prop: 'warehouseLocationCode', minWidth: 120 },
           { label: '特殊需求', prop: 'specialNeedsStr', minWidth: 120 },
@@ -123,7 +125,7 @@
                   },
                   // code: 'ORDER_STATUS_BACKEND',
                 },
-                default: '',
+                default: this.$route.query.statusBackend || '',
                 span: 24,
                 searchImmediately: true,
                 on: {
@@ -167,6 +169,18 @@
               },
               { label: '收货地址:', id: 'address', type: 'input' },
               { label: '库位:', id: 'warehouseLocationCode', type: 'input' },
+              {
+                label: '用户账号:',
+                id: 'createName',
+                type: 'input',
+                el: { placeholder: '用户账号' },
+                rules: {
+                  required: false,
+                  pattern:  /^\d{1,11}$/,
+                  message: '请输入合法的用户账号',
+                  trigger: 'blur',
+                },
+              },
             ],
           },
         ],
@@ -181,7 +195,11 @@
                 component: 'el-bus-select-area',
                 span: 24,
                 commonFormat: true,
-                commonFormatProps: ['customerProvince', 'customerCity', 'customerRegion'],
+                commonFormatProps: [
+                  'customerProvince',
+                  'customerCity',
+                  'customerRegion',
+                ],
                 str: true,
                 strKey: 'districtStr',
                 rules: { required: true, message: '请选择地区' },
@@ -358,7 +376,9 @@
   },
   methods: {
     getDistrict(row) {
-      return `${row.customerProvince || ''}${row.customerCity || ''}${row.customerRegion || ''}`
+      return `${row.customerProvince || ''}${row.customerCity || ''}${
+        row.customerRegion || ''
+      }`
     },
   },
 }

--
Gitblit v1.9.3