fix: bug
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 7m11s

This commit is contained in:
sexygoat
2026-04-24 18:39:39 +08:00
parent 2d6b5d7903
commit 17c299e4ce
27 changed files with 500 additions and 481 deletions

View File

@@ -7,7 +7,7 @@
:items="searchFormItems"
show-expand
@reset="handleReset"
label-width="100"
label-width="90"
@search="handleSearch"
></ArtSearchBar>
@@ -421,8 +421,7 @@
config: {
maxlength: 50,
clearable: true
},
labelWidth: '100'
}
},
{
label: '资产标识符',
@@ -431,9 +430,8 @@
config: {
maxlength: 30,
clearable: true,
placeholder: 'ICCID/VirtualNo/IMEI/SN/MSISDN'
},
labelWidth: '100'
placeholder: 'ICCID/VirtualNo/IMEI/MSISDN/SN'
}
},
{
label: '买家手机号',
@@ -443,8 +441,24 @@
config: {
maxlength: 20,
clearable: true
},
labelWidth: '100'
}
},
{
label: '所属代理商',
prop: 'seller_shop_id',
type: 'select',
placeholder: '请选择所属代理商',
options: () =>
shopOptions.value.map((shop) => ({
label: shop.shop_name,
value: shop.id
})),
config: {
clearable: true,
filterable: true,
remote: true,
remoteMethod: (query: string) => searchShops(query)
}
},
{
label: '支付方式',
@@ -454,7 +468,7 @@
options: [
{ label: '钱包支付', value: 'wallet' },
{ label: '微信支付', value: 'wechat' },
{ label: '支付宝支付', value: 'alipay' },
// { label: '支付宝支付', value: 'alipay' },
{ label: '线下支付', value: 'offline' }
],
config: {
@@ -502,23 +516,6 @@
clearable: true
}
},
{
label: '所属代理商',
prop: 'seller_shop_id',
type: 'select',
placeholder: '请选择所属代理商',
options: () =>
shopOptions.value.map((shop) => ({
label: shop.shop_name,
value: shop.id
})),
config: {
clearable: true,
filterable: true,
remote: true,
remoteMethod: (query: string) => searchShops(query)
}
},
{
label: '订单渠道',
prop: 'purchase_role',
@@ -526,9 +523,9 @@
placeholder: '请选择订单渠道',
options: [
{ label: '自己购买', value: 'self_purchase' },
{ label: '上级代理购买', value: 'purchased_by_parent' },
{ label: '平台代购', value: 'purchased_by_platform' },
{ label: '给下级购买', value: 'purchase_for_subordinate' }
// { label: '上级代理购买', value: 'purchased_by_parent' },
{ label: '平台代购', value: 'purchased_by_platform' }
// { label: '给下级购买', value: 'purchase_for_subordinate' }
],
config: {
clearable: true
@@ -565,6 +562,7 @@
{ label: '资产标识符', prop: 'asset_identifier' },
{ label: '订单渠道', prop: 'purchase_role' },
{ label: '购买备注', prop: 'purchase_remark' },
{ label: '下单时间', prop: 'created_at' },
{ label: '操作者', prop: 'operator_name' },
{ label: '支付状态', prop: 'payment_status' },
{ label: '佣金状态', prop: 'commission_status_name' },
@@ -914,6 +912,7 @@
prop: 'asset_identifier',
label: '资产标识符',
width: 180,
showOverflowTooltip: true,
formatter: (row: Order) => row.asset_identifier || '-'
},
{
@@ -942,6 +941,12 @@
showOverflowTooltip: true,
formatter: (row: Order) => row.purchase_remark || '-'
},
{
prop: 'created_at',
label: '下单时间',
width: 180,
formatter: (row: Order) => formatDateTime(row.created_at)
},
{
prop: 'operator_name',
label: '操作者',