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/Returns/upreturnhistory.vue | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index 0535c37..443da5d 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -1,24 +1,32 @@
<template>
<div>
- <div style="display: flex;width: 1770px;">
- <el-input v-model="rawGlassWidth" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.width')" />
- <el-input v-model="rawGlassHeight" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.height')" />
- <el-input v-model="rawGlassThickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.thickness')" />
- <el-input v-model="rawGlassfilmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.coatingtypesbe')" />
- <el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
+ <div style="display: flex;width: 1770px; margin-top: 10px;">
+ <el-input v-model="engineeringId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 190px;" :placeholder="$t('Mounting.project')" />
+ <el-input v-model="rawGlassWidth" clearable style="margin-left: 10px;margin-bottom: 10px;width: 190px;" :placeholder="$t('Mounting.width')" />
+ <el-input v-model="rawGlassHeight" clearable style="margin-left: 10px;margin-bottom: 10px;width: 190px;" :placeholder="$t('Mounting.height')" />
+ <el-input v-model="rawGlassThickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 190px;" :placeholder="$t('Mounting.thickness')" />
+ <el-input v-model="rawGlassfilmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 190px;" :placeholder="$t('workOrder.coatingtypesbe')" />
+ <!-- <el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 190px;" :placeholder="$t('workOrder.upnumber')" /> -->
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
style="width: 200px;margin-left: 10px;">
<el-option :label="$t('searchOrder.empty')" value="0"></el-option>
<el-option :label="$t('film.execution')" value="1"></el-option>
<el-option :label="$t('searchOrder.endtask')" value="2"></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="id" align="center" label="ID" min-width="80" />
+ <el-table-column prop="engineeringId" :label="$t('Mounting.project')" align="center"></el-table-column>
<el-table-column prop="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="70" />
<el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="70" />
<el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" />
@@ -79,6 +87,7 @@
const rawGlassWidth = ref('');
const rawGlassfilmsId = ref('');
const slot = ref('');
+const engineeringId = ref('')
let getglobalDate = window.localStorage.getItem('getglobalDate')
const historical = async () => {
try {
@@ -91,7 +100,7 @@
rawGlassWidth: '',
rawGlassfilmsId: '',
slot: 0,
- station: 1,
+ station: 5,
taskStateList: [],
beginDate: startTime,
endDate: getglobalDate
@@ -143,10 +152,10 @@
rawGlassWidth: rawGlassWidth.value,
rawGlassfilmsId: rawGlassfilmsId.value,
slot: pslot,
- station: 1,
+ station: 5,
taskStateList: celllist,
- 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);
@@ -184,6 +193,7 @@
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
+ engineeringId: engineeringId.value,
pageNo: 1,
pageSize: 20,
rawGlassHeight: rawGlassHeight.value,
@@ -191,11 +201,11 @@
rawGlassWidth: rawGlassWidth.value,
rawGlassfilmsId: rawGlassfilmsId.value,
slot: pslot,
- station: 1,
+ station: 5,
taskStateList: celllist,
- 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) {
currentPage2.value = 1
ElMessage.success(response.message);
@@ -226,8 +236,41 @@
const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
-// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
-const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
+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))
+},
+ },
+]
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
@@ -242,17 +285,21 @@
case 1:
return 'success';
case 2:
- return 'info';
+ return 'info';
+ case 3:
+ return 'danger';
}
}
function getStatusTextb(taskState: number) {
switch (taskState) {
case 0:
- return t('searchOrder.empty');
+ return t('searchOrder.waiting');
case 1:
return t('film.execution');
case 2:
return t('searchOrder.endtask');
+ case 3:
+ return t('film.fail');
}
}
function getStatusTypea(taskRunning: number) {
--
Gitblit v1.8.0