|
@@ -28,6 +28,8 @@
|
|
|
min-width="55" align="center" />
|
|
min-width="55" align="center" />
|
|
|
<el-table-column v-if="contentCols.find((col) => col.prop === 'batch_no')?.show" key="batch_no"
|
|
<el-table-column v-if="contentCols.find((col) => col.prop === 'batch_no')?.show" key="batch_no"
|
|
|
label="事务编号" prop="batch_no" min-width="160" show-overflow-tooltip />
|
|
label="事务编号" prop="batch_no" min-width="160" show-overflow-tooltip />
|
|
|
|
|
+ <el-table-column v-if="contentCols.find((col) => col.prop === 'account')?.show" key="account"
|
|
|
|
|
+ label="支付宝账号" prop="account" min-width="180" show-overflow-tooltip />
|
|
|
<el-table-column v-if="contentCols.find((col) => col.prop === 'merchant_name')?.show" key="merchant_name"
|
|
<el-table-column v-if="contentCols.find((col) => col.prop === 'merchant_name')?.show" key="merchant_name"
|
|
|
label="商户名称" prop="merchant_name" min-width="120" show-overflow-tooltip />
|
|
label="商户名称" prop="merchant_name" min-width="120" show-overflow-tooltip />
|
|
|
<el-table-column v-if="contentCols.find((col) => col.prop === 'shop_name')?.show" key="shop_name"
|
|
<el-table-column v-if="contentCols.find((col) => col.prop === 'shop_name')?.show" key="shop_name"
|
|
@@ -124,6 +126,7 @@
|
|
|
<el-descriptions v-if="detailData" :column="1" border>
|
|
<el-descriptions v-if="detailData" :column="1" border>
|
|
|
<el-descriptions-item label="事务编号">{{ detailData.batch_no || '-' }}</el-descriptions-item>
|
|
<el-descriptions-item label="事务编号">{{ detailData.batch_no || '-' }}</el-descriptions-item>
|
|
|
<el-descriptions-item label="申请单号">{{ detailData.order_no || '-' }}</el-descriptions-item>
|
|
<el-descriptions-item label="申请单号">{{ detailData.order_no || '-' }}</el-descriptions-item>
|
|
|
|
|
+ <el-descriptions-item label="商户支付宝账号">{{ detailData.account || '-' }}</el-descriptions-item>
|
|
|
<el-descriptions-item label="状态">
|
|
<el-descriptions-item label="状态">
|
|
|
<el-tag :type="ORDER_STATUS_TAG_TYPE[detailData.order_status]">
|
|
<el-tag :type="ORDER_STATUS_TAG_TYPE[detailData.order_status]">
|
|
|
{{ ORDER_STATUS_LABEL[detailData.order_status] || detailData.order_status }}
|
|
{{ ORDER_STATUS_LABEL[detailData.order_status] || detailData.order_status }}
|
|
@@ -234,6 +237,7 @@ const searchConfig = reactive<ISearchConfig>({
|
|
|
const contentCols = reactive<Array<{ prop?: string; label?: string; show?: boolean }>>([
|
|
const contentCols = reactive<Array<{ prop?: string; label?: string; show?: boolean }>>([
|
|
|
{ prop: "selection", label: "选择框", show: false },
|
|
{ prop: "selection", label: "选择框", show: false },
|
|
|
{ prop: "batch_no", label: "事务编号", show: true },
|
|
{ prop: "batch_no", label: "事务编号", show: true },
|
|
|
|
|
+ { prop: "account", label: "支付宝账号", show: true },
|
|
|
{ prop: "merchant_name", label: "商户名称", show: true },
|
|
{ prop: "merchant_name", label: "商户名称", show: true },
|
|
|
{ prop: "shop_name", label: "店铺名称", show: true },
|
|
{ prop: "shop_name", label: "店铺名称", show: true },
|
|
|
{ prop: "order_status", label: "状态", show: true },
|
|
{ prop: "order_status", label: "状态", show: true },
|