From bc5cab0770963c2ae0f54cbceadb5cc42780879a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 24 三月 2026 14:20:52 +0800
Subject: [PATCH] fix: 仓储物流日期筛选有问题，耗材物料没有日期筛选框
---
src/pages/consumablesLogistics/stockReport/index.vue | 100 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 84 insertions(+), 16 deletions(-)
diff --git a/src/pages/consumablesLogistics/stockReport/index.vue b/src/pages/consumablesLogistics/stockReport/index.vue
index a46a065..8dc324f 100644
--- a/src/pages/consumablesLogistics/stockReport/index.vue
+++ b/src/pages/consumablesLogistics/stockReport/index.vue
@@ -12,6 +12,37 @@
<text>{{ t.label }}</text>
</view>
</view>
+ <!-- 鏃堕棿閫夋嫨鍖哄煙 -->
+ <view class="search-section">
+ <!-- 鏃ユ姤锛氶�夋嫨骞存湀鏃� -->
+ <view v-if="searchForm.reportType === 'daily'" class="search-row">
+ <view class="date-picker" @click="openDatePicker('single')">
+ <text>{{ searchForm.singleDate || '璇烽�夋嫨鏃ユ湡' }}</text>
+ </view>
+ </view>
+
+ <!-- 鏈堟姤锛氶�夋嫨骞存湀 -->
+ <view v-else-if="searchForm.reportType === 'monthly'" class="search-row">
+ <view class="date-picker" @click="openDatePicker('startMonth')">
+ <text>{{ searchForm.startMonth || '璇烽�夋嫨寮�濮嬫湀浠�' }}</text>
+ </view>
+ ~
+ <view class="date-picker" @click="openDatePicker('endMonth')">
+ <text>{{ searchForm.endMonth || '璇烽�夋嫨缁撴潫鏈堜唤' }}</text>
+ </view>
+ </view>
+
+ <!-- 杩涘嚭瀛橈細閫夋嫨骞存湀鏃ユ椂闂磋寖鍥� -->
+ <view v-else-if="searchForm.reportType === 'inout'" class="search-row">
+ <view class="date-picker" @click="openDatePicker('startDate')">
+ <text>{{ searchForm.startDate || '璇烽�夋嫨寮�濮嬫棩鏈�' }}</text>
+ </view>
+ ~
+ <view class="date-picker" @click="openDatePicker('endDate')">
+ <text>{{ searchForm.endDate || '璇烽�夋嫨缁撴潫鏃ユ湡' }}</text>
+ </view>
+ </view>
+ </view>
<view class="list-section">
<view class="section-header">
<text class="table-title">{{ tableTitle }}</text>
@@ -33,6 +64,8 @@
<view class="row" v-if="searchForm.reportType === 'inout'"><text class="l">鍑哄簱鏁伴噺</text><text class="r">{{ item.totalStockOut }}</text></view>
<view class="row"><text class="l">鐜板湪搴撳瓨</text><text class="r highlight">{{ item.currentStock }}</text></view>
<view class="row" v-if="item.createBy"><text class="l">鍏ュ簱浜�</text><text class="r">{{ item.createBy }}</text></view>
+ <view class="row" v-if="item.currentWeight"><text class="l">鐜板噣閲�(鍚�)</text><text class="r">{{ item.currentWeight }}</text></view>
+ <view class="row" v-if="item.recordType"><text class="l">鏉ユ簮</text><text class="r">{{ getRecordType(item.recordType) }}</text></view>
</view>
</view>
<view class="load-more-wrap">
@@ -45,6 +78,7 @@
<up-datetime-picker
v-model="dateValue"
:mode="datePickerMode"
+ :show="showDatePicker"
@confirm="onDateConfirm"
@cancel="showDatePicker = false"
/>
@@ -59,7 +93,9 @@
import { formatDateToYMD } from "@/utils/ruoyi";
import { onShow, onReachBottom } from "@dcloudio/uni-app";
import { getConsumablesInReportList, getConsumablesInInAndOutReportList } from "@/api/consumablesLogistics/consumablesIn.js";
-
+import {
+ findAllQualifiedStockInRecordTypeOptions,
+} from "@/api/basicData/enum.js";
const reportTypes = [
{ label: "鏃ユ姤", value: "daily" },
{ label: "鏈堟姤", value: "monthly" },
@@ -84,7 +120,7 @@
const { searchForm } = toRefs(data);
const datePickerMode = computed(() => {
- if (datePickerTarget.value === "startMonth" || datePickerTarget.value === "endMonth") return "month";
+ if (datePickerTarget.value === "startMonth" || datePickerTarget.value === "endMonth") return "year-month";
return "date";
});
@@ -102,17 +138,28 @@
if (searchForm.value.reportType === "daily") {
p.reportDate = searchForm.value.singleDate;
} else if (searchForm.value.reportType === "monthly") {
- p.startMonth = searchForm.value.startMonth;
- p.endMonth = searchForm.value.endMonth;
- } else if (searchForm.value.reportType === "monthly") {
- p.startMonth = searchForm.value.startMonth;
- p.endMonth = searchForm.value.endMonth;
+ p.startMonth = searchForm.value.startMonth ? `${searchForm.value.startMonth}-01` : "";
+ p.endMonth = searchForm.value.endMonth ? `${searchForm.value.endMonth}-01` : "";
} else {
p.startDate = searchForm.value.startDate;
p.endDate = searchForm.value.endDate;
}
return p;
};
+
+const stockRecordTypeOptions = ref([])
+
+const getRecordType = (recordType) => {
+ return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
+}
+
+// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
+const fetchStockRecordTypeOptions = () => {
+ findAllQualifiedStockInRecordTypeOptions()
+ .then(res => {
+ stockRecordTypeOptions.value = res.data;
+ })
+}
const getList = () => {
const isFirstPage = page.current === 1;
@@ -166,6 +213,8 @@
if (target === "single") val = searchForm.value.singleDate;
else if (target === "startMonth") val = searchForm.value.startMonth;
else if (target === "endMonth") val = searchForm.value.endMonth;
+ else if (target === "startDate") val = searchForm.value.startDate;
+ else if (target === "endDate") val = searchForm.value.endDate;
dateValue.value = val ? new Date(val).getTime() : Date.now();
showDatePicker.value = true;
};
@@ -173,11 +222,31 @@
const onDateConfirm = (e) => {
const isMonth = datePickerTarget.value === "startMonth" || datePickerTarget.value === "endMonth";
const str = isMonth ? dayjs(e.value).format("YYYY-MM") : formatDateToYMD(e.value);
- if (datePickerTarget.value === "single") searchForm.value.singleDate = str;
- else if (datePickerTarget.value === "startMonth") searchForm.value.startMonth = str;
- else if (datePickerTarget.value === "endMonth") searchForm.value.endMonth = str;
- showDatePicker.value = false;
- handleQuery();
+ if (datePickerTarget.value === "single") {
+ searchForm.value.singleDate = str;
+ showDatePicker.value = false;
+ handleQuery();
+ } else if (datePickerTarget.value === "startMonth") {
+ searchForm.value.startMonth = str;
+ showDatePicker.value = false;
+ setTimeout(() => {
+ openDatePicker("endMonth");
+ }, 300);
+ } else if (datePickerTarget.value === "endMonth") {
+ searchForm.value.endMonth = str;
+ showDatePicker.value = false;
+ handleQuery();
+ } else if (datePickerTarget.value === "startDate") {
+ searchForm.value.startDate = str;
+ showDatePicker.value = false;
+ setTimeout(() => {
+ openDatePicker("endDate");
+ }, 300);
+ } else if (datePickerTarget.value === "endDate") {
+ searchForm.value.endDate = str;
+ showDatePicker.value = false;
+ handleQuery();
+ }
};
const initDefaultDates = () => {
@@ -186,10 +255,8 @@
searchForm.value.singleDate = today.format("YYYY-MM-DD");
}
if (!searchForm.value.startMonth || !searchForm.value.endMonth) {
- const startOfMonth = today.startOf("month").format("YYYY-MM-DD");
- const endOfMonth = today.endOf("month").format("YYYY-MM-DD");
- searchForm.value.startMonth = startOfMonth;
- searchForm.value.endMonth = endOfMonth;
+ searchForm.value.startMonth = today.format("YYYY-MM");
+ searchForm.value.endMonth = today.add(1, "month").format("YYYY-MM");
}
if (!searchForm.value.startDate || !searchForm.value.endDate) {
searchForm.value.endDate = today.format("YYYY-MM-DD");
@@ -207,6 +274,7 @@
onShow(() => {
initDefaultDates();
handleQuery();
+ fetchStockRecordTypeOptions();
});
onReachBottom(() => loadMore());
--
Gitblit v1.9.3