From e425812229ba4f464475cac1fc6c30cd974f2c52 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 15 九月 2025 11:12:09 +0800
Subject: [PATCH] 解决订单查看详情问题
---
manager/src/views/order/order/orderList.vue | 58 ++++++++++++++--------------
manager/src/views/order/order/orderDetail.vue | 3 +
seller/src/views/order/order/orderDetail.vue | 10 ++--
3 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 28bf76a..161680c 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -716,7 +716,7 @@
console.log("to:",to.fullPath)
console.log("form:",from.fullPath)
// 姝ｇ‘鎵撳嵃璺敱瀵硅薄鐨勬柟娉�
- if(from.fullPath === "/orderList" && to.fullPath.includes("/order-detail")){
+ if((from.fullPath === "/orderList"|| from.fullPath === "/fictitiousOrderList" ||from.fullPath === "/orderStatistics") && to.fullPath.includes("/order-detail")){
this.sn = this.$route.query.sn;
this.getDataList();
this.getOrderPackage();
@@ -803,6 +803,7 @@
// 鑾峰彇璁㈠崟璇︽儏
getDataList () {
this.loading = true;
+ console.log("鎵ц鑾峰彇璁㈠崟淇℃伅鎿嶄綔")
API_Order.orderDetail(this.sn).then((res) => {
this.loading = false;
if (res.success) {
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 1c93b0d..b13591e 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -464,24 +464,24 @@
)
);
}
- // 鏍规嵁璁㈠崟鐘舵�佷负'PAID'鏃舵樉绀洪澶栨搷浣滄寜閽�
- if (params.row.deliverStatus === 'UNDELIVERED') {
- buttons.push(
- h(
- "Button",
- {
- props: { type: "primary", size: "small" },
- style: { marginRight: "5px" },
- on: {
- click: () => {
- this.handlerEditorQrcode(params.row);
- },
- },
- },
- "淇敼鍦板潃浜岀淮鐮�"
- )
- );
- }
+ // // 鏍规嵁璁㈠崟鐘舵�佷负'PAID'鏃舵樉绀洪澶栨搷浣滄寜閽�
+ // if (params.row.deliverStatus === 'UNDELIVERED') {
+ // buttons.push(
+ // h(
+ // "Button",
+ // {
+ // props: { type: "primary", size: "small" },
+ // style: { marginRight: "5px" },
+ // on: {
+ // click: () => {
+ // this.handlerEditorQrcode(params.row);
+ // },
+ // },
+ // },
+ // "淇敼鍦板潃浜岀淮鐮�"
+ // )
+ // );
+ // }
return h('div', buttons);
},
@@ -526,17 +526,17 @@
closeGeneralQrCode(){
this.showGeneralQrCode = false;
},
- handlerEditorQrcode(row){
- this.QRCodeUrl = '';
- this.showGeneralQrCode = true
- this.codeLoading = true;
-
- //鑾峰緱鍟嗗搧瀵瑰簲鐨勭涓�涓猻kuid
- this.codeLoading = false;
- this.QRCodeUrl = this.QRcodeBaseUrl+ '/scanpage/editOrderAddress'+'?orderSn='+row.sn
- console.log(this.QRCodeUrl);
-
- },
+ // handlerEditorQrcode(row){
+ // this.QRCodeUrl = '';
+ // this.showGeneralQrCode = true
+ // this.codeLoading = true;
+ //
+ // //鑾峰緱鍟嗗搧瀵瑰簲鐨勭涓�涓猻kuid
+ // this.codeLoading = false;
+ // this.QRCodeUrl = this.QRcodeBaseUrl+ '/scanpage/editOrderAddress'+'?orderSn='+row.sn
+ // console.log(this.QRCodeUrl);
+ //
+ // },
// 閫変腑鐨勫浘鐗�
callbackSelected(val) {
console.log(val)
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index dd1896f..909a124 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -894,7 +894,7 @@
// 鐩存帴浠巇ata鏁扮粍涓幏鍙栨渶鏂扮殑canNum鍊硷紝鑰屼笉渚濊禆閫夋嫨鏃剁殑鏁版嵁
const currentDataItem = this.data.find(d => d.id === item.id);
const finalDeliveryNum = currentDataItem ? currentDataItem.canNum : item.num;
-
+
console.log('澶勭悊鍟嗗搧椤�:', {
id: item.id,
selectedCanNum: item.canNum,
@@ -902,7 +902,7 @@
num: item.num,
finalDeliveryNum: finalDeliveryNum
});
-
+
return {
orderItemId: item.id,
deliveryNum: finalDeliveryNum,
@@ -1017,14 +1017,14 @@
// 鍙湪寮圭獥鎵撳紑鐘舵�佷笅鎵嶄繚鐣欑敤鎴蜂慨鏀圭殑canNum鍊�
const existingItem = this.groupShipModalOpened ? this.data.find(d => d.id === item.id) : null;
const defaultCanNum = item.num - item.deliverNumber;
-
+
return {
...item,
___num: item.num,
_disabled: item.deliverNumber >= item.num,
// 濡傛灉寮圭獥宸叉墦寮�涓旂敤鎴峰凡缁忎慨鏀硅繃canNum涓斿�煎悎鐞嗭紝鍒欎繚鐣欙紱鍚﹀垯浣跨敤榛樿鍊�
- canNum: (existingItem && existingItem.canNum !== undefined && existingItem.canNum <= defaultCanNum)
- ? existingItem.canNum
+ canNum: (existingItem && existingItem.canNum !== undefined && existingItem.canNum <= defaultCanNum)
+ ? existingItem.canNum
: defaultCanNum
};
});
--
Gitblit v1.8.0