Merge remote-tracking branch 'origin/master'

NNowhZzU

2023-12-25 fcd7ece15a86fc0cb526ee801ff8262b0db22dee

 north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue

@@ -11,6 +11,7 @@
        <el-breadcrumb-item :to="{ path: '/main/delivery/selectDelivery' }">发货首页</el-breadcrumb-item>
        <el-breadcrumb-item :to="{ path: '/main/delivery/selectOrderList' }">订单发货</el-breadcrumb-item>
        <el-breadcrumb-item :to="{ path: '/main/delivery/deliveryReport' }">报表</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/delivery/deliveryReport' }">报表</el-breadcrumb-item>
      </el-breadcrumb>
    </div>

@@ -38,7 +39,7 @@
}
/*main-body样式*/
#main-body{
  width: 100%;
  width: 99%;
  height: 95%;
  margin-top: 1%;
}