diff --git a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
index 2cef8b83e..27332a859 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
@@ -36,14 +36,6 @@
-
-
-
+
+
+
{{
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
index 947f0bcb8..d75129395 100644
--- a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
+++ b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
@@ -27,8 +27,7 @@
{{ discrepancy.tradeNo }}
-
- {{ discrepancy.channelTradeNo }}
+
{{ discrepancy.outTradeNo }}
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
index ea3d60607..6625ef354 100644
--- a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
+++ b/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
@@ -40,17 +40,16 @@
{{ dictConvert('reconcile_discrepancy_type', row.discrepancyType) }}
+
+
+ {{ row.tradeNo }}
+
+
-
-
- {{ row.tradeNo }}
-
-
-
- {{ dictConvert('trade_type', row.tradeType) || '无' }}
+ {{ dictConvert('trade_type', row.tradeType) }}
@@ -62,9 +61,9 @@
}}
+
-
@@ -72,6 +71,11 @@
+
+
+ {{ dictConvert('trade_type', row.channelTradeType) }}
+
+
{{
@@ -158,7 +162,7 @@
placeholder: '请选择对账差异类型',
selectList: discrepancyTypeList.value,
},
- { field: 'tradeNo', type: STRING, name: '交易号(平台)', placeholder: '请输入交易号(平台)' },
+ { field: 'tradeNo', type: STRING, name: '平台交易号', placeholder: '请输入平台交易号' },
{
field: 'bizTradeNo',
type: STRING,
@@ -191,12 +195,6 @@
name: '交易号(通道)',
placeholder: '请输入交易号(通道)',
},
- {
- field: 'channelOutTradeNo',
- type: STRING,
- name: '平台交易号(通道)',
- placeholder: '请输入平台交易号(通道)',
- },
{
field: 'channelTradeType',
type: LIST,
@@ -263,7 +261,7 @@
})
}
/**
- * 查看
+ * 查看差异记录
*/
function show(record) {
reconcileDiscrepancyInfo.value.init(record.id)
@@ -273,7 +271,7 @@
* 查看对账单
*/
function showReconcile(record) {
- reconcileDiscrepancyInfo.value.init(record.reconcileId)
+ reconcileStatementInfo.value.init(record.reconcileId)
}
/**