From 9d0a3a93c49d83cfa2a89befb34f102d1cb78382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 18 Jun 2024 15:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pad=E3=80=91=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/padManage/isPadForMenuPage.vue  |  4 ++--
 .../padManage/isPadForOutStockFinish.vue      | 21 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/fe/PC/src/views/padManage/isPadForMenuPage.vue b/fe/PC/src/views/padManage/isPadForMenuPage.vue
index cd8aa113b..ed56495fc 100644
--- a/fe/PC/src/views/padManage/isPadForMenuPage.vue
+++ b/fe/PC/src/views/padManage/isPadForMenuPage.vue
@@ -3,8 +3,8 @@
         <div class="item"><el-button type="primary"><a href="/#/isPadForTransferLibJob">业务库移</a></el-button></div>
         <div class="item"><el-button type="warning"><a href="/#/isPadForKittingPack">Kitting组包</a></el-button></div>
         <div class="item"><el-button type="success"><a href="/#/isPadForReceiveTractorAction">下架指导牵引车</a></el-button></div>
-        <div class="item"><el-button type="success"><a href="/#/isPadForOutStockFinish">出库任务完成</a></el-button></div>
-        <div class="item"><el-button type="success"><a href="/#/isPadForReceiveBackStock">回库器具或空器具AGV搬运</a></el-button></div>
+        <div class="item"><el-button type="primary"><a href="/#/isPadForOutStockFinish">出库任务完成</a></el-button></div>
+        <div class="item"><el-button type="warning"><a href="/#/isPadForReceiveBackStock">回库器具或空器具AGV搬运</a></el-button></div>
     </div>
 </template>
 
diff --git a/fe/PC/src/views/padManage/isPadForOutStockFinish.vue b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
index 67416f30d..0a7ec44da 100644
--- a/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
+++ b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
@@ -2,12 +2,13 @@
   <div class="padListPageOuter isPadForOutStockFinishPage">
     <p class="pageTitle">{{pageTitle}}</p>
     <div class="bottomBox">
-      <el-form class="formBox" :inline="true" :model="formData" size="small">
+      <el-form @submit.native.prevent class="formBox" :inline="true" :model="formData" size="small">
         <el-form-item label="出库物品条码">
-          <el-input ref="itemCode_Ref" clearable v-model="formData.itemCode" placeholder="请扫描出库物品条码"></el-input>
+          <el-input @change="sureItem" ref="itemCode_Ref" clearable v-model="formData.itemCode" placeholder="请扫描出库物品条码"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="sureItem">确定</el-button>
+          <p style="color:#999;line-height:30px;margin:0;padding:0">如果不是使用扫码，请点击回车</p>
+          <!-- <el-button type="primary" @click="sureItem">回车/点击确定</el-button> -->
         </el-form-item>
       </el-form>
       <div class="isScanCodeBox">
@@ -52,12 +53,14 @@ export default {
   },
   methods: {
     sureItem(){
-      if(!this.formData.itemCode){
-        this.$warningMsg("请先扫描");
-        this.$nextTick(()=>{
-          if(this.$refs.itemCode_Ref)this.$refs.itemCode_Ref.focus()
-        })
-      }else{
+      // if(!this.formData.itemCode || this.formData.itemCode.length <= 0){
+      //   this.$warningMsg("请先扫描")
+      //   this.$nextTick(()=>{
+      //     if(this.$refs.itemCode_Ref)this.$refs.itemCode_Ref.focus()
+      //   })
+      //   return
+      // }
+      if(this.formData.itemCode){
         if(this.scanCodes.indexOf(this.formData.itemCode) < 0){
           this.scanCodes.push(this.formData.itemCode)
           this.$nextTick(()=>{