From 4f2e99d36d44d83befa607bc26cf1bf9b0bfcb6f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 10 九月 2025 11:08:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-web into dev
---
manager/src/views/video/VideoList.vue | 21 ++++++++++++++-------
seller/src/views/order/order/orderDetail.vue | 39 +++++++++++++++++++++++++++++++++++++--
2 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/manager/src/views/video/VideoList.vue b/manager/src/views/video/VideoList.vue
index 7529244..5d0db16 100644
--- a/manager/src/views/video/VideoList.vue
+++ b/manager/src/views/video/VideoList.vue
@@ -462,7 +462,7 @@
<Col>
<FormItem :label-width="70" label="寮�濮嬫椂闂达細" prop="startTime">
<DatePicker
- :v-model="commentForm.startTime"
+ v-model="commentForm.startTime"
type="datetime"
placeholder="閫夋嫨寮�濮嬫椂闂�"
style="width: 120px"
@@ -474,7 +474,7 @@
<Col>
<FormItem :label-width="70" label="缁撴潫鏃堕棿锛�" prop="endTime">
<DatePicker
- :v-model="commentForm.endTime"
+ v-model="commentForm.endTime"
type="datetime"
placeholder="閫夋嫨缁撴潫鏃堕棿"
style="width: 120px"
@@ -487,8 +487,7 @@
</Form>
<div slot="footer">
- <Button type="text" @click="closeVideoDown">鍏抽棴</Button>
- <Button type="primary" @click="videoDown">纭</Button>
+ <Button type="text" @click="closeComment">鍏抽棴</Button>
</div>
<Table
:loading="commentLoading"
@@ -517,9 +516,7 @@
show-sizer
></Page>
</Row>
- <div slot="footer">
- </div>
</Modal>
<Modal
@@ -879,6 +876,9 @@
this.getTags('')
},
methods: {
+ closeComment(){
+ this.showVideoComment = false
+ },
commentChangePage(page) {
this.commentForm.pageNumber = page
this.commentPage()
@@ -891,8 +891,14 @@
this.commentPage()
},
commentPage(){
+ //杞崲涓哄瓧绗︿覆
+ let startTime = this.formatDate(this.commentForm.startTime);
+ let endTime = this.formatDate(this.commentForm.endTime);
+ let from = {...this.commentForm};
+ from.startTime = startTime;
+ from.endTime = endTime;
this.commentLoading = true;
- getCommentPage(this.commentForm).then(res =>{
+ getCommentPage(from).then(res =>{
this.commentLoading = false;
if (res.code === 200){
this.commentData = res.data;
@@ -938,6 +944,7 @@
// this.selectCount = selection.length
},
openComment(row){
+ this.$refs.commentForm.resetFields();
console.log(row)
this.commentForm.videoId = row.id;
this.showVideoComment = true;
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index fbfd09b..dd1896f 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -807,6 +807,7 @@
// 鍒嗗寘瑁瑰彂璐�
groupShipModal: false,
+ groupShipModalOpened: false, // 鏍囪瘑鍒嗗寘瑁瑰彂璐у脊绐楁槸鍚﹀凡鎵撳紑杩�
shipLoading: true,
groupOrderDeliveryForm: {
logisticsNo: "", //鍙戣揣鍗曞彿
@@ -857,11 +858,19 @@
methods: {
// 閫変腑
selectGroupShipGoodsMethods (selected) {
+ console.log('selectGroupShipGoodsMethods琚皟鐢�, selected:', JSON.stringify(selected));
+ // 绠�鍖栭�昏緫锛岀洿鎺ヤ繚瀛橀�変腑鐨勫晢鍝侊紝鏁伴噺鍦ㄦ彁浜ゆ椂浠巇ata鏁扮粍鑾峰彇
this.selectGroupShipGoods = selected;
+ console.log('selectGroupShipGoods宸叉洿鏂�');
},
// 鍒嗗寘瑁瑰彂璐�
groupShip () {
this.groupShipModal = true;
+ this.groupShipModalOpened = true; // 鏍囪寮圭獥宸叉墦寮�
+ this.groupOrderDeliveryForm = {
+ logisticsNo: "", //鍙戣揣鍗曞彿
+ logisticsId: "", //鐗╂祦鍏徃
+ }
this.getLogisticsList();
},
// 鍒嗛〉鑾峰彇鐗╂祦鍏徃
@@ -874,6 +883,7 @@
},
// 鍒嗗寘瑁瑰彂璐�
confirmShipGroupGoods () {
+ console.log('琛ㄥ崟鍘熷鏁版嵁--------------------------銆�',JSON.stringify(this.selectGroupShipGoods))
this.$refs.groupOrderDeliveryForm.validate(async (valid) => {
if (valid) {
if (this.selectGroupShipGoods.length) {
@@ -881,16 +891,33 @@
...this.groupOrderDeliveryForm,
orderSn: this.sn,
partDeliveryDTOList: this.selectGroupShipGoods.map((item) => {
+ // 鐩存帴浠巇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,
+ dataCanNum: currentDataItem?.canNum,
+ num: item.num,
+ finalDeliveryNum: finalDeliveryNum
+ });
+
return {
orderItemId: item.id,
- deliveryNum: item.canNum ? item.canNum : item.num,
+ deliveryNum: finalDeliveryNum,
};
}),
};
+ console.log('---------------------->',JSON.stringify(submit));
const res = await API_Order.partDelivery(this.sn, submit);
if (res.success) {
this.$Message.success("鍙戣揣鎴愬姛!");
this.shipLoading = false;
+ // 娓呯┖閫変腑鐨勫晢鍝佹暟鎹紝閬垮厤鏁版嵁娈嬬暀
+ this.selectGroupShipGoods = [];
+ // 閲嶇疆寮圭獥鎵撳紑鏍囪瘑锛屼笅娆℃墦寮�鏃舵樉绀洪粯璁ゅ��
+ this.groupShipModalOpened = false;
this.getDataDetail();
this.getOrderPackage();
this.groupShipModal = false;
@@ -987,13 +1014,21 @@
this.allowOperation = res.result.allowOperationVO;
if (res.result.orderItems.length) {
this.data = res.result.orderItems.map((item) => {
+ // 鍙湪寮圭獥鎵撳紑鐘舵�佷笅鎵嶄繚鐣欑敤鎴蜂慨鏀圭殑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: item.num - item.deliverNumber
+ // 濡傛灉寮圭獥宸叉墦寮�涓旂敤鎴峰凡缁忎慨鏀硅繃canNum涓斿�煎悎鐞嗭紝鍒欎繚鐣欙紱鍚﹀垯浣跨敤榛樿鍊�
+ canNum: (existingItem && existingItem.canNum !== undefined && existingItem.canNum <= defaultCanNum)
+ ? existingItem.canNum
+ : defaultCanNum
};
});
+ console.log('---------------------->璁㈠崟璇︽儏',this.data)
}
this.orderLogData = res.result.orderLogs;
this.typeList = JSON.parse(JSON.stringify(res.result.order.priceDetailDTO.discountPriceDetail));
--
Gitblit v1.8.0