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

src/views/ecw/box/shippingAir/nodePage/checkout/startCheckout.vue

@@ -50,12 +50,22 @@
               </el-table-column>
               <el-table-column :label="$t('计划箱数')" align="center" prop="num">
                 <template slot-scope="scope">
-                  {{getTotlContent(scope.row,['num'])}}
+                  <div>
+                    <a href="javascript:void(0);" class="order-href" @click="orderClick(scope.row)">{{getTotlContent(scope.row,['num'])}}</a>
+                  </div>
+                  <div style="color:blue;fontWeight:bold;">
+                    {{ scope.row.isExternalWarehouse === 1 ? '(' + $t('外部仓') + ')' : ''}}
+                  </div>
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('实装箱数')" align="center" prop="installNum">
+              <el-table-column :label="$t('出仓箱数')" align="center" prop="installNum">
                 <template slot-scope="scope">
-                  {{ scope.row.installNum }}{{$t('箱')}}
+                  <div>
+                    <a href="javascript:void(0);" class="order-href" @click="orderClick(scope.row)">{{ scope.row.installNum }}{{$t('箱')}}</a>
+                  </div>
+                  <div style="color:blue;fontWeight:bold;">
+                    {{ scope.row.isExternalWarehouse === 1 ? '(' + $t('外部仓') + ')' : ''}}
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('体积')" align="center" prop="volume">