From 9797e46619f64bddb78d4b4eaa03d53069ac2ba4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 01 九月 2025 17:37:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/order/order/orderList.vue | 107 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 93 insertions(+), 14 deletions(-)
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 1bc82ef..2303292 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -95,7 +95,20 @@
:data="data"
ref="table"
sortable="custom"
- ></Table>
+ >
+ <template slot="sn" slot-scope="{ row }">
+ <div style="width: 100%" @click="detail(row)">
+ <span>{{row.sn}}</span>
+ </div>
+ </template>
+ <template slot="nickName" slot-scope="{ row }">
+ <div style="width: 100%" @click="handleNickNameClick(row)">
+ <span >{{row.nickName}}</span>
+ </div>
+
+ </template>
+
+ </Table>
<Row type="flex" justify="end" class="mt_10">
<Page
@@ -180,6 +193,7 @@
key: "sn",
minWidth: 240,
tooltip: true,
+ slot: 'sn'
},
{
@@ -230,9 +244,10 @@
},
{
title: "涔板鍚嶇О",
- key: "memberName",
+ key: "nickName",
minWidth: 130,
tooltip: true,
+ slot:'nickName'
},
{
@@ -305,21 +320,47 @@
title: "鎿嶄綔",
key: "action",
align: "center",
- width: 100,
+ width: 150,
render: (h, params) => {
- return h(
- "Button",
- {
- props: { type: "info", size: "small" },
- style: { marginRight: "5px" },
- on: {
- click: () => {
- this.detail(params.row);
+ const buttons = [];
+
+ // 鏌ョ湅鎸夐挳 - 濮嬬粓鏄剧ず
+ buttons.push(
+ h(
+ "Button",
+ {
+ props: { type: "info", size: "small" },
+ style: { marginRight: "5px" },
+ on: {
+ click: () => {
+ this.detail(params.row);
+ },
},
},
- },
- "鏌ョ湅"
+ "鏌ョ湅"
+ )
);
+
+ // 鏍规嵁璁㈠崟鐘舵�佷负'PAID'鏃舵樉绀洪澶栨搷浣滄寜閽�
+ if (params.row.orderStatus === 'PAID') {
+ buttons.push(
+ h(
+ "Button",
+ {
+ props: { type: "primary", size: "small" },
+ style: { marginRight: "5px" },
+ on: {
+ click: () => {
+ this.handlePaidOrder(params.row);
+ },
+ },
+ },
+ "鏇存柊璁㈠崟鐘舵��"
+ )
+ );
+ }
+
+ return h('div', buttons);
},
},
@@ -343,6 +384,9 @@
};
},
methods: {
+ handleNickNameClick(row){
+ this.$options.filters.customRouterPush({ name: "member-detail", query: { id: row.memberId } })
+ },
// 鍒濆鍖栨暟鎹�
init() {
this.getDataList();
@@ -387,11 +431,46 @@
// 璺宠浆璇︽儏椤甸潰
detail(v) {
let sn = v.sn;
- this.$options.filters.customRouterPush({
+ this.$router.push({
name: "order-detail",
query: { sn: sn },
})
+ },
+ // 澶勭悊宸蹭粯娆捐鍗曠殑鎿嶄綔
+ handlePaidOrder(order) {
+ // 杩欓噷鍙互娣诲姞宸蹭粯娆捐鍗曠殑鍏蜂綋鎿嶄綔閫昏緫
+ // 渚嬪锛氭樉绀虹‘璁ゅ璇濇锛屽彂璧峰彂璐ц姹傜瓑
+ this.$Modal.confirm({
+ title: '鏇存柊鐘舵��',
+ content: `纭瀵硅鍗曞彿锛�${order.sn} 杩涜鏇存柊鐘舵搷浣滃悧锛焋,
+ onOk: () => {
+ // 璋冪敤鍙戣揣API
+ this.deliverOrder(order);
+ },
+ onCancel: () => {
+ this.$Message.info('宸插彇娑堟搷浣�');
+ }
+ });
+ },
+ // 鍙戣揣鎿嶄綔
+ deliverOrder(order) {
+ console.log('------------->鑾峰彇璁㈠崟淇℃伅',order);
+ console.log('璁㈠崟sn缂栧彿',order.sn);
+ // 杩欓噷鍙互璋冪敤鐩稿叧鐨凙PI杩涜鍙戣揣鎿嶄綔
+ API_Order.sendMessage(order.sn).then((res) => {
+ console.log('-------------->',res);
+ if (res.success) {
+ this.$Message.success('鏇存柊鐘舵�佹垚鍔�');
+ this.getDataList(); // 鍒锋柊鍒楄〃
+ } else {
+ this.$Message.error('鏇存柊鐘舵�佸け璐�');
+ }
+ });
+ // 鏆傛椂妯℃嫙鎿嶄綔
+ this.$Message.success(`璁㈠崟 ${order.sn} 鏇存柊鐘舵�佹垚鍔燂紒`);
+ // 鍒锋柊鍒楄〃鏁版嵁
+ this.getDataList();
},
// 瀵煎嚭璁㈠崟
async exportOrder() {
--
Gitblit v1.8.0