diff --git a/src/components/SearchOrder.vue b/src/components/SearchOrder.vue
new file mode 100644
index 0000000..4a3ca33
--- /dev/null
+++ b/src/components/SearchOrder.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SelectionOrderBack.vue b/src/components/SelectionOrderBack.vue
index e9bfcca..b652d15 100644
--- a/src/components/SelectionOrderBack.vue
+++ b/src/components/SelectionOrderBack.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/components/SelectionOrderStatus.vue b/src/components/SelectionOrderStatus.vue
index e677e0e..519863e 100644
--- a/src/components/SelectionOrderStatus.vue
+++ b/src/components/SelectionOrderStatus.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/components/SerchOrder.vue b/src/components/SerchOrder.vue
new file mode 100644
index 0000000..e9bfcca
--- /dev/null
+++ b/src/components/SerchOrder.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/layout/components/main/order/index.vue b/src/views/layout/components/main/order/index.vue
index 2dfb5bb..0fa3429 100644
--- a/src/views/layout/components/main/order/index.vue
+++ b/src/views/layout/components/main/order/index.vue
@@ -9,13 +9,7 @@
-
+
@@ -67,6 +61,7 @@ import SelectionShopId from '@/components/SelectionShopId'
import SelectionOrderStatus from '@/components/SelectionOrderStatus'
import SelectionOrderBack from '@/components/SelectionOrderBack'
import DatePickerOrder from '@/components/DatePickerOrder'
+import SearchOrder from '@/components/SearchOrder'
export default {
name: 'Order',
@@ -78,14 +73,16 @@ export default {
start_time: '', // 搜索条件 起始时间
end_time: '', // 搜索条件 结束时间
status: [], // 搜索条件 订单状态
- back: []// 搜索条件 退款状态
+ back: [], // 搜索条件 退款状态
+ search: [] // 搜索条件 搜索
}
},
components: {
SelectionShopId,
SelectionOrderStatus,
SelectionOrderBack,
- DatePickerOrder
+ DatePickerOrder,
+ SearchOrder
},
computed: {
// 获取订单列表
@@ -123,6 +120,22 @@ export default {
return this.back.includes(order.back)
})
}
+ // 搜索条件过滤
+ if (this.search[1] !== '') {
+ filteredList = filteredList.filter(order => {
+ if (this.search[0] === 'orderId') {
+ return order.order_sn.indexOf(this.search[1]) >= 0
+ } else if (this.search[0] === 'name') {
+ return order.receiver.indexOf(this.search[1]) >= 0
+ } else if (this.search[0] === 'tel') {
+ return order.tel.indexOf(this.search[1]) >= 0
+ } else if (this.search[0] === 'remark') {
+ return order.remark.indexOf(this.search[1]) >= 0
+ } else if (this.search[0] === 'desc') {
+ return order.describe.indexOf(this.search[1]) >= 0
+ }
+ })
+ }
return filteredList
} else {
return []
@@ -151,6 +164,12 @@ export default {
*/
handleOrderBackChange (val) {
this.back = val
+ },
+ /**
+ * @description: 搜索组件绑定事件
+ */
+ handleSearchChange (val) {
+ this.search = val
}
},
watch: {