Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/components/WarehouseDetail.vue

@@ -7,7 +7,7 @@
           <el-table-column :label="$t('箱数')" prop="cartonsNum">
             <template slot-scope="{row}">
               <template v-if="row.orderWarehouseInDetailsVOList && row.orderWarehouseInDetailsVOList.length">
-                <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" text readonly />
+                <WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" :num="row.cartonsNum" text readonly />
               </template>
               <template v-else>{{ row.cartonsNum }}</template>
             </template>

src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue

 <template>
   <div style="display: inline-block">
     <template v-if="text">
-      <el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ value.length }}（混箱）</el-button>
+      <el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ num }}（混箱）</el-button>
     </template>
     <template v-else>
       <el-button size="mini" type="primary" style="margin-right: 10px" @click="handleOpen">{{ title }}</el-button>
@@ -57,6 +57,10 @@ export default {
     text: {
       type: Boolean,
       default: false
+    },
+    num:{
+      type:Number,
+      default:0
     }
   },