From 94ad4de767b25b0e6b2486287da90a7cb78ad3d3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 12 十月 2023 18:48:13 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 3 ++-
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 3 ++-
src/views/sales/refundForm/AddRefundFormDialog.vue | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 81745ae..91c3ed7 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -484,7 +484,9 @@
refundDate: data.refundDate || "",
sourceId: this.sourceId || 0,
sourceType: 1
- }
+ },
+ codeRule:this.codeRule,
+
}
return params
},
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 019d25e..ddf96d5 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -560,7 +560,8 @@
wechatOrderStatus: data.wechatOrderStatus || 0,
logisticCompany: data.logisticCompany || "",
logisticCost: data.logisticCost || 0,
- logisticNumber: data.logisticNumber || ""
+ logisticNumber: data.logisticNumber || "",
+ codeRule:this.codeRule,
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index cc96f64..566997b 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -419,7 +419,8 @@
salesReturnStatusId: data.salesReturnStatusId || 0,
sourceId: this.SalesDetailsId,
sourceType: 1
- }
+ },
+ codeRule:this.codeRule,
}
return params
},
--
Gitblit v1.8.0