From ccbad18cbba7b7695fd2ec163995a170afebf849 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 二月 2025 08:49:42 +0800
Subject: [PATCH] 上片模块新增架子复位功能，原片仓储编辑入参更改
---
UI-Project/src/views/Returns/upreturns.vue | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 386f5b7..817892c 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -362,30 +362,38 @@
}
};
// 鏋跺瓙澶嶄綅
-const handleptask = async() => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('basicData.prackreset'),
- t('workOrder.prompt'),
- {
- confirmButtonText: t('workOrder.yes'),
+const handleptask = async (workstationId: number) => {
+ console.log(workstationId);
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('basicData.prackreset'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
cancelButtonText: t('workOrder.cancel'),
- type: 'warning',
- }
+ 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);
+ if (confirmResult === 'confirm') {
+
+ const slot = workstationId === 1 ? 101 : (workstationId === 2 ? 102 : null);
+ if (slot !== null) {
+ const response = await request.post('/glassStorage/rawGlassStorageDetails/shelfReset', {
+ slot: slot,
+ })
+ // const url = `/loadGlass/rawGlassStorageDetails/shelfReset?slot=${slot}`;
+ // const response = await request.post(url);
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
} else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
- }
-};
+ }
+ }
+ } catch (error) {
+ }
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -479,16 +487,16 @@
<div style="display: flex;">
<img src="../../assets/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
- <el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
+ <el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="500"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
- <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60"/>
+ <el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50"/>
<el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80"/>
<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">
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="handleptask()">{{ $t('basicData.rackreset') }}</el-button>
+ <el-button size="mini" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0