Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/indexAir.vue

@@ -74,7 +74,7 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+    <el-table size="mini" v-loading="loading" :data="list">
       <el-table-column :label="$t('自编号')" align="center" prop="selfNo">
         <template slot-scope="scope">
           <a href="javascript:void(0)" @click="handleCommand(scope.row, 'detail')">{{ scope.row.selfNo }}</a>
@@ -92,16 +92,26 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('方数（分拣/已装）')" align="center" prop="">
+      <el-table-column :label="$t('订单方数（分拣/已装）')" align="center" prop="">
         <template slot-scope="{row}">
           {{row.boxStatistics.volume}}/{{row.boxStatistics.loadVolume}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('重量（分拣/已装）')" align="center" prop="weight">
+      <el-table-column :label="$t('订单重量（分拣/已装）')" align="center" prop="weight">
         <template slot-scope="{row}">
           {{row.boxStatistics.weight}}/{{row.boxStatistics.loadWeight}}
         </template>
       </el-table-column>
+      <el-table-column :label="$t('合包方数（分拣/已装）')" align="center" prop="weight">
+        <template slot-scope="{row}">
+          {{row.boxStatistics.volume }}/{{row.boxStatistics.mergeVolume}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('合包重量（分拣/已装）')" align="center" prop="weight">
+        <template slot-scope="{row}">
+          {{row.boxStatistics.weight}}/{{row.boxStatistics.mergeWeight}}
+        </template>
+      </el-table-column>
 
       <el-table-column :label="$t('状态')" align="center" prop="shipmentStatusText" />
 
@@ -125,8 +135,8 @@
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['shipment:box:delete']">{{$t('删除')}}</el-button> -->
           <el-dropdown trigger="click" @command="(command) => handleCommand(scope.row, command)" style="marginRight:10px;">
-            <el-button type="primary"> {{ $t('操作') }}<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
-            <el-dropdown-menu slot="dropdown">
+            <el-button type="text"> {{ $t('操作') }}<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
+            <el-dropdown-menu  slot="dropdown">
               <el-dropdown-item command="edit" v-has-permi="['shipment:air:edit']" :disabled="scope.row.prStatus>21">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item command="air" v-has-permi="['shipment:air:action']">{{$t('操作')}}-{{$t('空运')}}</el-dropdown-item>
               <el-dropdown-item command="error" v-has-permi="['shipment:air:exception']">{{$t('异常登记')}}</el-dropdown-item>
@@ -141,7 +151,7 @@
           'shipment:air:download:downloadLoadGoodsList','shipment:air:download:downloadReceivableList',
           'shipment:air:download:downloadAgentListFiles','shipment:air:download:downloadSoncapFiles',
           'shipment:air:download:zipDownload','shipment:air:download:downloadLadingCopy']">
-            <el-button type="primary">
+            <el-button type="text">
               {{$t('下载')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">