Merge remote-tracking branch 'origin/dev' into dev

public/static/plugins/ueditor/ueditor.config.js

@@ -42,7 +42,8 @@
             'directionalityltr', 'directionalityrtl', 'indent', '|',
             'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
             'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
-            'simpleupload'
+            // 'simpleupload', 
+            'insertimage'
             // , 'insertimage', 'emotion', 'scrawl', 'insertvideo', 'music', 'attachment', 'map', 'gmap', 'insertframe', 'insertcode', 'webapp', 'pagebreak', 'template', 'background', '|',
             // 'horizontal', 'date', 'time', 'spechars', 'snapscreen', 'wordimage', '|',
             // 'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',

src/api/ecw/busiPwd.js

@@ -52,3 +52,12 @@ export function exportBusiPwdExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 验证业务密码
+export function validatePwd(data){
+  return request({
+    url: '/ecw/busi-pwd/validate-pwd',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file

src/components/Breadcrumb/index.vue

@@ -2,8 +2,8 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ $l(item.meta,'title') }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ $l(item.meta,'title') }}</a>
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>

src/components/TableForm/components/dd-select.vue

-<template>
-	<div class="xselect">
-        <el-select v-model="valueSync">
-            <el-option v-for="(item, index) in options" :key="index" :label="item.label" :value="item.value"></el-option>
-        </el-select>
-	</div>
-</template>
-
-<script>
-	export default {
-        props:{
-            value:{
-            	type: String,
-            },
-            options:{
-                type: Array,
-                default(){
-                    return []
-                }
-            }
-        },
-		watch: {
-		    valueSync(newValue) {
-		        this.$emit('input', newValue)
-		    }
-		},
-        data(){
-            return {
-                valueSync: []
-            }
-        },
-        created() {
-            this.$set(this, 'valueSync', this.value)
-        },
-		methods: {
-
-		}
-	}
-</script>

src/components/TableForm/components/index.js

-let modules = {}
-const files = require.context('', false, /\.vue$/);
-files.keys().forEach((filename) => {
-	modules[filename.slice(2, -4)] = files(filename).default || files(filename)
-});
-export default modules
\ No newline at end of file

src/components/TableForm/index.vue

-<template>
-    <el-card shadow="never">
-        <div slot="header" class="clearfix card-header">
-            <div class="card-title">{{title}}</div>
-            <el-button size="mini" type="primary" icon="el-icon-plus" @click="listData.push({})"></el-button>
-        </div>
-        <el-table :data="listData" border>
-            <el-table-column :label="$t('序号')" width="90px">
-                <template slot-scope="scope">
-                    {{scope.$index + 1}}
-                </template>
-            </el-table-column>
-            <template v-for="col in fields">
-            <el-table-column :label="col.label" :key="col.field">
-                <template slot-scope="{row}">
-                    <component :is="col.tag || 'el-input'" v-model="row[col.field]" v-bind="col.attrs" />
-                </template>
-            </el-table-column>
-            </template>
-            <!-- <el-table-column label="职位">
-                <template slot-scope="{row}">
-                    <el-input v-model="row.job" />
-                </template>
-            </el-table-column> -->
-            <el-table-column :label="$t('操作')">
-                <template slot-scope="scope">
-                    <el-button type="danger" size="mini" icon="el-icon-delete" @click="del(scope.$index)"></el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-    </el-card>
-</template>
-<script>
-/*
-fields:
-[
-    {
-        field: 'name',
-        label: '字段名'
-        tag: 'el-input',
-        attr: {}
-    }
-]
-*/
-import FormComponents from './components/index.js'
-export default {
-    components: {...FormComponents},
-    props:{
-        title: String,
-        fields: Array,
-        value: Array
-    },
-    data(){
-        return {
-            listData: []
-        }
-    },
-    watch:{
-        listData(val){
-            console.log('数据更新')
-            this.$emit('input', val)
-        },
-        value(){
-            this.listData = this.value
-        }
-    },
-    methods:{
-        del(index){
-            this.$confirm(this.$t('确定删除此行？'))
-                .then(res => {
-                    this.listData.splice(index, 1)
-                })
-        }
-    }
-}
-</script>
-<style scoped lang="scss">
-.card-header{
-    display: flex;
-    .card-title{
-        flex: 1;
-        display: flex;
-        align-items: center;
-        font-size: 16px;
-    }
-}
-</style>
\ No newline at end of file

src/components/Ueditor/index.vue

@@ -54,5 +54,7 @@
 </script>
 
 <style>
-
+#edui_fixedlayer{
+    z-index: 10005 !important;
+}
 </style>

src/i18n/index.js

@@ -12,7 +12,7 @@ const i18n = new VueI18n({
     }
 })
 console.log({i18n})
-Vue.prototype.$l = (object, field) => {
+Vue.prototype.$l = (object, field = '') => {
     let prefix = i18n.locale.split('_')[0]
     let append = prefix.charAt(0).toUpperCase() + prefix.toLowerCase().substr(1)
     // 如果object是null则返回字段名

src/layout/components/TagsView/index.vue

@@ -13,7 +13,7 @@
         @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
         @contextmenu.prevent.native="openMenu(tag,$event)"
       >
-        {{ tag.title }}
+        {{ $l(tag.meta, 'title') }}
         <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
@@ -56,6 +56,7 @@ export default {
   },
   watch: {
     $route() {
+      console.log(this.$route, this.$route.redirectedFrom)
       this.addTags()
       this.moveToCurrentTag()
     },

src/main.js

@@ -25,7 +25,7 @@ import DictSelector from '@/components/DictSelector'
 // import 'highlight.js/styles/github-gist.css'
 import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "@/utils/dict";
 import i18n from './i18n'
-console.log({i18n})
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
@@ -66,7 +66,6 @@ Vue.component('DictTag', DictTag)
 Vue.component('DocAlert', DocAlert)
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
-// Vue.component('TableForm', TableForm)
 Vue.component('DictSelector', DictSelector)
 // 字典标签组件
 import DictTag from '@/components/DictTag'
@@ -109,6 +108,11 @@ import '@/styles/index.scss'
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size
 })
+Vue.prototype.$redirect = (path) =>{
+   let currentView = router.history.current
+   router.replace(path)
+   store.dispatch("tagsView/delView", currentView)
+}
 
 Vue.config.productionTip = false
 

src/store/modules/tagsView.js

@@ -176,7 +176,6 @@ const actions = {
     })
   },
   delCurrentView({ dispatch }){
-    // console.log('delCurrentView', router.history.current)
     const view = router.history.current
     return dispatch('delView', view).then(({visitedViews}) => {
       const latestView = visitedViews.slice(-1)[0]

src/utils/dict.js

@@ -109,6 +109,7 @@ export const DICT_TYPE = {
   ECW_PRICE_TYPE: 'price_type',
   ECW_RELEASE_STATUS: 'release_status', // 放货状态
   ECW_PICK_RECURRENT_NUCLEAR_TYPE: 'PICK_RECURRENT_NUCLEAR_TYPE', // 放货反复核类型
+  ECW_COST_FEE_TYPE: 'cost_fee_type', // 清单费用类型
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/offer/edit.vue

@@ -224,16 +224,16 @@
                     <template v-if="row.fee && row.fee.charging == 1">
                         <template v-if="!row.fee.freight">{{$t('未报价')}}</template>
                         <template v-else>
-                            {{$t('全包价')}}：{{row.fee.freight}} {{currentcyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
+                            {{$t('全包价')}}：{{row.fee.freight}} {{currencyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
                         </template>
                     </template>
                     <template v-else-if="!row.fee || !row.fee.freight && !row.fee.clearanceFee">{{$t('未报价')}}</template>
                     <template v-else-if="row.fee">
                         <div>
-                            {{$t('运费')}}：{{row.fee.freight}} {{currentcyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
+                            {{$t('运费')}}：{{row.fee.freight}} {{currencyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
                         </div>
                         <div>
-                            {{$t('清关费')}}：{{row.fee.oneClearanceFee}} {{currentcyMap[row.fee.clearanceFeeCurrency]}} / {{unitMap[row.fee.clearanceFeeVolume]}}
+                            {{$t('清关费')}}：{{row.fee.oneClearanceFee}} {{currencyMap[row.fee.clearanceFeeCurrency]}} / {{unitMap[row.fee.clearanceFeeVolume]}}
                         </div>
                     </template>
                 </template>
@@ -295,13 +295,13 @@
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('总运费')">
                     <template v-for="item in clearanceFeeList">
-                        <div :key="item.currencyId">{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</div>
+                        <div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div>
                     </template>
                 </el-descriptions-item>
                 <!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
                 <el-descriptions-item :label="$t('总清关费')">
                     <template v-for="item in freightFeeList">
-                        <div :key="item.currencyId">{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</div>
+                        <div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div>
                     </template>
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('其他费用')">
@@ -310,7 +310,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('原价')" :span="2">
                     <template v-for="item in originalFeeList">
-                        <div :key="item.currencyId">{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</div>
+                        <div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div>
                     </template>
                 </el-descriptions-item>
             </el-descriptions>
@@ -337,7 +337,7 @@
                 <el-table-column label="">
                     <template slot-scope="{row}">
                         -{{row.reduceAmount}} 
-                        {{currentcyMap[row.reduceCurrencyId]}}
+                        {{currencyMap[row.reduceCurrencyId]}}
                     </template>
                 </el-table-column>
                 <el-table-column label="">
@@ -350,12 +350,12 @@
             <el-descriptions :column="1" class="mt-20">
                 <el-descriptions-item :label="$t('优惠费用')"  v-if="couponTotalAmountList && couponTotalAmountList.length">
                     <div v-for="(item, discountIndex) in couponTotalAmountList" :key="discountIndex">
-                        {{item.totalAmount}} {{currentcyMap[item.currencyId]}}
+                        {{item.totalAmount}} {{currencyMap[item.currencyId]}}
                     </div>
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('预计费用')">
                     <template v-for="item in estimatedCosts">
-                        <div :key="item.currencyId">{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</div>
+                        <div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div>
                     </template>
                 </el-descriptions-item>
             </el-descriptions>
@@ -529,6 +529,7 @@ export default {
         endTime:        [{ required: true, message: "有效期结束时间不能为空"}],
         transportId:    [{ required: true, message: "选择运输方式"}],
         channelId:      [{ required: true, message: "选择出货渠道"}],
+        stopTime:       [{ required: true, message: "不能为空"}]
         /*sendstatus: [{ required: true, message: "站内信状态，0未发送，1已发送不能为空", trigger: "blur" }], */
       },
       labelStyle: 'width:120px',
@@ -576,17 +577,17 @@ export default {
         if(!this.form.lineId)return null
         return this.routerList.find(item => item.id == this.form.lineId)
     },
-    currentcyMap(){
+    currencyMap(){
         let map = {}
         this.currencyList.forEach(item => {
-            map[item.id] = item.titleZh
+            map[item.id] = this.$l(item, 'title')
         })
         return map
     },
     unitMap(){
         let map = {}
         this.unitList.forEach(item => {
-            map[item.id] = item.titleZh
+            map[item.id] = this.$l(item, 'title')
         })
         return map
     },
@@ -669,9 +670,6 @@ export default {
         if(!this.selectedRouter || !this.selectedRouter.otherService) return []
         return this.selectedRouter.otherService.split(',')
     }
-    /* productKeyd(){
-        return arrryToKeyedObjectBy(this.productList, 'prodId')
-    } */
   },
   watch:{
     // 始发地
@@ -745,14 +743,6 @@ export default {
                 this.contactChooseType = 'consignor'
                 this.onContactChoose(data.list.find(item => item.customerContactsId == res.data.consignorId))
             })
-            /* res.data.transportRespVOList.forEach(item => {
-                let transport = this.transportList.find(t => t.transportId ==  item.transportId)
-                console.log(item.transportId, transport)
-                Object.assign(transport, item, {_enabled: true})
-            }) */
-            /* this.$nextTick(() => {
-                this.updateEnabledTransports()
-            }) */
         })
     }//else this.addProduct()
   },
@@ -773,12 +763,6 @@ export default {
         this.contactChooseType = null
         this.quickCreateType = null
     },
-    /* onProductChange(row, product){
-        row.goodsType = product.typeId;
-        // 保存商品id和品名，用于优惠信息显示
-        this.$set(this.productNames, product.id, product.titleZh)
-        this.calculationPrice()
-    }, */
     onProductChange(row, product){
         console.log(product)
         // row.goodsType = product ? product.typeId : null
@@ -888,7 +872,7 @@ export default {
         // 添加的提交
         createOffer(data).then(response => {
           this.$modal.msgSuccess(this.$t("新增成功"));
-          this.$router.replace('index')
+          this.$redirect('index')
         });
       });
     },

src/views/ecw/offer/index.vue

@@ -47,63 +47,49 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式')" align="left">
-        <template slot-scope="scope" v-if="scope.row.transportIds" >
-          <span v-for="(item, index) in scope.row.transportIds.split(',')" :key="index">
-            <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item" />
-          </span>
+        <template slot-scope="scope" >
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('业务员')" align="left">
-        <template slot-scope="scope">
-          暂无
-        </template>
+      <el-table-column :label="$t('业务员')" align="left" prop="creatorName">
       </el-table-column>
 
-      <el-table-column :label="$t('预计销售额')" align="center" prop="estCost">
+      <el-table-column :label="$t('预计销售额')" align="left" prop="estCost">
         <template slot-scope="{row}">
-          <div class="" v-if="row.estCostVO.clearanceNGN || row.estCostVO.clearanceRMB || row.estCostVO.clearanceUSD">
-            {{$t('清关费')}}：
-            <span v-if="row.estCostVO.clearanceNGN">{{row.estCostVO.clearanceNGN}}N</span>
-            <span v-if="row.estCostVO.clearanceRMB">{{row.estCostVO.clearanceRMB}}￥</span>
-            <span v-if="row.estCostVO.clearanceUSD">{{row.estCostVO.clearanceUSD}}$</span>
+          <div class="" v-for="item in row.estCostVO.feeDtoList" :key="item.feeType">
+            <dict-tag :type="DICT_TYPE.ECW_COST_FEE_TYPE" :value="item.feeType" />
+            {{item.amount}} {{currencyMap[item.currencyId]}}
           </div>
-          <div class="" v-if="row.estCostVO.seaNGN || row.estCostVO.seaRMB || row.estCostVO.seaUSD">
-            {{$t('运费')}}：
-            <span v-if="row.estCostVO.seaNGN">{{row.estCostVO.seaNGN}}N</span>
-            <span v-if="row.estCostVO.seaRMB">{{row.estCostVO.seaRMB}}￥</span>
-            <span v-if="row.estCostVO.seaUSD">{{row.estCostVO.seaUSD}}$</span>
-          </div>
-
         </template>
       </el-table-column>
 
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <template v-if="[1,2].indexOf(scope.row.status) > -1">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
+          <el-button size="mini" type="text" @click="$router.push('detail?offerId=' + scope.row.offerId)"
                     v-hasPermi="['ecw:offer:update']">{{$t('详情')}}</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('edit?id=' + scope.row.offerId)"
+            <el-button size="mini" type="text" @click="$router.push('edit?id=' + scope.row.offerId)"
                       v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('logList?offerId=' + scope.row.offerId)"
+            <el-button size="mini" type="text" @click="$router.push('logList?offerId=' + scope.row.offerId)"
                       v-hasPermi="['ecw:offer:update']">{{$t('跟进')}}</el-button>
           </template>
           <template v-if="scope.row.status == 2">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
+            <el-button size="mini" type="text" @click="$router.push('detail?offerId=' + scope.row.offerId)"
                       v-hasPermi="['ecw:offer:update']">{{$t('详情')}}</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)"
+            <el-button size="mini" type="text" @click="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)"
                       v-hasPermi="['ecw:offer:update']">{{$t('结果')}}</el-button>
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/offer/special/' + scope.row.offerId)"
+            <el-button size="mini" type="text" @click="$router.push('/offer/special/' + scope.row.offerId)"
                       v-hasPermi="['ecw:offer:update']">{{$t('特价')}}</el-button>
 
-            <el-button size="mini" type="text" icon="el-icon-edit"
+            <el-button size="mini" type="text" 
                       v-hasPermi="['ecw:offer:update']">{{$t('取消')}}</el-button>
 
-            <el-button size="mini" type="text" icon="el-icon-edit"
+            <el-button size="mini" type="text" 
                       v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-button>
           </template>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
+          <el-button size="mini" type="text" @click="$router.push('detail?offerId=' + scope.row.offerId)"
                     v-hasPermi="['ecw:offer:update']">{{$t('详情')}}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete"
+          <el-button size="mini" type="text"
                      v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-button>
         </template>
       </el-table-column>
@@ -116,7 +102,8 @@
 </template>
 
 <script>
-import { createOffer, updateOffer, deleteOffer, getOffer, getOfferPage, exportOfferExcel } from "@/api/ecw/offer";
+import { deleteOffer, getOfferPage, exportOfferExcel } from "@/api/ecw/offer";
+import { getCurrencyList } from '@/api/ecw/currency';
 
 export default {
   name: "Offer",
@@ -173,12 +160,24 @@ export default {
         estCost: null,
         sendstatus: null,
       },
-
+      currencyList: []
 
     };
   },
+  computed:{
+    currencyMap(){
+        let map = {}
+        this.currencyList.forEach(item => {
+            map[item.id] = this.$l(item, 'title')
+        })
+        return map
+    },
+  },
   created() {
     this.getList();
+    getCurrencyList().then(res => {
+      this.currencyList = res.data
+    })
   },
   methods: {
     /** 查询列表 */

src/views/ecw/order/edit.vue

@@ -934,7 +934,7 @@ export default {
         // 添加的提交
         createOrder(data).then(response => {
           this.$modal.msgSuccess(this.$t("新增成功"));
-          this.$router.replace('success?orderId=' + response.data)
+          this.$redirect('success?orderId=' + response.data)
         });
       });
     },

src/views/ecw/order/pending.vue

@@ -2,96 +2,95 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-card>
-        <div slot="header" class="card-title">查看</div>
+        <div slot="header" class="card-title">{{$t('查看')}}</div>
         <el-descriptions :column="4">
-            <el-descriptions-item label="唛头">
-                {{orderData.marks?orderData.marks:'无'}}
+            <el-descriptions-item :label="$t('唛头')">
+                {{orderData.marks?orderData.marks:$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="已到箱数/总箱数">
+            <el-descriptions-item :label="$t('已到箱数/总箱数')">
                 {{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
             </el-descriptions-item>
-            <el-descriptions-item label="订单状态">
+            <el-descriptions-item :label="$t('订单状态')">
               <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
             </el-descriptions-item>
-            <el-descriptions-item label="送货日期">
-               {{orderData.deliveryDate||'无'}}
-              <!-- <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?parseTime(orderData.orderItemVOList[0].warehouseInInfoVO.firstInTime):'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span> -->
+            <el-descriptions-item :label="$t('送货日期')">
+               {{orderData.deliveryDate||$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="运输方式">
+            <el-descriptions-item :label="$t('运输方式')">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
               </el-descriptions-item>
-            <el-descriptions-item label="始发地" :span="2">
-                 {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
+            <el-descriptions-item :label="$t('始发地')" :span="2">
+                 {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="目的地">
-               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
+            <el-descriptions-item :label="$t('目的地')">
+               {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
             </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="4">
-            <el-descriptions-item label="发货人">
-                {{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
+            <el-descriptions-item :label="$t('发货人')">
+                {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="发货公司">
-                {{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
+            <el-descriptions-item :label="$t('发货公司')">
+                {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="发货电话">
-                {{orderData.consignorVO?orderData.consignorVO.phone||'无':'无'}}
+            <el-descriptions-item :label="$t('发货电话')">
+                {{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions :column="4">
-            <el-descriptions-item label="收货人">
-                {{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}}
+            <el-descriptions-item :label="$t('收货人')">
+                {{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="收货公司">
-                {{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
+            <el-descriptions-item :label="$t('收货公司')">
+                {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="收货电话">
-                {{orderData.consigneeVO?orderData.consigneeVO.phone||'无':'无'}}
+            <el-descriptions-item :label="$t('收货电话')">
+                {{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
             </el-descriptions-item>
         </el-descriptions>
     </el-card>
     <el-card class="card">
       <!-- 列表 -->
-      <div slot="header" class="card-title">问题详情</div>
+      <div slot="header" class="card-title">{{$t('问题详情')}}</div>
       <el-table v-loading="loading" border :data="list">
-        <el-table-column label="序号" align="center" prop="id" type="index">
+        <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
           <template slot-scope="scope">
               <span>{{scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="异常类型" align="center" >
+        <el-table-column :label="$t('异常类型')" align="center" >
         <template slot-scope="scope">
             <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="scope.row.orderExceptionType" />
           </template>
         </el-table-column>
-        <el-table-column label="异常描述" align="center">
+        <el-table-column :label="$t('异常描述')" align="center">
             <template slot-scope="scope">
               <span>{{scope.row.orderExceptionDescVO.descZh}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="金额" align="center" scope="orderExceptionAmount" />
-       <el-table-column label="状态" align="center">
+        <el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount" />
+       <el-table-column :label="$t('状态')" align="center">
           <template slot-scope="scope">
               <dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />
             </template>
           </el-table-column>
-        <el-table-column label="附件" align="center">
+        <el-table-column :label="$t('附件')" align="center">
           <template slot-scope="scope">
             <div class="filelist">
-              <span v-for="(item,index) in scope.row.orderExceptionAttr" :key="index" @click="onClickOpenPreview(item,scope.$index)">{{item}}</span>
+              <span v-for="(item,index) in scope.row.orderExceptionAttr" :key="index" @click="onClickOpenPreview(item,scope.$index)">{{'附件'+(index+1)}}</span>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="处理人" align="center" prop="userName" />
-        <el-table-column label="处理时间" align="center">
+        <el-table-column :label="$t('处理人')" align="center" prop="userName" />
+        <el-table-column :label="$t('处理时间')" align="center">
           <template slot-scope="scope">
              <span>{{parseTime(scope.row.handlerTime)}}</span>
             </template>
           </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column :label="$t('操作')" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.orderExceptionStatus>0">已完成</el-tag>
-            <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">处理</el-button>
+            <el-tag v-if="scope.row.orderExceptionStatus>0">{{$t('已完成')}}</el-tag>
+            <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -141,6 +140,13 @@ export default {
       // 执行查询
       getExceptionListByOrderId(this.orderId).then(response => {
         this.list = response.data;
+        this.list.forEach((item)=>{
+          if(item.orderExceptionAttr){
+            item.orderExceptionAttr = item.orderExceptionAttr.split(',')
+          }else{
+            item.orderExceptionAttr = []
+          }
+        })
         this.loading = false;
       });
     },
@@ -189,10 +195,7 @@ export default {
         url: val,  // 预览地址
         downUrl:"", // 下载地址
       } // 目标对象
-      if(this.list[index].orderExceptionAttr.indexOf(',')==-1){
-        this.FilePreAll.push(this.TragetPic)
-      }else{
-        var fileArr = this.list[index].orderExceptionAttr.split(',')
+        var fileArr = this.list[index].orderExceptionAttr
         fileArr.forEach(item =>{ // 需要预览的文件数组（可以传空数组就是单张预览）
           let obj = {
             FileName: this.getFileName(item),
@@ -203,7 +206,6 @@ export default {
           }
           this.FilePreAll.push(obj)
         })
-      }
       this.IsPreview = true // 打开预览弹窗
       this.timers = new Date().getTime() // 刷新预览地址
     },
@@ -219,10 +221,9 @@ export default {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
+    flex-direction: column
   }
   .filelist span{
-    width: 48%;
-    margin-right: 2%;
     color: #1E98D7;
   }
   .card-title{

src/views/ecw/order/special/commission.vue

@@ -2,76 +2,76 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-card>
-        <div slot="header" class="card-title">修改佣金规则-{{form.orderNo||''}}</div>
+        <div slot="header" class="card-title">{{$t('修改佣金规则')}}-{{form.orderNo||''}}</div>
         <el-form :model="form" ref="queryForms" label-width="120px" class="card">
-          <el-form-item label="商品类型:">
+          <el-form-item :label="$t('商品类型:')">
              <span>{{getProductAttrNameById(form.prodType) }}</span>
            </el-form-item>
-           <el-form-item label="商品名称:">
+           <el-form-item :label="$t('商品名称:')">
              <span>{{ form.prodTitleZh }}</span>
            </el-form-item>
-           <el-form-item label="英文名称:">
+           <el-form-item :label="$t('英文名称:')">
              <span>{{ form.prodTitleEn }}</span>
            </el-form-item>
-           <el-form-item label="线路:">
+           <el-form-item :label="$t('线路:')">
              {{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${startTitleZh}】发往【${destTitleZh}】`}}
            </el-form-item>
-          <el-form-item label="运费:" >
+          <el-form-item :label="$t('运费:')" >
               <span>{{ form.subtotalFreight }} {{ currentMap[form.freightCurrency] }}</span>
           </el-form-item>
-          <el-form-item label="清关费:">
+          <el-form-item :label="$t('清关费:')">
               <span>{{ form.subtotalClearanceFreight }} {{ currentMap[form.clearanceFreightCurrency] }}</span>
           </el-form-item>
-          <el-form-item label="佣金类型:">
+          <el-form-item :label="$t('佣金类型:')">
                 <el-radio-group v-model="form.commissionType" >
                   <el-radio :label="dict.value" v-for="dict in getDictDatas('commission_type')">{{dict.label}}</el-radio>
                 </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.commissionType==3" label="暗佣佣金:">
+          <el-form-item v-if="form.commissionType==3" :label="$t('暗佣佣金:')">
             <el-input style="width: 100px;"  type="number" v-model="shadeCommissionAmount"  />
               <span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span>
               <span>/{{ volumeMap[form.freightVolume] }}</span>
           </el-form-item >
-            <el-form-item v-if="form.commissionType==1||form.commissionType==3" label="明佣佣金:">
+            <el-form-item v-if="form.commissionType==1||form.commissionType==3" :label="$t('明佣佣金:')">
                <el-input style="width: 100px;"  type="number" v-model="lightCommissionAmount"  />
               <span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span>
               <span>/{{ volumeMap[form.freightVolume] }}</span>
             </el-form-item >
-          <el-form-item v-if="form.commissionType!=0" label="商品:">
+          <el-form-item v-if="form.commissionType!=0" :label="$t('商品:')">
               <span>{{form.prodTitleZh }}</span>
-               <span style="margin-left: 10px;" v-if="form.commissionType==3">成本价：{{parseInt(form.freight)-parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
-              <span style="margin-left: 10px;">  销售价：{{form.commissionType!=2?(parseInt(form.freight)+parseInt(lightCommissionAmount)):form.freight}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
-              <span style="margin-left: 10px;color: #1E98D7;" v-if="form.commissionType==2" @click="$router.push(`/customer/customerCommission`)">去设置</span>
-              <span style="margin-left: 10px;" v-if="form.commissionType==3">实际佣金返点：{{parseInt(lightCommissionAmount)+parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
+               <span style="margin-left: 10px;" v-if="form.commissionType==3">{{$t('成本价')}}：{{parseInt(form.freight)-parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
+              <span style="margin-left: 10px;">  {{$t('销售价')}}：{{form.commissionType!=2?(parseInt(form.freight)+parseInt(lightCommissionAmount)):form.freight}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
+              <span style="margin-left: 10px;color: #1E98D7;" v-if="form.commissionType==2" @click="$router.push(`/customer/customerCommission`)">{{$t('去设置')}}</span>
+              <span style="margin-left: 10px;" v-if="form.commissionType==3">{{$t('实际佣金返点')}}：{{parseInt(lightCommissionAmount)+parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
           </el-form-item>
-          <el-form-item label="审核状态:">
+          <el-form-item :label="$t('审核状态:')">
               <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus"></dict-tag>
               <span>{{form.applyResult?('('+form.applyResult+')'):''}}</span>
           </el-form-item>
         </el-form>
     </el-card>
-    <div slot="header" class="card-title">审批流程</div>
+    <div slot="header" class="card-title">{{$t('审批流程')}}</div>
     <work-flow xmlkey="commission_config" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
     <div slot="footer" class="card footer_btn">
-        <el-button type="primary" v-if="form.applyStatus==0" @click="submitForm">提交</el-button>
-        <el-button plain type="primary" v-if="form.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
-        <el-button v-if="form.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+form.formId)">审核中</el-button>
-        <el-button v-if="form.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
-        <el-button v-if="form.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
+        <el-button type="primary" v-if="form.applyStatus==0" @click="submitForm">{{$t('提交')}}</el-button>
+        <el-button plain type="primary" v-if="form.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
+        <el-button v-if="form.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+form.formId)">{{$t('审核中')}}</el-button>
+        <el-button v-if="form.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
+        <el-button v-if="form.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
     </div>
     <el-dialog
-      title="提示"
+      :title="$t('提示')"
       :visible.sync="dialogVisible"
       width="30%">
-      <span class="cancel_notice">特价申请正在审核中，你确定取消特价申请吗？</span>
+      <span class="cancel_notice">{{$t('特价申请正在审核中，你确定取消特价申请吗？')}}</span>
       <div class="cancel_content">
-        <span>取消原因：</span>
-        <el-input v-model="reason" placeholder="请输入取消原因"></el-input>
+        <span>{{$t('取消原因')}}：</span>
+        <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="cancelSplit">确 定</el-button>
+        <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
+        <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -203,18 +203,18 @@ export default {
        }
        this.form.ccIds = this.selectedUsers.join(',')
       createOrderSpecial(this.form).then(r => {
-        this.$message.success(r.msg || '提交成功')
+        this.$message.success(r.msg || this.$t('提交成功'))
         this.$store.dispatch('tagsView/delCurrentView')
       })
     },
     cancelSplit(){
       let that = this
       if(!that.reason){
-        that.$message.error("请输入取消原因");
+        that.$message.error(this.$t("请输入取消原因"));
         return
       }
       cancelOrderSpecial(that.form.orderApprovalId,{reason:that.reason}).then(res=>{
-          that.$message.success("取消成功");
+          that.$message.success(this.$t("取消成功"));
           that.$store.dispatch('tagsView/delCurrentView')
         })
     },

src/views/ecw/order/special/light.vue

@@ -2,21 +2,21 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-card>
-        <div slot="header" class="card-title">申请泡货优惠-{{queryParams.orderNo||''}}</div>
+        <div slot="header" class="card-title">{{$t('申请泡货优惠')}}-{{queryParams.orderNo||''}}</div>
         <el-form :model="queryParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
           <el-row >
-              <el-form-item label="原泡货标准:" label-width="150px">
+              <el-form-item :label="$t('原泡货标准:')" label-width="150px">
                   <span>{{queryParams.orgVWeight}}kg/cbm</span>
               </el-form-item>
           </el-row>
           <el-row :span="8" >
-             <el-form-item label="* 现泡货申请标准:" size="medium" label-width="150px">
+             <el-form-item :label="$t('*现泡货申请标准:')" size="medium" label-width="150px">
                <el-input style="width: 100px;"  type="text" v-model="queryParams.vweight"  />
                 <span style="margin-left: 10px;">kg/cbm</span>
              </el-form-item>
           </el-row>
           <el-row :span="8">
-             <el-form-item label="备注:" size="medium" label-width="150px">
+             <el-form-item :label="$t('备注:')" size="medium" label-width="150px">
                <el-input style="width: 500px;"  type="textarea" v-model="queryParams.remarks"  />
              </el-form-item>
           </el-row>
@@ -24,25 +24,25 @@
     </el-card>
     <work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
     <div slot="footer" class="card footer_btn">
-        <el-button v-if="queryParams.applyStatus==0" type="primary" @click="submitForm">提交</el-button>
-        <el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
-       <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button>
-       <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
-       <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
+        <el-button v-if="queryParams.applyStatus==0" type="primary" @click="submitForm">{{$t('提交')}}</el-button>
+        <el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
+       <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
+       <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
+       <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
     </div>
     <el-dialog
-      title="提示"
+      :title="$t('提示')"
       :visible.sync="dialogVisible"
       width="30%">
-      <span class="cancel_notice">申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？</span>
+      <span class="cancel_notice">{{$t('申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？')}}</span>
       <div class="cancel_content">
-        <span>取消原因：</span>
-        <el-input v-model="reason" placeholder="请输入取消原因"></el-input>
+        <span>{{$t('取消原因')}}：</span>
+        <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="cancelSplit">确 定</el-button>
+        <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
+        <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -99,18 +99,18 @@ export default {
       this.queryParams.applyType = 5
       this.queryParams.ccIds = this.selectedUsers.join(',')
      createOrderSpecial(this.queryParams).then(r => {
-        this.$message.success(r.msg || '提交成功')
+        this.$message.success(r.msg || this.$t('提交成功'))
         this.$store.dispatch('tagsView/delCurrentView')
       })
     },
     cancelSplit(){
       let that = this
       if(!that.reason){
-        that.$message.error("请输入取消原因");
+        that.$message.error(this.$t("请输入取消原因"));
         return
       }
        cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
-          that.$message.success("取消成功");
+          that.$message.success(this.$t("取消成功"));
           that.$store.dispatch('tagsView/delCurrentView')
         })
     },

src/views/ecw/order/special/weight.vue

@@ -2,21 +2,21 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-card>
-        <div slot="header" class="card-title">申请重货优惠-{{queryParams.orderNo||''}}</div>
+        <div slot="header" class="card-title">{{$t('申请重货优惠')}}-{{queryParams.orderNo||''}}</div>
         <el-form :model="queryParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
           <el-row >
-              <el-form-item label="原重货标准:" label-width="150px">
+              <el-form-item :label="$t('原重货标准:')" label-width="150px">
                   <span>{{queryParams.orgWVolume}}kg/cbm</span>
               </el-form-item>
           </el-row>
           <el-row :span="8" >
-             <el-form-item label="* 现重货申请标准:" size="medium" label-width="150px">
+             <el-form-item :label="$t('*现重货申请标准:')" size="medium" label-width="150px">
                <el-input style="width: 100px;"  type="text" v-model="queryParams.wvolume"  />
                 <span style="margin-left: 10px;">kg/cbm</span>
              </el-form-item>
           </el-row>
           <el-row :span="8">
-             <el-form-item label="备注:" size="medium" label-width="150px">
+             <el-form-item :label="$t('备注:')" size="medium" label-width="150px">
                <el-input style="width: 500px;"  type="textarea" v-model="queryParams.remarks"  />
              </el-form-item>
           </el-row>
@@ -24,25 +24,25 @@
     </el-card>
     <work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
     <div slot="footer" class="card footer_btn">
-        <el-button type="primary" v-if="queryParams.applyStatus==0" @click="submitForm">提交</el-button>
-        <el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
-        <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button>
-        <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
-        <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
+        <el-button type="primary" v-if="queryParams.applyStatus==0" @click="submitForm">{{$t('提交')}}</el-button>
+        <el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
+        <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
+        <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
+        <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
     </div>
     <el-dialog
-      title="提示"
+      :title="$t('提示')"
       :visible.sync="dialogVisible"
       width="30%">
-      <span class="cancel_notice">申请重货优惠正在审核中，你确定取消申请重货优惠吗？</span>
+      <span class="cancel_notice">{{$t('申请重货优惠正在审核中，你确定取消申请重货优惠吗？')}}</span>
       <div class="cancel_content">
-        <span>取消原因：</span>
-        <el-input v-model="reason" placeholder="请输入取消原因"></el-input>
+        <span>{{$t('取消原因')}}：</span>
+        <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="cancelSplit">确 定</el-button>
+        <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
+        <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -100,18 +100,18 @@ export default {
       this.queryParams.applyType = 4
        this.queryParams.ccIds = this.selectedUsers.join(',')
       createOrderSpecial(this.queryParams).then(r => {
-        this.$message.success(r.msg || '提交成功')
+        this.$message.success(r.msg || this.$t('提交成功'))
         this.$store.dispatch('tagsView/delCurrentView')
       })
     },
     cancelSplit(){
       let that = this
       if(!that.reason){
-        that.$message.error("请输入取消原因");
+        that.$message.error(this.$t("请输入取消原因"));
         return
       }
        cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
-          that.$message.success("取消成功");
+          that.$message.success(this.$t("取消成功"));
           that.$store.dispatch('tagsView/delCurrentView')
         })
     },

src/views/ecw/order/success.vue

@@ -22,9 +22,9 @@
           </el-col>
         </el-row>
         <div class="actions">
-            <el-button type="primary" @click="$router.replace('detail?orderId=' + order.orderId)">{{$t('查看订单')}}</el-button>
+            <el-button type="primary" @click="$redirect('detail?orderId=' + order.orderId)">{{$t('查看订单')}}</el-button>
             <el-button type="warning" @click="showNotice = true">{{$t('入仓须知')}}</el-button>
-            <el-button type="info" @click="$router.replace('create')">{{$t('再来一单')}}</el-button>
+            <el-button type="info" @click="$redirect('create')">{{$t('再来一单')}}</el-button>
         </div>
 
         <el-dialog :title="$t('查看须知')" :visible.sync="showNotice" width="700px">
@@ -60,31 +60,7 @@ export default {
                 .then(res => {
                     this.order = res.data
                 })
-        },
-        /* download(){
-            let el = document.getElementById('noticeImg')
-            this.downloadIamge(this.noticeUrl, 'ce')
-        },
-        downloadIamge(imgsrc, name) {
-            //下载图片地址和图片名
-            var image = new Image()
-            // 解决跨域 Canvas 污染问题
-            image.setAttribute('crossOrigin', 'anonymous')
-            image.onload = function () {
-                var canvas = document.createElement('canvas')
-                canvas.width = image.width
-                canvas.height = image.height
-                var context = canvas.getContext('2d')
-                context.drawImage(image, 0, 0, image.width, image.height)
-                var base64 = canvas.toDataURL('image/png') //得到图片的base64编码数据
-                document.getElementById('noticeImg').setAttribute('src', base64)
-                window.base64 = base64
-                let blob = dataURLtoBlob(base64)
-                FileSaver.saveAs(blob, '入仓须知.png');
-            }
-            image.src = imgsrc
-
-        } */
+        }
     }
 }
 </script>

src/views/ecw/order/weightDeal.vue

@@ -2,106 +2,106 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-card>
-        <div slot="header" class="card-title">查看</div>
+        <div slot="header" class="card-title">{{$t('查看')}}</div>
         <el-descriptions :column="4">
-            <el-descriptions-item label="唛头">
-                {{orderData.marks?orderData.marks:'无'}}
+            <el-descriptions-item :label="$t('唛头')">
+                {{orderData.marks?orderData.marks:$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="已到箱数/总箱数">
+            <el-descriptions-item :label="$t('已到箱数/总箱数')">
                 {{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
             </el-descriptions-item>
-            <el-descriptions-item label="订单状态">
+            <el-descriptions-item :label="$t('订单状态')">
               <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
             </el-descriptions-item>
-            <el-descriptions-item label="送货日期">
-              <span>{{orderData.deliveryDate||'无'}}</span>
+            <el-descriptions-item :label="$t('送货日期')">
+              <span>{{orderData.deliveryDate||$t('无')}}</span>
             </el-descriptions-item>
-            <el-descriptions-item label="运输方式">
+            <el-descriptions-item :label="$t('运输方式')">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
               </el-descriptions-item>
-             <el-descriptions-item label="始发地" :span="2">
-                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
+             <el-descriptions-item :label="$t('始发地')" :span="2">
+                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
              </el-descriptions-item>
-             <el-descriptions-item label="目的地">
-                {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
+             <el-descriptions-item :label="$t('目的地')">
+                {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
              </el-descriptions-item>
         </el-descriptions>
         <el-descriptions :column="4">
-            <el-descriptions-item label="发货人">
-                {{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
+            <el-descriptions-item :label="$t('发货人')">
+                {{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="发货公司">
-                {{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
+            <el-descriptions-item :label="$t('发货公司')">
+                {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="发货电话">
-                {{orderData.consignorVO?orderData.consignorVO.phone||'无':'无'}}
+            <el-descriptions-item :label="$t('发货电话')">
+                {{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions :column="4">
-            <el-descriptions-item label="收货人">
-                {{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}}
+            <el-descriptions-item :label="$t('收货人')">
+                {{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="收货公司">
-                {{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
+            <el-descriptions-item :label="$t('收货公司')">
+                {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
             </el-descriptions-item>
-            <el-descriptions-item label="收货电话">
-                {{orderData.consigneeVO?orderData.consigneeVO.phone||'无':'无'}}
+            <el-descriptions-item :label="$t('收货电话')">
+                {{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
             </el-descriptions-item>
         </el-descriptions>
     </el-card>
     <el-card class="card">
       <!-- 列表 -->
-      <div slot="header" class="card-title">货物信息</div>
+      <div slot="header" class="card-title">{{$t('货物信息')}}</div>
       <el-table v-loading="loading" border :data="orderData.orderItemVOList" :summary-method="getSummaries" show-summary>
-        <el-table-column label="序号" align="center" prop="id" type="index">
+        <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
           <template slot-scope="scope">
               <span>{{scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="品名" align="center" >
+        <el-table-column :label="$t('品名')" align="center" >
           <template slot-scope="scope">
             <p>{{scope.row.prodTitleEn||''}}</p>
             <p>{{scope.row.prodTitleZh||''}}</p>
           </template>
           </el-table-column>
-          <el-table-column label="填单货物信息">
+          <el-table-column :label="$t('填单货物信息')">
             <template slot-scope="scope">
-              <p>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></p>
-              <p>箱数：{{scope.row.num||0}}</p>
-              <p>体积：{{scope.row.volume||0}}CBM</p>
-              <p>重量：{{scope.row.weight||0}}KG</p>
+              <p>{{$t('品牌')}}：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></p>
+              <p>{{$t('箱数')}}：{{scope.row.num||0}}</p>
+              <p>{{$t('体积')}}：{{scope.row.volume||0}}CBM</p>
+              <p>{{$t('重量')}}：{{scope.row.weight||0}}KG</p>
             </template>
             </el-table-column>
-            <el-table-column label="入库货物属性" align="center" >
+            <el-table-column :label="$t('入库货物属性')" align="center" >
               <template slot-scope="scope">
-                 <span>规格：{{scope.row.boxGauge||0}}</span>
+                 <span>{{$t('品牌')}}：{{scope.row.boxGauge||0}}</span>
                  <p>
                   <span>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
-                  <span>箱数：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
-                  <span>体积：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
-                  <span>重量：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
+                  <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
+                  <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
+                  <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
                 </p>
               </template>
          </el-table-column>
-        <el-table-column label="重货方数" align="center" v-if="type=='order_heavy_cargo_exception'">
+        <el-table-column :label="$t('重货方数')" align="center" v-if="type=='order_heavy_cargo_exception'">
           <template slot-scope="scope">
             <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.heavyNumber||0):0}}CBM</span>
           </template>
         </el-table-column>
-        <el-table-column label="泡货方数" align="center" v-else >
+        <el-table-column :label="$t('泡货方数')" align="center" v-else >
           <template slot-scope="scope">
             <span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.lightNumber||0):0}}CBM</span>
           </template>
         </el-table-column>
-        <el-table-column label="最后操作时间" scope="handlerTime" />
+        <el-table-column :label="$t('最后操作时间')" scope="handlerTime" />
 
       </el-table>
 
     </el-card>
       <div slot="footer" class="dialog-footer">
         <div>
-          <el-button  type="primary" @click="submit('general_cargo')">设为普货</el-button>
-          <el-button plain type="primary" @click="submit('process')">设为已处理</el-button>
+          <el-button  type="primary" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
+          <el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
         </div>
       </div>
   </div>
@@ -157,7 +157,7 @@ export default {
       if(!this.orderData || !this.orderData.list ||ths.orderData.length==0){
         return sums
       }
-      sums[0] = '小计'
+      sums[0] = this.$t('小计')
       var orderSum = 0
       var orderV = 0
       var orderW = 0
@@ -173,15 +173,15 @@ export default {
           leviteW += column.weight
       });
       sums[1] = ''
-      sums[2] = '下单统计：'+ orderSum+' 箱 '+ orderV +' m³ ' + orderW + ' kg'
-      sums[3] = '入仓统计：'+ leviteSum+' 箱 '+ leviteV +' m³ ' + leviteW + ' kg'
+      sums[2] = this.$t('下单统计：')+ orderSum+this.$t(' 箱 ')+ orderV +' m³ ' + orderW + ' kg'
+      sums[3] = this.$t('入仓统计：')+ leviteSum+this.$t(' 箱 ')+ leviteV +' m³ ' + leviteW + ' kg'
       sums[4] = ''
       sums[5] = ''
       return sums;
     },
     submit(result){
       handlerExceptionByExceptionId({orderExceptionId:this.list.id,orderExceptionHandlerResult:result}).then(res=>{
-          this.$modal.msgSuccess("提交成功");
+          this.$modal.msgSuccess(this.$t("提交成功"));
           this.$router.back()
       })
     }

src/views/system/internalMessage/index.vue

@@ -3,9 +3,9 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="站内信来源" prop="fromId">
-        <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+<!--      <el-form-item label="站内信来源" prop="fromId">-->
+<!--        <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>-->
+<!--      </el-form-item>-->
       <el-form-item label="发送时间">
         <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -45,7 +45,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="站内信来源" align="center" prop="fromId" />
+<!--      <el-table-column label="站内信来源" align="center" prop="fromId" />-->
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime) }}</span>
@@ -79,9 +79,9 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="站内信来源ID" prop="fromId">
-          <el-input v-model="form.fromId" placeholder="请输入站内信来源" />
-        </el-form-item>
+<!--        <el-form-item label="站内信来源ID" prop="fromId">-->
+<!--          <el-input v-model="form.fromId" placeholder="请输入站内信来源" />-->
+<!--        </el-form-item>-->
         <el-form-item label="发送时间" prop="sendTime">
           <el-date-picker clearable v-model="form.sendTime" type="date" value-format="yyyy-MM-dd" placeholder="选择发送时间" />
         </el-form-item>