Merge branch 'dev' into pre-production

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"

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;
 };

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -934,6 +934,9 @@ export default {
   methods: {
     // 未入库数量跳转
     InformationViewing(row) {
+      if(!row.notReceived || Number(row.isZero)) {
+        return
+      }
       this.$router.push({
         path: '/distribution/inventory/delivery/Unstoreddetails',
         query: {