前端最新版本同步
This commit is contained in:
@@ -138,6 +138,14 @@
|
||||
>重置</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
@@ -276,13 +284,13 @@
|
||||
<el-table-column
|
||||
label="制单日期"
|
||||
align="center"
|
||||
key="createTime"
|
||||
prop="createTime"
|
||||
key="occurrenceTime"
|
||||
prop="occurrenceTime"
|
||||
width="160"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
<span>{{ parseTime(scope.row.occurrenceTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -316,6 +324,7 @@ import {
|
||||
} from "./statisticalManagent";
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
const route = useRoute();
|
||||
|
||||
// const {
|
||||
// item_type
|
||||
@@ -347,8 +356,8 @@ const data = reactive({
|
||||
purposeLocationId: undefined,
|
||||
categoryType: undefined,
|
||||
supplierId: undefined,
|
||||
createTimeSTime:undefined,
|
||||
createTimeETime:undefined,
|
||||
occurrenceTimeSTime:undefined,
|
||||
occurrenceTimeETime:undefined,
|
||||
},
|
||||
rules: {},
|
||||
});
|
||||
@@ -363,6 +372,12 @@ function getPharmacyCabinetLists() {
|
||||
supplierListOptions.value = response.data.supplierListOptions
|
||||
})
|
||||
}
|
||||
/** 导出按钮操作 */
|
||||
function handleExport() {
|
||||
proxy.$download.downloadGet("report-manage/inbound/excel-out", {
|
||||
...queryParams.value
|
||||
}, `dict_${new Date().getTime()}.xlsx`);
|
||||
}
|
||||
/** 查询调拨管理项目列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
@@ -373,13 +388,37 @@ function getList() {
|
||||
});
|
||||
}
|
||||
|
||||
// 监听路由变化
|
||||
watch(
|
||||
() => route.query,
|
||||
(newQuery) => {
|
||||
// 如果路由中包含指定参数,则使用这些参数进行查询
|
||||
if (newQuery.purposeLocationId || newQuery.occurrenceTimeSTime || newQuery.occurrenceTimeETime) {
|
||||
// 设置查询参数
|
||||
if (newQuery.purposeLocationId) {
|
||||
queryParams.value.purposeLocationId = newQuery.purposeLocationId;
|
||||
}
|
||||
if (newQuery.occurrenceTimeSTime) {
|
||||
queryParams.value.occurrenceTimeSTime = newQuery.occurrenceTimeSTime + ' 00:00:00';
|
||||
}
|
||||
if (newQuery.occurrenceTimeETime) {
|
||||
queryParams.value.occurrenceTimeETime = newQuery.occurrenceTimeETime + ' 23:59:59';
|
||||
}
|
||||
|
||||
// 执行查询
|
||||
getList();
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
function handleQuery() {
|
||||
queryParams.value.createTimeSTime =
|
||||
queryParams.value.occurrenceTimeSTime =
|
||||
approvalTime.value && approvalTime.value.length == 2
|
||||
? approvalTime.value[0] + " 00:00:00"
|
||||
: "";
|
||||
queryParams.value.createTimeETime =
|
||||
queryParams.value.occurrenceTimeETime =
|
||||
approvalTime.value && approvalTime.value.length == 2
|
||||
? approvalTime.value[1] + " 23:59:59"
|
||||
: "";
|
||||
@@ -390,8 +429,8 @@ function handleQuery() {
|
||||
/** 清空条件按钮操作 */
|
||||
function handleClear() {
|
||||
// 清空查询条件
|
||||
queryParams.value.createTimeSTime = ""
|
||||
queryParams.value.createTimeETime = ""
|
||||
queryParams.value.occurrenceTimeSTime = ""
|
||||
queryParams.value.occurrenceTimeETime = ""
|
||||
approvalTime.value = ""
|
||||
proxy.resetForm("queryRef");
|
||||
getList();
|
||||
|
||||
Reference in New Issue
Block a user