From 111392f8ae1f27c4cde93bd7974a5f16c8188188 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 09 一月 2025 09:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/order/list/index.vue | 125 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 119 insertions(+), 6 deletions(-)
diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index 378a70a..753861e 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-bus-crud
+<!-- <el-bus-crud
ref="crud"
v-bind="tableConfig"
:extra-query="{ levelDown: checkedLevelDown }"
@@ -14,7 +14,11 @@
>未处理的质检异常订单</el-checkbox
>
</template>
- </el-bus-crud>
+ </el-bus-crud>-->
+ <el-bus-crud
+ ref="crud"
+ v-bind="tableConfig"
+ ></el-bus-crud>
<div id="print-container">
<print-list ref="printList" :order-list="orderList" />
</div>
@@ -42,6 +46,9 @@
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}`)
},
@@ -57,6 +64,12 @@
// 组件内部不会修改这个prop直接修改可忽略警告
statusComp.extraQuery = { ...params, statusBackend: '' }
statusComp.getOtherOptions()
+ }
+ const abnormalOrderStatusComp = searchForm.getComponentById('abnormalOrderStatus')
+ if (abnormalOrderStatusComp) {
+ // 组件内部不会修改这个prop直接修改可忽略警告
+ abnormalOrderStatusComp.extraQuery = { ...params, abnormalOrderStatus: '' }
+ abnormalOrderStatusComp.getOtherOptions()
}
}
},
@@ -81,8 +94,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 },
@@ -120,7 +135,42 @@
},
// code: 'ORDER_STATUS_BACKEND',
},
- default: '',
+ default: this.$route.query.statusBackend || '',
+ span: 24,
+ searchImmediately: true,
+ on: {
+ optionsChange: (e, updateForm, { currentComp }) => {
+ if (Array.isArray(e[0]) && e[0].length > 0) {
+ const totalCount = e[0].reduce((total, current) => {
+ return (total += current.orderCount)
+ }, 0)
+ // 组件内部不会修改这个prop直接修改可忽略警告
+ currentComp.props = {
+ allLabel: `不限(${totalCount})`,
+ }
+ }
+ },
+ },
+ },
+ {
+ label: '异常订单：',
+ id: 'abnormalOrderStatus',
+ type: 'bus-radio',
+ el: {
+ hasAll: true,
+ otherInterfaceUri: 'flower/api/order/abnormal/status/count',
+ childType: 'el-radio-button',
+ filterOptions: (list) => {
+ return list.map((item) => {
+ return {
+ ...item,
+ label: `${item.label}(${item.orderCount})`,
+ }
+ })
+ },
+ // code: 'ORDER_STATUS_BACKEND',
+ },
+ default: this.$route.query.abnormalOrderStatus || '',
span: 24,
searchImmediately: true,
on: {
@@ -164,6 +214,29 @@
},
{ 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',
+ },
],
},
],
@@ -178,7 +251,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: '请选择地区' },
@@ -283,6 +360,14 @@
],
extraButtons: [
{
+ text: '快递单号',
+ show: (row) => !row.partnerName && row.statusBackend === 'SEND',
+ atClick: (row) => {
+ this.$refs.crud.$refs.extraDialog[1].show(row)
+ return false
+ },
+ },
+ {
text: '发货',
show: (row) => !row.partnerName && row.statusBackend === 'SEND',
atClick: (row) => {
@@ -321,7 +406,8 @@
{
label: '快递号：',
id: 'deliveryNo',
- type: 'input',
+ type: 'text',
+ readonly: true,
rules: {
required: true,
message: '请输入快递号',
@@ -336,6 +422,31 @@
)
if (code === 0) {
this.$message.success('发货成功')
+ }
+ },
+ },
+ {
+ title: '快递单号录入',
+ hiddenReverseItems: [],
+ form: [
+ {
+ label: '快递号：',
+ id: 'deliveryNo',
+ type: 'input',
+ rules: {
+ required: true,
+ message: '请输入快递号',
+ trigger: 'blur',
+ },
+ },
+ ],
+ atConfirm: async (val) => {
+ const { code } = await this.$elBusHttp.request(
+ 'flower/api/order/list/saveDeliveryNo',
+ { method: 'post', data: val }
+ )
+ if (code === 0) {
+ this.$message.success('快递单号录入成功')
}
},
},
@@ -355,7 +466,9 @@
},
methods: {
getDistrict(row) {
- return `${row.customerProvince || ''}${row.customerCity || ''}${row.customerRegion || ''}`
+ return `${row.customerProvince || ''}${row.customerCity || ''}${
+ row.customerRegion || ''
+ }`
},
},
}
--
Gitblit v1.9.3