全部渠道列表

src/api/ecw/customerContacts.js

@@ -89,3 +89,28 @@ export function warehouseLinePage(params){
      params,
   })
 }
+//获得空运线路模板
+ export function getAirLineChannelTemplateList(params){
+  return request({
+    url:'/ecw/warehouse-line/get-air-line-channel-template-list',
+    method:'get',
+    params
+  })
+ }
+
+//  根据线路id渠道列表和清关费（复制使用）
+export function getAirLineChannelPackagingList(id){
+  return request({
+    url:'/ecw/warehouse-line/get-air-line-channel-packaging-list',
+    method:'get',
+    params:{lineId:id}
+  })
+}
+// 创建仓库线路的渠道包装
+export function createWarehouseLineChannelPackaging(data){
+  return request({
+     url:'/ecw/warehouse-line/create-warehouse-line-channel-packaging',
+    method:'put',
+    data
+  })
+}

src/views/ecw/channel/componrnts/packaging-type.vue

@@ -75,7 +75,7 @@ export default {
        type:String,
        default:'channelPriceStepClearanceList'
     },
-    readonly: Boolean
+    readonly: Boolean,
   },
   name: "packaging-type",
   components: {Template, WeightSelect, CurrencySelect},
@@ -152,10 +152,11 @@ export default {
      deleteFn(index){
        this.value1[this.keyArr].splice(index, 1)
        this.$forceUpdate();
+
      }
    },
   watch:{
-    'value1.priceStepClearanceList':{
+    'value1.priceStepClearanceCreateReqVOList':{
       handler(val){
         if(val && val.length === 0){
           this.addInterval();

src/views/ecw/offer/all-routes-list.vue

@@ -33,30 +33,33 @@
     </el-form>
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('序号')" align="center" type="index" />
+      <el-table-column :label="$t('序号')" align="center" type="index"/>
       <el-table-column :label="$t('始发仓')" align="center">
         <template slot-scope="{row}">
-          {{$l(exportWarehouseList.find(i=>i.id === row.startWarehouseId),'title')}}
+          {{ $l(exportWarehouseList.find(i => i.id === row.startWarehouseId), 'title') }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('目的仓')" align="center">
         <template slot-scope="{row}">
-          {{$l(importWarehouseList.find(i=>i.id === row.destWarehouseId),'title')}}
+          {{ $l(importWarehouseList.find(i => i.id === row.destWarehouseId), 'title') }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('运输方式')" align="center" >
+      <el-table-column :label="$t('运输方式')" align="center">
         <template slot-scope="{row}">
-          <dict-tag  :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportType"></dict-tag>
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportType"></dict-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('出货渠道')" align="center" >
+      <el-table-column :label="$t('出货渠道')" align="center">
         <template slot-scope="{row}">
-<!--          {{channelList.find(i=>i.channelId === row.)}}-->
+          {{ row.channelIds ? $l(row, 'channelNames') : '/'}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center">
         <template slot-scope="{row}">
-          <el-button v-if="row.transportType === 3" type="text">空运渠道包装清关费</el-button>
+          <el-button v-if="row.transportType === 3" type="text" @click="$router.push({
+          path:'/offer/channel-route?id='+ row.id,
+          })">空运渠道包装清关费
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -154,9 +157,8 @@ export default {
       this.loading = true;
       const params = {...this.queryParams}
       // 执行查询
-      warehouseLinePage(params).then(r =>{
+      warehouseLinePage(params).then(r => {
         this.loading = false;
-        console.log(r,'rrr')
         this.list = r.data.list;
         this.total = r.data.total
       })

src/views/ecw/offer/components/airFreightRouteTemplate.vue

 <script>
-import {getAirLineChannelTemplateList} from "@/api/ecw/customerContacts";
+import {warehouseLinePage} from "@/api/ecw/customerContacts";
 import {getWarehouseList} from "@/api/ecw/warehouse";
 import Template from "@/views/cms/template/index.vue";
 
 export default {
   name: "airFreightRouteTemplate",
   components: {Template},
+  props:{
+    lineId:{
+      default:''
+    }
+  },
   data() {
     return {
-      open: true,
-      warehouseList:[],
-      list:[],
-      form:{
-
+      open: false,
+      warehouseList: [],
+      list: [],
+      total: 0,
+      form: {},
+      queryParams: {
+        pageSize:20,
+        transportType:3
       }
-
     }
   },
   mounted() {
     getWarehouseList().then((r) => {
       this.warehouseList = r.data;
     });
-    this.getList();
   },
   methods: {
     getList() {
-      getAirLineChannelTemplateList(this.form).then(r => {
-        console.log(r,'rrr')
-        this.list = r.data;
+      warehouseLinePage(this.queryParams).then(r => {
+        this.list = r.data.list;
+        this.total = r.data.total
       })
     },
-
+    copy(value) {
+      this.$emit('copy', value)
+      this.open = false
+    }
   },
   computed: {
     exportWarehouseList() {
@@ -44,20 +53,27 @@ export default {
       );
     },
   },
+  watch: {
+    open(value) {
+      if (value) {
+        this.getList();
+      }
+    }
+  }
 
 }
 </script>
 
 <template>
   <div>
-    <div style="display: inline-block">
+    <div @click="open = true;" style="display: inline-block">
       <slot></slot>
     </div>
     <el-dialog :visible.sync="open">
       <el-card>
         <template #header>
-          <el-form inline >
-            <el-form-item label="始发地" >
+          <el-form inline>
+            <el-form-item label="始发地">
               <el-select v-model="form.startWarehouseId" :placeholder="$t('请选择始发地')">
                 <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id"
                            :key="item.id"></el-option>
@@ -65,7 +81,8 @@ export default {
             </el-form-item>
             <el-form-item :label="$t('目的地')" prop="destWarehouseId">
               <el-select v-model="form.destWarehouseId" :placeholder="$t('请选择目的地')">
-                <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
+                <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id"
+                           :key="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
@@ -73,22 +90,27 @@ export default {
         <el-table border :data="list">
           <el-table-column label="始发仓">
             <template slot-scope="{row}">
-              {{ $l(row,'startWarehouseName')}}
+              {{ $l(exportWarehouseList.find(i => i.id === row.startWarehouseId), 'title') }}
             </template>
           </el-table-column>
-          <el-table-column label="目的仓" >
+          <el-table-column label="目的仓">
             <template slot-scope="{row}">
-              {{ $l(row,'destWarehouseName')}}
-
+              {{ $l(importWarehouseList.find(i => i.id === row.destWarehouseId), 'title') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="渠道数">
+            <template slot-scope="{row}">
+              {{ row.channelIds ? row.channelIds.split(',').length : 0 }}
             </template>
           </el-table-column>
-          <el-table-column label="渠道数"  prop="channelCount" ></el-table-column>
           <el-table-column>
-            <template>
-              <el-button type="text">复制</el-button>
+            <template slot-scope="{row}">
+              <el-button type="text" v-if="lineId !== row.id" @click="copy(row)">复制</el-button>
             </template>
           </el-table-column>
         </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                    @pagination="getList"/>
       </el-card>
     </el-dialog>
   </div>

src/views/ecw/warehouse/index.vue

@@ -137,6 +137,8 @@
 
             <el-button size="mini" type="primary" @click="serviceClick(scope.row)" v-if="scope.row.lineId != null"
                        v-hasPermi="['ecw:warehouse:routerQuery']">{{$t('开通服务')}}</el-button>
+            <el-button size="mini" type="danger" @click="$router.push('/offer/channel-route?lineId='+scope.row.lineId)" v-if="scope.row.lineId != null && scope.row.transportType == 3" >{{$t('渠道包装清关费')}}</el-button>
+
           </template>
         </el-table-column>
      </el-table>