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

src/views/ecw/box/batchMarkup.vue

@@ -157,7 +157,9 @@ export default {
       unitList:[],
       currencyList:[],
       form:{
-        copyUserId:[]
+        copyUserId:[],
+        freightUnitId: 6,
+        clearanceUnitId: 6
       },
       // 表格多选
       multipleSelection: [],

src/views/ecw/order/cargoControl.vue

@@ -291,7 +291,7 @@ export default {
         this.exportLoading = true;
         return exportCargoControl(this.combinedQueryParams);
       }).then(response => {
-        this.$download.excel(response, this.$t('控货订单') + '.xlsx');
+        this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
         this.exportLoading = false;
       }).catch(() => { });
     },

src/views/ecw/order/detail.vue

@@ -733,6 +733,11 @@ export default {
         {field: 'hiddenCommission', label: this.$t('暗佣')}
       ]
 
+      // 批量加价
+      if(row.markupSeaFreight){
+        freightFields.push({field: 'markupSeaFreight', label: this.$t('批量加价')})
+      }
+
       // 品牌加价
       if(row['brandFreightPrice'] && row['brandFreightPrice'] > 0){
         freightFields.push({field: 'brandFreightPrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
@@ -763,6 +768,10 @@ export default {
         {field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')},
         {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')}
       ]
+      // 批量加价
+      if(row.markupClearanceFreight){
+        clearanceFields.push({field: 'markupClearanceFreight', label: this.$t('批量加价')})
+      }
       // 品牌加价
       if(row['brandClearanceFeePrice'] && row['brandClearanceFeePrice'] > 0){
         clearanceFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})

src/views/ecw/order/index.vue

@@ -379,7 +379,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-            <template v-if="exclude(scope.row.status, [0, 11,12,13,14,15,17,18]) && exclude(scope.row.inWarehouseState, [204,205,206])">
+            <template v-if="exclude(scope.row.status, [0, 11,12,13,14,15,17,18, 32]) && exclude(scope.row.inWarehouseState, [204,205,206])">
               <!-- <el-divider direction="vertical"></el-divider> -->
               <!--仓库相关的-->
               <el-dropdown v-hasPermi="[
@@ -468,7 +468,8 @@
                   <!--修改备货-->
                   <template v-if="
                       include(scope.row.airShipment, [3, 4, 10]) &&
-                      scope.row.abnormalState === 0
+                      scope.row.abnormalState === 0 &&
+                      scope.row.status <= 5
                     ">
                     <el-dropdown-item @click.native="$router.push({path:'/order/stocking?action=update&id=' + scope.row.orderId})"  v-hasPermi="['ecw:order:stocking_update']">{{$t('修改备货')}}</el-dropdown-item>
                   </template>