diff --git a/src/views/system/goofish/erpGoofishOrder/index.vue b/src/views/system/goofish/erpGoofishOrder/index.vue
index 62685f0..d7ff704 100644
--- a/src/views/system/goofish/erpGoofishOrder/index.vue
+++ b/src/views/system/goofish/erpGoofishOrder/index.vue
@@ -91,6 +91,17 @@
+
+
+
+ {{ refundStatusLabel(scope.row.refundStatus) }}
+
+
+
{{ formatPayDisplay(scope.row) }}
@@ -235,7 +246,7 @@
{{ displayExpressName(jsonRow) }}
{{ formatPayDisplay(jsonRow) }}
-
+
+
+
+ {{ refundStatusLabel(jsonRow.refundStatus) }}
+
+
{{ displayBuyerNick(jsonRow) }}
{{ privacyHidden }}
{{ displayReceiverName(jsonRow) }}
@@ -284,6 +304,27 @@
import { listGoofishOrder, listGoofishOrderEventLogs, pullAllGoofishOrders, pullAllGoofishOrdersFull, pullGoofishOrdersFull, refreshGoofishDetail, retryGoofishShip, getGoofishOrder } from '@/api/jarvis/goofish'
import { parseTime } from '@/utils/ruoyi'
+/** 与闲管家开放平台 order_status 一致 */
+const GOOFISH_ORDER_STATUS = Object.freeze({
+ 11: '待付款',
+ 12: '待发货',
+ 21: '已发货',
+ 22: '已完成',
+ 23: '已退款',
+ 24: '已关闭'
+})
+/** 与闲管家开放平台 refund_status 一致 */
+const GOOFISH_REFUND_STATUS = Object.freeze({
+ 0: '未申请退款',
+ 1: '待商家处理',
+ 2: '待买家退货',
+ 3: '待商家收货',
+ 4: '退款关闭',
+ 5: '退款成功',
+ 6: '已拒绝退款',
+ 8: '待确认退货地址'
+})
+
export default {
name: 'ErpGoofishOrder',
data() {
@@ -342,6 +383,7 @@ export default {
{ label: '快递名称', before: cell(b, 'detailExpressName'), after: cell(a, 'detailExpressName') },
{ label: '本地运单', before: cell(b, 'localWaybillNo'), after: cell(a, 'localWaybillNo') },
{ label: '订单状态', before: cell(b, null, r => this.orderStatusLabel(r && r.orderStatus)), after: cell(a, null, r => this.orderStatusLabel(r && r.orderStatus)) },
+ { label: '退款状态', before: cell(b, null, r => this.refundStatusLabel(r && r.refundStatus)), after: cell(a, null, r => this.refundStatusLabel(r && r.refundStatus)) },
{ label: '发货展示', before: cell(b, null, r => this.shipDisplayLabel(r)), after: cell(a, null, r => this.shipDisplayLabel(r)) }
]
return rows
@@ -361,8 +403,26 @@ export default {
this.refreshLogisticsOrderNo = ''
},
orderStatusLabel(s) {
- const o = this.orderStatusOptions.find(x => x.v === s)
- return o ? o.l : (s == null ? '-' : String(s))
+ if (s == null || s === '') {
+ return '—'
+ }
+ const t = GOOFISH_ORDER_STATUS[s]
+ return t != null ? t : `未识别(${s})`
+ },
+ refundStatusLabel(s) {
+ if (s == null || s === '') {
+ return '—'
+ }
+ const t = GOOFISH_REFUND_STATUS[s]
+ return t != null ? t : `未识别(${s})`
+ },
+ /** 退款中/处理中用 warning,成功/关闭用 success/info,拒绝 danger */
+ refundStatusTagType(s) {
+ if (s == null || s === '') {
+ return 'info'
+ }
+ const m = { 0: 'info', 1: 'warning', 2: 'warning', 3: 'warning', 4: 'info', 5: 'success', 6: 'danger', 8: 'warning' }
+ return m[s] !== undefined ? m[s] : 'info'
},
/** Element 标签类型(仅 success/info/warning/danger):与闲管家 order_status 对齐 */
orderStatusTagType(s) {