fix: some
Some checks failed
构建并部署前端到测试环境 / build-and-deploy (push) Failing after 50m13s

This commit is contained in:
luo
2026-09-20 10:22:39 +08:00
parent 085a83d4e4
commit a6ce24f2f2
4 changed files with 10 additions and 12 deletions

View File

@@ -4,6 +4,7 @@
<ArtSearchBar <ArtSearchBar
v-model:filter="searchForm" v-model:filter="searchForm"
:items="searchFormItems" :items="searchFormItems"
:show-expand="false"
@reset="handleReset" @reset="handleReset"
@search="handleSearch" @search="handleSearch"
/> />
@@ -151,7 +152,6 @@
{ {
prop: 'external_transaction_no', prop: 'external_transaction_no',
label: '外部交易流水号', label: '外部交易流水号',
minWidth: 220,
formatter: (row: EmployeeCollectionApplication) => formatter: (row: EmployeeCollectionApplication) =>
h( h(
'span', 'span',
@@ -165,7 +165,6 @@
{ {
prop: 'payment_method_name', prop: 'payment_method_name',
label: '收款方式', label: '收款方式',
width: 140,
formatter: (row: EmployeeCollectionApplication) => row.payment_method_name || '-' formatter: (row: EmployeeCollectionApplication) => row.payment_method_name || '-'
}, },
{ {
@@ -188,7 +187,6 @@
{ {
prop: 'created_at', prop: 'created_at',
label: '提交时间', label: '提交时间',
width: 170,
formatter: (row: EmployeeCollectionApplication) => formatDateTime(row.created_at) formatter: (row: EmployeeCollectionApplication) => formatDateTime(row.created_at)
} }
]) ])

View File

@@ -5,8 +5,7 @@
<ArtSearchBar <ArtSearchBar
v-model:filter="searchForm" v-model:filter="searchForm"
:items="searchFormItems" :items="searchFormItems"
show-expand :show-expand="false"
label-width="100px"
@reset="handleReset" @reset="handleReset"
@search="handleSearch" @search="handleSearch"
></ArtSearchBar> ></ArtSearchBar>
@@ -19,6 +18,7 @@
@refresh="handleRefresh" @refresh="handleRefresh"
> >
<template #left> <template #left>
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
<span v-if="snapshotText" class="report-snapshot">{{ snapshotText }}</span> <span v-if="snapshotText" class="report-snapshot">{{ snapshotText }}</span>
<ElTag v-if="exportTask" :type="exportStatusType" class="report-export-tag"> <ElTag v-if="exportTask" :type="exportStatusType" class="report-export-tag">
{{ exportTask.status_name || '处理中' }} {{ exportTask.status_name || '处理中' }}
@@ -26,7 +26,6 @@
<ElButton v-if="canDownload" type="success" link @click="downloadExport"> <ElButton v-if="canDownload" type="success" link @click="downloadExport">
下载 下载
</ElButton> </ElButton>
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
</template> </template>
</ArtTableHeader> </ArtTableHeader>
@@ -268,6 +267,7 @@
.report-snapshot { .report-snapshot {
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
margin-left: 20px;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
} }

View File

@@ -5,8 +5,7 @@
<ArtSearchBar <ArtSearchBar
v-model:filter="searchForm" v-model:filter="searchForm"
:items="searchFormItems" :items="searchFormItems"
show-expand :show-expand="false"
label-width="100px"
@reset="handleReset" @reset="handleReset"
@search="handleSearch" @search="handleSearch"
></ArtSearchBar> ></ArtSearchBar>
@@ -19,6 +18,7 @@
@refresh="handleRefresh" @refresh="handleRefresh"
> >
<template #left> <template #left>
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
<span v-if="snapshotText" class="report-snapshot">{{ snapshotText }}</span> <span v-if="snapshotText" class="report-snapshot">{{ snapshotText }}</span>
<ElTag v-if="exportTask" :type="exportStatusType" class="report-export-tag"> <ElTag v-if="exportTask" :type="exportStatusType" class="report-export-tag">
{{ exportTask.status_name || '处理中' }} {{ exportTask.status_name || '处理中' }}
@@ -26,7 +26,6 @@
<ElButton v-if="canDownload" type="success" link @click="downloadExport"> <ElButton v-if="canDownload" type="success" link @click="downloadExport">
下载 下载
</ElButton> </ElButton>
<ElButton type="primary" :loading="exporting" @click="handleExport">导出</ElButton>
</template> </template>
</ArtTableHeader> </ArtTableHeader>
@@ -268,6 +267,7 @@
.report-snapshot { .report-snapshot {
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
margin-left: 20px;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
} }

View File

@@ -4,7 +4,6 @@
<ArtSearchBar <ArtSearchBar
v-model:filter="searchForm" v-model:filter="searchForm"
:items="searchFormItems" :items="searchFormItems"
label-width="110"
:show-expand="false" :show-expand="false"
@reset="handleReset" @reset="handleReset"
@search="handleSearch" @search="handleSearch"
@@ -31,7 +30,7 @@
:total="pagination.total" :total="pagination.total"
:marginTop="10" :marginTop="10"
:actions="getActions" :actions="getActions"
:actionsWidth="200" :actionsWidth="120"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
@@ -402,7 +401,8 @@
{ {
prop: 'effective_time', prop: 'effective_time',
label: '生效时间', label: '生效时间',
minWidth: 170, minWidth: 340,
showOverflowTooltip: true,
formatter: (row: H5PopupConfiguration) => formatter: (row: H5PopupConfiguration) =>
`${formatDateTime(row.starts_at)} ~ ${formatDateTime(row.ends_at)}` `${formatDateTime(row.starts_at)} ~ ${formatDateTime(row.ends_at)}`
}, },