From aa29ed51929ca4d7977f7501099f3ab00a2b6484 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 3 Sep 2024 15:19:34 +0800
Subject: [PATCH] =?UTF-8?q?9/3=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderTabs.vue | 29 +++++++++++++-------------
 src/views/collect/IoCreateOrder.vue    |  6 +++---
 src/views/collect/destroyOutDialog.vue |  4 +++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index eff1899f..9b685296 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -93,24 +93,25 @@
 <!--            <i class="el-icon-s-platform"></i>-->
             <span slot="title">工位库存</span>
           </el-menu-item>
+            <el-menu-item :index=7 @click="clickMenuItem(7)">
+              <!--            <i class="el-icon-s-help"></i>-->
+              <span slot="title">拆零管理</span>
+            </el-menu-item>
+            <el-menu-item :index=8 @click="clickMenuItem(8)">
+              <!--            <i class="el-icon-warning"></i>-->
+              <span slot="title">存量预警</span>
+            </el-menu-item>
 
           </el-submenu>
 
 
-          <el-submenu index="22" v-if="autoTag == 1">
-            <template slot="title">
-              <i class="el-icon-s-help"></i>
-              <span>库存管理</span>
-            </template>
-          <el-menu-item :index=7 @click="clickMenuItem(7)">
-<!--            <i class="el-icon-s-help"></i>-->
-            <span slot="title">拆零管理</span>
-          </el-menu-item>
-          <el-menu-item :index=8 @click="clickMenuItem(8)">
-<!--            <i class="el-icon-warning"></i>-->
-            <span slot="title">存量预警</span>
-          </el-menu-item>
-          </el-submenu>
+          <!--<el-submenu index="22" v-if="autoTag == 1">-->
+          <!--  <template slot="title">-->
+          <!--    <i class="el-icon-s-help"></i>-->
+          <!--    <span>库存管理</span>-->
+          <!--  </template>-->
+
+          <!--</el-submenu>-->
 
         </el-menu>
       </el-col>
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 47fd4ae5..baf5774b 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -43,10 +43,10 @@
             <!--&gt;草稿保存-->
             <!--</el-button>-->
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
-                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
+                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
             >选入草稿单据
             </el-button>
-            <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
+            <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading" v-show="isLinkDisabled"
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
             >草稿保存
             </el-button>
@@ -54,7 +54,7 @@
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
             >上货完成
             </el-button>
-            <el-button size="mini" type="primary" @click.native="" :loading="submitLoading"
+            <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"
                        v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
             >草稿保存
             </el-button>
diff --git a/src/views/collect/destroyOutDialog.vue b/src/views/collect/destroyOutDialog.vue
index 09c5762a..cdf0f69d 100644
--- a/src/views/collect/destroyOutDialog.vue
+++ b/src/views/collect/destroyOutDialog.vue
@@ -180,7 +180,6 @@ export default {
 
   },
   created() {
-    console.log("djhdjjdjd",this.prescribeData)
     if (this.prescribeData.produceDate != null) {
       this.produceDate = this.conversionDate(this.prescribeData.produceDate)
     }
@@ -190,6 +189,9 @@ export default {
     if (this.destroyType == 2) {
       this.prescribeData.reCount = this.prescribeData.totalCount
     }
+    if (this.destroyType == 3) {
+      this.prescribeData.reCount = this.prescribeData.remainCount
+    }
   }
 }
 </script>