From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturnhistory.vue | 174 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 97 insertions(+), 77 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index 4641812..f9d95f8 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -6,29 +6,29 @@
<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')" />
- <el-select
- :placeholder="$t('searchOrder.taskstatus')"
- clearable
- style="width: 270px;margin-left: 10px;"
- v-model="taskStateList">
- <el-option
- v-for="item in optionsa"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </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-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
+ 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="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" />
- <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" />
+ <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" />
- <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
+ <el-table-column prop="rawGlassFilmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
+ <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
<el-table-column prop="totalCount" align="center" :label="$t('basicData.tonumber')" min-width="80" />
<el-table-column prop="finishCount" align="center" :label="$t('basicData.finishnumber')" min-width="80" />
<el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80" />
@@ -41,18 +41,6 @@
<template #default="scope">
<el-tag :type="getStatusTypeb(scope.row.taskState)">
{{ getStatusTextb(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('sorter.taskRunning')"
- min-width="80"
- prop="taskRunning"
- >
- <template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskRunning)">
- {{ getStatusTexta(scope.row.taskRunning) }}
</el-tag>
</template>
</el-table-column>
@@ -87,7 +75,7 @@
const globalDate = inject('globalDate');
const router = useRouter()
const timeRange = ref([])
-const taskStateList = reactive([]);
+const selectValuesa = reactive([]);
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
@@ -107,9 +95,9 @@
rawGlassThickness: '',
rawGlassWidth: '',
rawGlassfilmsId: '',
- slot: '',
+ slot: 0,
station: 1,
- taskStateList: '',
+ taskStateList: [],
beginDate: startTime,
endDate: getglobalDate
})
@@ -122,7 +110,6 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -134,26 +121,37 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
const historicala = async (page) => {
try {
+let pslot= ''
+let celllist=[]
+if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+}
+if(slot.value != ""){
+ pslot = slot.value
+}else{
+ pslot = '0'
+}
let page = window.localStorage.getItem('pagenumber')
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
pageNo: page,
pageSize: 20,
- rawGlassHeight: '',
- rawGlassThickness: '',
- rawGlassWidth: '',
- rawGlassfilmsId: '',
- slot: '',
+ rawGlassHeight: rawGlassHeight.value,
+ rawGlassThickness: rawGlassThickness.value,
+ rawGlassWidth: rawGlassWidth.value,
+ rawGlassfilmsId: rawGlassfilmsId.value,
+ slot: pslot,
station: 1,
- taskStateList: '',
- beginDate: startTime,
- endDate: getglobalDate
+ taskStateList: celllist,
+ beginDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[0])) || '',
+ endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -176,9 +174,20 @@
// 鍘嗗彶鏌ヨ鐐瑰嚮
const sethistorical = async () => {
try {
+let pslot= ''
+let celllist=[]
+if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+}
+if(slot.value != ""){
+ pslot = slot.value
+}else{
+ pslot = '0'
+}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
- console.log(page);
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
pageNo: 1,
pageSize: 20,
@@ -186,13 +195,14 @@
rawGlassThickness: rawGlassThickness.value,
rawGlassWidth: rawGlassWidth.value,
rawGlassfilmsId: rawGlassfilmsId.value,
- slot: slot.value,
+ slot: pslot,
station: 1,
- taskStateList: '',
- beginDate: (timeRange.value && timeRange.value[0]) || '',
- endDate: (timeRange.value && timeRange.value[1]) || '',
- })
+ taskStateList: celllist,
+ 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);
const formattedData = response.data.records.map(record => ({
...record,
@@ -221,13 +231,45 @@
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澶�
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
+ oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
@@ -238,7 +280,7 @@
case 1:
return 'success';
case 2:
- return 'success';
+ return 'info';
}
}
function getStatusTextb(taskState: number) {
@@ -258,29 +300,7 @@
case 1:
return 'success';
}
-}
-function getStatusTexta(taskRunning: number) {
- switch (taskRunning) {
- case 0:
- return t('basicData.untask');
- case 1:
- return t('basicData.up');
- }
}
-const optionsa = [
- {
- value: 0,
- label: t('searchOrder.empty'),
- },
- {
- value: 1,
- label: t('film.execution'),
- },
- {
- value: 2,
- label: t('searchOrder.endtask'),
- }
-]
onMounted(() => {
parseAndSetTime();
historical();
--
Gitblit v1.8.0