|
|
@@ -21,6 +21,7 @@
|
|
|
<el-option label="待收货" value="pending_receipt" />
|
|
|
<el-option label="已完成" value="completed" />
|
|
|
<el-option label="已取消" value="cancelled" />
|
|
|
+ <el-option label="待退款" value="pending_refund" />
|
|
|
<el-option label="退款中" value="refunding" />
|
|
|
<el-option label="退款到帐中" value="refund_pending" />
|
|
|
<el-option label="已退款" value="refunded" />
|
|
|
@@ -75,21 +76,15 @@
|
|
|
{{ formatTime(row.createdAt) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" width="200" fixed="right">
|
|
|
+ <el-table-column label="操作" width="220" fixed="right">
|
|
|
<template slot-scope="{ row }">
|
|
|
<el-button size="mini" type="primary" @click="viewDetail(row)">详情</el-button>
|
|
|
- <el-dropdown trigger="hover" @command="(cmd) => handleActionCmd(row, cmd)">
|
|
|
- <el-button size="mini">
|
|
|
- 更多<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
- </el-button>
|
|
|
- <el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item v-if="row.status === 'paid'" command="vendor-confirm" icon="el-icon-check">确认发货</el-dropdown-item>
|
|
|
- <el-dropdown-item v-if="row.status === 'paid'" command="ship" icon="el-icon-s-cooperation">发货</el-dropdown-item>
|
|
|
- <el-dropdown-item v-if="row.status === 'paid' || row.status === 'refunding'" command="close" icon="el-icon-circle-close">关闭</el-dropdown-item>
|
|
|
- <el-dropdown-item v-if="row.status === 'refunding'" command="refund" icon="el-icon-warning-outline">退款审核</el-dropdown-item>
|
|
|
- <el-dropdown-item v-if="row.status === 'refund_pending'" command="view-pending-refund" icon="el-icon-warning">退款到帐中</el-dropdown-item>
|
|
|
- </el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
+ <!-- 按状态直显所需操作按钮(移除「更多」下拉与冗余的「确认发货」) -->
|
|
|
+ <el-button v-if="row.status === 'paid'" size="mini" type="success" @click="showShipDialog(row)">发货</el-button>
|
|
|
+ <el-button v-if="row.status === 'pending_refund'" size="mini" type="warning" @click="showRefundDialog(row)">退款审核</el-button>
|
|
|
+ <el-button v-if="row.status === 'refunding'" size="mini" type="warning" @click="handleConfirmArrive(row)">确认到账</el-button>
|
|
|
+ <el-button v-if="row.status === 'refund_pending'" size="mini" type="info" @click="goPendingRefund()">退款到帐中</el-button>
|
|
|
+ <el-button v-if="canClose(row.status)" size="mini" type="danger" plain @click="handleClose(row)">关闭</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -207,7 +202,7 @@
|
|
|
<script>
|
|
|
import SortMixin from '@/mixins/SortMixin'
|
|
|
import ListStateMixin from '@/mixins/ListStateMixin'
|
|
|
-import { getOrderList, shipOrder, closeOrder, approveRefund, rejectRefund, vendorConfirmOrder } from '@/api/admin'
|
|
|
+import { getOrderList, shipOrder, closeOrder, approveRefund, rejectRefund, confirmRefundArrived } from '@/api/admin'
|
|
|
|
|
|
export default {
|
|
|
mixins: [SortMixin, ListStateMixin],
|
|
|
@@ -347,18 +342,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- async handleVendorConfirm(row) {
|
|
|
- try {
|
|
|
- await this.$confirm('确认供应商已发货/履约完成?', '提示', { type: 'info' })
|
|
|
- await vendorConfirmOrder(row.orderNo)
|
|
|
- this.$message.success('已确认发货')
|
|
|
- this.loadList()
|
|
|
- } catch (e) {
|
|
|
- if (e !== 'cancel') {
|
|
|
- this.$message.error(e.message || '操作失败')
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
showRefundDialog(row) {
|
|
|
this.refundTarget = row
|
|
|
this.refundRejectReason = ''
|
|
|
@@ -397,14 +380,29 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
canClose(status) {
|
|
|
- return ['pending', 'paid', 'pending_receipt', 'refunding'].includes(status);
|
|
|
+ return ['pending', 'paid', 'pending_receipt', 'pending_refund', 'refunding'].includes(status);
|
|
|
+ },
|
|
|
+ async handleConfirmArrive(row) {
|
|
|
+ try {
|
|
|
+ await this.$confirm('确认该笔退款已到账?', '提示', { type: 'warning' })
|
|
|
+ var res = await confirmRefundArrived(row.orderNo)
|
|
|
+ this.$message.success(res.message || '已确认到账')
|
|
|
+ this.loadList()
|
|
|
+ } catch (e) {
|
|
|
+ if (e !== 'cancel') {
|
|
|
+ this.$message.error(e.message || '操作失败')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ goPendingRefund() {
|
|
|
+ this.$router.push('/pending-refund')
|
|
|
},
|
|
|
statusType(status) {
|
|
|
- var map = { pending: 'warning', paid: 'primary', pending_receipt: '', completed: 'success', cancelled: 'info', refunding: 'danger', refunded: 'danger', closed: 'info', refund_pending: 'warning' }
|
|
|
+ var map = { pending: 'warning', paid: 'primary', pending_receipt: '', completed: 'success', cancelled: 'info', pending_refund: 'warning', refunding: 'danger', refunded: 'danger', closed: 'info', refund_pending: 'warning' }
|
|
|
return map[status] || 'info'
|
|
|
},
|
|
|
statusLabel(status) {
|
|
|
- var map = { pending: '待支付', paid: '待发货', pending_receipt: '待收货', completed: '已完成', cancelled: '已取消', refunding: '退款中', refunded: '已退款', closed: '已关闭', refund_pending: '退款到帐中' }
|
|
|
+ var map = { pending: '待支付', paid: '待发货', pending_receipt: '待收货', completed: '已完成', cancelled: '已取消', pending_refund: '待退款', refunding: '退款中', refunded: '已退款', closed: '已关闭', refund_pending: '退款到帐中' }
|
|
|
return map[status] || status
|
|
|
},
|
|
|
payMethodLabel(method) {
|
|
|
@@ -460,12 +458,12 @@ export default {
|
|
|
},
|
|
|
|
|
|
handleActionCmd(row, cmd) {
|
|
|
+ // 「更多」下拉已移除;保留兜底以防历史调用
|
|
|
switch (cmd) {
|
|
|
case 'ship': this.showShipDialog(row); break;
|
|
|
- case 'vendor-confirm': this.handleVendorConfirm(row); break;
|
|
|
case 'close': this.handleClose(row); break;
|
|
|
case 'refund': this.showRefundDialog(row); break;
|
|
|
- case 'view-pending-refund': this.$router.push('/pending-refund'); break;
|
|
|
+ case 'view-pending-refund': this.goPendingRefund(); break;
|
|
|
}
|
|
|
}
|
|
|
}
|