合并发货

ghsApp/src/admin/home/components/OrderItem.vue

@@ -45,6 +45,11 @@
             <i class="iconfont iconxiangyou"></i>
             </view>
         </view>
+        <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum>1" style="text-align: center;color:white;
+        font-weight: bold;margin-top:20upx;font-size:30upx;background-color:red;padding-top:6upx;padding-bottom:6upx;"
+        @click="pageTo({url:'/admin/order/itemOrder?ids='+item.sameTimeIds})">
+          本地址下共有{{item.sameTimeIdsNum}}个订单，可合并发货
+        </view>
         </view>
         <div class="list-bottom">
             <div class="list-button">

ghsApp/src/admin/order/itemOrder.vue

@@ -59,6 +59,9 @@ export default {
     this.getOrderList()
   },
   methods: {
+    init(){
+
+    },
     printOrder(item){
       let that = this
       uni.showLoading({title: '打印中...'});
@@ -86,6 +89,11 @@ export default {
           this.completes(res)
         })
       }
+      if(this.option.ids){
+        return getListB({ page: this.list.page,ids:this.option.ids }).then((res) => {
+          this.completes(res)
+        }) 
+      }
     }
   },
 };