首页优化,借料、还料的查询优化

This commit is contained in:
2026-01-26 10:20:12 +08:00
parent b9b7aa8853
commit 78ec95c313
3 changed files with 30 additions and 32 deletions

View File

@@ -715,17 +715,17 @@ const goNotice = (noticeId) => {
onMounted(() => { onMounted(() => {
getMonthCountList() // getMonthCountList()
getWaitList() // getWaitList()
getInventoryAgeList() // getInventoryAgeList()
getInventoryReviewList() // getInventoryReviewList()
getInStorageList() // getInStorageList()
getGoodsTypeList() // getGoodsTypeList()
getAgeLongList() // getAgeLongList()
getInventoryTypeList() // getInventoryTypeList()
getOutInventoryTypeList() // getOutInventoryTypeList()
getDailyInventoryList() // getDailyInventoryList()
getNoticeList() // getNoticeList()
}); });
const downloadExcel = () => { const downloadExcel = () => {

View File

@@ -4,9 +4,9 @@
<el-row :gutter="40"> <el-row :gutter="40">
<el-col :span="5"> <el-col :span="5">
<el-form-item label="借用时间" prop="borrowTime"> <el-form-item label="借用时间" prop="borrowTime">
<el-date-picker v-model="borrowTime" type="datetimerange" range-separator="至" start-placeholder="开始日期" <el-date-picker v-model="borrowTime" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" clearable placeholder="请选择借用时间" format="YYYY/MM/DD HH:mm:ss" end-placeholder="结束日期" clearable placeholder="请选择借用时间" format="YYYY/MM/DD"
value-format="YYYY-MM-DD HH:mm:ss"> value-format="YYYY-MM-DD">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -213,7 +213,7 @@
<el-form ref="returnRef" :model="returnData" label-width="100px"> <el-form ref="returnRef" :model="returnData" label-width="100px">
<el-form-item label="还料时间"> <el-form-item label="还料时间">
<el-date-picker style="width: 100%" v-model="returnData.returnTime" value-format="YYYY-MM-DD HH:mm:ss" <el-date-picker style="width: 100%" v-model="returnData.returnTime" value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm:ss" type="datetime" /> format="YYYY-MM-DD HH:mm:ss" type="date" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
@@ -352,11 +352,11 @@ function reset() {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
if (borrowTime.value && borrowTime.value.length > 0) { if (borrowTime.value && borrowTime.value.length > 0) {
queryParams.value.startTime = borrowTime.value[0] queryParams.value.startDate = borrowTime.value[0]
queryParams.value.endTime = borrowTime.value[1] queryParams.value.endDate = borrowTime.value[1]
} else { } else {
queryParams.value.startTime = "" queryParams.value.startDate = ""
queryParams.value.endTime = "" queryParams.value.endDate = ""
} }
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
getList(); getList();

View File

@@ -6,14 +6,14 @@
<el-form-item label="还料时间" prop="returnTime"> <el-form-item label="还料时间" prop="returnTime">
<el-date-picker <el-date-picker
v-model="returnTime" v-model="returnTime"
type="datetimerange" type="daterange"
range-separator="" range-separator=""
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
clearable clearable
placeholder="请选择出库时间" placeholder="请选择出库时间"
format="YYYY/MM/DD HH:mm:ss" format="YYYY/MM/DD"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@@ -216,10 +216,7 @@
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const outboundList = ref([]);
const loading = ref(true);
const showSearch = ref(true); const showSearch = ref(true);
const total = ref(0);
const showContent = ref(false); // 控制打印内容是否显示 const showContent = ref(false); // 控制打印内容是否显示
const dateStr = ref("") //打印单据生成的日期 const dateStr = ref("") //打印单据生成的日期
@@ -253,10 +250,13 @@
const { queryParams, printViewInfo } = toRefs(data); const { queryParams, printViewInfo } = toRefs(data);
const loading = ref(true);
const outboundList = ref([]);
const total = ref(0);
/** 查询库存单据主列表 */ /** 查询库存单据主列表 */
function getList() { function getList() {
loading.value = true; loading.value = true;
queryParams.value.bizType = 3
listStock(queryParams.value).then(response => { listStock(queryParams.value).then(response => {
outboundList.value = response.rows; outboundList.value = response.rows;
total.value = response.total; total.value = response.total;
@@ -268,11 +268,11 @@
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {
if(returnTime.value && returnTime.value.length>0){ if(returnTime.value && returnTime.value.length>0){
queryParams.value.startTime = returnTime.value[0] queryParams.value.startDate = returnTime.value[0]
queryParams.value.endTime = returnTime.value[1] queryParams.value.endDate = returnTime.value[1]
}else{ }else{
queryParams.value.startTime = "" queryParams.value.startDate = ""
queryParams.value.endTime = "" queryParams.value.endDate = ""
} }
queryParams.value.pageNum = 1; queryParams.value.pageNum = 1;
getList(); getList();
@@ -288,7 +288,6 @@
//打印单据 多选框选中数据 //打印单据 多选框选中数据
function printSelectionChange(selection){ function printSelectionChange(selection){
printList.value = selection printList.value = selection
queryParams.value.ids = selection.map(item => item.id)
console.log(queryParams.value.ids) console.log(queryParams.value.ids)
} }
//打印单据 //打印单据
@@ -309,7 +308,6 @@
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
function handleExport() { function handleExport() {
proxy.download('wisdom/stock/export', { proxy.download('wisdom/stock/export', {