From 78d73df2f8e0c6855d65eb1f2c6df08e0f99bab1 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 22 十月 2025 12:45:05 +0800
Subject: [PATCH] 仓储后端接口返回信息国际化处理
---
UI-Project/src/views/Returns/upreturnhistory.vue | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index f9d95f8..443da5d 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -1,11 +1,12 @@
<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>
@@ -24,6 +25,8 @@
<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" />
@@ -84,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 {
@@ -96,7 +100,7 @@
rawGlassWidth: '',
rawGlassfilmsId: '',
slot: 0,
- station: 1,
+ station: 5,
taskStateList: [],
beginDate: startTime,
endDate: getglobalDate
@@ -148,7 +152,7 @@
rawGlassWidth: rawGlassWidth.value,
rawGlassfilmsId: rawGlassfilmsId.value,
slot: pslot,
- station: 1,
+ station: 5,
taskStateList: celllist,
beginDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[0])) || '',
endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
@@ -189,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,
@@ -196,7 +201,7 @@
rawGlassWidth: rawGlassWidth.value,
rawGlassfilmsId: rawGlassfilmsId.value,
slot: pslot,
- station: 1,
+ station: 5,
taskStateList: celllist,
beginDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[0])) || '',
endDate: (formatTimestamp(timeRange.value) && formatTimestamp(timeRange.value[1])) || '',
@@ -280,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