|
|
@@ -3,37 +3,37 @@
|
|
|
<el-header height="36px" style="margin-top: 8px">
|
|
|
<el-date-picker
|
|
|
v-model="dateRange"
|
|
|
- type="datetimerange"
|
|
|
+ :shortcuts="shortcuts"
|
|
|
+ end-placeholder="结束日期"
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- :shortcuts="shortcuts"
|
|
|
+ type="datetimerange"
|
|
|
></el-date-picker>
|
|
|
<span></span>
|
|
|
<el-select v-model="type" style="width: 130px">
|
|
|
- <el-option v-for="item in types" :key="item.code" :value="item.code" :label="item.name"></el-option>
|
|
|
+ <el-option v-for="item in types" :key="item.code" :label="item.name" :value="item.code"></el-option>
|
|
|
</el-select>
|
|
|
<span></span>
|
|
|
- <el-button type="primary" icon="el-icon-search" @click="fetchResult">查询</el-button>
|
|
|
- <el-button type="primary" icon="el-icon-upload" @click="exportExcel">导出Excel</el-button>
|
|
|
+ <el-button icon="el-icon-search" type="primary" @click="fetchResult">查询</el-button>
|
|
|
+ <el-button icon="el-icon-upload" type="primary" @click="exportExcel">导出Excel</el-button>
|
|
|
</el-header>
|
|
|
<el-main>
|
|
|
- <el-table :data="list" stripe :height="tableHeight">
|
|
|
+ <el-table :data="list" :height="tableHeight" stripe>
|
|
|
<el-table-column type="index"></el-table-column>
|
|
|
- <el-table-column prop="ptntName" label="姓名"></el-table-column>
|
|
|
- <el-table-column prop="idCard" label="身份证"></el-table-column>
|
|
|
- <el-table-column prop="itmStrValue" label="检测结果"></el-table-column>
|
|
|
- <el-table-column prop="ordrCreateDate" label="送检时间"></el-table-column>
|
|
|
+ <el-table-column label="姓名" prop="ptntName"></el-table-column>
|
|
|
+ <el-table-column label="身份证" prop="idCard"></el-table-column>
|
|
|
+ <el-table-column label="检测结果" prop="itmStrValue"></el-table-column>
|
|
|
+ <el-table-column label="送检时间" prop="ordrCreateDate"></el-table-column>
|
|
|
</el-table>
|
|
|
<el-pagination
|
|
|
- @size-change="handleSizeChange"
|
|
|
- @current-change="handleCurrentChange"
|
|
|
:current-page="currentPage"
|
|
|
- :page-sizes="[15, 30, 45, 70, 100]"
|
|
|
:page-size="pageSize"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :page-sizes="[15, 30, 45, 70, 100]"
|
|
|
:total="totalSize"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
style="margin-top: 5px"
|
|
|
+ @size-change="handleSizeChange"
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
></el-pagination>
|
|
|
</el-main>
|
|
|
</el-container>
|
|
|
@@ -45,8 +45,9 @@ import {formatDate, formatDatetime} from '@/utils/date'
|
|
|
import {shortcuts} from '@/data/shortcuts'
|
|
|
import {fetchCovidExamData} from '@/api/inspections'
|
|
|
import store from '@/store'
|
|
|
-import {writeExcelFile, createWorkSheet} from '@/utils/excel'
|
|
|
+import {createWorkSheet, writeExcelFile} from '@/utils/excel'
|
|
|
import {ElMessage} from 'element-plus'
|
|
|
+import {stringNotBlank} from "@/utils/blank-utils";
|
|
|
|
|
|
export default {
|
|
|
setup() {
|
|
|
@@ -115,6 +116,12 @@ export default {
|
|
|
type: type.value,
|
|
|
}
|
|
|
fetchCovidExamData(param).then((res) => {
|
|
|
+ res.list.forEach((item) => {
|
|
|
+ if (stringNotBlank(item.ordrCreateDate)) {
|
|
|
+ let date = item.ordrCreateDate.split(" ")
|
|
|
+ item.ordrCreateDate = date[0]
|
|
|
+ }
|
|
|
+ })
|
|
|
const titName = type.value === 1 ? '新冠核酸检测' : '新冠抗体检测'
|
|
|
const fileName = titName + '（' + formatDate(dateRange.value[0]) + ' - ' + formatDate(dateRange.value[1]) + '）.xlsx'
|
|
|
setTimeout(() => {
|
