From 3ea473d429ccb261df894826b10a2af72ee0f4f5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:50:21 +0800
Subject: [PATCH] 义乌前端最新代码

---
 UI-Project/src/views/Returns/upreturns2.vue |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index bc4cdb7..f4fdcab 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -121,8 +121,8 @@
   let engineeringId = window.localStorage.getItem('engineeringId')
   if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
     try {
-      const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
-        // const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+      // const response = await request.post('/loadGlass/engineering/engineering/pauseTask', {
+        const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
         stationCell: 6,
         filmRemove: filmRemove,
         engineerId: engineeringId,
@@ -311,6 +311,8 @@
         </template> 
           </el-table-column>
       <el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
+      <!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
+      <!-- <el-table-column prop="stationCell" :label="$t('Mounting.loadinglinea')" align="center"/> -->
     </el-table>
       </div>
     </el-card>
@@ -328,8 +330,8 @@
             <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>
-        </div>
-      </div>
+    </div>
+  </div>
       <!-- <div style="width: 48%;float: right;">
         <div style="display: flex;">
           <img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
@@ -398,7 +400,7 @@
       </div>
     </template>
   </el-dialog>
-    </div>
+        </div>
   <el-dialog v-model="dialogFormVisible" top="24vh" width="70%">
     <div class="flex-container" style="margin-left: 50px;margin-bottom: 10px;">
       <el-form-item :label="$t('Mounting.loadingline')" :required="true">

--
Gitblit v1.8.0