From b8a043314eb644f45e3e110c75c29b19218c2ae8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 十二月 2025 09:43:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 1209c8b..a1b7ee6 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -142,15 +142,16 @@
ElMessage.error(t('basicData.plselectproject'))
return
}
- if (!filmRemove.value) {
- ElMessage.error(t('Mounting.removalmethod'))
- return
- }
+ // if (!filmRemove.value) {
+ // ElMessage.error(t('Mounting.removalmethod'))
+ // return
+ // }
try {
const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
stationCell: 5,
engineerId: selectedProjectNo.value,
- filmRemove: parseInt(filmRemove.value, 10),
+ filmRemove: 0,
+ // filmRemove: parseInt(filmRemove.value, 10),
})
window.localStorage.setItem('engineeringIda', selectedProjectNo.value)
window.localStorage.setItem('filmRemove', filmRemove.value)
@@ -597,7 +598,7 @@
</template>
</el-dialog>
</div>
- <el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
+ <el-dialog v-model="dialogFormVisible" top="24vh" width="50%">
<div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item :label="$t('Mounting.loadingline')" :required="true">
<el-select disabled v-model="stationCell" clearable :placeholder="$t('Mounting.inloadingline')">
@@ -612,14 +613,12 @@
:value="item.projectNo" />
</el-select>
</el-form-item>
- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
+ <!-- <el-form-item :label="$t('Mounting.removalmethoda')" :required="true">
<el-select v-model="filmRemove" clearable :placeholder="$t('Mounting.removalmethod')">
<el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
- <!-- 涓嶉櫎鑶滐細0 闄よ啘锛�2 -->
- <!-- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option> -->
<el-option :label="$t('Mounting.removal')" value="2"></el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
</div>
<template #footer>
<div id="dialog-footer">
--
Gitblit v1.8.0