1

src/views/sys/order-manage/logisticsAddress.vue

@@ -270,18 +270,8 @@
 					return;
 				}
 				let titleText = status == 1 ? '确定同意该申请吗？' : '确定拒绝该申请吗？';
-				//退款提示
+				if(this.getGroupOrderIds(item.groupOrderIds).length > 0){
-				
-				if(item.groupOrderIds != null && item.groupOrderIds != ''){
 					titleText += '该订单为面对面配送单，所有参团订单将同步处理';
-					for(let i = 0; i < this.returnData.length;i++){
-						if(item.groupOrderIds.indexOf(this.returnData[i].mallOrder.id) != -1){
-							//需要展示具体订单信息这里有
-							this.groupOrderIdList.push(this.returnData[i]);
-						}
-					}
-				}else{
-					this.groupOrderIdList = []
 				}
 				
 				this.$Modal.confirm({
@@ -290,47 +280,49 @@
 					loading: true,
 					onOk: () => {
 						this.$Modal.remove();
-						if(this.groupOrderIdList != [] && this.groupOrderIdList.length > 0){
+						this.processReturn(item, status);
-							for(let i = 0; i < this.groupOrderIdList.length;i++){
-								this.processReturn(this.groupOrderIdList[i], status);
-							}
-						}else{
-							this.processReturn(item, status);
-						}
 					},
 				});
 			},
+			getGroupOrderIds(groupOrderIds) {
+				if (groupOrderIds == null || groupOrderIds === "") return [];
+				if (Array.isArray(groupOrderIds)) {
+					return groupOrderIds.filter((id) => id != null && id !== "");
+				}
+				return String(groupOrderIds).split(",").map((id) => id.trim()).filter((id) => id !== "");
+			},
 			processReturn(item,status){
 				if (!item) return;
-				let url = ''
+				const returnFormData = {};
 				//退款
 				if(item.status == 7 || item.status == 0){
 					//不同意
 					if(status == 0){
-						this.returnFormData.status = 2
+						returnFormData.status = 2
 					}else{
-						this.returnFormData.status = 1
+						returnFormData.status = 1
 					}
 				}else if(item.status == 11 || item.status == 3){
 					//售后
 					if(status == 0){
-						this.returnFormData.status = 5
+						returnFormData.status = 5
 					}else{
-						this.returnFormData.status = 4
+						returnFormData.status = 4
 					}
 				}
 				const order = item.mallOrder || this.orderData || {};
-				this.returnFormData.id = item.id;
+				returnFormData.id = item.id;
-				this.returnFormData.linkId = item.linkId;
+				returnFormData.linkId = item.linkId;
-				this.returnFormData.orderId = item.orderId || order.id;
+				returnFormData.orderId = item.orderId || order.id;
-				this.returnFormData.deliveryType = order.deliveryType;
+				returnFormData.deliveryType = order.deliveryType;
-				this.returnFormData.orderType = order.orderType;
+				returnFormData.orderType = order.orderType;
-				this.returnFormData.refundAmount = item.refundAmount;
+				returnFormData.refundAmount = item.refundAmount;
-				this.returnFormData.refundType = item.refundType;
+				returnFormData.refundType = item.refundType;
-				this.returnFormData.refundTypeStatus = item.refundTypeStatus;
+				returnFormData.refundTypeStatus = item.refundTypeStatus;
-				
+				if (item.groupOrderIds != null && item.groupOrderIds !== "") {
-				let that = this;
+					returnFormData.groupOrderIds = item.groupOrderIds;
-				returnOrNoOrder(this.returnFormData).then((res) => {
+				}
+				returnOrNoOrder(returnFormData).then((res) => {
 					this.loading = false;
 					if (res.success) {
 						this.$Message.success("售后成功");