This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
<ArtSearchBar
|
||||
v-model:filter="searchForm"
|
||||
:items="searchFormItems"
|
||||
:show-expand="false"
|
||||
@reset="handleReset"
|
||||
@search="handleSearch"
|
||||
/>
|
||||
@@ -151,7 +152,6 @@
|
||||
{
|
||||
prop: 'external_transaction_no',
|
||||
label: '外部交易流水号',
|
||||
minWidth: 220,
|
||||
formatter: (row: EmployeeCollectionApplication) =>
|
||||
h(
|
||||
'span',
|
||||
@@ -165,7 +165,6 @@
|
||||
{
|
||||
prop: 'payment_method_name',
|
||||
label: '收款方式',
|
||||
width: 140,
|
||||
formatter: (row: EmployeeCollectionApplication) => row.payment_method_name || '-'
|
||||
},
|
||||
{
|
||||
@@ -188,7 +187,6 @@
|
||||
{
|
||||
prop: 'created_at',
|
||||
label: '提交时间',
|
||||
width: 170,
|
||||
formatter: (row: EmployeeCollectionApplication) => formatDateTime(row.created_at)
|
||||
}
|
||||
])
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
<ArtSearchBar
|
||||
v-model:filter="searchForm"
|
||||
:items="searchFormItems"
|
||||
show-expand
|
||||
label-width="100px"
|
||||
:show-expand="false"
|
||||
@reset="handleReset"
|
||||
@search="handleSearch"
|
||||
></ArtSearchBar>
|
||||
@@ -19,6 +18,7 @@
|
||||
@refresh="handleRefresh"
|
||||
>
|
||||
<template #left>
|
||||
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
|
||||
<span v-if="snapshotText" class="report-snapshot">{{ snapshotText }}</span>
|
||||
<ElTag v-if="exportTask" :type="exportStatusType" class="report-export-tag">
|
||||
{{ exportTask.status_name || '处理中' }}
|
||||
@@ -26,7 +26,6 @@
|
||||
<ElButton v-if="canDownload" type="success" link @click="downloadExport">
|
||||
下载
|
||||
</ElButton>
|
||||
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
|
||||
</template>
|
||||
</ArtTableHeader>
|
||||
|
||||
@@ -268,6 +267,7 @@
|
||||
.report-snapshot {
|
||||
font-size: 12px;
|
||||
font-weight: 400;
|
||||
margin-left: 20px;
|
||||
color: var(--el-text-color-secondary);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
<ArtSearchBar
|
||||
v-model:filter="searchForm"
|
||||
:items="searchFormItems"
|
||||
show-expand
|
||||
label-width="100px"
|
||||
:show-expand="false"
|
||||
@reset="handleReset"
|
||||
@search="handleSearch"
|
||||
></ArtSearchBar>
|
||||
@@ -19,6 +18,7 @@
|
||||
@refresh="handleRefresh"
|
||||
>
|
||||
<template #left>
|
||||
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
|
||||
<span v-if="snapshotText" class="report-snapshot">{{ snapshotText }}</span>
|
||||
<ElTag v-if="exportTask" :type="exportStatusType" class="report-export-tag">
|
||||
{{ exportTask.status_name || '处理中' }}
|
||||
@@ -26,7 +26,6 @@
|
||||
<ElButton v-if="canDownload" type="success" link @click="downloadExport">
|
||||
下载
|
||||
</ElButton>
|
||||
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
|
||||
</template>
|
||||
</ArtTableHeader>
|
||||
|
||||
@@ -268,6 +267,7 @@
|
||||
.report-snapshot {
|
||||
font-size: 12px;
|
||||
font-weight: 400;
|
||||
margin-left: 20px;
|
||||
color: var(--el-text-color-secondary);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
<ArtSearchBar
|
||||
v-model:filter="searchForm"
|
||||
:items="searchFormItems"
|
||||
label-width="110"
|
||||
:show-expand="false"
|
||||
@reset="handleReset"
|
||||
@search="handleSearch"
|
||||
@@ -31,7 +30,7 @@
|
||||
:total="pagination.total"
|
||||
:marginTop="10"
|
||||
:actions="getActions"
|
||||
:actionsWidth="200"
|
||||
:actionsWidth="120"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
@@ -402,7 +401,8 @@
|
||||
{
|
||||
prop: 'effective_time',
|
||||
label: '生效时间',
|
||||
minWidth: 170,
|
||||
minWidth: 340,
|
||||
showOverflowTooltip: true,
|
||||
formatter: (row: H5PopupConfiguration) =>
|
||||
`${formatDateTime(row.starts_at)} ~ ${formatDateTime(row.ends_at)}`
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user