From b0884ede9aff94441929fcc94e52f5d540c86196 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 18 二月 2025 13:57:48 +0800
Subject: [PATCH] 新增字段
---
UI-Project/src/views/Returns/upreturns.vue | 33 ++++++++++++++++++++++++++++++++-
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 4 ++--
UI-Project/src/lang/en.js | 2 ++
UI-Project/src/lang/py.js | 2 ++
UI-Project/src/lang/zh.js | 3 ++-
5 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index d9bbb3d..f7649af 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,6 +34,8 @@
quit:"Exit",
},
basicData:{
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
printing:'鑷姩鎵撳嵃',
laserprinting:'Laser printing machine ready status锛�',
cuttingmachine:'Cutting machine ready status锛�',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 11788cf..2edcb56 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -34,6 +34,8 @@
quit: "袙褘褏芯写",
},
basicData: {
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
deletemessage: '校写邪谢懈褌褜 褝褌褍 懈薪褎芯褉屑邪褑懈褞 懈谢懈 薪械褌?',
laserprinting: '袦邪褕懈薪邪 谢邪蟹械褉薪芯泄 屑邪褉泻懈褉芯胁泻懈 谐芯褌芯胁邪锛�',
cuttingmachine: '袦邪褕懈薪邪 写谢褟 褉械蟹泻懈 谐芯褌芯胁邪锛�',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 29ef20d..145e945 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -34,7 +34,8 @@
quit:"閫�鍑�",
},
basicData:{
- printing:'鑷姩鎵撳嵃',
+ rackreset:'鏋跺瓙澶嶄綅',
+ prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
laserprinting:'鎵撴爣鏈哄氨缁姸鎬侊細',
cuttingmachine:'鍒囧壊鏈哄氨缁姸鎬侊細',
machine:'涓婄墖鏈鸿仈鏈虹姸鎬侊細',
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 514e236..6353e05 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -222,8 +222,8 @@
const response = await request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest", {
beginDate: (timeRange.value && timeRange.value[0]) || '',
endDate: (timeRange.value && timeRange.value[1]) || '',
- taskState: stateList,
- taskType: celllist
+ taskState: celllist,
+ taskType: stateList
})
if (response.code === 200) {
// tableDataa.value = response.data;
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index ce26404..386f5b7 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -73,7 +73,8 @@
try {
const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
if (response.code === 200) {
- tableData.splice(0, tableData.length, ...response.data);
+ tableData.value = response.data
+ // tableData.splice(0, tableData.length, ...response.data);
ElMessage.error(response.message);
window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
@@ -360,6 +361,31 @@
console.error('鍙戠敓閿欒:', error);
}
};
+// 鏋跺瓙澶嶄綅
+const handleptask = async() => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('basicData.prackreset'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/loadGlass/rawGlassStorageDetails/shelfReset?slot="+ 1;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -460,6 +486,11 @@
<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center" width="70">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleptask()">{{ $t('basicData.rackreset') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
--
Gitblit v1.8.0