From 23f026fbfd81066b1f2e9662bbeff31965dda4d6 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 17:00:16 +0800
Subject: [PATCH] 仓储页面推送数据过滤查询
---
UI-Project/src/views/GlassStorage/rawhistory.vue | 88 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index bd7f9a9..6139cf0 100644
--- a/UI-Project/src/views/GlassStorage/rawhistory.vue
+++ b/UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -15,15 +15,20 @@
<el-option :label="$t('sorter.advancerequests')" value="4"></el-option>
<el-option :label="$t('sorter.releaserequest')" value="5"></el-option>
</el-select>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
- style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
- </el-date-picker>
+ <el-date-picker
+ style="margin-left: 15px;"
+ v-model="timeRange"
+ type="datetimerange"
+ :shortcuts="shortcuts"
+ range-separator="鑷�"
+ :start-placeholder="$t('reportmanage.starttime')"
+ :end-placeholder="$t('reportmanage.endtime')"
+ />
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="50" />
- <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')" min-width="50" />
+ <el-table-column prop="endSlot" align="center" :label="$t('film.endoriginateslot')" min-width="50" />
<el-table-column prop="shelf" align="center" :label="$t('film.resetnumber')" min-width="50" />
<el-table-column prop="patternQuantity" align="center" :label="$t('film.thickremainquant')" min-width="50" />
<el-table-column
@@ -208,8 +213,8 @@
pageSize: 20,
taskState: celllist,
taskType: stateList,
- beginDate: (timeRange.value && timeRange.value[0]) || '',
- endDate: (timeRange.value && timeRange.value[1]) || '',
+ beginDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[0])) || '',
+ endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -262,8 +267,8 @@
pageSize: 20,
taskState: celllist,
taskType: stateList,
- beginDate: (timeRange.value && timeRange.value[0]) || '',
- endDate: (timeRange.value && timeRange.value[1]) || '',
+ beginDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[0])) || '',
+ endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -294,6 +299,41 @@
const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
+const shortcuts = [
+ {
+ text: '鏈�杩戜竴鍛�',
+ value: () => {
+ const backendTime = new Date(getglobalDate)
+ const oneWeekAgo = new Date(getglobalDate)
+ oneWeekAgo.setHours(0, 0, 0, 0);
+ oneWeekAgo.setDate(oneWeekAgo.getDate() - 7)
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)]
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+ },
+ },
+ {
+ text: '鏈�杩戜竴涓湀',
+ value: () => {
+ const backendTime = new Date(getglobalDate)
+ const oneWeekAgo = new Date(getglobalDate)
+ oneWeekAgo.setHours(0, 0, 0, 0);
+ oneWeekAgo.setMonth(oneWeekAgo.getMonth() - 1)
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)]
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+ },
+ },
+ {
+ text: '鏈�杩戜笁涓湀',
+ value: () => {
+ const backendTime = new Date(getglobalDate)
+ const oneWeekAgo = new Date(getglobalDate)
+ oneWeekAgo.setHours(0, 0, 0, 0);
+ oneWeekAgo.setMonth(oneWeekAgo.getMonth() - 3)
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)]
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+},
+ },
+]
// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
@@ -328,27 +368,31 @@
case 4:
return t('sorter.advancerequests');//杩涚墖璇锋眰
case 5:
- return t('sorter.releaserequest');//鍑虹墖璇锋眰
+ return t('sorter.warehouseReturntasks');//鍥炲簱璇锋眰
}
}
function getStatusType2(taskState) {
switch (taskState) {
- case 0:
- return 'info';
- case 2:
- return 'warning';
- case 1:
- return 'success';
+ case 0:
+ return 'info';
+ case 1:
+ return 'warning';
+ case 2:
+ return 'success';
+ case 3:
+ return 'danger';
}
}
function getStatusText2(taskState) {
switch (taskState) {
- case 0:
- return t('film.built');//鏂板缓
- case 2:
- return t('film.fail');//澶辫触
- case 1:
- return t('film.finish');//瀹屾垚
+ case 0:
+ return t('film.built');//鏂板缓
+ case 1:
+ return t('film.execution');//鎵ц涓�
+ case 2:
+ return t('film.finish');//瀹屾垚
+ case 3:
+ return t('film.fail');//澶辫触
}
}
onMounted(() => {
--
Gitblit v1.8.0