From beb3dec1265d95752c51968df42d64b2de197393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 10 Jan 2025 17:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF=E3=80=91pad?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../padManage/isPadForNotifyOutTaskBack.vue   | 42 +++++++++++++------
 .../padManage/isPadForOutStockFinish.vue      |  8 +++-
 .../padManage/isPadForReceiveBackStock.vue    |  8 +++-
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue b/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue
index 8ecc64c5f..42c4e8d08 100644
--- a/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue
+++ b/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue
@@ -1,16 +1,20 @@
 <template>
-  <div class="padpageBox isPadForNotifyOutTaskBackPage" v-loading="loading">
-    <currenForm
-      :labelWidth="'90px'"
-      ref="compeletHandleForm_Ref"
-      :style="'width:calc(100% - 100px)'"
-      size="large"
-      :searchData="taskBackFormData"
-      :searchForm="taskBackForm"
-      :rules="taskBackRule"
-      :searchHandle="taskBackHandle"
-      @submitForm="submitForm"
-    ></currenForm>
+  <div class="padListPageOuter isPadForNotifyOutTaskBackPage" v-loading="loading">
+    <p class="pageTitle">{{pageTitle}}</p>
+    <div class="bottomBox">
+      <currenForm
+        :labelWidth="'90px'"
+
+        ref="compeletHandleForm_Ref"
+        :style="'width:calc(100% - 100px)'"
+        size="large"
+        :searchData="taskBackFormData"
+        :searchForm="taskBackForm"
+        :rules="taskBackRule"
+        :searchHandle="taskBackHandle"
+        @submitForm="submitForm"
+      ></currenForm>
+    </div>
   </div>
 </template>
 <script>
@@ -21,6 +25,7 @@ export default {
   data() {
     return {
       loading:false,
+      pageTitle:'回库',
       taskBackFormData: {
         endPosition:"",
         returnQty:"",
@@ -75,11 +80,22 @@ export default {
 <style lang="scss" scoped>
 @import "@/styles/padMain.scss";
 .isPadForNotifyOutTaskBackPage{
-  padding:20px;
   ::v-deep .formButton{
     .el-button{
       width:160px !important
     }
   }
+  .pageTitle{
+    text-align:center;
+    height:40px;
+    line-height:40px;
+    overflow:hidden;
+    font-weight:bold;
+    // box-shadow: 1px 1px 5px #ddd;
+    margin:0;
+    border-bottom: #efefef solid 1px;
+    margin-bottom:30px;
+    background:#fff;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/padManage/isPadForOutStockFinish.vue b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
index 389c66f2f..0129dc4b2 100644
--- a/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
+++ b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="padListPageOuter isPadForOutStockFinishPage">
+  <div class="padListPageOuter isPadForOutStockFinishPage" v-loading="loading">
     <p class="pageTitle">{{pageTitle}}</p>
     <div class="bottomBox">
       <el-form @submit.native.prevent class="formBox" :inline="true" :model="formData" size="small">
@@ -44,7 +44,8 @@ export default {
       formData:{
         itemCode:null
       },
-      scanCodes:[]
+      scanCodes:[],
+      loading:false
     }
   },
   mounted(){
@@ -86,6 +87,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.loading = true
         let _data = {
           uuid: generateUUID(),
           operatorName: this.$store.getters.name.userName,
@@ -93,6 +95,7 @@ export default {
         }
         outStockFinishCommit(_data)
         .then((res) => {
+          this.loading = false
           if(res.Code == 0){
             this.$successMsg("提交成功")
             this.scanCodes = []
@@ -100,6 +103,7 @@ export default {
             this.$errorMsg(res.Message || '提交失败')
           }
         }).catch(() => {
+          this.loading = false
           this.$errorMsg("提交失败")
         });
       }).catch(() => {
diff --git a/fe/PC/src/views/padManage/isPadForReceiveBackStock.vue b/fe/PC/src/views/padManage/isPadForReceiveBackStock.vue
index 5fe7f753a..55b07b677 100644
--- a/fe/PC/src/views/padManage/isPadForReceiveBackStock.vue
+++ b/fe/PC/src/views/padManage/isPadForReceiveBackStock.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="padListPageOuter isPadForOutStockFinishPage">
+  <div class="padListPageOuter isPadForOutStockFinishPage"  v-loading="loading">
     <p class="pageTitle">{{pageTitle}}</p>
     <div class="bottomBox" v-loading="pageLoading">
       <el-form class="formBox" ref="form_Ref" :rules="rules" :model="formData" size="small">
@@ -26,7 +26,8 @@ export default {
   name: 'isPadForReceiveBackStock',
   data () {
     return {
-      pageLoading:false,
+      pageLoading:false,//获取库位码，中间位置loading
+      loading:false,//整个页面loading
       pageTitle:'回库器具或空器具AGV搬运',
       formData:{
         site:null,//位置码
@@ -72,6 +73,7 @@ export default {
             type: 'warning'
           })
           .then(() => {
+            this.loading = true
             let _data = {
               uuid: generateUUID(),
               operatorName: this.$store.getters.name.userName,
@@ -82,12 +84,14 @@ export default {
             }
             receiveBackStockAction(_data)
             .then((res) => {
+              this.loading = false
               if(res.Code == 0){
                 this.$successMsg("提交成功")
               }else{
                 this.$errorMsg(res.Message || '提交失败')
               }
             }).catch(() => {
+              this.loading = false
               this.$errorMsg("提交失败")
             });
           }).catch(() => {