From 5f2cc81d68f3065b7bcaa7dfac48f29e263b0042 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 10 六月 2025 13:44:44 +0800
Subject: [PATCH] 上片模块预览工程确认时,“除膜方式”必填判断

---
 UI-Project/src/views/Returns/upreturns.vue  |   20 ++++++++++++++------
 UI-Project/src/views/Returns/upreturns2.vue |   20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 12be9ea..610d14a 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -123,6 +123,14 @@
 };
 //閫夋嫨宸ョ▼棰勮纭
 const handlesure = async () => {
+   if (!selectedProjectNo.value) {
+      ElMessage.error('璇烽�夋嫨宸ョ▼锛�');
+    return
+  }
+   if (!filmRemove.value) {
+      ElMessage.error('璇烽�夋嫨闄よ啘鏂瑰紡锛�');
+    return
+  }
   try {
     const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
       stationCell: 5,
@@ -397,11 +405,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>
@@ -570,8 +578,8 @@
         <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>
+            <!-- <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>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 13ef8d6..dff8008 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('璇烽�夋嫨宸ョ▼锛�');
+    return
+  }
+   if (!filmRemove.value) {
+      ElMessage.error('璇烽�夋嫨闄よ啘鏂瑰紡锛�');
+    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>
@@ -594,8 +602,8 @@
       <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>
+          <!-- <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