From 3e7d3a450b924efd4d584f9c2149028955ebb72f Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 30 Oct 2024 01:26:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
 =?UTF-8?q?=EF=BC=88=E5=88=87=E6=8D=A2tab=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/inventory/delivery/Unstoreddetails.vue     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/Unstoreddetails.vue b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
index f782c3e5..0f852193 100644
--- a/src/views/distribution/inventory/delivery/Unstoreddetails.vue
+++ b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
@@ -82,8 +82,8 @@
         </el-form>
       </div>
       <el-tabs type="border-card" class="el_tabs" @click="tabclaick" v-model="activeName">
-        <el-tab-pane label="已入库" name="1"></el-tab-pane>
         <el-tab-pane label="未入库" name="2"></el-tab-pane>
+        <el-tab-pane label="已入库" name="1"></el-tab-pane>
       </el-tabs>
       <!-- 控件模块 -->
       <el-row>
@@ -181,7 +181,7 @@ import {
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
-const activeName = ref('1');
+const activeName = ref('2');
 const dataCopy = ref([]); //拷贝数据
 const dialogVisible = ref(false);
 const from = ref({
@@ -401,7 +401,7 @@ const onLoad = async () => {
   console.log(_res, '基础信息');
   from.value.warehouse = data.warehouse; //已入库
   from.value.unWarehouse = data.unWarehouse; //未入库
-  details.data = data.warehouse;
+  details.data = data.unWarehouse;
   dataCopy.value = deepClone(from.value.warehouse);
   details.loadingObj.list = false;
 };

From b434f7f1aff8d39cb45f13196c09c1f45e7df2d6 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 30 Oct 2024 01:36:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/delivery/distributionStockArticle.vue            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 0602bc89..dd5b309b 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -934,6 +934,9 @@ export default {
   methods: {
     // 未入库数量跳转
     InformationViewing(row) {
+      if(!row.notReceived) {
+        return
+      }
       this.$router.push({
         path: '/distribution/inventory/delivery/Unstoreddetails',
         query: {

From 2e180ca31b816fe5844bdfc1e2e57a64825e6163 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 30 Oct 2024 01:52:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrder.vue                  | 4 ++--
 .../inventory/delivery/distributionStockArticle.vue           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 7b0a6070..16a8f085 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -98,13 +98,13 @@
                     <el-icon><Plus /></el-icon>新 增</el-button
                   >
 
-                  <el-button
+                  <!-- <el-button
                     v-if="ButtonPermissions.export_Report"
                     type="primary"
                     @click="exportReport"
                   >
                     <el-icon><Download /></el-icon>EXCEL导出</el-button
-                  >
+                  > -->
 
                   <el-button
                     v-if="ButtonPermissions.Timed_outexport"
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index dd5b309b..b1478648 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -934,7 +934,7 @@ export default {
   methods: {
     // 未入库数量跳转
     InformationViewing(row) {
-      if(!row.notReceived) {
+      if(!row.notReceived || Number(row.isZero)) {
         return
       }
       this.$router.push({