From 2e05d43a7da078224a40e6620544969799504a9f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 10 三月 2025 16:48:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

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

diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 9b3710e..802057b 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -358,7 +358,7 @@
        glassId: row.glassId,
        line: 6,
        status: 1,
-       type: 8,
+       state: 8,
        workingProcedure: '涓婄墖',
     })
     if (response.code === 200) {
@@ -388,7 +388,7 @@
        glassId: row.glassId,
        line: 6,
        status: 1,
-       type: 9,
+       state: 9,
        workingProcedure: '涓婄墖',
     })
     if (response.code === 200) {
@@ -504,7 +504,7 @@
             <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
             <el-table-column fixed="right" :label="$t('film.operate')" align="center">
             <template #default="scope">
-          <el-button size="mini" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+          <el-button size="mini" :disabled="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
             </template>
         </el-table-column>
           </el-table>

--
Gitblit v1.8.0