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

ff8e0474 · 我在何方 · 1d29e338 · dd8f3692 · 1d29e338 · 1d29e338
Commit ff8e0474 authored Sep 22, 2022 by 我在何方
32 changed files
--- a/bash.exe.stackdump
+++ b/bash.exe.stackdump
-Stack trace:
-Frame        Function    Args
-00800000010  0018006401E (001802839A0, 0018026EFD1, 00000000059, 000FFFFB700)
-00800000010  0018004973A (00800000010, 00100000000, 00000000000, 00000000001)
-00800000010  00180049772 (00000000000, 00000000000, 00000000059, 00180354100)
-00800000010  00180070FE9 (00000000000, 000FFFFC7D0, 0000000000B, 00000000000)
-00800000010  001800712A0 (00000000003, 000FFFFC8F0, 00180045BCF, 000FFFFC8F0)
-00800000010  00180072AB9 (000FFFFC8F0, 00180271795, 001801004A7, 0000000000D)
-00800000010  0018005B2A3 (7FF8018B1490, 00000000000, 00000000000, 000FFFFFFFF)
-00800000010  0018005C655 (00800029390, 1D400000000, 00000000000, 00000000008)
-00800000010  0018005CB3F (000FFFFCCE0, 000FFFFCC45, 00000000000, 205C745C615C635C)
-000FFFFCBBC  0018005CF2F (635C655C205C265C, 3E5C205C6F5C685C, 765C655C645C2F5C, 795C745C745C2F5C)
-000FFFFCCE0  00180049EE8 (00000000000, 00000000000, 00000000000, 00000000000)
-000FFFFFFF0  00180048846 (00000000000, 00000000000, 00000000000, 00000000000)
-000FFFFFFF0  001800488F4 (00000000000, 00000000000, 00000000000, 00000000000)
-End of stack trace
--- a/sh.exe.stackdump
+++ b/sh.exe.stackdump
-Stack trace:
-Frame        Function    Args
-00800000010  0018006401E (001802839A0, 0018026EFD1, 00000000059, 000FFFFB710)
-00800000010  0018004973A (00800000010, 00100000000, 00000000000, 00000000001)
-00800000010  00180049772 (00000000000, 00000000000, 00000000059, 00180353FD0)
-00800000010  00180070FE9 (00000000002, 000FFFFC7E0, 0000000000B, 00000000000)
-00800000010  001800712A0 (000FFFFCBC0, 00800000010, 00180045B55, 000FFFFC900)
-00800000010  00180072AB9 (000FFFFC900, 00180271795, 001801004A7, 0000000000D)
-00800000010  0018005B2A3 (7FF8018B1490, 00000000000, 00000000000, 040FFFFFFFF)
-00800000010  0018005C655 (00000000002, 00180350D08, 00000000002, 00000000008)
-00800000010  0018005CB3F (000FFFFCC9C, 000FFFFCCE0, 000FFFFCC9D, 000FFFFCC00)
-000FFFFCBCC  0018005CF2F (6D5C2D5C6C5C615C, 675C615C6E5C615C, 635C2D5C725C655C, 205C655C725C6F5C)
-000FFFFCCE0  00180049EE8 (00000000000, 00000000000, 00000000000, 00000000000)
-000FFFFFFF0  00180048846 (00000000000, 00000000000, 00000000000, 00000000000)
-000FFFFFFF0  001800488F4 (00000000000, 00000000000, 00000000000, 00000000000)
-End of stack trace
--- a/src/api/ecw/futureBox.js
+++ b/src/api/ecw/futureBox.js
@@ -52,3 +52,28 @@ export function exportFutureBoxExcel(query) {
    responseType: 'blob'
  })
 }
+
+// 根据运输方式ID得到已封柜方数
+export function getBoxedVolume(params){
+  return request({
+    url: '/ecw/future-box/getBoxedVolume',
+    method: 'get',
+    params
+  })
+}
+// 根据运输方式ID得到待入仓方数
+export function getToBeWareHousedVolume(params){
+  return request({
+    url: '/ecw/future-box/getToBeWareHousedVolume',
+    method: 'get',
+    params
+  })
+}
+// 根据运输方式ID得到已入仓方数
+export function getWareHousedVolume(params){
+  return request({
+    url: '/ecw/future-box/getWareHousedVolume',
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file
--- a/src/api/ecw/offer.js
+++ b/src/api/ecw/offer.js
@@ -106,3 +106,21 @@ export function getOfferSpecialByApproveId(approveId) {
  })
 }

+
+// 取消报价管理
+export function cancel(id) {
+  return request({
+    url: '/ecw/offer/cancel',
+    method: 'delete',
+    params: {id}
+  })
+}
+
+// 恢复取消的报价管理
+export function recovery(id) {
+  return request({
+    url: '/ecw/offer/recovery',
+    method: 'delete',
+    params: {id}
+  })
+}
\ No newline at end of file
--- a/src/components/ChooseContactDialog/index.vue
+++ b/src/components/ChooseContactDialog/index.vue
@@ -55,7 +55,7 @@ export default {
    },
    methods:{
        handleQuery(){
-            // this.form.pageNo = 1
+            this.form.pageNo = 1
            this.loadList()
        },
        loadList(){

--- a/src/components/SupplierSelector/index.vue
+++ b/src/components/SupplierSelector/index.vue
@@ -57,7 +57,8 @@ export default {
        },
        remoteMethod(keyword){
            let params = {
-                pageSize: 100
+                pageSize: 500,
+                companyType: this.companyType
            }
            params.keyword = keyword
            this.loading = true

--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -12,10 +12,20 @@ const i18n = new VueI18n({
    }
 })
 console.log({i18n})
+/*
+用法
+$l('title')         => titleZh
+$l(item, 'title')   => item.titleZh
+$l(null, 'title')   => titleZh
+$l()                => Zh
+*/
 Vue.prototype.$l = (object, field = '') => {
    let prefix = i18n.locale.split('_')[0]
    let append = prefix.charAt(0).toUpperCase() + prefix.toLowerCase().substr(1)
-    // 如果object是null则返回字段名
+    if(typeof object == 'string'){
+        return object + append
+    }
+    // 如果object是null或者字符串则返回字段名
    if(!object) return field + append

    return object[field + append] || object[field]

--- a/src/store/index.js
+++ b/src/store/index.js
@@ -17,7 +17,7 @@ const store = new Vuex.Store({
    tagsView,
    permission,
    settings,
-    dict
+    dict,
  },
  getters
 })

--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -82,6 +82,26 @@ const mutations = {
      }
      return false
    })
+  },
+  DEL_LEFT_VIEWS: (state, view) => {
+    const index = state.visitedViews.findIndex(v => v.path === view.path)
+    if (index === -1) {
+      return
+    }
+    state.visitedViews = state.visitedViews.filter((item, idx) => {
+      if (idx >= index || (item.meta && item.meta.affix)) {
+        return true
+      }
+      const i = state.cachedViews.indexOf(item.name)
+      if (i > -1) {
+        state.cachedViews.splice(i, 1)
+      }
+      if(item.meta.link) {
+        const fi = state.iframeViews.findIndex(v => v.path === item.path)
+        state.iframeViews.splice(fi, 1)
+      }
+      return false
+    })
  }
 }

@@ -176,6 +196,12 @@ const actions = {
      resolve([...state.visitedViews])
    })
  },
+  delLeftTags({ commit }, view){
+    return new Promise(resolve => {
+      commit('DEL_LEFT_VIEWS', view)
+      resolve([...state.visitedViews])
+    })
+  },
  delCurrentView({ dispatch }){
    const view = router.history.current
    return dispatch('delView', view).then(({visitedViews}) => {

--- a/src/utils/cache.js
+++ b/src/utils/cache.js
+import store from '../store'
+export default {
+    getChannels(){
+        if(!store.state.cache.channelList){
+            store.dispatch('cache/getChannelList')
+        }
+        return store.state.cache.channelList
+    }
+}
\ No newline at end of file
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -110,6 +110,7 @@ export const DICT_TYPE = {
  ECW_RELEASE_STATUS: 'release_status', // 放货状态
  ECW_PICK_RECURRENT_NUCLEAR_TYPE: 'PICK_RECURRENT_NUCLEAR_TYPE', // 放货反复核类型
  ECW_COST_FEE_TYPE: 'cost_fee_type', // 清单费用类型
+  ECW_PRICE_AUDIT_STATUS: 'price_audit_status', // 路线价格审核状态
  //--------ecw---------
  CUSTOMER_STATUS: 'customer_status',
  CUSTOMER_SOURCE: 'customer_source',

--- a/src/views/bpm/processInstance/detail.vue
+++ b/src/views/bpm/processInstance/detail.vue
@@ -131,7 +131,7 @@ import {approveTask, getTaskListByProcessInstanceId, rejectTask, updateTaskAssig
 import {getDate} from "@/utils/dateUtils";
 import {listSimpleUsers} from "@/api/system/user";
 import {getActivityList} from "@/api/bpm/activity";
-import specialDetail from "@/views/ecw/offer/components/specialDetail"
+import SpecialDetail from "@/views/ecw/offer/components/specialDetail"
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import shippingDetail from '@/views/ecw/box/shippingDetail'
 import SplitDetail from '@/views/ecw/order/components/SplitDetail'
@@ -142,7 +142,7 @@ export default {
  name: "ProcessInstanceDetail",
  components: {
    Parser,
-    specialDetail,
+    SpecialDetail,
    warehouseDetails,
    shippingDetail,
    SplitDetail,

--- a/src/views/ecw/box/indexFutureBox.vue
+++ b/src/views/ecw/box/indexFutureBox.vue
@@ -4,17 +4,18 @@
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="运输方式" prop="transportType">
-        <el-select v-model="queryParams.transportType" placeholder="请选择运输方式" clearable size="small">
+        <!-- <el-select v-model="queryParams.transportType" placeholder="请选择运输方式" clearable size="small">
          <el-option v-for="dict in transportTypes" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
+        </el-select> -->
+        <dict-selector :type="DICT_TYPE.TRANSPORT_TYPE" v-model="queryParams.transportType" />
      </el-form-item>
-      <el-form-item label="始发地" prop="startWarehouseId">
+      <el-form-item label="始发仓" prop="startWarehouseId">
        <el-select v-model="queryParams.startWarehouseId" placeholder="请选择始发地">
          <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
        </el-select>
      </el-form-item>

-      <el-form-item label="目的地" prop="destWarehouseId">
+      <el-form-item label="目的仓" prop="destWarehouseId">
        <el-select v-model="queryParams.destWarehouseId" placeholder="请选择目的地">
          <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
        </el-select>
@@ -30,7 +31,7 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['ecw:future-box:create']">新增</el-button>
+                   v-hasPermi="['ecw:future-box:create']">新建计划</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
@@ -41,38 +42,68 @@

    <!-- 列表 -->
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="始发地" align="center" prop="startWarehouse" />
-      <el-table-column label="目的地" align="center" prop="destWarehouse" />
-      <el-table-column label="运输方式" align="center" prop="transportType">
+      <el-table-column :label="$t('序号')" align="center" prop="id" />
+      <el-table-column :label="$t('始发地')" align="center" prop="startWarehouse">
+        <template slot-scope="{row}">
+          {{getExportWarehouseName(row.startWarehouseId)}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('目的地')" align="center" prop="destWarehouse" >
+        <template slot-scope="{row}">
+          {{getImportWarehouseName(row.destWarehouseId)}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('运输方式')" align="center" prop="transportType">
        <template slot-scope="scope">
          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportType" />
        </template>
      </el-table-column>
-      <el-table-column label="出货渠道" align="center" prop="shippingChannelId" />
-      <el-table-column label="待入仓方数" align="center" prop="readyWarehousingNumber" />
-      <el-table-column label="已入仓方数" align="center" prop="warehousedNumber" />
-      <el-table-column label="在仓方数" align="center" prop="warehousingNumber" />
-      <el-table-column label="已装柜方数" align="center" prop="loadingNumber" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column :label="$t('出货渠道')" align="center" prop="shippingChannelId">
+        <template slot-scope="{row}">
+          {{getShipChannelName(row.shippingChannelId)}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('待入仓方数')" align="center" prop="readyWarehousingNumber">
+        <template slot-scope="{row}">
+          {{row.readyWarehousingNumber  || 0}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('已入仓方数')" align="center" prop="warehousedNumber">
+        <template slot-scope="{row}">
+          {{row.warehousedNumber  || 0}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('在仓方数')" align="center" prop="warehousingNumber" >
+        <template slot-scope="{row}">
+          {{row.warehousingNumber  || 0}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('已装柜方数')" align="center" prop="loadingNumber" >
+        <template slot-scope="{row}">
+          {{row.loadingNumber  || 0}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="未来天数" align="center" prop="futureNumber" />
-      <el-table-column label="计划货柜" align="center" prop="gpNumber">
+      <el-table-column :label="$t('未来天数')" align="center" prop="futureNumber" />
+      <el-table-column :label="$t('计划货柜')" align="center" prop="gpNumber">
        <template slot-scope="{row}">
-          {{row.gpNumber}}个40GP/{{row.hqNumber}}个40HQ
+          <div>{{row.gpNumber}}个40GP</div>
+          <div>{{row.hqNumber}}个40HQ</div>
        </template>
      </el-table-column>
-      <el-table-column label="未来计划方数" align="center" prop="futurePlanNumber" />
-      <el-table-column label="未来实际方数" align="center" prop="actualNumber" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('未来计划方数')" align="center" prop="futurePlanNumber" />
+      <el-table-column :label="$t('未来实际方数')" align="center" prop="actualNumber" />
+      <el-table-column :label="$t('创建人')" align="center" prop="createName" />
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['ecw:future-box:update']">编辑</el-button>
+                     v-hasPermi="['ecw:future-box:update']">{{$t('编辑')}}</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['ecw:future-box:delete']">删除</el-button>
+                     v-hasPermi="['ecw:future-box:delete']">{{$t('删除')}}</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -95,37 +126,43 @@
          </el-select>
        </el-form-item>
        <el-form-item label="运输方式" prop="transportType">
-          <el-radio-group v-model="form.transportType">
+          <!-- <el-radio-group v-model="form.transportType">
            <el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
-          </el-radio-group>
+          </el-radio-group> -->
+          <dict-selector :type="DICT_TYPE.TRANSPORT_TYPE" v-model="form.transportType" form-type="radio" />
        </el-form-item>
-        <el-form-item label="出货渠道" prop="shippingChannelId">
+        <el-form-item label="出货渠道" prop="shippingChannelId" v-if="form.transportType == 3 || form.transportType == 4">
          <el-select v-model="form.shippingChannelId" placeholder="请选择出货渠道">
-            <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId" :key="item.channelId"></el-option>
+            <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
          </el-select>
        </el-form-item>
-        <el-form-item label="待入仓方数" prop="readyWarehousingNumber"/>
-        <el-form-item label="已入仓方数" prop="warehousedNumber"/>
-        <el-form-item label="在仓方数" prop="warehousingNumber"/>
-        <el-form-item label="已装柜仓数" prop="loadingNumber"/>
-        <el-form-item label="未来" />
-        <el-form-item prop="futureNumber">
-          <el-input v-model="form.futureNumber" placeholder="请输入未来货柜天数" />
+        <el-form-item label="待入仓方数">
+          {{form.readyWarehousingNumber}} m³
        </el-form-item>
-        <el-form-item label="天货柜数" />
-        <el-form-item prop="gpNumber">
-          <el-input v-model="form.gpNumber" placeholder="请输入GP" />
+        <el-form-item label="已入仓方数">
+          {{form.warehousedNumber}} m³
        </el-form-item>
-        <el-form-item label="x40GP"/>
-        <el-form-item prop="hqNumber">
-          <el-input v-model="form.hqNumber" placeholder="请输入hq" />
+        <el-form-item label="在仓方数">
+          {{form.warehousingNumber}} m³
        </el-form-item>
-        <el-form-item label="x40HQ"/>
-        <el-form-item label="未来计划方数" prop="futurePlanNumber">
-          <el-input v-model="form.futurePlanNumber" placeholder="请输入未来计划方数" />
+        <el-form-item label="已装柜仓数">
+          {{form.loadingNumber}} m³
        </el-form-item>
-        <el-form-item label="未来实际方数" prop="actualNumber">
-          <el-input v-model="form.actualNumber" placeholder="请输入未来实际方数" />
+        
+        <el-form-item label="">
+          <div>
+            未来 <el-input v-model="form.futureNumber" class="w-100"></el-input> 天货柜数
+          </div>
+          <div class="mt-10">
+            <el-input v-model="form.gpNumber" class="w-100" /> &times; 40GP
+            <el-input v-model="form.hqNumber" class="w-100 ml-10" /> &times; 40HQ
+          </div>
+          <div class="mt-10">
+            未来{{form.futureNumber}}天计划方数：<el-input v-model="form.futurePlanNumber" class="w-100"></el-input> m³
+          </div>
+          <div class="mt-10">
+            未来{{form.futureNumber}}天实际方数：<el-input v-model="form.actualNumber" class="w-100"></el-input> m³
+          </div>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -137,11 +174,11 @@
 </template>

 <script>
-import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel } from "@/api/ecw/futureBox";
+import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel, getBoxedVolume, getToBeWareHousedVolume,getWareHousedVolume } from "@/api/ecw/futureBox";
 import {getCabinetPage} from "@/api/ecw/cabinet";
 import { getChannelList } from '@/api/ecw/channel';
 import { getWarehouseList } from "@/api/ecw/warehouse"
-
+import {getTradeCityList} from '@/api/ecw/region'
 export default {
  name: "indexFutureBox",
  components: {
@@ -183,15 +220,21 @@ export default {
        status: null,
      },
      // 表单参数
-      form: {},
+      form: {
+        
+      },
      // 表单校验
      rules: {
      },
      warehouseList: [],
      channelList: [],
+      /* tradeCityList: [] */
    };
  },
  computed: {
+    channels(){
+      return this.$store.getters.channels
+    },
    exportWarehouseList() {
      return this.warehouseList.filter(
        (item) => item.tradeType == "2" || item.type == "3"
@@ -217,25 +260,80 @@ export default {
          for (let index in this.channelList) {
            let channelItem = this.channelList[index];
            if (channelItem.channelId == shippingChannelId) {
-              return channelItem.nameZh;
+              return this.$l(channelItem, 'name');
            }
          }
          return '/'
        }
+    },
+    getExportWarehouseName(){
+      return id => {
+        let warehouse = this.exportWarehouseList.find(item => item.id == id)
+        return this.$l(warehouse, 'title')
+      }
+    },
+    getImportWarehouseName(){
+      return id => {
+        let warehouse = this.importWarehouseList.find(item => item.id == id)
+        return this.$l(warehouse, 'title')
+      } 
    }
+    /* importCityList(){
+      return this.tradeCityList.filter(item => item.type == 1 || item.tye == 3)
+    },
+    exportCityList(){
+      return this.tradeCityList.filter(item => item.type == 2 || item.type == 3)
+    } */
  },
  created() {
+    /* getTradeCityList().then(res => {
+      this.tradeCityList = res.data
+    }) */
+
    // 查询渠道
    getChannelList().then((res) => (this.channelList = res.data));
-    this.transportTypes = this.getDictDatas(
+    /* this.transportTypes = this.getDictDatas(
      this.DICT_TYPE.ECW_TRANSPORT_TYPE
-    ).filter((item) => item.value == "1" || item.value == "2");
+    ).filter((item) => item.value == "1" || item.value == "2"); */
+
    getWarehouseList().then((res) => (this.warehouseList = res.data));
    getCabinetPage(null).then((response) => {
      this.cabinetList = response.data.list;
    });
    this.getList();
  },
+  watch:{
+    'form.transportType'(transportId){
+      if(!transportId){
+        this.$set(this.form, 'loadingNumber', 0)
+        this.$set(this.form, 'readyWarehousingNumber', 0)
+        this.$set(this.form, 'warehousedNumber', 0)
+        this.$set(this.form, 'warehousingNumber', 0)
+
+        return 
+      }
+      // 获得已封柜方数
+      getBoxedVolume({transportId}).then(res => {
+        this.$set(this.form, 'loadingNumber', res.data || 0)
+      })
+      // 获得待入仓方数
+      getToBeWareHousedVolume({transportId}).then(res => {
+        this.$set(this.form, 'readyWarehousingNumber', res.data || 0)
+      })
+      // 获得已入仓方数
+      getWareHousedVolume({transportId}).then(res => {
+        this.$set(this.form, 'warehousedNumber', res.data || 0)
+      })
+    },
+    'form.warehousedNumber'(){
+      //在仓 = 已入仓-已封柜
+      this.$set(this.form, 'warehousingNumber', this.form.warehousedNumber - this.form.loadingNumber)
+    },
+    'form.loadingNumber'(){
+      //在仓 = 已入仓-已封柜
+      this.$set(this.form, 'warehousingNumber', this.form.warehousedNumber - this.form.loadingNumber)
+    }
+  },
  methods: {
    /** 查询列表 */
    getList() {

--- a/src/views/ecw/customerCommission/index.vue
+++ b/src/views/ecw/customerCommission/index.vue
@@ -53,7 +53,7 @@
            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button></div>
          <div style="flex: 1; text-align: right;">
            <router-link :to="'/customerCommissionInfo/'+ 0 ">
-              <el-button>佣金设置</el-button>
+              <el-button type="primary">佣金设置</el-button>
            </router-link>
          </div>
        </div>
@@ -119,7 +119,7 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
+<!--          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>-->
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
        </template>
      </el-table-column>
@@ -194,6 +194,9 @@ export default {
    },
  },
  created() {
+    if(this.$route.query.customerId){
+      this.queryParams.customerId = this.$route.query.customerId
+    }
    this.getList();
    getTradeCityList().then(res => {
      this.tradeCityList = res.data

--- a/src/views/ecw/customerCommissionInfo/customSelectorsDictionary.vue
+++ b/src/views/ecw/customerCommissionInfo/customSelectorsDictionary.vue
 <template>
  <el-select v-if="options" v-model="selectVal" placeholder="请选择">
+    <el-option v-if="allShow"  label="全部" :value='0'></el-option>
    <el-option
      v-for="item in options"
      :key="item[valueKey]"
@@ -26,6 +27,10 @@ export default {
      type:String,
      default: 'value',
    },
+    allShow:{
+      type:Boolean,
+      default:false
+    }
  },
  data(){
    return{

--- a/src/views/ecw/customerCommissionInfo/index.vue
+++ b/src/views/ecw/customerCommissionInfo/index.vue
@@ -6,43 +6,47 @@
          <el-row>
            <el-col :span="5">
              <el-form-item label="客户名称" prop="customerId">
-                <el-select
-                  v-model="customerForm.name"
-                  filterable
-                  placeholder="请输入关键词"
-                  @change="changefn">
-                  <el-option
-                    v-for="item in customeList"
-                    :key="item.id"
-                    :value="item.id.toString()"
-                    :label="item.name"
-                  >
-                    {{ item.number }}|{{ item.name }}|{{ item.defaultContactPhone }}
-                  </el-option>
-                </el-select>
+              <div style="display: flex">
+                <el-input placeholder="请输入选择客户" v-model="customerName"></el-input>
+                <img style="width: 40px;height: 40px;margin-left: 40px;" src="@/assets/images/phonebook.png" class="phonebook" @click="customerNameShow= true" />
+              </div>
+<!--                <el-select-->
+<!--                  v-model="customerForm.name"-->
+<!--                  filterable-->
+<!--                  placeholder="请输入关键词"-->
+<!--                  @change="changefn">-->
+<!--                  <el-option-->
+<!--                    v-for="item in customeList"-->
+<!--                    :key="item.id"-->
+<!--                    :value="item.id.toString()"-->
+<!--                    :label="item.name"-->
+<!--                  >-->
+<!--                    {{ item.number }}|{{ item.name }}|{{ item.defaultContactPhone }}-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
              </el-form-item>
            </el-col>
+          </el-row>
+          <el-row>
            <el-col :span="5">
              <el-form-item label="运输方式" prop="transportId">
                <div>
-                  <custom-selectors-dictionary v-model="form.transportId" :options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary>
+                  <custom-selectors-dictionary :all-show="true" v-model="form.transportId" :options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary>
                </div>
              </el-form-item>
            </el-col>
            <el-col :span="5">
              <el-form-item label="始发地" prop="departureId">
                <div>
-                  <custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.departureId"
+                  <custom-selectors-dictionary :all-show="true" label-key="titleZh" value-key="id" v-model="form.departureId"
                                               :options="exportCityList"></custom-selectors-dictionary>
                </div>
              </el-form-item>
            </el-col>
-          </el-row>
-          <el-row>
            <el-col :span="5">
              <el-form-item label="目的地" prop="objectiveId">
                <div>
-                  <custom-selectors-dictionary label-key="titleZh" value-key="id" v-model="form.objectiveId"
+                  <custom-selectors-dictionary :all-show="true" label-key="titleZh" value-key="id" v-model="form.objectiveId"
                                               :options="importCityList"></custom-selectors-dictionary>
                </div>
              </el-form-item>
@@ -50,7 +54,7 @@
            <el-col :span="5">
              <el-form-item label="报关方式" prop="customsType">
                <div>
-                  <custom-selectors-dictionary v-model="form.customsType"
+                  <custom-selectors-dictionary :all-show="true" v-model="form.customsType"
                                               :options="getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"></custom-selectors-dictionary>
                </div>
              </el-form-item>
@@ -58,7 +62,7 @@
            <el-col :span="5">
              <el-form-item label="备案" prop="approval">
                <div>
-                  <custom-selectors-dictionary v-model="form.approval"
+                  <custom-selectors-dictionary :all-show="true" v-model="form.approval"
                                               :options="getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"></custom-selectors-dictionary>
                </div>
              </el-form-item>
@@ -109,7 +113,7 @@
              <el-form-item label="商品类型" v-for="(item,index) in darkServantAndProductForm" :key="index">
                <div class="shanping-type">
                  <div class="tool">
-                    <custom-selectors-dictionary v-model="item.productType" :options="commodity" label-key="titleZh"
+                    <custom-selectors-dictionary :all-show="true" v-model="item.productType" :options="productAttrList" label-key="titleZh"
                                                 value-key="id"></custom-selectors-dictionary>
                  </div>
                  <div class="box">
@@ -117,7 +121,7 @@
                      商品特性
                    </div>
                    <div class="custom">
-                      <custom-selectors-dictionary v-model="item.productAttr" label-key="attrName" value-key="id"
+                      <custom-selectors-dictionary :all-show="true" v-model="item.productAttr" label-key="attrName" value-key="id"
                                                   :options="commodityType"></custom-selectors-dictionary>
                    </div>
                  </div>
@@ -229,6 +233,7 @@
        </el-row>
      </el-card>
    </el-form>
+    <choose-contact-dialog v-if="customerNameShow"  @choose="onContactChoose"   @close="customerNameShow = false" />
  </div>
 </template>

@@ -244,16 +249,20 @@ import {getTradeCityList} from "@/api/ecw/region";
 import RoutersSelector from "@/components/RoutersSelector"
 import CustomersSelector from "@/components/CustomersSelector";
 import {getUnitList} from "@/api/ecw/unit";
-
+import ChooseContactDialog from '@/components/ChooseContactDialog'
+import {getProductTypeList} from "@/api/ecw/productType";
 export default {
  name: "CustomerCommissionInfo",
  components: {
    customSelectorsDictionary,
    RoutersSelector,
-    CustomersSelector
+    CustomersSelector,
+    ChooseContactDialog
  },
  data() {
    return {
+      customerName:undefined,
+      customerNameShow:false,
      value: '',
      isSubmit:false,
      getDictDatas,
@@ -262,20 +271,20 @@ export default {
      tradeCityList: [],
      // 表单参数
      form: {
-        approval: undefined,//	产品备案
+        approval: 0,//	产品备案
        customerCommissionInfoBaseVOList: [],//	佣金详情
        customerId: undefined,//客户id
-        customsType: undefined,//报关类别：我司全代：1，自单代报：2，混合报关：3
+        customsType: 0,//报关类别：我司全代：1，自单代报：2，混合报关：3
        darkReturnType: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_DARK_TYPE)[0].value),//	暗佣类型 1产品2达标
-        departureId: undefined,//	始发地id
-        objectiveId: undefined,//目的地id
-        transportId:undefined,//运输方式
+        departureId: 0,//	始发地id
+        objectiveId: 0 ,//目的地id
+        transportId:0,//运输方式
        type: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_TYPE)[1].value),//	佣金类型
      },
      //明佣
      mingServantFrom: [
        {
-          refund: 0,
+          refund: 1,
          refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),
          refundUnit:undefined,
        }
@@ -283,9 +292,9 @@ export default {
      //暗佣金+产品
      darkServantAndProductForm: [
        {
-          productType:undefined,//商品类型
-          productAttr: undefined,//暗佣 产品属性
-          darkCommission: 0,//暗佣 佣金
+          productType:0,//商品类型
+          productAttr: 0,//暗佣 产品属性
+          darkCommission: 1,//暗佣 佣金
          darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
          darkUnit:undefined,//	暗佣 单位
        }
@@ -293,10 +302,10 @@ export default {
      //暗佣+达标返佣
      darkServantAndRebateForm: [
        {
-          amount: 0,//	暗佣-满减金额
+          amount: 1,//	暗佣-满减金额
          amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
          amountUnit:undefined,//	暗佣-满减金额对应单位,
-          refund: 0,//暗佣-满之后返还金额
+          refund: 1,//暗佣-满之后返还金额
          refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
          refundUnit:undefined,//暗佣-满之后返还金额的单位
        }
@@ -304,10 +313,10 @@ export default {
      //暗佣+明金
      mingServantAnddarkServant: [
        {
-          refund: 0,//	暗佣+明佣 上调金额
+          refund: 1,//	暗佣+明佣 上调金额
          refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣+明佣 上调对应的货币
          refundUnit: undefined,//暗佣+明佣 上调对应的单位
-          darkAdjustCommission: 0,//暗佣+明佣 上调金额
+          darkAdjustCommission: 1,//暗佣+明佣 上调金额
          darkAdjustCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣+明佣 上调对应的货币
          darkAdjustUnit:undefined,//暗佣+明佣 上调对应的单位
        }
@@ -326,8 +335,8 @@ export default {
      },
      customerShow: true,
      id:undefined,//佣金id
-      weightList:[]
-
+      weightList:[],
+      productAttrList:[]
    };
  },
  computed:{
@@ -339,37 +348,41 @@ export default {
    },
  },
  created() {
+    getProductTypeList().then(response => {
+      console.log(response.data,'response.data')
+      this.productAttrList = response.data
+    })
    //重量单位
    getUnitList().then(r =>{
      if(r.code === 0){
        this.weightList = r.data
        this.$set(this.mingServantFrom,0, {
-            refund: 0,
+            refund: 1,
            refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),
            refundUnit: parseInt(this.weightList[0].id),})
        this.$set(this.darkServantAndProductForm, 0,
          {
-            productType: undefined,//商品类型
-            productAttr: undefined,//暗佣 产品属性
-            darkCommission: 0,//暗佣 佣金
+            productType: 0,//商品类型
+            productAttr: 0,//暗佣 产品属性
+            darkCommission: 1,//暗佣 佣金
            darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
            darkUnit: parseInt(this.weightList[0].id),//	暗佣 单位
          })
        this.$set(this.darkServantAndRebateForm, 0,
          {
-            amount: 0,//	暗佣-满减金额
+            amount: 1,//	暗佣-满减金额
            amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
            amountUnit:parseInt (this.weightList[0].id),//	暗佣-满减金额对应单位,
-            refund: 0,//暗佣-满之后返还金额
+            refund: 1,//暗佣-满之后返还金额
            refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
            refundUnit:parseInt(this.weightList[0].id),//暗佣-满之后返还金额的单位
          })
        this.$set(this.mingServantAnddarkServant, 0,
          {
-            refund: 0,//	暗佣+明佣 上调金额
+            refund: 1,//	暗佣+明佣 上调金额
            refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣+明佣 上调对应的货币
            refundUnit: parseInt(this.weightList[0].id),//暗佣+明佣 上调对应的单位
-            darkAdjustCommission: 0,//暗佣+明佣 上调金额
+            darkAdjustCommission: 1,//暗佣+明佣 上调金额
            darkAdjustCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣+明佣 上调对应的货币
            darkAdjustUnit:parseInt(this.weightList[0].id),//暗佣+明佣 上调对应的单位
          })
@@ -453,10 +466,10 @@ export default {
        approval: undefined,
        customerCommissionInfoBaseVOList: [],
        customerId: undefined,//客户id
-        customsType: undefined,//报关类别：我司全代：1，自单代报：2，混合报关：3
+        customsType: '',//报关类别：我司全代：1，自单代报：2，混合报关：3
        darkReturnType: this.getDictDatas(this.DICT_TYPE.COMMISSION_DARK_TYPE)[0].value,//	暗佣类型 1产品2达标
-        departureId: undefined,//	始发地id
-        objectiveId: undefined,//	运输方式
+        departureId: '',//	始发地id
+        objectiveId: '',//	运输方式
        type: this.getDictDatas(this.DICT_TYPE.COMMISSION_TYPE)[1].value,//	佣金类型
      };
      this.resetForm("form");
@@ -465,18 +478,18 @@ export default {
    addToFn(val){
      if(val === 1){
         this.darkServantAndProductForm.push({
-           productType:this.commodity[0].id,//商品类型
-           productAttr: this.commodityType[0].id,//暗佣 产品属性
-           darkCommission: 0,//暗佣 佣金
+           productType:0,//商品类型
+           productAttr:0,//暗佣 产品属性
+           darkCommission: 1,//暗佣 佣金
           darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
           darkUnit:this.darkServantAndProductForm[0].darkUnit,//	暗佣 单位
         })
      }else {
        this.darkServantAndRebateForm.push( {
-          amount: 0,//	暗佣-满减金额
+          amount: 1,//	暗佣-满减金额
          amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
          amountUnit: parseInt(this.weightList[0].id),//	暗佣-满减金额对应单位,
-          refund: 0,//暗佣-满之后返还金额
+          refund: 1,//暗佣-满之后返还金额
          refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
          refundUnit: this.darkServantAndRebateForm[0].refundUnit,//暗佣-满之后返还金额的单位
        })
@@ -488,21 +501,25 @@ export default {
        this.isSubmit = true;
        if(!valid)return
        if (this.form.type == 1) {
+           if(Number(this.mingServantFrom[0].refund) <= 0 || isNaN(Number(this.mingServantFrom[0].refund))) return this.$message.warning('请输入大于0的金额')
          this.form.customerCommissionInfoBaseVOList = this.mingServantFrom
        } else if (this.form.type == 2) {
          if (this.form.darkReturnType == 1) {
+            if(this.darkServantAndProductForm.some(i => i.darkCommission <= 0 || isNaN(i.darkCommission))) return this.$message.warning('请输入大于0的金额')
            this.form.customerCommissionInfoBaseVOList = this.darkServantAndProductForm
          } else {
+            if(this.darkServantAndRebateForm.some(i => i.amount <= 0 || i.refund <=0)) return this.$message.warning('请输入大于0的金额')
            this.form.customerCommissionInfoBaseVOList = this.darkServantAndRebateForm
          }
        } else if (this.form.type == 3) {
+          if(this.mingServantAnddarkServant[0].darkAdjustCommission <= 0 || this.mingServantAnddarkServant[0].refund <= 0 ) return this.$message.warning('请输入大于0的金额')
          this.form.customerCommissionInfoBaseVOList = this.mingServantAnddarkServant
        }
        if(this.$route.params.dictId == 0){
          createCommission(this.form).then(r =>{
            console.log('添加',r)
            if(r.code == 0){
-              this.$message('添加成功！');
+              this.$message.success('添加成功！');
              this.$router.go(-1)
            }
          })
@@ -513,10 +530,9 @@ export default {
          }
          p.customerCommissionInfoBaseVOList.forEach(item => {item.commissionId = this.$route.params.dictId})
          updateCustomerCommissionInfo(p).then(r=>{
-            console.log('更新',r)
            if(r.code == 0){
              this.$router.go(-1)
-              this.$message('修改成功！');
+              this.$message.success('修改成功！');
            }
          })
        }
@@ -529,7 +545,7 @@ export default {
        if (res.code === 0) {
          this.commodityType = res.data;
          if(this.$route.params.dictId == 0 || (this.form.type == 2 && this.form.darkReturnType != 1)){
-            this.darkServantAndProductForm.forEach(item =>{item.productAttr = this.commodityType[0].id})
+            this.darkServantAndProductForm.forEach(item =>{item.productAttr = 0})
          }
        }
      })
@@ -539,9 +555,15 @@ export default {
      commodityList().then(res => {
        this.commodity = res.data
        if(this.$route.params.dictId == 0 || (this.form.type == 2 && this.form.darkReturnType != 1)){
-          this.darkServantAndProductForm.forEach(item=>{item.productType =this.commodity[0].id})
+          this.darkServantAndProductForm.forEach(item=>{item.productType = 0})
        }
      })
+    },
+    onContactChoose(val){
+      this.customerNameShow = false;
+      this.customerName = val.customerName;
+      this.form.customerId = val.customerId;
+
    }
  },
  watch:{
@@ -554,7 +576,7 @@ export default {
      deep:true,
    },
    'form.transportId':function (val){
-            if(!this.weightList) return
+            if(this.weightList.length === 0 || !val) return
            if((val == 1 || val == 2)){
           let index =  this.weightList.findIndex(item => item.id == 7);
              this.mingServantFrom.forEach(item =>{

--- a/src/views/ecw/offer/components/Commossion.vue
+++ b/src/views/ecw/offer/components/Commossion.vue
+<template>
+  <el-dialog visible :close-on-click-modal="false" :before-close="closeDialog" :title="$t('佣金规则申请')">
+    <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+      <el-form-item :label="$t('商品类型')">
+        <span>{{ getProductAttrNameById(form.productType) }}</span>
+      </el-form-item>
+      <el-form-item :label="$t('商品名称')">
+        <span>{{ form.prodTitleZh }}</span>
+      </el-form-item>
+      <el-form-item :label="$t('英文名称')">
+        <span>{{ form.prodTitleEn }}</span>
+      </el-form-item>
+      <el-form-item :label="$t('线路')">
+        {{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${form.departureName}】发往【${form.objectiveName}】`}}
+      </el-form-item>
+      
+      <el-row v-if="!form.charging">
+        <el-col :span="12">
+          <el-form-item :label="$t('运费')">
+            {{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="$t('清关费')">
+            {{form.orgClearanceFreight}} {{ currentMap[form.orgClearanceFreightCurrency] }} / {{ unitMap[form.orgClearanceFreightVolume] }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item :label="$t('全包价')" v-if="form.charging">
+        {{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
+      </el-form-item>
+      <el-form-item :label="$t('佣金类型')" prop="commissionType">
+        <dict-selector :type="DICT_TYPE.COMMISSION_TYPE" v-model="form.commissionType" form-type="radio" />
+      </el-form-item>
+
+      <!-- 明佣或者明佣+暗佣才显示 -->
+      <el-form-item label="明佣佣金" v-if="form.commissionType == 1 || form.commissionType == 3">
+        <el-input v-model.number="form.lightCommissionAmount" placeholder="" class="w-100"></el-input>
+        {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
+      </el-form-item>
+
+      <!-- 明佣+暗佣才显示 -->
+      <el-form-item label="暗佣佣金" v-if="form.commissionType == 3">
+        <el-input v-model.number="form.shadeCommissionAmount" placeholder="" class="w-100"></el-input>
+        {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
+      </el-form-item>
+
+      <!-- 无佣金不显示 -->
+      <div class="pl-50" v-if="form.commissionType != 0">
+        <div>{{$l(form, 'prodTitle')}}</div>
+
+        <!-- 明佣+暗佣显示 -->
+        <div v-if="form.commissionType == 3">成本价：{{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}</div>
+        <!-- 暗佣显示 -->
+        <div v-if="form.commissionType == 2">
+          暗佣：// TODO {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
+          <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">去设置</el-link>
+        </div>
+
+        <div  v-if="form.commissionType == 1 || form.commissionType == 3">销售价：{{form.orgSeaFreight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}</div>
+        <div v-if="form.commissionType == 3">实际佣金返点：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}</div>
+      </div>
+    </el-form>
+    <div class="page-title">审批流程</div>
+    <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
+
+    <div v-if="!form.applyStatus">
+      <el-button type="primary" @click="handleSubmit">提交</el-button>
+    </div>
+    <div v-else>
+      <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
+        <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {createOfferSpecial, getOfferSpecial, getOfferSpecialByApproveId} from "@/api/ecw/offer"
+import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
+import DictSelector from "@/components/DictSelector"
+import {getUnitList} from "@/api/ecw/unit"
+import {getChannelList} from "@/api/ecw/channel"
+import { getCurrencyList } from '@/api/ecw/currency'
+import { getProductAttrList } from '@/api/ecw/productAttr'
+import WorkFlow from '@/components/WorkFlow'
+export default {
+  name: "Commossion",
+  props: {
+    offerProdId: Number,
+    customerId: Number
+  },
+  components: {
+    DictSelector, WorkFlow
+  },
+  created() {
+    // 查看详情，列表进来的
+    if(this.offerProdId){
+      this.getOfferSpecial()
+    }
+
+    getUnitList().then(res => this.unitList = res.data)
+    getChannelList().then(res => this.channelList = res.data)
+    getCurrencyList().then(res => this.currencyList = res.data)
+    getProductAttrList().then(res => this.productAttrList = res.data)
+
+  },
+  data() {
+    return {
+      getDictDataLabel,
+      DICT_TYPE,
+      unitList:[],
+      channelList:[],
+      currencyList:[],
+      productAttrList:[],
+      ccIdArr: [],
+      form: {
+        type: 2
+      },
+      rules:{
+        commissionType      : {required: true, message: '请选择佣金类型'},
+      }
+    }
+  },
+  computed: {
+    // 根据渠道id显示渠道名
+    getChannelNameById(){
+      return channelId => {
+        const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
+        return s ? '【' + s + '】' : ''
+      }
+    },
+    currentMap(){
+      let map = {}
+      this.currencyList.forEach(item => {
+        map[item.id] = this.$l(item, 'title')
+      })
+      return map
+    },
+    unitMap(){
+      let map = {}
+      this.unitList.forEach(item => {
+        map[item.id] = this.$l(item, 'title')
+      })
+      return map
+    },
+  },
+  watch:{
+    ccIdArr(){
+      this.$set(this.form, 'ccIds', this.ccIdArr.join(','))
+    },
+    'form.commissionType'(val){
+      this.$set(this.form, 'lightCommissionAmount', 0)
+      this.$set(this.form, 'shadeCommissionAmount', 0)
+    }
+  },
+  methods: {
+    handleSubmit(){
+      this.$refs.form.validate().then(res => {
+        // 接口运费不能为空，所以这里提交了运费字段
+        createOfferSpecial(Object.assign({
+          clearanceFreight: this.form.orgClearanceFreight,
+          seaFreight: this.form.orgSeaFreight
+        }, this.form, {type: 2})).then(res => {
+          this.$message.success(this.$t('提交成功'))
+          this.$emit('success')
+        })
+      })
+    },
+    getOfferSpecial(){
+      getOfferSpecial(this.offerProdId, {type: 2}).then(r => {
+        this.form = r.data
+      })
+    },
+    getProductAttrNameById(id){
+      return this.productAttrList.find(e => e.id === id)?.attrName || ''
+    },
+    closeDialog(){
+      this.$emit('close')
+    }
+  }
+}
+</script>
--- a/src/views/ecw/offer/components/specialDiscount.vue
+++ b/src/views/ecw/offer/components/specialDiscount.vue
@@ -55,9 +55,14 @@
    </el-form>
    <div class="page-title">审批流程</div>
    <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
-    <div>
+    <div v-if="!form.applyStatus">
      <el-button type="primary" @click="handleSubmit">提交</el-button>
    </div>
+    <div v-else>
+      <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
+        <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
+      </el-button>
+    </div>
  </el-dialog>
 </template>

@@ -116,10 +121,9 @@ export default {
  methods: {
    handleSubmit(){
      this.$refs.form.validate().then(res => {
-              console.log(this.form.type)
-
        createOfferSpecial(Object.assign({}, this.form, {type: 1})).then(res => {
          this.$message.success(this.$t('提交成功'))
+          this.$emit('success')
        })
      })
    },

--- a/src/views/ecw/offer/index.vue
+++ b/src/views/ecw/offer/index.vue
@@ -3,14 +3,12 @@

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('编号')" prop="number">
-        <el-input v-model="queryParams.number" :placeholder="$t('请输入报价单号、订单号')" clearable @keyup.enter.native="handleQuery"/>
-        <!--// TODO -->
+      <el-form-item :label="$t('编号')" prop="searchNumber">
+        <el-input v-model="queryParams.searchNumber" :placeholder="$t('请输入报价单号、订单号')" clearable @keyup.enter.native="handleQuery"/>
      </el-form-item>

-      <el-form-item :label="$t('客户')" prop="orderNo">
-        <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery"/>
-        <!--// TODO -->
+      <el-form-item :label="$t('客户')" prop="searchCustomer">
+        <el-input v-model="queryParams.searchCustomer" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery"/>
      </el-form-item>
      
      <el-form-item :label="$t('创建时间')" prop="orderNo">
@@ -30,19 +28,17 @@
        </el-select>
      </el-form-item>

-      <el-form-item :label="$t('运输方式')" prop="orderNo">
+      <el-form-item :label="$t('运输方式')" prop="transportId">
        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number" />
      </el-form-item>
-      <el-form-item :label="$t('商品')" prop="orderNo">
-        <el-input v-model="queryParams.product" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery"/>
-        <!--// TODO -->
+      <el-form-item :label="$t('商品')" prop="prodTitle">
+        <el-input v-model="queryParams.prodTitle" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery"/>
      </el-form-item>
      <el-form-item :label="$t('控货')" prop="control">
        <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" v-model="queryParams.control" />
      </el-form-item>
-      <el-form-item :label="$t('客户经理')" prop="orderNo">
-        <user-selector v-model="queryParams.salesman" />
-        <!--// TODO -->
+      <el-form-item :label="$t('客户经理')" prop="followUpSalesmanId">
+        <user-selector v-model="queryParams.followUpSalesmanId" />
      </el-form-item>
      <el-form-item :label="$t('销售阶段')" prop="status">
        <dict-selector :type="DICT_TYPE.ECW_OFFER_STATUS" v-model="queryParams.status" />
@@ -121,18 +117,19 @@
          4 赢单                                    删除
          5 输单                                    删除
          6 完成                                    删除
+          7 跟进中      编辑、跟进、结果、特价、取消、 删除
          -->
          <el-dropdown>
            <el-button icon="el-icon-plus" circle type="primary"></el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item @click.native="$router.push('detail?offerId=' + scope.row.offerId)"                                                                                                                  >{{$t('详情')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)"                                   v-if="[1,2,3].indexOf(scope.row.status) > -1"        v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$router.push('logList?offerId=' + scope.row.offerId)"                           v-if="[1,3].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('跟进')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" v-if="[3].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('结果')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)"                            v-if="[3].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('特价')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$alert('// TODO')"                                                              v-if="[1,3].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('取消')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$alert('// TODO')"                                                              v-if="[0].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$alert('// TODO')"                                                              v-if="[1,2,3,4,5,6].indexOf(scope.row.status) > -1"  v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)"                                   v-if="[1,2,3,7].indexOf(scope.row.status) > -1"        v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('logList?offerId=' + scope.row.offerId)"                           v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('跟进')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" v-if="[3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('结果')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)"                    v-if="[3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('特价')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="cancel(scope.row.offerId)"                                                      v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('取消')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="recovery(scope.row.offerId)"                                                    v-if="[0].indexOf(scope.row.status) > -1"              v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="deleteOffer(scope.row.offerId)"                                                 v-if="[1,2,3,4,5,6,7].indexOf(scope.row.status) > -1"  v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>

@@ -184,7 +181,7 @@
 </template>

 <script>
-import { deleteOffer, getOfferPage, exportOfferExcel } from "@/api/ecw/offer";
+import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery } from "@/api/ecw/offer";
 import { getCurrencyList } from '@/api/ecw/currency';
 import {getTradeCityList} from '@/api/ecw/region'
 import UserSelector from '@/components/UserSelector'
@@ -342,6 +339,24 @@ export default {
          this.$download.excel(response, '${table.classComment}.xls');
          this.exportLoading = false;
        }).catch(() => {});
+    },
+    cancel(id){
+      this.doAction('确定要取消此报价单么？', cancel, id);
+    },
+    recovery(id){
+      this.doAction('确定要恢复此报价单么？', recovery, id);
+    },
+    deleteOffer(id){
+      this.doAction('确定要删除此报价单么？', deleteOffer, id);
+    },
+    doAction(tips, action, id){
+      this.$confirm(tips).then(res => {
+        return action(id)
+      })
+      .then(() => {
+        this.$message.success('操作成功')
+        this.handleQuery()
+      })
    }
  }
 };

--- a/src/views/ecw/offer/special.vue
+++ b/src/views/ecw/offer/special.vue
@@ -13,7 +13,7 @@
            <el-descriptions-item :label="$t('出货渠道')">
              {{channel ? $l(channel, 'name') : '/'}}
            </el-descriptions-item>
-            
+
            <el-descriptions-item :label="$t('创建时间')">{{offer.createTime}}</el-descriptions-item>
            <el-descriptions-item :label="$t('状态')">
              <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="offer.status" />
@@ -43,7 +43,7 @@
            <dict-tag :value="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" />
          </template>
        </el-table-column>
-        
+
        <el-table-column
          :label="$t('原价')">
          <template v-slot="{row}">
@@ -72,7 +72,7 @@
          :label="$t('操作')">
          <template v-slot="{row}">
            <el-button size="mini" type="text" @click="showOfferProdId=row.offerProdId">{{$t('优惠申请')}}</el-button>
-            <el-button size="mini" type="text" @click="$alert('// TODO')">{{$t('佣金规则')}}</el-button>
+            <el-button size="mini" type="text" @click="showCommissionProdId=row.offerProdId">{{$t('佣金规则')}}</el-button>
          </template>
        </el-table-column>

@@ -83,7 +83,8 @@
        <el-button type="primary">申请泡货优惠</el-button>
        <el-button type="primary">关闭窗口</el-button>
      </div> -->
-      <special-discount v-if="showOfferProdId" :offerProdId="showOfferProdId" @close="showOfferProdId=null" @success="onSuccess" />
+      <special-discount v-if="showOfferProdId"      :offerProdId="showOfferProdId"        @close="showOfferProdId=null"       @success="onSuccess" />
+      <commossion       v-if="showCommissionProdId" :offerProdId="showCommissionProdId" :customer-id="offer.relationId"   @close="showCommissionProdId=null"  @success="onSuccess" />
    </el-card>
  </div>
 </template>
@@ -97,11 +98,13 @@ import {getProductAttrList} from "@/api/ecw/productAttr"
 import { parseTime } from '@/utils/ruoyi'
 import {listByIds} from '@/api/ecw/region'
 import {getChannel} from '@/api/ecw/channel'
-import specialDiscount from '@/views/ecw/offer/components/specialDiscount'
+import SpecialDiscount from '@/views/ecw/offer/components/specialDiscount'
+import Commossion from '@/views/ecw/offer/components/Commossion'
+
 export default {
  name: "OfferSpecial",
  components: {
-    specialDiscount
+    SpecialDiscount, Commossion
  },
  props: {
    offerId: String
@@ -133,7 +136,8 @@ export default {
      objective: null,
      departure: null,
      channel: null, // 渠道信息
-      showOfferProdId: null // 显示申请优惠的产品id
+      showOfferProdId: null, // 显示申请优惠的产品id
+      showCommissionProdId: null, // 修改佣金规则的产品ID
    };
  },
  watch:{
@@ -157,7 +161,7 @@ export default {
      })
    },
    getChannel(){
-      if(!this.offer.channelId) return 
+      if(!this.offer.channelId) return
      getChannel(this.offer.channelId).then(res => {
        this.channel = res.data
      })

--- a/src/views/ecw/order/cargoControl.vue
+++ b/src/views/ecw/order/cargoControl.vue
@@ -139,7 +139,7 @@

    <transfer       v-if="showTransferOrder"          v-bind="showTransferOrder"            @close="showTransferOrder=null" />
    <release        v-if="showReleaseOrderId"         :order-id="showReleaseOrderId"        @close="showReleaseOrderId=null"        @success="onReleaseSuccess" />
-    <transfer-cargo v-if="showTransferCargoOrderId"   :order-id="showTransferCargoOrderId"  @close="showTransferCargoOrderId=null"  @success="onReansferCargoSuccess" />
+    <transfer-cargo v-if="showTransferCargoOrderId"   :order-id="showTransferCargoOrderId"  @close="showTransferCargoOrderId=null"  @success="onTransferCargoSuccess" />
    <fallback       v-if="showFallbackOrder !== null" :order="showFallbackOrder"            @close="showFallbackOrder=null"         @success="onFallbackSuccess" :index="null"   />
  </div>
 </template>
@@ -296,7 +296,7 @@ export default {
      this.showFallbackOrder = null
      this.handleQuery()
    },
-    onReansferCargoSuccess(){
+    onTransferCargoSuccess(){
      this.showTransferCargoOrderId = null
      this.handleQuery()
    }

--- a/src/views/ecw/order/components/Release.vue
+++ b/src/views/ecw/order/components/Release.vue
@@ -142,7 +142,13 @@ export default {
    },
    methods:{
        loadData(){
-            getRleaseInfo(this.orderId).then(res => this.detail = res.data)
+            getRleaseInfo(this.orderId).then(res => {
+              this.detail = res.data
+              this.$set(this.formData, 'consigneeName', res.data.consigneeName)
+              this.$set(this.formData, 'consigneeCountryCode', '+' + res.data.consigneeCountryCode)
+              this.$set(this.formData, 'consigneePhone', res.data.consigneePhone)
+              this.$set(this.formData, 'consigneeEmail', res.data.consigneeEmail)
+            })
        },
        closeDialog(){
            this.show = false

--- a/src/views/ecw/order/components/TransferCargo.vue
+++ b/src/views/ecw/order/components/TransferCargo.vue
@@ -24,7 +24,9 @@

        <el-table :data="selectedOrders" border>
          <el-table-column :label="$t('订单号')">
-              {{detail.orderNo}}
+            <template slot-scope="{row}">
+              {{row.orderNo}}
+            </template>
          </el-table-column>
          <el-table-column :label="$t('目的地')">
            <template slot-scope="{row}">

--- a/src/views/ecw/order/detail.vue
+++ b/src/views/ecw/order/detail.vue
@@ -128,15 +128,15 @@
                
                <template v-if="row.charging ==1">
                  <template v-if="!row.seaFreight">未报价</template>
-                  <template>{{$t('全包价')}} {{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
+                  <template>{{$t('全包价')}} {{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
                </template>
                <template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
                <template v-else>
                  <div>
-                      {{$t('运费')}}：{{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
+                      {{$t('运费')}}：{{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
                  </div>
                  <div>
-                      {{$t('清关费')}}：{{row.clearanceFreight}} {{currentcyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
+                      {{$t('清关费')}}：{{row.oneClearanceFreight}} {{currentcyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
                  </div>
                </template>
              </template>

--- a/src/views/ecw/order/edit.vue
+++ b/src/views/ecw/order/edit.vue
@@ -93,8 +93,8 @@
        <el-card  class="mt-10">
            <div slot="header" class="card-title">
                <div class="card-name">{{$t('商品信息')}}</div>
-                <el-button type="primary" size="mini" @click="addProduct(null)" :disabled="!form.lineId">{{$t('添加货物')}}</el-button>
-                <el-button type="primary" size="mini" @click="showBatchImportDialog=true" :disabled="!form.lineId">{{$t('批量添加货物')}}</el-button>
+                <el-button type="primary" size="mini" @click="addProduct(null)" :disabled="!canAddProduct">{{$t('添加货物')}}</el-button>
+                <el-button type="primary" size="mini" @click="showBatchImportDialog=true" :disabled="!canAddProduct">{{$t('批量添加货物')}}</el-button>
            </div>
            <el-table :data="form.orderItemVOList" border class="product-list">
              <el-table-column :label="$t('序号')" width="60px" fixed>
@@ -111,13 +111,13 @@
                        }"
                        class="mb-0 mr-0"
                    >
-                        <product-selector v-model="scope.row.prodId" @change="onProductChange(scope.row, $event)" :disabled="!form.lineId || !productEditable" />
+                        <product-selector v-model="scope.row.prodId" @change="onProductChange(scope.row, $event)" :disabled="!canAddProduct || !productEditable" />
                    </el-form-item>
                </template>
              </el-table-column>
              <el-table-column :label="$t('英文品名')" width="160px">
                <template slot-scope="scope">
-                    <product-selector lang="En" v-model="scope.row.prodId" @change="onProductChange(scope.row, $event)" :disabled="!form.lineId || !productEditable" />
+                    <product-selector lang="En" v-model="scope.row.prodId" @change="onProductChange(scope.row, $event)" :disabled="!canAddProduct || !productEditable" />
                </template>
              </el-table-column>
              <!-- <el-table-column label="商品类型" width="160px">
@@ -135,33 +135,33 @@
                        }"
                        class="mb-0 mr-0"
                    >
-                        <dict-selector v-model="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" defaultable :disabled="!form.lineId || !productEditable" />
+                        <dict-selector v-model="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" defaultable :disabled="!canAddProduct || !productEditable" />
                    </el-form-item>
                </template>
              </el-table-column>
              <el-table-column :label="$t('件数')" width="90px">
                <template slot-scope="{row}">
-                    <el-input v-model.number="row.num" :disabled="!form.lineId || !productEditable" />
+                    <el-input v-model.number="row.num" :disabled="!canAddProduct || !productEditable" />
                </template>
              </el-table-column>
              <el-table-column :label="$t('包装单位')">
                <template slot-scope="{row}">
-                    <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable :disabled="!form.lineId || !productEditable" />
+                    <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable :disabled="!canAddProduct || !productEditable" />
                </template>
              </el-table-column>
              <el-table-column :label="$t('数量') + '(个)'" width="120px">
                <template slot-scope="{row}">
-                    <el-input v-model="row.quantity" type="number" :disabled="!form.lineId || !productEditable" />
+                    <el-input v-model="row.quantity" type="number" :disabled="!canAddProduct || !productEditable" />
                </template>
              </el-table-column>
              <el-table-column :label="$t('总体积') + '(m³)'" width="100px">
                <template slot-scope="{row}">
-                    <el-input v-model="row.volume" :disabled="!form.lineId || !productEditable" />
+                    <el-input v-model="row.volume" :disabled="!canAddProduct || !productEditable" />
                </template>
              </el-table-column>
              <el-table-column :label="$t('总重量') + '(kg)'" width="100px">
                <template slot-scope="{row}">
-                    <el-input v-model="row.weight" :disabled="!form.lineId || !productEditable" />
+                    <el-input v-model="row.weight" :disabled="!canAddProduct || !productEditable" />
                </template>
              </el-table-column>
              <el-table-column :label="$t('总货值') + '(RMB)'" width="100px">
@@ -173,13 +173,13 @@
                        }"
                        class="mb-0 mr-0"
                    >
-                        <el-input v-model="scope.row.worth" :disabled="!form.lineId" @input="calculationPrice" />
+                        <el-input v-model="scope.row.worth" :disabled="!canAddProduct" @input="calculationPrice" />
                    </el-form-item>
                </template>
              </el-table-column>
              <el-table-column :label="$t('商品特性')" width="250px">
                <template slot-scope="{row}">
-                    <el-checkbox-group v-model="row.prodAttrArr" @change="onProductAttrChange(row, $event)" :disabled="!form.lineId || !productEditable">
+                    <el-checkbox-group v-model="row.prodAttrArr" @change="onProductAttrChange(row, $event)" :disabled="!canAddProduct || !productEditable">
                      <el-checkbox v-for="item in productAttrList" :label="item.id" :key="item.id">{{$l(item, 'attrName')}}</el-checkbox>
                    </el-checkbox-group>
                </template>
@@ -415,15 +415,12 @@
            
            <div v-if="[3,4].indexOf(+form.transportId) > -1">
                <el-form-item :label="$t('航空公司')">
-                    <!--待查询备选数据-->
-                    <el-select placeholder="" v-model="form.airlineCompany">
-                    </el-select>
+                    <supplier-selector v-model="form.airlineCompany" company-type="10" />
                </el-form-item>
            </div>
            <div  v-if="[2].indexOf(+form.transportId) > -1">
                <el-form-item :label="$t('船公司')">
-                    <el-select placeholder="" v-model="form.shippingCompany">
-                    </el-select>
+                    <supplier-selector v-model="form.shippingCompany" company-type="9" />
                </el-form-item>
            </div>
            <div v-if="[2,3,4].indexOf(+form.transportId) > -1"> 
@@ -520,14 +517,14 @@ import AreaCodeSelector from '@/components/AreaCodeSelector'
 import ChooseContactDialog from '@/components/ChooseContactDialog'
 import QuickCreateCustomer from '@/components/QuickCreateCustomer'
 import {calculationPrice} from '@/api/ecw/product'
-
+import SupplierSelector from '@/components/SupplierSelector'
 // 缓存默认的表单数据
 let defaultFormData = null

 export default {
  name: "EcwOrderEdit",
  components: {
-    ProductSelector, Selector, CustomerContactSelector, AreaSelector, FileUpload, AreaCodeSelector, ChooseContactDialog, QuickCreateCustomer
+    ProductSelector, Selector, CustomerContactSelector, AreaSelector, FileUpload, AreaCodeSelector, ChooseContactDialog, QuickCreateCustomer, SupplierSelector
  },
  data() {
    return {
@@ -689,6 +686,17 @@ export default {
    routeOtherServices(){
        if(!this.selectedRouter || !this.selectedRouter.otherService) return []
        return this.selectedRouter.otherService.split(',')
+    },
+    // 是否可以添加商品
+    canAddProduct(){
+        if(!this.form.lineId){
+            return false
+        }
+        // 如果是海空联运或者空运专线则必须选择渠道
+        if(this.transport && this.transport.cssClass == 'channel' && !this.form.channelId ){
+            return false
+        }
+        return true
    }
  },
  watch:{
@@ -797,8 +805,13 @@ export default {
        let form = new FormData()
        form.append('file', e.file)
        orderImport(form).then(res => {
+            if(!this.importList.length){
+                return this.$message.error('无有效数据')
+            }
+
            this.importList = res.data.list
            this.$set(this.form, 'packingListUrl', res.data.packingListUrl)
+            
        })
    },
    addToProductList(){
@@ -831,7 +844,7 @@ export default {
            this.$set(row, 'link', value)
        })
    },
-    onFileChoosed(e){
+    /* onFileChoosed(e){
        window.choosed = e
        console.log('onFileChoosed', e)

@@ -845,7 +858,7 @@ export default {
            window.zzexcel = zzexcel
            window.tableJson = xlsx.utils.sheet_to_json(zzexcel.Sheets[zzexcel.SheetNames[0]])
        }
-    },
+    }, */
    onProductChange(row, product){
        console.log(product)
        // row.goodsType = product ? product.typeId : null

--- a/src/views/ecw/order/exception/index.vue
+++ b/src/views/ecw/order/exception/index.vue
@@ -98,7 +98,8 @@
      </el-table-column>
      <el-table-column :label="$t('体积/重量')" align="center">
          <template slot-scope="scope">
-            <span>{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
          </template>
      </el-table-column>
      <el-table-column :label="$t('运输方式/目的地')" align="center">

--- a/src/views/ecw/order/release.vue
+++ b/src/views/ecw/order/release.vue
@@ -48,7 +48,8 @@
    </div>
 </template>
 <script>
-import {getOrder, createOrderPickup} from '@/api/ecw/order'
+import {getOrder} from '@/api/ecw/order'
+import {create} from '@/api/ecw/orderPickup'
 import ImageUpload from '@/components/ImageUpload'
 export default {
    components: {ImageUpload},
@@ -69,10 +70,10 @@ export default {
            })
        },
        submit(){
-            createOrderPickup(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => {
+            create(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => {
                return this.$alert(res.message || this.$t('操作成功'))
            }).then(res => {
-                this.$router.back()
+                this.$store.dispatch('tagsView/delCurrentView')
            })
        }
    }

--- a/src/views/ecw/order/special/discount.vue
+++ b/src/views/ecw/order/special/discount.vue
@@ -36,45 +36,24 @@
           </el-form-item>
           <el-form-item label="新运费" required style="width: 400px">
             <el-input v-model="form.freight" type="number" class="input-with-select">
-               <el-select v-model="form.freightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
-                 <el-option
-                   v-for="item in currencyList"
-                   :key="item.id"
-                   :label="item.titleZh"
-                   :value="item.id">
-                 </el-option>
-               </el-select>
-               <el-select v-model="form.freightVolume" placeholder="请选择" slot="append" style="width: 100px">
-                 <el-option
-                   v-for="item in unitList"
-                   :key="item.id"
-                   :label="item.titleZh"
-                   :value="item.id">
-                 </el-option>
-               </el-select>
+               <div slot="prepend" style="width: 60px">{{ currentMap[form.freightCurrency] }}</div>
+               <div slot="append" style="width: 60px">{{ unitMap[form.freightVolume] }}</div>
             </el-input>
           </el-form-item>
           <el-form-item label="新清关费" required style="width: 400px">
             <el-input v-model="form.clearanceFreight" type="number" class="input-with-select">
-               <el-select v-model="form.clearanceFreightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
-                 <el-option
-                   v-for="item in currencyList"
-                   :key="item.id"
-                   :label="item.titleZh"
-                   :value="item.id">
-                 </el-option>
-               </el-select>
-               <el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
-                 <el-option
-                   v-for="item in unitList"
-                   :key="item.id"
-                   :label="item.titleZh"
-                   :value="item.id">
-                 </el-option>
-               </el-select>
+               <div slot="prepend" style="width: 60px">{{ currentMap[form.clearanceFreightCurrency] }}</div>
+               <div slot="append" style="width: 60px">{{ unitMap[form.clearanceFreightVolume] }}</div>
             </el-input>
           </el-form-item>
         </el-form>
+
+         <div >
+           <h2>审批流程</h2>
+           <work-flow xmlkey="free_apply" v-model="form.channelId"  />
+           <!--        <div>选择的用户：{{selectedUsers}}</div>-->
+         </div>
+
         <div v-if="!readonly">
           <el-button type="primary" @click="handleSubmit">提交</el-button>
         </div>
@@ -107,6 +86,7 @@ import {getChannelList} from "@/api/ecw/channel"
 import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductAttrList } from '@/api/ecw/productAttr'
 import {openedRouterList} from "@/api/ecw/warehouse"
+import WorkFlow from "@/components/WorkFlow"

 export default {
  name: "specialDiscount",
@@ -119,7 +99,8 @@ export default {
    }
  },
  components: {
-    DictSelector
+    DictSelector,
+    WorkFlow
  },
  created() {
    // 临时
@@ -227,6 +208,7 @@ export default {
        freightVolume: this.form.freightVolume,
      }).then(r => {
        this.$message.success(r.msg || '提交成功')
+        this.$tab.closePage()
      })
    },
    getOrderSpecial(){
@@ -287,9 +269,4 @@ export default {
 </script>

 <style scoped lang="scss">
-::v-deep .input-with-select {
-  .el-input-group__prepend, .el-input-group__append {
-    background-color: #fff;
-  }
-}
 </style>
--- a/src/views/ecw/order/transferWarehousing.vue
+++ b/src/views/ecw/order/transferWarehousing.vue
@@ -67,25 +67,26 @@
    <el-descriptions style="margin-top: 20px" :column="4" border>
      <el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName  ?  warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
      <el-descriptions-item label="储位">
-         <div v-for="item in storageSpaceList"  style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div></div>
+         <div v-for="item in storageSpaceList"  style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div> <div>{{item.code}}</div></div>
      </el-descriptions-item>
      <el-descriptions-item v-if="type == 2" label="选择储位">
        <div @click="areaVisible = true" style="color: #0a84ff;cursor: pointer;">选择储位</div>
      </el-descriptions-item>
      <el-descriptions-item label="调拨目标仓">{{ warehouseDetails && warehouseDetails.warehouseInName ? warehouseDetails.warehouseInName : '' }}</el-descriptions-item>
      <el-descriptions-item label="物流公司">
-        <el-select v-model="params.logisticsCompany" >
+        <el-select :disabled="type == 2" v-model="params.logisticsCompany" >
          <el-option v-for="(item,index) in expressList " :key="index"  :value="item.id" :label="item.companyZh"></el-option>
        </el-select>
      </el-descriptions-item>
      <el-descriptions-item label="物流单号">
-        <el-input v-model="params.logisticsNo"></el-input>
+        <el-input :disabled="type == 2" v-model="params.logisticsNo"></el-input>
      </el-descriptions-item>
      <el-descriptions-item label="联系电话">
-        <el-input v-model="params.phone"></el-input>
+        <el-input :disabled="type == 2" v-model="params.phone"></el-input>
      </el-descriptions-item>
      <el-descriptions-item label="出仓日期" >
        <el-date-picker
+          :disabled="type == 2"
          value-format="yyyy-MM-dd HH:mm:ss"
          v-model="params.deliveryDate"
          type="date"
@@ -276,15 +277,27 @@ export default {
                if(item.wareId === itemm.id){
                  itemm.children.forEach(itemmm => {
                   if(itemmm.id === item.areaId){
-                     obj.push({
-                       warehouseName:itemm.name,
-                       regionName:itemmm.name
-                     })
+                     if(itemmm.positionList.length > 0){
+                       itemmm.positionList.forEach(ic =>{
+                         if(ic.children.length > 0){
+                           ic.children.forEach(icc => {
+                             if(icc.id === item.locationId){
+                               obj.push({
+                                 warehouseName:itemm.name,
+                                 regionName:itemmm.name,
+                                 code:icc.code
+                               })
+                             }
+                           })
+                         }
+                       })
+                     }
                   }
                  })
                }
              })
            })
+            console.log(obj)
            this.storageSpaceList = obj;
          })
        }
@@ -366,6 +379,42 @@ export default {
      });
    },
  },
+  watch:{
+    'params.orderLocationCreateReqVOList'(val){
+      console.log(val,'123')
+      getByWarehouseId().then(r =>{
+        console.log(r,'仓库')
+        let obj = [];
+        val.forEach(item => {
+          r.data.forEach(itemm => {
+            if(item.wareId === itemm.id){
+              itemm.children.forEach(itemmm => {
+                if(itemmm.id === item.areaId){
+                  if(itemmm.positionList.length > 0){
+                    itemmm.positionList.forEach(ic =>{
+                    if(ic.children.length > 0){
+                      ic.children.forEach(icc => {
+                        if(icc.id === item.locationId){
+                          obj.push({
+                            warehouseName:itemm.name,
+                            regionName:itemmm.name,
+                            code:icc.code
+                          })
+                        }
+                      })
+                    }
+                    })
+                  }
+                }
+              })
+            }
+          })
+        })
+        console.log(obj,'obj')
+        this.storageSpaceList = obj;
+      })
+    }
+  }
 }
 </script>


--- a/src/views/ecw/productPrice/edit.vue
+++ b/src/views/ecw/productPrice/edit.vue
@@ -82,49 +82,49 @@
              </template>
            </div>
            <el-form-item :label="$t(`第{index}阶梯`, {index: index + 1})">
-              <el-input v-model="item.startNum" type="number" placeholder="" class="w100"></el-input>
+              <el-input v-model="item.startNum" type="number" placeholder="" class="w-100"></el-input>
              -
-              <el-input v-model="item.endNum" type="number" placeholder="" class="w100"></el-input>
+              <el-input v-model="item.endNum" type="number" placeholder="" class="w-100"></el-input>
              /
-              <selector v-model="form.weightUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable  class="w100" />
+              <selector v-model="form.weightUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
            </el-form-item>
            <el-form-item :label="$t('默认运费')" v-if="form.priceType != 1">
-              <inputor default="0" v-model.number="item.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
-              <selector v-model="item.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable  class="w100" />
-              / <selector v-model="item.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable  class="w100" />
+              <inputor default="0" v-model.number="item.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
+              <selector v-model="item.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
+              / <selector v-model="item.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
            </el-form-item>
            <el-form-item :label="$t('默认清关费')" v-if="form.priceType != 1">
-              <inputor default="0" v-model.number="item.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
-              <selector v-model="item.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable  class="w100" />
-              / <selector v-model="item.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable  class="w100" />
+              <inputor default="0" v-model.number="item.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
+              <selector v-model="item.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
+              / <selector v-model="item.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
            </el-form-item>

            <el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
-              <inputor default="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
-              <selector v-model="item.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable  class="w100" />
-              / <selector v-model="item.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable  class="w100" />
+              <selector v-model="item.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
+              <inputor default="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
+              / <selector v-model="item.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable  class="w-100" />
            </el-form-item>
          </div>
        </template>

        <template v-else>
          <el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
+            <selector v-model="form.allPriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 mr-10" />
            <inputor default="0" v-model.number="form.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
-            <selector v-model="form.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable  class="w100" />
-            / <selector v-model="form.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable  class="w100" />
+            / <selector v-model="form.allVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable  class="w-100" />
          </el-form-item>
          <template v-else>
            <el-form-item :label="$t('默认运费')" prop="transportPrice">
-                <selector v-model="form.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
+                <selector v-model="form.transportPriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 mr-10" />
                <inputor default="0" v-model.number="form.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100  mr-10" />
                <span class="mr-10">/</span>
-                <selector v-model="form.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
+                <selector v-model="form.transportVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable class="w-100" />
            </el-form-item>
            <el-form-item :label="$t('默认清关费')" prop="clearancePrice">
-                <selector v-model="form.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
+                <selector v-model="form.clearancePriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 mr-10" />
                <inputor default="0" v-model.number="form.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
                <span class="mr-10">/</span>
-                <selector v-model="form.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
+                <selector v-model="form.clearanceVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable class="w-100" />
            </el-form-item>
          </template>
          
@@ -135,28 +135,28 @@
              v-for="(special, specialIndex) in this.specialProducts"
              :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('全包价')"
              :key="specialIndex + 'transport'">
-                  <selector v-model="special.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
+                  <selector v-model="special.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100 mr-10" />
                  <inputor default="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
                  <span class="mr-10">/</span>
-                  <selector v-model="special.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
+                  <selector v-model="special.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" />
            </el-form-item>
          </template>
          <template v-else v-for="(special, specialIndex) in this.specialProducts">
            <el-form-item
              :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('运费')"
              :key="specialIndex + 'transport'">
-              <selector v-model="special.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
+              <selector v-model="special.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100 mr-10" />
              <inputor default="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
              <span class="mr-10">/</span>
-              <selector v-model="special.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
+              <selector v-model="special.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" />
            </el-form-item>
            <el-form-item
              :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')"
              :key="specialIndex + 'clearance'">
-              <selector v-model="special.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
+              <selector v-model="special.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100 mr-10" />
              <inputor default="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
              <span class="mr-10">/</span>
-              <selector v-model="special.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
+              <selector v-model="special.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" />
            </el-form-item>
          </template>
        </template>

--- a/src/views/ecw/productPrice/index.vue
+++ b/src/views/ecw/productPrice/index.vue
@@ -48,7 +48,10 @@
        </el-select>
      </el-form-item>  
      
-      <el-form-item :label="$t('状态')" prop="destCityId" v-if="!$route.query.product_id">
+      <el-form-item :label="$t('审核状态')" prop="auditStatus">
+          <dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" />
+      </el-form-item>
+      <el-form-item :label="$t('状态')" prop="status">
        // TODO
      </el-form-item>
  

--- a/src/views/ecw/supplier/index.vue
+++ b/src/views/ecw/supplier/index.vue
@@ -44,7 +44,7 @@
            <el-option v-for="dict in this.getDictDatas('company_type')"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
        </el-select-->
-        <dict-selector :type="DICT_TYPE.COMPANY_TYPE" v-model="queryParams.companyType" />
+        <dict-selector :type="DICT_TYPE.ECW_COMPANY_TYPE" v-model="queryParams.companyType" />
      </el-form-item>
      <el-form-item :label="$t('合作类型')" prop="cooperationType">
        <dict-selector :type="DICT_TYPE.ECW_COOPERATION_TYPE" v-model="queryParams.cooperationType" />