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

.env.dev

+# 开发环境配置
+NODE_ENV = 'production'
+
+# 页面标题
+VUE_APP_TITLE = 捷道管理系统
+
+# 捷道管理系统/开发环境
+VUE_APP_BASE_API = 'http://jd.admtest.jdshangmen.com'
+# VUE_APP_BASE_API = '/api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = false
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = true
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

README.md

-捷道项目管理后台-前端
\ No newline at end of file
+捷道项目管理后台-前端
+
+后台：
+本地运行：npm run dev
+测试环境：npm run build:dev
+生产环境：npm run build:prod
\ No newline at end of file

package.json

@@ -6,6 +6,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
+    "build:dev": "vue-cli-service build --mode dev",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "build:demo1024": "vue-cli-service build --mode demo1024",

src/components/QuickCreateCustomer/index.vue

@@ -16,7 +16,7 @@
           <el-option v-for="(item, index) in countryList"
                       :key="index" :label="item.nameShort + item.nameZh + '(' + item.tel + ')'" :value="item.tel" />
         </el-select>
-        <el-input v-model="form.customerContacts[0].phoneNew" placeholder="请输入联系方式" class="w-150 ml-10"/>
+        <el-input v-model="form.customerContacts[0].phoneNew" maxlength="11" placeholder="请输入联系方式" class="w-150 ml-10"/>
       </el-form-item>
 
       <el-form-item label="客户来源" prop="source">

src/i18n/index.js

@@ -11,8 +11,12 @@ const i18n = new VueI18n({
         'zh_CN': require('./languages/zh_CN.json')
     }
 })
+
+// 自动提取脚本只匹配$t,所以给个别名
+i18n.$t = i18n.t
+/* 
 window.i18n = i18n
-console.log({i18n})
+console.log({i18n}) */
 /*
 用法
 $l('title')         => titleZh

src/views/ecw/bannerPop/index.vue

@@ -99,14 +99,10 @@
           <el-input v-model="form.titleEn" placeholder="请输入英文标题" />
         </el-form-item>
         <el-form-item label="有效期" prop="validateStart">
-          <el-date-picker v-model="form.validateStart" @change="startChange"
-            type="date"
-            placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateStart" @change="startChange">
           </el-date-picker>
           ~
-          <el-date-picker v-model="form.validateEnd"
-            type="date"
-            placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateEnd">
           </el-date-picker>
           <span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
         </el-form-item>
@@ -223,7 +219,7 @@ export default {
     formatTime() {
       return millisecond => {
         if(millisecond) {
-          return new Date(millisecond).format('yyyy-MM-dd');
+          return new Date(millisecond).format('yyyy-MM-dd hh:mm:ss');
         }
         return '';
       }
@@ -317,6 +313,9 @@ export default {
       const id = row.id;
       getBannerPop(id).then(response => {
         this.form = response.data;
+		this.form.validateStart = this.parseTime(response.data.validateStart);
+		this.form.validateEnd = this.parseTime(response.data.validateEnd);
+		console.log(this.form);
         this.open = true;
         this.title = "修改广告弹窗";
       });

src/views/ecw/box/shippingSea/shippingSea.vue

@@ -46,7 +46,7 @@ import { listUser } from "@/api/system/user";
 
 // 这里引入的数据切换语言后要刷新才生效，优化办法是label同时配备labelEn字段，然后再页面上用$l函数调用
 import { getSeaStatus, getStatusName, seaBaseData } from "./utils";
-
+console.log(seaBaseData())
 /**
  * 海运操作主页面
  */

src/views/ecw/box/shippingSea/utils.js

@@ -4,8 +4,6 @@ import FileSaver from "file-saver";
 import Decimal from "decimal.js";
 import i18n from "@/i18n";
 
-// 自动提取脚本只匹配$t,所以需要重新给个名字
-const $t = (args) => i18n.t(...args)
 /**
  * 节点状态值
  *
@@ -14,67 +12,67 @@ const $t = (args) => i18n.t(...args)
 function getStatusName(statu) {
   const statusName = new Map();
 
-  statusName.set(11, $t("未订舱"));
-  statusName.set(12, $t("已订舱"));
+  statusName.set(11, i18n.$t("未订舱"));
+  statusName.set(12, i18n.$t("已订舱"));
 
-  statusName.set(21, $t("未预装"));
-  statusName.set(22, $t("预装中"));
-  statusName.set(23, $t("预装审核中"));
-  statusName.set(24, $t("预装审核失败"));
-  statusName.set(25, $t("预装审核成功"));
+  statusName.set(21, i18n.$t("未预装"));
+  statusName.set(22, i18n.$t("预装中"));
+  statusName.set(23, i18n.$t("预装审核中"));
+  statusName.set(24, i18n.$t("预装审核失败"));
+  statusName.set(25, i18n.$t("预装审核成功"));
 
-  statusName.set(2111, $t("未理货"));
-  statusName.set(2112, $t("已理货"));
+  statusName.set(2111, i18n.$t("未理货"));
+  statusName.set(2112, i18n.$t("已理货"));
 
-  statusName.set(31, $t("未派车"));
-  statusName.set(32, $t("已派车"));
+  statusName.set(31, i18n.$t("未派车"));
+  statusName.set(32, i18n.$t("已派车"));
 
-  statusName.set(41, $t("未装柜"));
-  statusName.set(42, $t("装柜中"));
-  statusName.set(43, $t("已装柜、待封柜"));
-  statusName.set(44, $t("封柜审核中"));
-  statusName.set(45, $t("封柜审核失败"));
-  statusName.set(46, $t("封柜审核成功"));
-  statusName.set(47, $t("已封柜，待出仓"));
+  statusName.set(41, i18n.$t("未装柜"));
+  statusName.set(42, i18n.$t("装柜中"));
+  statusName.set(43, i18n.$t("已装柜、待封柜"));
+  statusName.set(44, i18n.$t("封柜审核中"));
+  statusName.set(45, i18n.$t("封柜审核失败"));
+  statusName.set(46, i18n.$t("封柜审核成功"));
+  statusName.set(47, i18n.$t("已封柜，待出仓"));
 
-  statusName.set(51, $t("未报关"));
-  statusName.set(52, $t("报关中"));
-  statusName.set(53, $t("已报关"));
+  statusName.set(51, i18n.$t("未报关"));
+  statusName.set(52, i18n.$t("报关中"));
+  statusName.set(53, i18n.$t("已报关"));
 
-  statusName.set(61, $t("未配船"));
-  statusName.set(62, $t("已配船"));
+  statusName.set(61, i18n.$t("未配船"));
+  statusName.set(62, i18n.$t("已配船"));
 
-  statusName.set(71, $t("未提单补料"));
-  statusName.set(72, $t("已提单补料"));
+  statusName.set(71, i18n.$t("未提单补料"));
+  statusName.set(72, i18n.$t("已提单补料"));
 
-  statusName.set(81, $t("未驳船"));
-  statusName.set(82, $t("已驳船"));
+  statusName.set(81, i18n.$t("未驳船"));
+  statusName.set(82, i18n.$t("已驳船"));
 
-  statusName.set(91, $t("未起运"));
-  statusName.set(92, $t("已起运"));
+  statusName.set(91, i18n.$t("未起运"));
+  statusName.set(92, i18n.$t("已起运"));
 
-  statusName.set(101, $t("未上传"));
-  statusName.set(102, $t("已上传"));
+  statusName.set(101, i18n.$t("未上传"));
+  statusName.set(102, i18n.$t("已上传"));
 
-  statusName.set(111, $t("未清关文件"));
-  statusName.set(112, $t("已清关文件"));
+  statusName.set(111, i18n.$t("未清关文件"));
+  statusName.set(112, i18n.$t("已清关文件"));
 
-  statusName.set(121, $t("未到港"));
-  statusName.set(122, $t("已到港"));
+  statusName.set(121, i18n.$t("未到港"));
+  statusName.set(122, i18n.$t("已到港"));
 
-  statusName.set(131, $t("未清关"));
-  statusName.set(132, $t("已清关"));
+  statusName.set(131, i18n.$t("未清关"));
+  statusName.set(132, i18n.$t("已清关"));
 
-  statusName.set(181, $t("未卸柜"));
-  statusName.set(182, $t("卸柜中"));
-  statusName.set(183, $t("卸柜审核中"));
-  statusName.set(184, $t("卸柜审核失败"));
-  statusName.set(185, $t("卸柜审核成功"));
-  statusName.set(186, $t("已卸柜"));
+  statusName.set(181, i18n.$t("未卸柜"));
+  statusName.set(182, i18n.$t("卸柜中"));
+  statusName.set(183, i18n.$t("卸柜审核中"));
+  statusName.set(184, i18n.$t("卸柜审核失败"));
+  statusName.set(185, i18n.$t("卸柜审核成功"));
+  statusName.set(186, i18n.$t("已卸柜"));
 
-  statusName.set(191, $t("未结算"));
-  statusName.set(192, $t("结算中"));
-  statusName.set(193, $t("已结算"));
+  statusName.set(191, i18n.$t("未结算"));
+  statusName.set(192, i18n.$t("结算中"));
+  statusName.set(193, i18n.$t("已结算"));
 
   return statusName.get(statu);
 }
@@ -88,7 +86,7 @@ function seaBaseData() {
   return [
     [
       {
-        title: $t("订舱"),
+        title: i18n.$t("订舱"),
         imgSrc: {
           start: require("@/assets/images/shipping/dc-start.png"),
           end: require("@/assets/images/shipping/dc-end.png"),
@@ -109,7 +107,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("排单"),
+        title: i18n.$t("排单"),
         imgSrc: {
           start: require("@/assets/images/shipping/yz-start.png"),
           wait: require("@/assets/images/shipping/yz-wait.png"),
@@ -142,7 +140,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("理货"),
+        title: i18n.$t("理货"),
         imgSrc: {
           start: require("@/assets/images/shipping/lh-start.png"),
           wait: require("@/assets/images/shipping/lh-wait.png"),
@@ -162,7 +160,7 @@ function seaBaseData() {
         },
       },
       {
-        title: $t("拖车"),
+        title: i18n.$t("拖车"),
         imgSrc: {
           start: require("@/assets/images/shipping/tc-start.png"),
           wait: require("@/assets/images/shipping/tc-wait.png"),
@@ -184,7 +182,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("装柜"),
+        title: i18n.$t("装柜"),
         imgSrc: {
           start: require("@/assets/images/shipping/zg-start.png"),
           wait: require("@/assets/images/shipping/zg-wait.png"),
@@ -206,7 +204,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("报关"),
+        title: i18n.$t("报关"),
         imgSrc: {
           start: require("@/assets/images/shipping/bg-start.png"),
           wait: require("@/assets/images/shipping/bg-wait.png"),
@@ -246,7 +244,7 @@ function seaBaseData() {
         },
       },
       {
-        title: $t("提单补料"),
+        title: i18n.$t("提单补料"),
         imgSrc: {
           start: require("@/assets/images/shipping/tdcl-start.png"),
           wait: require("@/assets/images/shipping/tdcl-wait.png"),
@@ -268,7 +266,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("驳船"),
+        title: i18n.$t("驳船"),
         imgSrc: {
           start: require("@/assets/images/shipping/bc-start.png"),
           wait: require("@/assets/images/shipping/bc-wait.png"),
@@ -290,7 +288,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("起运"),
+        title: i18n.$t("起运"),
         imgSrc: {
           start: require("@/assets/images/shipping/qy-start.png"),
           wait: require("@/assets/images/shipping/qy-wait.png"),
@@ -312,7 +310,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("提单Copy"),
+        title: i18n.$t("提单Copy"),
         imgSrc: {
           start: require("@/assets/images/shipping/tdcopy-start.png"),
           wait: require("@/assets/images/shipping/tdcopy-wait.png"),
@@ -338,7 +336,7 @@ function seaBaseData() {
           wait: require("@/assets/images/shipping/qg-wait.png"),
           end: require("@/assets/images/shipping/qg-end.png"),
         },
-        title: $t("清关文件"),
+        title: i18n.$t("清关文件"),
         dataKey: "11", // 字典数据键值
         /**
          * 清关文件状态：111、未清关文件；112、已清关文件
@@ -354,7 +352,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("到港"),
+        title: i18n.$t("到港"),
         imgSrc: {
           start: require("@/assets/images/shipping/dg-start.png"),
           wait: require("@/assets/images/shipping/dg-wait.png"),
@@ -376,7 +374,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("清关"),
+        title: i18n.$t("清关"),
         imgSrc: {
           start: require("@/assets/images/shipping/qg-start.png"),
           wait: require("@/assets/images/shipping/qg-wait.png"),
@@ -398,7 +396,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("卸柜"),
+        title: i18n.$t("卸柜"),
         imgSrc: {
           start: require("@/assets/images/shipping/xg-start.png"),
           wait: require("@/assets/images/shipping/xg-wait.png"),
@@ -420,7 +418,7 @@ function seaBaseData() {
     ],
     [
       {
-        title: $t("结算"),
+        title: i18n.$t("结算"),
         imgSrc: {
           start: require("@/assets/images/shipping/js-start.png"),
           wait: require("@/assets/images/shipping/js-wait.png"),
@@ -452,7 +450,7 @@ function seaAirBaseData() {
   return [
     [
       {
-        title: $t("订舱"),
+        title: i18n.$t("订舱"),
         imgSrc: {
           start: require("@/assets/images/shipping/dc-start.png"),
           end: require("@/assets/images/shipping/dc-end.png"),
@@ -473,7 +471,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("排单"),
+        title: i18n.$t("排单"),
         imgSrc: {
           start: require("@/assets/images/shipping/yz-start.png"),
           wait: require("@/assets/images/shipping/yz-wait.png"),
@@ -506,7 +504,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("理货"),
+        title: i18n.$t("理货"),
         imgSrc: {
           start: require("@/assets/images/shipping/lh-start.png"),
           wait: require("@/assets/images/shipping/lh-wait.png"),
@@ -526,7 +524,7 @@ function seaAirBaseData() {
         },
       },
       {
-        title: $t("拖车"),
+        title: i18n.$t("拖车"),
         imgSrc: {
           start: require("@/assets/images/shipping/tc-start.png"),
           wait: require("@/assets/images/shipping/tc-wait.png"),
@@ -548,7 +546,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("装柜"),
+        title: i18n.$t("装柜"),
         imgSrc: {
           start: require("@/assets/images/shipping/zg-start.png"),
           wait: require("@/assets/images/shipping/zg-wait.png"),
@@ -570,7 +568,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("报关"),
+        title: i18n.$t("报关"),
         imgSrc: {
           start: require("@/assets/images/shipping/bg-start.png"),
           wait: require("@/assets/images/shipping/bg-wait.png"),
@@ -590,7 +588,7 @@ function seaAirBaseData() {
         },
       },
       {
-        title: $t("配船"),
+        title: i18n.$t("配船"),
         imgSrc: {
           start: require("@/assets/images/shipping/pc-start.png"),
           wait: require("@/assets/images/shipping/pc-wait.png"),
@@ -610,7 +608,7 @@ function seaAirBaseData() {
         },
       },
       {
-        title: $t("提单补料"),
+        title: i18n.$t("提单补料"),
         imgSrc: {
           start: require("@/assets/images/shipping/tdcl-start.png"),
           wait: require("@/assets/images/shipping/tdcl-wait.png"),
@@ -632,7 +630,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("驳船"),
+        title: i18n.$t("驳船"),
         imgSrc: {
           start: require("@/assets/images/shipping/bc-start.png"),
           wait: require("@/assets/images/shipping/bc-wait.png"),
@@ -654,7 +652,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("起运"),
+        title: i18n.$t("起运"),
         imgSrc: {
           start: require("@/assets/images/shipping/qy-start.png"),
           wait: require("@/assets/images/shipping/qy-wait.png"),
@@ -676,7 +674,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("提单Copy"),
+        title: i18n.$t("提单Copy"),
         imgSrc: {
           start: require("@/assets/images/shipping/tdcopy-start.png"),
           wait: require("@/assets/images/shipping/tdcopy-wait.png"),
@@ -702,7 +700,7 @@ function seaAirBaseData() {
           wait: require("@/assets/images/shipping/qg-wait.png"),
           end: require("@/assets/images/shipping/qg-end.png"),
         },
-        title: $t("清关文件"),
+        title: i18n.$t("清关文件"),
         dataKey: "11", // 字典数据键值
         /**
          * 清关文件状态：111、未清关文件；112、已清关文件
@@ -718,7 +716,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("到港"),
+        title: i18n.$t("到港"),
         imgSrc: {
           start: require("@/assets/images/shipping/dg-start.png"),
           wait: require("@/assets/images/shipping/dg-wait.png"),
@@ -740,7 +738,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("清关"),
+        title: i18n.$t("清关"),
         imgSrc: {
           start: require("@/assets/images/shipping/qg-start.png"),
           wait: require("@/assets/images/shipping/qg-wait.png"),
@@ -762,7 +760,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("二程起飞"),
+        title: i18n.$t("二程起飞"),
         imgSrc: {
           start: require("@/assets/images/shipping/ecqf-start.png"),
           wait: require("@/assets/images/shipping/ecqf-wait.png"),
@@ -784,7 +782,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("二程到港"),
+        title: i18n.$t("二程到港"),
         imgSrc: {
           start: require("@/assets/images/shipping/ecdg-start.png"),
           wait: require("@/assets/images/shipping/ecdg-wait.png"),
@@ -806,7 +804,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("卸柜"),
+        title: i18n.$t("卸柜"),
         imgSrc: {
           start: require("@/assets/images/shipping/xg-start.png"),
           wait: require("@/assets/images/shipping/xg-wait.png"),
@@ -828,7 +826,7 @@ function seaAirBaseData() {
     ],
     [
       {
-        title: $t("结算"),
+        title: i18n.$t("结算"),
         imgSrc: {
           start: require("@/assets/images/shipping/js-start.png"),
           wait: require("@/assets/images/shipping/js-wait.png"),
@@ -864,254 +862,254 @@ function getColmnMapping() {
         key: "sono",
       },
       {
-        title: $t("船公司类型"),
+        title: i18n.$t("船公司类型"),
         key: "shipCompanyType",
         type: "supplier",
       },
       {
-        title: $t("驳船港"),
+        title: i18n.$t("驳船港"),
         key: "bargePortId",
         type: "dock",
       },
       {
-        title: $t("大船港"),
+        title: i18n.$t("大船港"),
         key: "bigPortId",
         type: "dock",
       },
       {
-        title: $t("目的港"),
+        title: i18n.$t("目的港"),
         key: "destPortId",
         type: "dock",
       },
       {
-        title: $t("订舱公司"),
+        title: i18n.$t("订舱公司"),
         key: "spaceCompanyId",
         type: "supplier",
       },
       {
-        title: $t("预计驳船时间"),
+        title: i18n.$t("预计驳船时间"),
         key: "bargeTime",
         type: "date",
       },
       {
-        title: $t("预计开船时间"),
+        title: i18n.$t("预计开船时间"),
         key: "sailTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     preInstallInfo: [
       {
-        title: $t("预装时间"),
+        title: i18n.$t("预装时间"),
         key: "createTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     trailerInfo: [
       {
-        title: $t("货柜号"),
+        title: i18n.$t("货柜号"),
         key: "tlContainerNo",
       },
       {
-        title: $t("封条"),
+        title: i18n.$t("封条"),
         key: "tlStripSeal",
       },
       {
-        title: $t("拖车公司"),
+        title: i18n.$t("拖车公司"),
         key: "tlCompanyId",
         type: "supplier",
       },
       {
-        title: $t("拖车时间"),
+        title: i18n.$t("拖车时间"),
         key: "tlTime",
         type: "date",
       },
       {
-        title: $t("车牌"),
+        title: i18n.$t("车牌"),
         key: "tlLicensePlate",
       },
       {
-        title: $t("司机"),
+        title: i18n.$t("司机"),
         key: "tlDriver",
       },
       {
-        title: $t("联系方式"),
+        title: i18n.$t("联系方式"),
         key: "tlDriverContact",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     tallyInfo: [
       {
-        title: $t("完成理货时间"),
+        title: i18n.$t("完成理货时间"),
         key: "tyTime",
         type: "datetime",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "tyOperator",
       },
     ],
     agentInfo: [
       {
-        title: $t("代理商"),
+        title: i18n.$t("代理商"),
         key: "agentId",
         type: "supplier",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     cabinetInfo: [
       {
-        title: $t("到仓时间"),
+        title: i18n.$t("到仓时间"),
         key: "ldInWarehouseTime",
         type: "date",
       },
       {
-        title: $t("仓库类型"),
+        title: i18n.$t("仓库类型"),
         key: "ldWarehouseType",
         type: "warehouse",
       },
       {
-        title: $t("装柜时间"),
+        title: i18n.$t("装柜时间"),
         key: "ldBoxTime",
         type: "date",
       },
       {
-        title: $t("出仓时间"),
+        title: i18n.$t("出仓时间"),
         key: "ldOutWarehouseTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     customsInfo: [
       {
-        title: $t("报关方式"),
+        title: i18n.$t("报关方式"),
         key: "dcCustomsType",
         type: "shipping_customs_type",
       },
       {
-        title: $t("报关行公司"),
+        title: i18n.$t("报关行公司"),
         key: "dcCompanyId",
         type: "supplier",
       },
       {
-        title: $t("截关时间"),
+        title: i18n.$t("截关时间"),
         key: "dcCutOffTime",
         type: "date",
       },
       {
-        title: $t("状态"),
+        title: i18n.$t("状态"),
         key: "dcCustomsStatus",
         type: "shipping_dcCustoms_status",
       },
       {
-        title: $t("放行时间"),
+        title: i18n.$t("放行时间"),
         key: "dcPassTime",
         type: "date",
       },
       {
-        title: $t("新封条"),
+        title: i18n.$t("新封条"),
         key: "dcStripSeal",
       },
       {
-        title: $t("柜重"),
+        title: i18n.$t("柜重"),
         key: "dcBoxWgt",
       },
       {
-        title: $t("货重"),
+        title: i18n.$t("货重"),
         key: "dcGoodsWgt",
       },
       {
-        title: $t("VGM重量"),
+        title: i18n.$t("VGM重量"),
         key: "dcVgmWgt",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     shipConfigInfo: [
       {
-        title: $t("已配/免配"),
+        title: i18n.$t("已配/免配"),
         key: "saExmtStatus",
         type: "saExmtStatus",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     ladingBillInfo: [
       {
-        title: $t("清关代理"),
+        title: i18n.$t("清关代理"),
         key: "agentId",
         type: "supplier",
       },
       {
-        title: $t("提单品名"),
+        title: i18n.$t("提单品名"),
         key: "blMblNo",
       },
       {
-        title: $t("通知方"),
+        title: i18n.$t("通知方"),
         key: "notifyingId",
         type: "user",
       },
       {
-        title: $t("提单备注"),
+        title: i18n.$t("提单备注"),
         key: "remarks",
       },
       {
-        title: $t("数量（个）"),
+        title: i18n.$t("数量（个）"),
         key: "packageNum",
       },
       {
-        title: $t("体积"),
+        title: i18n.$t("体积"),
         key: "cbm",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     bargeInfo: [
       {
-        title: $t("驳船"),
+        title: i18n.$t("驳船"),
         key: "bgExmtStatus",
         type: "bgExmtStatus",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     shippingInfo: [
       {
-        title: $t("实际开船时间"),
+        title: i18n.$t("实际开船时间"),
         key: "dtRealShipTime",
         type: "datetime",
       },
       {
-        title: $t("预计到港时间"),
+        title: i18n.$t("预计到港时间"),
         key: "dtEstArrivalTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
@@ -1127,128 +1125,128 @@ function getColmnMapping() {
         type: "isFile",
       },
       {
-        title: $t("出单方式"),
+        title: i18n.$t("出单方式"),
         key: "cdOutBillType",
         type: "billingMethod",
       },
       {
-        title: $t("寄送时间"),
+        title: i18n.$t("寄送时间"),
         key: "cdSendTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     arrivalInfo: [
       {
-        title: $t("实际到港时间"),
+        title: i18n.$t("实际到港时间"),
         key: "apRealTime",
         type: "datetime",
       },
       {
-        title: $t("确认到港"),
+        title: i18n.$t("确认到港"),
         key: "apConfirmTime",
         type: "datetime",
       },
       {
-        title: $t("卸港时间"),
+        title: i18n.$t("卸港时间"),
         key: "apUnloadPortTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     clearanceInfo: [
       {
-        title: $t("预计清关时间"),
+        title: i18n.$t("预计清关时间"),
         key: "clEstTime",
         type: "date",
       },
       {
-        title: $t("清关时间"),
+        title: i18n.$t("清关时间"),
         key: "clClearTime",
         type: "datetime",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     takeOffInfo: [
       {
-        title: $t("预计头程时间"),
+        title: i18n.$t("预计头程时间"),
         key: "estHeadTime",
         type: "datetime",
       },
       {
-        title: $t("实际头程时间"),
+        title: i18n.$t("实际头程时间"),
         key: "actHeadTime",
         type: "datetime",
       },
       {
-        title: $t("预计二程时间"),
+        title: i18n.$t("预计二程时间"),
         key: "estSecondTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     airArrivalInfo: [
       {
-        title: $t("预计到达时间"),
+        title: i18n.$t("预计到达时间"),
         key: "estTime",
         type: "datetime",
       },
       {
-        title: $t("实际到达时间"),
+        title: i18n.$t("实际到达时间"),
         key: "actTime",
         type: "datetime",
       },
       {
-        title: $t("实际二程时间"),
+        title: i18n.$t("实际二程时间"),
         key: "actSecondTime",
         type: "datetime",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     cabinetUnloadInfo: [
       {
-        title: $t("到仓时间"),
+        title: i18n.$t("到仓时间"),
         key: "ulWarehouseTime",
         type: "date",
       },
       {
-        title: $t("卸货时间"),
+        title: i18n.$t("卸货时间"),
         key: "ulBoxTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
     settlementInfo: [
       {
-        title: $t("可结算"),
+        title: i18n.$t("可结算"),
         key: "slSettlementTime",
         type: "date",
       },
       {
-        title: $t("已结算"),
+        title: i18n.$t("已结算"),
         key: "slSettledTime",
         type: "date",
       },
       {
-        title: $t("业务员"),
+        title: i18n.$t("业务员"),
         key: "operator",
       },
     ],
@@ -1263,44 +1261,44 @@ const constantDict = {
   saExmtStatus: [
     {
       value: "1",
-      label: $t("免配"),
+      label: i18n.$t("免配"),
     },
     {
       value: "2",
-      label: $t("已配"),
+      label: i18n.$t("已配"),
     },
   ],
   // 驳船
   bgExmtStatus: [
     {
       value: "1",
-      label: $t("无驳船"),
+      label: i18n.$t("无驳船"),
     },
     {
       value: "2",
-      label: $t("有驳船"),
+      label: i18n.$t("有驳船"),
     },
   ],
   // 出单方式
   billingMethod: [
     {
       value: "1",
-      label: $t("电放"),
+      label: i18n.$t("电放"),
     },
     {
       value: "2",
-      label: $t("正本"),
+      label: i18n.$t("正本"),
     },
   ],
   // 是否有文件
   isFile: [
     {
       value: "1",
-      label: $t("无需"),
+      label: i18n.$t("无需"),
     },
     {
       value: "2",
-      label: $t("已做"),
+      label: i18n.$t("已做"),
     },
   ],
 };

src/views/ecw/financial/creatCollection.vue

@@ -862,10 +862,10 @@ export default {
         const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
         const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
-        const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
+        const rmbList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
         const rmb = rmbList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
-        const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 3)
+        const nairaList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 2)
         const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
 
         this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira]

src/views/ecw/financial/creatPayment.vue

@@ -460,7 +460,8 @@ export default {
     if (that.$route.query.payableId && that.$route.query.payableId !== '0') {
       this.payableId = this.$route.query.payableId;
       getPayableInfoByIds({ id: this.payableId }).then(res => {
-        this.list = [{...res.data}]
+        this.handleSelectionChange([res.data])
+        this.list = this.multipleSelection
         this.$set(this.form, 'supplierId', res.data.supplierId)
       })
     }

src/views/ecw/offer/edit.vue

@@ -885,7 +885,7 @@ export default {
         console.log('选择联系人', contact)
         if(!this.contactChooseType && !this.quickCreateType) return
         if(!this.contactChooseType && this.quickCreateType){
-            this.contactChooseType = this.quickCreateType == 1 ? 'consignor' : 'consignee'
+            this.contactChooseType = this.quickCreateType == 0 ? 'consignor' : 'consignee'
         }
         this.$set(this.form, this.contactChooseType + 'Company', contact.company)
         this.$set(this.form, this.contactChooseType + 'Id', contact.customerContactsId)

src/views/ecw/order/prepayDeal.vue

@@ -29,7 +29,7 @@
                 {{orderData?getRouterNameById():''}}
            </el-form-item>
        </el-row>
-       
+
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
        <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
         <!-- 预付异常,提货异常是针对整个订单的 -->
@@ -76,7 +76,7 @@
               <template v-else>{{$t('无入仓数据')}}</template>
           </el-row>
         </template>
-        
+
         <el-row :span="12">
           <el-form-item :label="$t('异常描述')+':'">
             <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" />
@@ -125,7 +125,7 @@
                 {{ currencyMap[row.currencyId] }}
           </template>
         </el-table-column>
-          
+
         <el-table-column :label="$t('付款人')">
           <template slot-scope="scope">
             <span>{{scope.row.consigneeName}}({{$t('收货人')}})</span>
@@ -209,7 +209,7 @@
           </el-form-item>
           </el-col>
           <el-col :span="8">
-          <el-form-item :label="$t('预付商品货值占佣金额比例')+':'" label-width="200px">
+          <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="200px">
               {{orderFee.paymentGoodsWorthScale}}%
           </el-form-item>
           </el-col>
@@ -360,7 +360,7 @@
           orderExceptionStatus:"1",
           orderExceptionHandlerResult:''
         },
-        
+
         //发货/收货人信息
         consigneeData:[],
         routerList:[],
@@ -522,4 +522,4 @@
     display: flex;
     /* justify-content: space-between; */
   }
-</style>
\ No newline at end of file
+</style>

src/views/ecw/order/singleApply.vue

@@ -120,7 +120,7 @@
         <el-table-column :label="$t('入仓货物属性')" align="center">
             <template slot-scope="scope">
               <span>{{$t('合计')}}：</span>
-              <span>{{scope.row.sumNum+this.$t('箱')+' '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
+              <span>{{scope.row.sumNum+$t('箱')+' '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
             </template>
         </el-table-column>
         <el-table-column :label="$t('入仓时间')" align="center">
@@ -221,6 +221,7 @@ export default {
       // 执行查询
       getMergeListByOrderNo(this.queryParams).then(response => {
         this.loading = false;
+        console.log('(response.data',response.data)
         if(response.data.mergedList){
           this.mergedList = response.data.mergedList;
         }

src/views/ecw/order/warehousing/index.vue

@@ -140,7 +140,7 @@
     </el-form>
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
-                           :order-id="orderId" :city-id="cityId"></warehouse-area-dialog>
+                           :order-id="orderId" :warehouse-id="warehouseId"></warehouse-area-dialog>
 
     <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
 
@@ -431,8 +431,8 @@ export default {
       })
       return result
     },
-    cityId(){
-      return  this.order?.departureVO?.departureId
+    warehouseId(){
+      return this.order?.logisticsInfoDto?.startWarehouseId
     }
   }
 }