From c42e625e4fac49d446d9e0eb98ea8b06eb1b8df0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 02 一月 2025 15:22:16 +0800
Subject: [PATCH] 掰片模块调整比例、字体大小

---
 UI-Project/src/views/Returns/upreturns.vue |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 6ec4545..7033a51 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -60,7 +60,8 @@
     if (response.code === 200) {
       tableData.splice(0, tableData.length, ...response.data);
       ElMessage.error(response.message);
-    }
+     window.localStorage.setItem('engineeringId', tableData[0].engineeringId)
+}
   } catch (error) {
   }
 };
@@ -78,6 +79,7 @@
   canSelectProjecta.value = true;
   canSelectProjectb.value = true;
   canSelectProjectc.value = false;
+  tableData.value = '';
 }
 };
 onBeforeUnmount(() => {
@@ -86,7 +88,6 @@
 // 缁撴潫宸ョ▼
 const handledelete = (row) => {
   blindb.value = true;
-  deleteTask()
 };
 const requestData = {
   state: 100
@@ -114,7 +115,7 @@
       engineerId: selectedProjectNo.value,
       filmRemove: parseInt(filmRemove.value, 10),
     })
-    window.localStorage.setItem('engineeringId', selectedProjectNo.value)
+    window.localStorage.setItem('engineeringIda', selectedProjectNo.value)
     window.localStorage.setItem('filmRemove', filmRemove.value)
     if (response.code == 200) {
       ElMessage.success(response.message);
@@ -147,6 +148,7 @@
         canSelectProjecta.value = true;
         canSelectProjectb.value = true;
         canSelectProjectc.value = false;
+        blindb.value = false;
       } else {
         ElMessage.error(response.message);
     }
@@ -165,13 +167,13 @@
 // 寮�濮嬩笂鐗�
 const handleon = async () => {
   let filmRemove = window.localStorage.getItem('filmRemove')
-  let engineeringId = window.localStorage.getItem('engineeringId')
+  let engineeringIda = window.localStorage.getItem('engineeringIda')
   if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
     try {
       const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
         stationCell: 5,
         filmRemove: filmRemove,
-        engineerId: engineeringId,
+        engineerId: engineeringIda,
         state: 1,
       })
       if (response.code == 200) {
@@ -468,7 +470,7 @@
   </el-dialog>
 <!-- 缁撴潫宸ョ▼ -->
   <el-dialog v-model="blindb" top="10vh" width="80%">
-    <el-table ref="table" style="margin-top: 20px;height: 300px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+    <el-table ref="table" style="margin-top: 20px;height: 450px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
         <el-table-column prop="engineerId" fixed align="center" :label="$t('basicData.projectnumber')"/>
         <el-table-column prop="glassId" fixed align="center" :label="$t('searchOrder.glassID')"/>
         <el-table-column prop="temperingLayoutId" fixed align="center" :label="$t('searchOrder.layoutID')"/>
@@ -478,7 +480,7 @@
         <el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')"/>
         <el-table-column prop="filmsid" align="center" :label="$t('basicData.coatingtypes')"/>
         <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')"/>
-        <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
+        <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="200">
             <template #default="scope">
               <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
               <el-button size="mini" type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
@@ -487,17 +489,10 @@
         </el-table>
         <template #footer>
       <div id="dialog-footer">
+        <el-button type="danger" @click="deleteTask()">{{ $t('searchOrder.deleteTask') }}</el-button>
         <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
       </div>
     </template>
-    <!-- <template #footer>
-      <div id="dialog-footer">
-        <el-button type="primary" @click="deleteTask">
-          {{ $t('basicData.confirm') }}
-        </el-button>
-        <el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button>
-      </div>
-    </template> -->
   </el-dialog>
   <!-- 鍊肩彮淇℃伅 -->
     <el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">

--
Gitblit v1.8.0