【修改】bug

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,7 +1,22 @@
 <template>
   <div v-if="!item.hidden">
     <!-- <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren) && !item.alwaysShow"> -->
-    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren || (onlyOneChild.children && onlyOneChild.children.length < 1 && (onlyOneChild.name == 'issue_index' || onlyOneChild.name == 'notice_index' || onlyOneChild.name == 'dashboard'))) && !item.alwaysShow">
+    <template 
+      v-if="hasOneShowingChild(item.children,item) && 
+        (
+          !onlyOneChild.children ||
+          onlyOneChild.noShowingChildren || 
+          (
+            onlyOneChild.children && 
+            onlyOneChild.children.length < 1 && 
+            (
+              onlyOneChild.name == 'issue_index' || 
+              onlyOneChild.name == 'notice_index' || 
+              onlyOneChild.name == 'dashboard'
+            )
+          )
+        ) && 
+        !item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
           <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
@@ -87,6 +102,7 @@ export default {
         this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
         return true
       }
+
       return false
     },
     resolvePath(routePath) {

src/views/supply/pickup/components/pickup_print.vue

@@ -78,7 +78,10 @@ export default {
 
     // 添加次数
     addPrint() {
-      addPrint({ids: this.listItem[0].invoiceOrderId}).then(res => {
+      let ids = this.listItem.map(item => {
+        return item.invoiceOrderId;
+      });
+      addPrint({ids: ids.join(',')}).then(res => {
         // this.$successMsg('提交成功');
         this.$parent.getList();
       })

src/views/supply/reserve/reserve_list.vue

@@ -87,7 +87,7 @@
             </el-table-column>
             <el-table-column align="center" label="预留单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="预留日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="销售订单号" prop="orderId" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="订单日期" prop="orderTime" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.orderTime | dateToDayFilter}}