From a4a795a986b009779f09e9a825c0099aa0bacbb8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 18 八月 2025 16:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns2.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 13ef8d6..7cf671e 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -159,6 +159,14 @@
};
//閫夋嫨宸ョ▼棰勮纭
const handlesure = async () => {
+ if (!selectedProjectNo.value) {
+ ElMessage.error(t('basicData.plselectproject'))
+ return
+ }
+ if (!filmRemove.value) {
+ ElMessage.error(t('Mounting.removalmethod'))
+ return
+ }
try {
const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
stationCell: 6,
@@ -401,11 +409,11 @@
function getStatusText2(filmRemove) {
switch (filmRemove) {
case 0:
- return t('Mounting.noremoval');//瀹屾垚
- case 1:
- return t('Mounting.coarselyground');//鏂板缓
+ return t('Mounting.noremoval');//涓嶉櫎鑶�
+ // case 1:
+ // return t('Mounting.coarselyground');
case 2:
- return t('Mounting.finegrinding');//鎵ц涓�
+ return t('Mounting.removal');//闄よ啘
}
}
</script>
@@ -470,6 +478,7 @@
:type="scope.row.state === 100 ? 'success' : 'warning'"
@click="toggleEnableState(scope.row)"
>
+ <!-- 绛夊緟涓細0 閫氳繃锛�100 -->
{{ scope.row.state === 100 ? $t('Mounting.pass') : $t('Mounting.waiting') }}
</el-tag>
</template>
@@ -480,7 +489,7 @@
<div style="display: flex;margin-left:5%">
<div style="width: 55%;float: left;margin-left: 300px;">
<div style="display: flex;">
- <img src="../../assets/shangpianji.png" alt=""
+ <img src="/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 3%;">
<el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="700"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
@@ -594,8 +603,9 @@
<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>
- <el-option :label="$t('Mounting.coarselyground')" value="1"></el-option>
- <el-option :label="$t('Mounting.finegrinding')" value="2"></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>
</div>
--
Gitblit v1.8.0