CC/ruoyi-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-07-28 19:12:13 +08:00
parent 6a863d3bc7
commit 672e248385
3 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/public/OrderSearch.vue
View File

@@ -370,7 +370,17 @@ export default {
30: '无效-累计件数超出类目上限',
31: '无效-黑名单sku',
33: '超市卡充值订单',
34: '无效-推卡订单无效'
34: '无效-推卡订单无效',
35: '无效-非CID订单',
36: '违规订单-账户绑定有误',
37: '违规订单-利用京东域内流量推广',
38: '违规订单-利用短信形式推广',
39: '违规订单-推广京东首页',
40: '违规订单-refer与备案信息不符',
41: '违规订单-用户交易异常',
42: '违规订单-批量下单',
43: '违规订单-超过类目上限',
44: '不计佣订单'
}
return statusMap[status] || `状态${status}`
},
@@ -385,9 +395,9 @@ export default {
if (status === 15) return 'warning' // 待付款
if (status === 24) return 'warning' // 已付定金
// 违规状态
if ([13, 25, 26, 27, 28].includes(status)) return 'warning' // 违规订单（黄色，优先级低于取消）
if ([13, 25, 26, 27, 28, 36, 37, 38, 39, 40, 41, 42, 43].includes(status)) return 'warning' // 违规订单（黄色，优先级低于取消）
// 无效状态
if ([2, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34].includes(status)) return 'info' // 无效订单（灰色）
if ([2, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34, 35, 44].includes(status)) return 'info' // 无效订单（灰色）
// 其他状态
return 'info'
}

28
src/views/system/jdorder/orderList.vue
View File

@@ -3116,7 +3116,17 @@ export default {
30: '无效-累计件数超出类目上限',
31: '无效-黑名单sku',
33: '超市卡充值订单',
34: '无效-推卡订单无效'
34: '无效-推卡订单无效',
35: '无效-非CID订单',
36: '违规订单-账户绑定有误',
37: '违规订单-利用京东域内流量推广',
38: '违规订单-利用短信形式推广',
39: '违规订单-推广京东首页',
40: '违规订单-refer与备案信息不符',
41: '违规订单-用户交易异常',
42: '违规订单-批量下单',
43: '违规订单-超过类目上限',
44: '不计佣订单'
}
return statusMap[status] || `状态${status}`
},
@@ -3154,7 +3164,17 @@ export default {
30: '超上限',
31: '黑名单',
33: '超市卡',
34: '推卡无效'
34: '推卡无效',
35: '非CID',
36: '账户绑定',
37: '域内流量',
38: '短信推广',
39: '推首页',
40: 'refer不符',
41: '交易异常',
42: '批量下单',
43: '超类目',
44: '不计佣'
}
return statusMap[status] || `${status}`
},
@@ -3169,9 +3189,9 @@ export default {
if (status === 15) return 'warning' // 待付款
if (status === 24) return 'warning' // 已付定金
// 违规状态
if ([13, 25, 26, 27, 28].includes(status)) return 'warning' // 违规订单（黄色，优先级低于取消）
if ([13, 25, 26, 27, 28, 36, 37, 38, 39, 40, 41, 42, 43].includes(status)) return 'warning' // 违规订单（黄色，优先级低于取消）
// 无效状态
if ([2, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34].includes(status)) return 'info' // 无效订单
if ([2, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34, 35, 44].includes(status)) return 'info' // 无效订单
if (status === 33) return 'success' // 超市卡充值订单
return 'info' // 其他状态
},

38
src/views/system/orderrows/index.vue
View File

@@ -664,19 +664,19 @@ export default {
// 合并分组
const groupMap = [
{ label: '取消', value: 'cancel', codes: ['3'] },
{ label: '无效', value: 'invalid', codes: ['2','4','5','6','7','8','9','10','11','14','19','20','21','22','23','29','30','31','32','33','34'] },
{ label: '无效', value: 'invalid', codes: ['2','4','5','6','7','8','9','11','14','19','20','21','22','23','29','30','31','33','34','35','44'] },
{ label: '待付款', value: 'pending', codes: ['15'] },
{ label: '已付款（待结算）', value: 'paid', codes: ['16'] },
{ label: '已完成', value: 'finished', codes: ['17'] },
{ label: '已付定金', value: 'deposit', codes: ['24'] },
{ label: '违规', value: 'illegal', codes: ['25','26','27','28'] }
{ label: '违规', value: 'illegal', codes: ['13','25','26','27','28','36','37','38','39','40','41','42','43'] }
];
// 兼容后端返回的code为数字或字符串
const allCodes = raw.map(i => String(i.value || i.code));
// 处理无效分组codes
groupMap[1].codes = ['2','4','5','6','7','8','9','11','14','19','20','21','22','23','29','30','31','33','34'];
groupMap[1].codes = ['2','4','5','6','7','8','9','11','14','19','20','21','22','23','29','30','31','33','34','35','44'];
// 违规codes
groupMap[6].codes = ['25','26','27','28'];
groupMap[6].codes = ['13','25','26','27','28','36','37','38','39','40','41','42','43'];
// 生成下拉和映射
this.mergedStatusList = groupMap.map(g => ({ label: g.label, value: g.value }));
this.statusValueMap = {};
@@ -719,7 +719,17 @@ export default {
'30': 'danger', // 无效-累计件数超出类目上限
'31': 'danger', // 无效-黑名单sku
'33': 'info', // 超市卡充值订单
'34': 'danger' // 无效-推卡订单无效
'34': 'danger', // 无效-推卡订单无效
'35': 'danger', // 无效-非CID订单
'36': 'danger', // 违规订单-账户绑定有误
'37': 'danger', // 违规订单-利用京东域内流量推广
'38': 'danger', // 违规订单-利用短信形式推广
'39': 'danger', // 违规订单-推广京东首页
'40': 'danger', // 违规订单-refer与备案信息不符
'41': 'danger', // 违规订单-用户交易异常
'42': 'danger', // 违规订单-批量下单
'43': 'danger', // 违规订单-超过类目上限
'44': 'danger' // 不计佣订单
};
return statusMap[validCode] || 'info';
},
@@ -756,7 +766,17 @@ export default {
'30': '无效-累计件数超出类目上限',
'31': '无效-黑名单sku',
'33': '超市卡充值订单',
'34': '无效-推卡订单无效'
'34': '无效-推卡订单无效',
'35': '无效-非CID订单',
'36': '违规订单-账户绑定有误',
'37': '违规订单-利用京东域内流量推广',
'38': '违规订单-利用短信形式推广',
'39': '违规订单-推广京东首页',
'40': '违规订单-refer与备案信息不符',
'41': '违规订单-用户交易异常',
'42': '违规订单-批量下单',
'43': '违规订单-超过类目上限',
'44': '不计佣订单'
};
return statusMap[validCode] || '代码描述未定义';
},
@@ -986,12 +1006,12 @@ export default {
const statusGroups = {
cancel: { label: '取消', codes: ['3'] },
invalid: { label: '无效', codes: ['2', '4', '5', '6', '7', '8', '9', '10', '11', '14', '19', '20', '21', '22', '23', '29', '30', '31', '32', '33', '34'] },
invalid: { label: '无效', codes: ['2', '4', '5', '6', '7', '8', '9', '11', '14', '19', '20', '21', '22', '23', '29', '30', '31', '33', '34', '35', '44'] },
pending: { label: '待付款', codes: ['15'] },
paid: { label: '已付款（待结算）', codes: ['16'] },
finished: { label: '已完成', codes: ['17'] },
deposit: { label: '已付定金', codes: ['24'] },
illegal: { label: '违规', codes: ['25', '26', '27', '28'] }
illegal: { label: '违规', codes: ['13', '25', '26', '27', '28', '36', '37', '38', '39', '40', '41', '42', '43'] }
};
Object.keys(statusGroups).forEach(key => {
@@ -1010,7 +1030,7 @@ export default {
const validCode = String(order.validCode);
const isCancel = validCode === '3';
const isIllegal = ['25', '26', '27', '28'].includes(validCode);
const isIllegal = ['13', '25', '26', '27', '28', '36', '37', '38', '39', '40', '41', '42', '43'].includes(validCode);
const estCos = parseFloat(order.estimateCosPrice) || 0;
const rate = parseFloat(order.commissionRate) || 0;
const estFee = parseFloat(order.estimateFee) || 0;