空运增加渠道筛选

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>
@@ -523,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: {
@@ -597,6 +602,8 @@ export default {
       statistics: null ,// 统计数据
 
       splitRevokeOrderId: null, // 撤销拆单的订单ID
+      // 渠道列表，空运需要渠道筛选
+      channelList:[]
     };
   },
   watch:{
@@ -645,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
@@ -670,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

src/views/ecw/order/penddingList.vue

@@ -92,6 +92,9 @@
           <el-option :label="$t('海外仓')" :value="2"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('出货渠道')" prop="number">
+        <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>
@@ -228,6 +231,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: "EcwPeddingList",
   components: {
@@ -274,6 +278,7 @@ export default {
         rows: 20,
       },
       currencyList:[],
+      channelList:[]
     };
   },
   watch:{
@@ -311,6 +316,7 @@ export default {
     getWarehouseList().then(res => this.warehouseList = res.data)
 
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
+    getChannelList().then(res => this.channelList = res.data)
   },
   methods: {
     /** 查询列表 */

src/views/ecw/order/stockingList.vue

@@ -92,6 +92,9 @@
           <el-option :label="$t('海外仓')" :value="2"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('出货渠道')" prop="number">
+        <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>
@@ -189,33 +192,7 @@ import { getProductAttrList } from '@/api/ecw/productAttr'
 import CustomerSelector from '@/components/CustomerSelector'
 import specialNeeds from '@/views/ecw/order/components/specialNeeds';
 
-import {
-  createOrder,
-  updateOrder,
-  deleteOrder,
-  getOrder,
-  getOrderPage,
-  exportOrderExcel,
-  orderSpecialNeed,
-  cancelOrder,
-  recoveryOrder,
-  getMyOrderPage,
-  deptOrderPage,
-  orderStatistics,
-  orderMyStatistics,
-  orderDeptStatistics,
-  orderExportSearch,
-  orderExportMySearch,
-  orderExportDeptSearch,
-  exportAbnormal,
-  exportHeavyOrder,
-  exportReturnOrder,
-  exportSaleRepay,
-  exportCustomsDatas,
-  exportShippingDatas,
-  exportShipFee,
-  exportUnload
-} from "@/api/ecw/order";
+import { getOrderPage } from "@/api/ecw/order";
 import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -229,6 +206,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: "EcwOrderStockinglist",
   components: {
@@ -275,6 +253,7 @@ export default {
         rows: 20,
       },
       currencyList:[],
+      channelList:[]
     };
   },
   watch:{
@@ -312,6 +291,7 @@ export default {
     getWarehouseList().then(res => this.warehouseList = res.data)
 
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
+    getChannelList().then(res => this.channelList = res.data)
   },
   methods: {
     /** 查询列表 */