diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 078d5dd..3398999 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -63,7 +63,13 @@
-
+
+
+ {{
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodsNum }} {{ scope.row.numUnit }}
+
+
{{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 2948941..29b7899 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -129,8 +129,8 @@
{{
- scope.row.permanentGold }}
- {{ scope.row.goodNum }}
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodNum }} {{ scope.row.numUnit }}
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 7ebdded..29b7899 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -129,8 +129,8 @@
{{
- scope.row.permanentGold }}
- {{ scope.row.goodNum }}
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodNum }} {{ scope.row.numUnit }}
@@ -445,12 +445,12 @@
-
-
-
+
+
{
const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge);
- editFormData.value = { ...row };
+ editFormData.value = {
+ ...row,
+ paymentCurrencyOrig: row.paymentCurrency,
+ paymentAmountOrig: row.paymentAmount,
+ };
// 区分金币产品与普通产品
if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true;
else isEditGold.value = false;
@@ -1235,7 +1239,9 @@ const submitEditForm = async () => {
receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
receivedTime: editFormData.value.receivedTime,
- receivedRemark: editFormData.value.receivedRemark || ''
+ receivedRemark: editFormData.value.receivedRemark || '',
+ paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig,
+ paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig),
}
});
@@ -1705,7 +1711,7 @@ const handlePagination = (type, val) => {
}
:deep(.adddialog .el-form-item__label) {
- min-width: 80px;
+ min-width: 100px;
width: auto;
font-weight: 800;
padding-bottom: 15px;
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index 5de7449..61b2906 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -97,15 +97,8 @@
{{
- scope.row.permanentGold }}
- {{ scope.row.goodNum }}
-
-
-
-
- {{
- scope.row.permanentGold }}
- {{ scope.row.goodNum }}
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodNum }} {{ scope.row.numUnit }}
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 3be1056..6f9d02e 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -73,7 +73,13 @@
show-overflow-tooltip />
-
+
+
+ {{
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodsNum }} {{ scope.row.numUnit }}
+
+
{{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll')
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index ea4dadb..b05aefd 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -65,7 +65,13 @@
-
+
+
+ {{
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodsNum }} {{ scope.row.numUnit }}
+
+
{{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 4230485..a7c9d31 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -66,7 +66,13 @@
-
+
+
+ {{
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodsNum }} {{ scope.row.numUnit }}
+
+
{{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 38896b1..b18c975 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -69,7 +69,13 @@
-
+
+
+ {{
+ scope.row.permanentGold }} {{ t('cash.unit') }}
+ {{ scope.row.goodsNum }} {{ scope.row.numUnit }}
+
+