From cf69a7ec3e5c58048c5476192fc3ee06e79ef210 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 14:46:42 +0800
Subject: [PATCH] 583-订单管理-订单列表统计页面增加一个，筛选地区的下拉列表，例如昆明-呈贡区等等

---
 pages/order/list/index.vue |   92 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index bd7415b..dc1cece 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -37,10 +37,14 @@
       orderList: [],
       tableConfig: {
         url: 'flower/api/order/list',
+        editUrl: 'flower/api/order/page/update',
         hasNew: false,
-        hasEdit: false,
+        hasEdit: true,
         hasDelete: false,
         persistSelection: true,
+        hasExport: true,
+        exportUrl: 'flower/api/order/list/export',
+        exportText: '导出订单',
         onResetView: (row) => {
           this.$router.push(`${this.$route.path}/${row.id}`)
         },
@@ -59,6 +63,11 @@
             }
           }
         },
+        beforeOpen: (row, isNew) => {
+          if (!isNew) {
+            row.districtStr = this.getDistrict(row)
+          }
+        },
         columns: [
           { label: '', type: 'selection', minWidth: 60, fixed: 'left' },
           { label: '订单号', prop: 'orderNo', minWidth: 150, fixed: 'left' },
@@ -75,10 +84,13 @@
           },
           { 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 },
           {
             label: '备注',
             formatter: (row) => (
@@ -113,7 +125,7 @@
                   },
                   // code: 'ORDER_STATUS_BACKEND',
                 },
-                default: '',
+                default: this.$route.query.statusBackend || '',
                 span: 24,
                 searchImmediately: true,
                 on: {
@@ -157,6 +169,75 @@
               },
               { 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',
+                },
+              },
+              {
+                label: '地区',
+                id: 'province',
+                component: 'el-bus-select-area',
+                el: {
+                  clearable: true,
+                },
+                commonFormat: true,
+                commonFormatProps: ['province', 'city', 'region'],
+                customClass: 'in-bus-form',
+              },
+            ],
+          },
+        ],
+        form: [
+          {
+            type: 'row',
+            span: 12,
+            items: [
+              {
+                label: '地区：',
+                id: 'customerProvince',
+                component: 'el-bus-select-area',
+                span: 24,
+                commonFormat: true,
+                commonFormatProps: [
+                  'customerProvince',
+                  'customerCity',
+                  'customerRegion',
+                ],
+                str: true,
+                strKey: 'districtStr',
+                rules: { required: true, message: '请选择地区' },
+              },
+              {
+                label: '详细地址：',
+                id: 'customerAddress',
+                type: 'input',
+                span: 24,
+                rules: {
+                  required: true,
+                  message: '请输入详细地址且最大不超过50个汉字',
+                  trigger: 'blur',
+                  max: 50,
+                },
+              },
+              {
+                label: '联系方式：',
+                id: 'customerTel',
+                type: 'input',
+                rules: {
+                  required: true,
+                  pattern: this.$elBusUtil.REG.MOBILEPHONE,
+                  message: '请输入合法的手机号',
+                  trigger: 'blur',
+                },
+              },
             ],
           },
         ],
@@ -304,6 +385,13 @@
       this.$refs.crud.search()
     },
   },
+  methods: {
+    getDistrict(row) {
+      return `${row.customerProvince || ''}${row.customerCity || ''}${
+        row.customerRegion || ''
+      }`
+    },
+  },
 }
 </script>
 

--
Gitblit v1.9.3