Merge branch 'dev' into zhto/air

src/views/ecw/box/indexAir.vue

@@ -94,11 +94,13 @@
           <el-dropdown trigger="click" @command="(command) => handleCommand(scope.row, command)">
             <el-button type="primary"> {{ $t('操作') }}<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="edit">{{ $t('编辑') }}</el-dropdown-item>
-              <el-dropdown-item command="air">{{ $t('操作') }}-{{ $t('空运') }}</el-dropdown-item>
-              <el-dropdown-item command="error">{{ $t('异常登记') }}</el-dropdown-item>
-              <el-dropdown-item command="cost">{{ $t('费用登记') }}</el-dropdown-item>
-              <el-dropdown-item command="delete">{{ $t('删除') }}</el-dropdown-item>
+              <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item command="air">{{$t('操作')}}-{{$t('空运')}}</el-dropdown-item>
+              <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
+              <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
+              <el-dropdown-item command="batchMarkup">{{$t('批量加价')}}</el-dropdown-item>
+              <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
+
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -401,13 +403,16 @@ export default {
           this.handleUpdate(row)
           break
 
-        case 'delete':
-          this.handleDelete(row)
-          break
-      }
+          case 'delete':
+            this.handleDelete(row);
+            break;
+          case 'batchMarkup':
+            this.$router.push('batch_markup?shipmentId=' + row.id)
+        }
+      },
     }
   }
-}
+
 </script>
 
 <style lang="scss" scoped>

src/views/ecw/order/detail.vue

@@ -145,6 +145,34 @@
         </el-descriptions>
 
     </el-card>
+    <el-card class="card" v-if="[3].indexOf(+order.transportId) > -1">
+      <el-descriptions class="mr-10" border :title="$t('空运专线')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
+        <el-descriptions-item :label="$t('是否双清')">
+          <dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('航空公司')">
+          {{ order.airlineCompany }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('清关证书')">
+            {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('清关证书备注')">
+            {{ order.clearCertRemark }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('是否拆包')">
+            {{order.isUnpack? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('单票立刻转运')">
+          {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('特殊要求')">
+          <dict-tag :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="order.packageTypeArr" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('特殊要求备注')">
+            {{order.packageRemarks}}
+          </el-descriptions-item>
+      </el-descriptions>
+    </el-card>
     <el-card class="card">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('货物详情')" name="first">

src/views/ecw/order/index.vue

@@ -112,6 +112,10 @@
           <el-option :label="$t('海外仓')" :value="2"></el-option>
         </el-select>
       </el-form-item>
+      <!--空运多一个出货渠道筛选-->
+      <el-form-item :label="$t('出货渠道')" prop="channelId" v-if="channelList.length">
+        <selector :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelId"></selector>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -120,7 +124,7 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-if="transportId">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['ecw:order:create']">{{$t('新增')}}</el-button>
       </el-col>
@@ -335,6 +339,13 @@
                   <el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo"  v-hasPermi="['ecw:order:merge_log']">{{$t('合单日志')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo"  v-hasPermi="['ecw:order:split_log']">{{$t('提货日志')}}</el-dropdown-item>
                 </template>
+
+                <!--变更出货渠道-->
+                <template v-if="(
+                  scope.row.transportId == 3
+                )">
+                  <el-dropdown-item @click.native="handleUpdate(scope.row, true)"  v-hasPermi="['ecw:order:update_channel']">{{$t('变更出货渠道')}}</el-dropdown-item>
+                </template>
               </el-dropdown-menu>
             </el-dropdown>
 
@@ -516,6 +527,7 @@ import PickupLog from './components/PickupLog'
 import {getWarehouseList} from '@/api/ecw/warehouse'
 import { getCurrencyPage } from "@/api/ecw/currency";
 import SplitRevoke from "@/views/ecw/order/components/SplitRevoke";
+import {getChannelList} from "@/api/ecw/channel";
 export default {
   name: "EcwOrderIndex",
   components: {
@@ -590,6 +602,8 @@ export default {
       statistics: null ,// 统计数据
 
       splitRevokeOrderId: null, // 撤销拆单的订单ID
+      // 渠道列表，空运需要渠道筛选
+      channelList:[]
     };
   },
   watch:{
@@ -638,9 +652,9 @@ export default {
         }
         return queryParams
     },
-    batchWarehouseAdjustment(){
+    /*batchWarehouseAdjustment(){
       return  this.multipleSelection.length > 0 && this.multipleSelection.every(e => e.status === 5)
-    },
+    },*/
     include(){
       return (state, arr) => {
         return arr.indexOf(state) > -1
@@ -663,8 +677,13 @@ export default {
     getWarehouseList().then(res => this.warehouseList = res.data)
 
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
+    // 如果是空运(专线空运和海空联运)则获取渠道
+    if(this.transportId == 3 || this.transportId == 4){
+      getChannelList().then(res => this.channelList = res.data)
+    }
   },
   methods: {
+
     // 取消拆单申请
     splitRevoke(row){
       this.splitRevokeOrderId = row.orderId
@@ -826,11 +845,15 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push('create')
+      this.$router.push('create?transportType=' + this.transportId)
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.$router.push('edit?id=' + row.orderId)
+    /** 修改按钮操作, updateChannel表示变更出货渠道 */
+    handleUpdate(row, updateChannel = false) {
+      let url = 'edit?id=' + row.orderId
+      if(updateChannel){
+        url += "&updateChannel=1"
+      }
+      this.$router.push(url)
     },
 
     /** 导出按钮操作 */

src/views/ecw/order/splitApply.vue

@@ -290,9 +290,9 @@
        <el-form-item v-if="mainOrderItem.orderItemId">
          <div>{{$t('剩余货值')}}：{{ mainOrderItem.worth || 0 }}{{ $t('美元') }}</div>
        </el-form-item>
-       <el-form-item :label="$t('放货货值')">
+       <el-form-item :label="$t('放入货值')">
          <el-input-number v-model="shopForm.worth" controls-position="right"  :min="0" :max="mainOrderItem.worth">
-           <template slot="append">{{ $t('美元') }}</template>
+           <template slot="append">{{ $t('元') }}</template>
          </el-input-number>
        </el-form-item>
         <el-form-item :label="$t('备注信息')+':'">

src/views/ecw/order/success.vue

@@ -8,6 +8,7 @@
                 <div class="title">{{$t('新增订单生成成功')}}</div>
                 <div class="line">{{$t('订单号')}}：{{order.orderNo}}</div>
                 <div class="line">{{$t('运输方式')}}：<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /></div>
+                <div class="line" v-if="order.channelName">{{$t('出货渠道')}}：{{order.channelName}}</div>
                 <div class="line">{{$t('路线')}}：{{$l(order.logisticsInfoDto, 'startTitle')}} >> {{$l(order.logisticsInfoDto, 'destTitle')}}</div>
                 <div class="line">{{$t('商品列表')}}：
                     <span v-for="(item, index) in order.orderItemVOList" :key="index">