Skip to content

J
jiedao-app-operator-master
Commit 35b9e1e1 authored by 我在何方's avatar 我在何方
Browse files
Options

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

parents 36e14a23 bbf73680
Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 189 deletions
.env.dev 0 → 100644
View file @ 35b9e1e1
# 开发环境配置
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
View file @ 35b9e1e1
捷道项目管理后台-前端 捷道项目管理后台-前端
\ 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
View file @ 35b9e1e1
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build:dev": "vue-cli-service build --mode dev",
"build:prod": "vue-cli-service build", "build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging", "build:stage": "vue-cli-service build --mode staging",
"build:demo1024": "vue-cli-service build --mode demo1024", "build:demo1024": "vue-cli-service build --mode demo1024",
......
src/components/QuickCreateCustomer/index.vue
View file @ 35b9e1e1
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-option v-for="(item, index) in countryList" <el-option v-for="(item, index) in countryList"
:key="index" :label="item.nameShort + item.nameZh + '(' + item.tel + ')'" :value="item.tel" /> :key="index" :label="item.nameShort + item.nameZh + '(' + item.tel + ')'" :value="item.tel" />
</el-select> </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>
<el-form-item label="客户来源" prop="source"> <el-form-item label="客户来源" prop="source">
......
src/i18n/index.js
View file @ 35b9e1e1
...@@ -11,8 +11,12 @@ const i18n = new VueI18n({ ...@@ -11,8 +11,12 @@ const i18n = new VueI18n({
'zh_CN': require('./languages/zh_CN.json') 'zh_CN': require('./languages/zh_CN.json')
} }
}) })
// 自动提取脚本只匹配$t,所以给个别名
i18n.$t = i18n.t
/*
window.i18n = i18n window.i18n = i18n
console.log({i18n}) console.log({i18n}) */
/* /*
用法 用法
$l('title') => titleZh $l('title') => titleZh
......
src/views/ecw/bannerPop/index.vue
View file @ 35b9e1e1
...@@ -99,14 +99,10 @@ ...@@ -99,14 +99,10 @@
<el-input v-model="form.titleEn" placeholder="请输入英文标题" /> <el-input v-model="form.titleEn" placeholder="请输入英文标题" />
</el-form-item> </el-form-item>
<el-form-item label="有效期" prop="validateStart"> <el-form-item label="有效期" prop="validateStart">
<el-date-picker v-model="form.validateStart" @change="startChange" <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateStart" @change="startChange">
type="date"
placeholder="选择日期" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
~ ~
<el-date-picker v-model="form.validateEnd" <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="form.validateEnd">
type="date"
placeholder="选择日期" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
<span style="color:red;font-size:14px;">注意：留空则表示永久有效</span> <span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
</el-form-item> </el-form-item>
...@@ -223,7 +219,7 @@ export default { ...@@ -223,7 +219,7 @@ export default {
formatTime() { formatTime() {
return millisecond => { return millisecond => {
if(millisecond) { if(millisecond) {
return new Date(millisecond).format('yyyy-MM-dd'); return new Date(millisecond).format('yyyy-MM-dd hh:mm:ss');
} }
return ''; return '';
} }
...@@ -317,6 +313,9 @@ export default { ...@@ -317,6 +313,9 @@ export default {
const id = row.id; const id = row.id;
getBannerPop(id).then(response => { getBannerPop(id).then(response => {
this.form = response.data; 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.open = true;
this.title = "修改广告弹窗"; this.title = "修改广告弹窗";
}); });
......
src/views/ecw/box/shippingSea/shippingSea.vue
View file @ 35b9e1e1
...@@ -46,7 +46,7 @@ import { listUser } from "@/api/system/user"; ...@@ -46,7 +46,7 @@ import { listUser } from "@/api/system/user";
// 这里引入的数据切换语言后要刷新才生效，优化办法是label同时配备labelEn字段，然后再页面上用$l函数调用 // 这里引入的数据切换语言后要刷新才生效，优化办法是label同时配备labelEn字段，然后再页面上用$l函数调用
import { getSeaStatus, getStatusName, seaBaseData } from "./utils"; import { getSeaStatus, getStatusName, seaBaseData } from "./utils";
console.log(seaBaseData())
/** /**
* 海运操作主页面 * 海运操作主页面
*/ */
......
src/views/ecw/box/shippingSea/utils.js
View file @ 35b9e1e1
...@@ -4,8 +4,6 @@ import FileSaver from "file-saver"; ...@@ -4,8 +4,6 @@ import FileSaver from "file-saver";
import Decimal from "decimal.js"; import Decimal from "decimal.js";
import i18n from "@/i18n"; import i18n from "@/i18n";
// 自动提取脚本只匹配$t,所以需要重新给个名字
const $t = (args) => i18n.t(...args)
/** /**
* 节点状态值 * 节点状态值
* *
...@@ -14,67 +12,67 @@ const $t = (args) => i18n.t(...args) ...@@ -14,67 +12,67 @@ const $t = (args) => i18n.t(...args)
function getStatusName(statu) { function getStatusName(statu) {
const statusName = new Map(); const statusName = new Map();
statusName.set(11, $t("未订舱")); statusName.set(11, i18n.$t("未订舱"));
statusName.set(12, $t("已订舱")); statusName.set(12, i18n.$t("已订舱"));
statusName.set(21, $t("未预装")); statusName.set(21, i18n.$t("未预装"));
statusName.set(22, $t("预装中")); statusName.set(22, i18n.$t("预装中"));
statusName.set(23, $t("预装审核中")); statusName.set(23, i18n.$t("预装审核中"));
statusName.set(24, $t("预装审核失败")); statusName.set(24, i18n.$t("预装审核失败"));
statusName.set(25, $t("预装审核成功")); statusName.set(25, i18n.$t("预装审核成功"));
statusName.set(2111, $t("未理货")); statusName.set(2111, i18n.$t("未理货"));
statusName.set(2112, $t("已理货")); statusName.set(2112, i18n.$t("已理货"));
statusName.set(31, $t("未派车")); statusName.set(31, i18n.$t("未派车"));
statusName.set(32, $t("已派车")); statusName.set(32, i18n.$t("已派车"));
statusName.set(41, $t("未装柜")); statusName.set(41, i18n.$t("未装柜"));
statusName.set(42, $t("装柜中")); statusName.set(42, i18n.$t("装柜中"));
statusName.set(43, $t("已装柜、待封柜")); statusName.set(43, i18n.$t("已装柜、待封柜"));
statusName.set(44, $t("封柜审核中")); statusName.set(44, i18n.$t("封柜审核中"));
statusName.set(45, $t("封柜审核失败")); statusName.set(45, i18n.$t("封柜审核失败"));
statusName.set(46, $t("封柜审核成功")); statusName.set(46, i18n.$t("封柜审核成功"));
statusName.set(47, $t("已封柜，待出仓")); statusName.set(47, i18n.$t("已封柜，待出仓"));
statusName.set(51, $t("未报关")); statusName.set(51, i18n.$t("未报关"));
statusName.set(52, $t("报关中")); statusName.set(52, i18n.$t("报关中"));
statusName.set(53, $t("已报关")); statusName.set(53, i18n.$t("已报关"));
statusName.set(61, $t("未配船")); statusName.set(61, i18n.$t("未配船"));
statusName.set(62, $t("已配船")); statusName.set(62, i18n.$t("已配船"));
statusName.set(71, $t("未提单补料")); statusName.set(71, i18n.$t("未提单补料"));
statusName.set(72, $t("已提单补料")); statusName.set(72, i18n.$t("已提单补料"));
statusName.set(81, $t("未驳船")); statusName.set(81, i18n.$t("未驳船"));
statusName.set(82, $t("已驳船")); statusName.set(82, i18n.$t("已驳船"));
statusName.set(91, $t("未起运")); statusName.set(91, i18n.$t("未起运"));
statusName.set(92, $t("已起运")); statusName.set(92, i18n.$t("已起运"));
statusName.set(101, $t("未上传")); statusName.set(101, i18n.$t("未上传"));
statusName.set(102, $t("已上传")); statusName.set(102, i18n.$t("已上传"));
statusName.set(111, $t("未清关文件")); statusName.set(111, i18n.$t("未清关文件"));
statusName.set(112, $t("已清关文件")); statusName.set(112, i18n.$t("已清关文件"));
statusName.set(121, $t("未到港")); statusName.set(121, i18n.$t("未到港"));
statusName.set(122, $t("已到港")); statusName.set(122, i18n.$t("已到港"));
statusName.set(131, $t("未清关")); statusName.set(131, i18n.$t("未清关"));
statusName.set(132, $t("已清关")); statusName.set(132, i18n.$t("已清关"));
statusName.set(181, $t("未卸柜")); statusName.set(181, i18n.$t("未卸柜"));
statusName.set(182, $t("卸柜中")); statusName.set(182, i18n.$t("卸柜中"));
statusName.set(183, $t("卸柜审核中")); statusName.set(183, i18n.$t("卸柜审核中"));
statusName.set(184, $t("卸柜审核失败")); statusName.set(184, i18n.$t("卸柜审核失败"));
statusName.set(185, $t("卸柜审核成功")); statusName.set(185, i18n.$t("卸柜审核成功"));
statusName.set(186, $t("已卸柜")); statusName.set(186, i18n.$t("已卸柜"));
statusName.set(191, $t("未结算")); statusName.set(191, i18n.$t("未结算"));
statusName.set(192, $t("结算中")); statusName.set(192, i18n.$t("结算中"));
statusName.set(193, $t("已结算")); statusName.set(193, i18n.$t("已结算"));
return statusName.get(statu); return statusName.get(statu);
} }
...@@ -88,7 +86,7 @@ function seaBaseData() { ...@@ -88,7 +86,7 @@ function seaBaseData() {
return [ return [
[ [
{ {
title: $t("订舱"), title: i18n.$t("订舱"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/dc-start.png"), start: require("@/assets/images/shipping/dc-start.png"),
end: require("@/assets/images/shipping/dc-end.png"), end: require("@/assets/images/shipping/dc-end.png"),
...@@ -109,7 +107,7 @@ function seaBaseData() { ...@@ -109,7 +107,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("排单"), title: i18n.$t("排单"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/yz-start.png"), start: require("@/assets/images/shipping/yz-start.png"),
wait: require("@/assets/images/shipping/yz-wait.png"), wait: require("@/assets/images/shipping/yz-wait.png"),
...@@ -142,7 +140,7 @@ function seaBaseData() { ...@@ -142,7 +140,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("理货"), title: i18n.$t("理货"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/lh-start.png"), start: require("@/assets/images/shipping/lh-start.png"),
wait: require("@/assets/images/shipping/lh-wait.png"), wait: require("@/assets/images/shipping/lh-wait.png"),
...@@ -162,7 +160,7 @@ function seaBaseData() { ...@@ -162,7 +160,7 @@ function seaBaseData() {
}, },
}, },
{ {
title: $t("拖车"), title: i18n.$t("拖车"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/tc-start.png"), start: require("@/assets/images/shipping/tc-start.png"),
wait: require("@/assets/images/shipping/tc-wait.png"), wait: require("@/assets/images/shipping/tc-wait.png"),
...@@ -184,7 +182,7 @@ function seaBaseData() { ...@@ -184,7 +182,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("装柜"), title: i18n.$t("装柜"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/zg-start.png"), start: require("@/assets/images/shipping/zg-start.png"),
wait: require("@/assets/images/shipping/zg-wait.png"), wait: require("@/assets/images/shipping/zg-wait.png"),
...@@ -206,7 +204,7 @@ function seaBaseData() { ...@@ -206,7 +204,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("报关"), title: i18n.$t("报关"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/bg-start.png"), start: require("@/assets/images/shipping/bg-start.png"),
wait: require("@/assets/images/shipping/bg-wait.png"), wait: require("@/assets/images/shipping/bg-wait.png"),
...@@ -246,7 +244,7 @@ function seaBaseData() { ...@@ -246,7 +244,7 @@ function seaBaseData() {
}, },
}, },
{ {
title: $t("提单补料"), title: i18n.$t("提单补料"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/tdcl-start.png"), start: require("@/assets/images/shipping/tdcl-start.png"),
wait: require("@/assets/images/shipping/tdcl-wait.png"), wait: require("@/assets/images/shipping/tdcl-wait.png"),
...@@ -268,7 +266,7 @@ function seaBaseData() { ...@@ -268,7 +266,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("驳船"), title: i18n.$t("驳船"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/bc-start.png"), start: require("@/assets/images/shipping/bc-start.png"),
wait: require("@/assets/images/shipping/bc-wait.png"), wait: require("@/assets/images/shipping/bc-wait.png"),
...@@ -290,7 +288,7 @@ function seaBaseData() { ...@@ -290,7 +288,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("起运"), title: i18n.$t("起运"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/qy-start.png"), start: require("@/assets/images/shipping/qy-start.png"),
wait: require("@/assets/images/shipping/qy-wait.png"), wait: require("@/assets/images/shipping/qy-wait.png"),
...@@ -312,7 +310,7 @@ function seaBaseData() { ...@@ -312,7 +310,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("提单Copy"), title: i18n.$t("提单Copy"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/tdcopy-start.png"), start: require("@/assets/images/shipping/tdcopy-start.png"),
wait: require("@/assets/images/shipping/tdcopy-wait.png"), wait: require("@/assets/images/shipping/tdcopy-wait.png"),
...@@ -338,7 +336,7 @@ function seaBaseData() { ...@@ -338,7 +336,7 @@ function seaBaseData() {
wait: require("@/assets/images/shipping/qg-wait.png"), wait: require("@/assets/images/shipping/qg-wait.png"),
end: require("@/assets/images/shipping/qg-end.png"), end: require("@/assets/images/shipping/qg-end.png"),
}, },
title: $t("清关文件"), title: i18n.$t("清关文件"),
dataKey: "11", // 字典数据键值 dataKey: "11", // 字典数据键值
/** /**
* 清关文件状态：111、未清关文件；112、已清关文件 * 清关文件状态：111、未清关文件；112、已清关文件
...@@ -354,7 +352,7 @@ function seaBaseData() { ...@@ -354,7 +352,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("到港"), title: i18n.$t("到港"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/dg-start.png"), start: require("@/assets/images/shipping/dg-start.png"),
wait: require("@/assets/images/shipping/dg-wait.png"), wait: require("@/assets/images/shipping/dg-wait.png"),
...@@ -376,7 +374,7 @@ function seaBaseData() { ...@@ -376,7 +374,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("清关"), title: i18n.$t("清关"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/qg-start.png"), start: require("@/assets/images/shipping/qg-start.png"),
wait: require("@/assets/images/shipping/qg-wait.png"), wait: require("@/assets/images/shipping/qg-wait.png"),
...@@ -398,7 +396,7 @@ function seaBaseData() { ...@@ -398,7 +396,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("卸柜"), title: i18n.$t("卸柜"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/xg-start.png"), start: require("@/assets/images/shipping/xg-start.png"),
wait: require("@/assets/images/shipping/xg-wait.png"), wait: require("@/assets/images/shipping/xg-wait.png"),
...@@ -420,7 +418,7 @@ function seaBaseData() { ...@@ -420,7 +418,7 @@ function seaBaseData() {
], ],
[ [
{ {
title: $t("结算"), title: i18n.$t("结算"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/js-start.png"), start: require("@/assets/images/shipping/js-start.png"),
wait: require("@/assets/images/shipping/js-wait.png"), wait: require("@/assets/images/shipping/js-wait.png"),
...@@ -452,7 +450,7 @@ function seaAirBaseData() { ...@@ -452,7 +450,7 @@ function seaAirBaseData() {
return [ return [
[ [
{ {
title: $t("订舱"), title: i18n.$t("订舱"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/dc-start.png"), start: require("@/assets/images/shipping/dc-start.png"),
end: require("@/assets/images/shipping/dc-end.png"), end: require("@/assets/images/shipping/dc-end.png"),
...@@ -473,7 +471,7 @@ function seaAirBaseData() { ...@@ -473,7 +471,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("排单"), title: i18n.$t("排单"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/yz-start.png"), start: require("@/assets/images/shipping/yz-start.png"),
wait: require("@/assets/images/shipping/yz-wait.png"), wait: require("@/assets/images/shipping/yz-wait.png"),
...@@ -506,7 +504,7 @@ function seaAirBaseData() { ...@@ -506,7 +504,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("理货"), title: i18n.$t("理货"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/lh-start.png"), start: require("@/assets/images/shipping/lh-start.png"),
wait: require("@/assets/images/shipping/lh-wait.png"), wait: require("@/assets/images/shipping/lh-wait.png"),
...@@ -526,7 +524,7 @@ function seaAirBaseData() { ...@@ -526,7 +524,7 @@ function seaAirBaseData() {
}, },
}, },
{ {
title: $t("拖车"), title: i18n.$t("拖车"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/tc-start.png"), start: require("@/assets/images/shipping/tc-start.png"),
wait: require("@/assets/images/shipping/tc-wait.png"), wait: require("@/assets/images/shipping/tc-wait.png"),
...@@ -548,7 +546,7 @@ function seaAirBaseData() { ...@@ -548,7 +546,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("装柜"), title: i18n.$t("装柜"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/zg-start.png"), start: require("@/assets/images/shipping/zg-start.png"),
wait: require("@/assets/images/shipping/zg-wait.png"), wait: require("@/assets/images/shipping/zg-wait.png"),
...@@ -570,7 +568,7 @@ function seaAirBaseData() { ...@@ -570,7 +568,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("报关"), title: i18n.$t("报关"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/bg-start.png"), start: require("@/assets/images/shipping/bg-start.png"),
wait: require("@/assets/images/shipping/bg-wait.png"), wait: require("@/assets/images/shipping/bg-wait.png"),
...@@ -590,7 +588,7 @@ function seaAirBaseData() { ...@@ -590,7 +588,7 @@ function seaAirBaseData() {
}, },
}, },
{ {
title: $t("配船"), title: i18n.$t("配船"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/pc-start.png"), start: require("@/assets/images/shipping/pc-start.png"),
wait: require("@/assets/images/shipping/pc-wait.png"), wait: require("@/assets/images/shipping/pc-wait.png"),
...@@ -610,7 +608,7 @@ function seaAirBaseData() { ...@@ -610,7 +608,7 @@ function seaAirBaseData() {
}, },
}, },
{ {
title: $t("提单补料"), title: i18n.$t("提单补料"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/tdcl-start.png"), start: require("@/assets/images/shipping/tdcl-start.png"),
wait: require("@/assets/images/shipping/tdcl-wait.png"), wait: require("@/assets/images/shipping/tdcl-wait.png"),
...@@ -632,7 +630,7 @@ function seaAirBaseData() { ...@@ -632,7 +630,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("驳船"), title: i18n.$t("驳船"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/bc-start.png"), start: require("@/assets/images/shipping/bc-start.png"),
wait: require("@/assets/images/shipping/bc-wait.png"), wait: require("@/assets/images/shipping/bc-wait.png"),
...@@ -654,7 +652,7 @@ function seaAirBaseData() { ...@@ -654,7 +652,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("起运"), title: i18n.$t("起运"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/qy-start.png"), start: require("@/assets/images/shipping/qy-start.png"),
wait: require("@/assets/images/shipping/qy-wait.png"), wait: require("@/assets/images/shipping/qy-wait.png"),
...@@ -676,7 +674,7 @@ function seaAirBaseData() { ...@@ -676,7 +674,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("提单Copy"), title: i18n.$t("提单Copy"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/tdcopy-start.png"), start: require("@/assets/images/shipping/tdcopy-start.png"),
wait: require("@/assets/images/shipping/tdcopy-wait.png"), wait: require("@/assets/images/shipping/tdcopy-wait.png"),
...@@ -702,7 +700,7 @@ function seaAirBaseData() { ...@@ -702,7 +700,7 @@ function seaAirBaseData() {
wait: require("@/assets/images/shipping/qg-wait.png"), wait: require("@/assets/images/shipping/qg-wait.png"),
end: require("@/assets/images/shipping/qg-end.png"), end: require("@/assets/images/shipping/qg-end.png"),
}, },
title: $t("清关文件"), title: i18n.$t("清关文件"),
dataKey: "11", // 字典数据键值 dataKey: "11", // 字典数据键值
/** /**
* 清关文件状态：111、未清关文件；112、已清关文件 * 清关文件状态：111、未清关文件；112、已清关文件
...@@ -718,7 +716,7 @@ function seaAirBaseData() { ...@@ -718,7 +716,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("到港"), title: i18n.$t("到港"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/dg-start.png"), start: require("@/assets/images/shipping/dg-start.png"),
wait: require("@/assets/images/shipping/dg-wait.png"), wait: require("@/assets/images/shipping/dg-wait.png"),
...@@ -740,7 +738,7 @@ function seaAirBaseData() { ...@@ -740,7 +738,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("清关"), title: i18n.$t("清关"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/qg-start.png"), start: require("@/assets/images/shipping/qg-start.png"),
wait: require("@/assets/images/shipping/qg-wait.png"), wait: require("@/assets/images/shipping/qg-wait.png"),
...@@ -762,7 +760,7 @@ function seaAirBaseData() { ...@@ -762,7 +760,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("二程起飞"), title: i18n.$t("二程起飞"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/ecqf-start.png"), start: require("@/assets/images/shipping/ecqf-start.png"),
wait: require("@/assets/images/shipping/ecqf-wait.png"), wait: require("@/assets/images/shipping/ecqf-wait.png"),
...@@ -784,7 +782,7 @@ function seaAirBaseData() { ...@@ -784,7 +782,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("二程到港"), title: i18n.$t("二程到港"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/ecdg-start.png"), start: require("@/assets/images/shipping/ecdg-start.png"),
wait: require("@/assets/images/shipping/ecdg-wait.png"), wait: require("@/assets/images/shipping/ecdg-wait.png"),
...@@ -806,7 +804,7 @@ function seaAirBaseData() { ...@@ -806,7 +804,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("卸柜"), title: i18n.$t("卸柜"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/xg-start.png"), start: require("@/assets/images/shipping/xg-start.png"),
wait: require("@/assets/images/shipping/xg-wait.png"), wait: require("@/assets/images/shipping/xg-wait.png"),
...@@ -828,7 +826,7 @@ function seaAirBaseData() { ...@@ -828,7 +826,7 @@ function seaAirBaseData() {
], ],
[ [
{ {
title: $t("结算"), title: i18n.$t("结算"),
imgSrc: { imgSrc: {
start: require("@/assets/images/shipping/js-start.png"), start: require("@/assets/images/shipping/js-start.png"),
wait: require("@/assets/images/shipping/js-wait.png"), wait: require("@/assets/images/shipping/js-wait.png"),
...@@ -864,254 +862,254 @@ function getColmnMapping() { ...@@ -864,254 +862,254 @@ function getColmnMapping() {
key: "sono", key: "sono",
}, },
{ {
title: $t("船公司类型"), title: i18n.$t("船公司类型"),
key: "shipCompanyType", key: "shipCompanyType",
type: "supplier", type: "supplier",
}, },
{ {
title: $t("驳船港"), title: i18n.$t("驳船港"),
key: "bargePortId", key: "bargePortId",
type: "dock", type: "dock",
}, },
{ {
title: $t("大船港"), title: i18n.$t("大船港"),
key: "bigPortId", key: "bigPortId",
type: "dock", type: "dock",
}, },
{ {
title: $t("目的港"), title: i18n.$t("目的港"),
key: "destPortId", key: "destPortId",
type: "dock", type: "dock",
}, },
{ {
title: $t("订舱公司"), title: i18n.$t("订舱公司"),
key: "spaceCompanyId", key: "spaceCompanyId",
type: "supplier", type: "supplier",
}, },
{ {
title: $t("预计驳船时间"), title: i18n.$t("预计驳船时间"),
key: "bargeTime", key: "bargeTime",
type: "date", type: "date",
}, },
{ {
title: $t("预计开船时间"), title: i18n.$t("预计开船时间"),
key: "sailTime", key: "sailTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
preInstallInfo: [ preInstallInfo: [
{ {
title: $t("预装时间"), title: i18n.$t("预装时间"),
key: "createTime", key: "createTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
trailerInfo: [ trailerInfo: [
{ {
title: $t("货柜号"), title: i18n.$t("货柜号"),
key: "tlContainerNo", key: "tlContainerNo",
}, },
{ {
title: $t("封条"), title: i18n.$t("封条"),
key: "tlStripSeal", key: "tlStripSeal",
}, },
{ {
title: $t("拖车公司"), title: i18n.$t("拖车公司"),
key: "tlCompanyId", key: "tlCompanyId",
type: "supplier", type: "supplier",
}, },
{ {
title: $t("拖车时间"), title: i18n.$t("拖车时间"),
key: "tlTime", key: "tlTime",
type: "date", type: "date",
}, },
{ {
title: $t("车牌"), title: i18n.$t("车牌"),
key: "tlLicensePlate", key: "tlLicensePlate",
}, },
{ {
title: $t("司机"), title: i18n.$t("司机"),
key: "tlDriver", key: "tlDriver",
}, },
{ {
title: $t("联系方式"), title: i18n.$t("联系方式"),
key: "tlDriverContact", key: "tlDriverContact",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
tallyInfo: [ tallyInfo: [
{ {
title: $t("完成理货时间"), title: i18n.$t("完成理货时间"),
key: "tyTime", key: "tyTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "tyOperator", key: "tyOperator",
}, },
], ],
agentInfo: [ agentInfo: [
{ {
title: $t("代理商"), title: i18n.$t("代理商"),
key: "agentId", key: "agentId",
type: "supplier", type: "supplier",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
cabinetInfo: [ cabinetInfo: [
{ {
title: $t("到仓时间"), title: i18n.$t("到仓时间"),
key: "ldInWarehouseTime", key: "ldInWarehouseTime",
type: "date", type: "date",
}, },
{ {
title: $t("仓库类型"), title: i18n.$t("仓库类型"),
key: "ldWarehouseType", key: "ldWarehouseType",
type: "warehouse", type: "warehouse",
}, },
{ {
title: $t("装柜时间"), title: i18n.$t("装柜时间"),
key: "ldBoxTime", key: "ldBoxTime",
type: "date", type: "date",
}, },
{ {
title: $t("出仓时间"), title: i18n.$t("出仓时间"),
key: "ldOutWarehouseTime", key: "ldOutWarehouseTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
customsInfo: [ customsInfo: [
{ {
title: $t("报关方式"), title: i18n.$t("报关方式"),
key: "dcCustomsType", key: "dcCustomsType",
type: "shipping_customs_type", type: "shipping_customs_type",
}, },
{ {
title: $t("报关行公司"), title: i18n.$t("报关行公司"),
key: "dcCompanyId", key: "dcCompanyId",
type: "supplier", type: "supplier",
}, },
{ {
title: $t("截关时间"), title: i18n.$t("截关时间"),
key: "dcCutOffTime", key: "dcCutOffTime",
type: "date", type: "date",
}, },
{ {
title: $t("状态"), title: i18n.$t("状态"),
key: "dcCustomsStatus", key: "dcCustomsStatus",
type: "shipping_dcCustoms_status", type: "shipping_dcCustoms_status",
}, },
{ {
title: $t("放行时间"), title: i18n.$t("放行时间"),
key: "dcPassTime", key: "dcPassTime",
type: "date", type: "date",
}, },
{ {
title: $t("新封条"), title: i18n.$t("新封条"),
key: "dcStripSeal", key: "dcStripSeal",
}, },
{ {
title: $t("柜重"), title: i18n.$t("柜重"),
key: "dcBoxWgt", key: "dcBoxWgt",
}, },
{ {
title: $t("货重"), title: i18n.$t("货重"),
key: "dcGoodsWgt", key: "dcGoodsWgt",
}, },
{ {
title: $t("VGM重量"), title: i18n.$t("VGM重量"),
key: "dcVgmWgt", key: "dcVgmWgt",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
shipConfigInfo: [ shipConfigInfo: [
{ {
title: $t("已配/免配"), title: i18n.$t("已配/免配"),
key: "saExmtStatus", key: "saExmtStatus",
type: "saExmtStatus", type: "saExmtStatus",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
ladingBillInfo: [ ladingBillInfo: [
{ {
title: $t("清关代理"), title: i18n.$t("清关代理"),
key: "agentId", key: "agentId",
type: "supplier", type: "supplier",
}, },
{ {
title: $t("提单品名"), title: i18n.$t("提单品名"),
key: "blMblNo", key: "blMblNo",
}, },
{ {
title: $t("通知方"), title: i18n.$t("通知方"),
key: "notifyingId", key: "notifyingId",
type: "user", type: "user",
}, },
{ {
title: $t("提单备注"), title: i18n.$t("提单备注"),
key: "remarks", key: "remarks",
}, },
{ {
title: $t("数量（个）"), title: i18n.$t("数量（个）"),
key: "packageNum", key: "packageNum",
}, },
{ {
title: $t("体积"), title: i18n.$t("体积"),
key: "cbm", key: "cbm",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
bargeInfo: [ bargeInfo: [
{ {
title: $t("驳船"), title: i18n.$t("驳船"),
key: "bgExmtStatus", key: "bgExmtStatus",
type: "bgExmtStatus", type: "bgExmtStatus",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
shippingInfo: [ shippingInfo: [
{ {
title: $t("实际开船时间"), title: i18n.$t("实际开船时间"),
key: "dtRealShipTime", key: "dtRealShipTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("预计到港时间"), title: i18n.$t("预计到港时间"),
key: "dtEstArrivalTime", key: "dtEstArrivalTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
...@@ -1127,128 +1125,128 @@ function getColmnMapping() { ...@@ -1127,128 +1125,128 @@ function getColmnMapping() {
type: "isFile", type: "isFile",
}, },
{ {
title: $t("出单方式"), title: i18n.$t("出单方式"),
key: "cdOutBillType", key: "cdOutBillType",
type: "billingMethod", type: "billingMethod",
}, },
{ {
title: $t("寄送时间"), title: i18n.$t("寄送时间"),
key: "cdSendTime", key: "cdSendTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
arrivalInfo: [ arrivalInfo: [
{ {
title: $t("实际到港时间"), title: i18n.$t("实际到港时间"),
key: "apRealTime", key: "apRealTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("确认到港"), title: i18n.$t("确认到港"),
key: "apConfirmTime", key: "apConfirmTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("卸港时间"), title: i18n.$t("卸港时间"),
key: "apUnloadPortTime", key: "apUnloadPortTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
clearanceInfo: [ clearanceInfo: [
{ {
title: $t("预计清关时间"), title: i18n.$t("预计清关时间"),
key: "clEstTime", key: "clEstTime",
type: "date", type: "date",
}, },
{ {
title: $t("清关时间"), title: i18n.$t("清关时间"),
key: "clClearTime", key: "clClearTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
takeOffInfo: [ takeOffInfo: [
{ {
title: $t("预计头程时间"), title: i18n.$t("预计头程时间"),
key: "estHeadTime", key: "estHeadTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("实际头程时间"), title: i18n.$t("实际头程时间"),
key: "actHeadTime", key: "actHeadTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("预计二程时间"), title: i18n.$t("预计二程时间"),
key: "estSecondTime", key: "estSecondTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
airArrivalInfo: [ airArrivalInfo: [
{ {
title: $t("预计到达时间"), title: i18n.$t("预计到达时间"),
key: "estTime", key: "estTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("实际到达时间"), title: i18n.$t("实际到达时间"),
key: "actTime", key: "actTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("实际二程时间"), title: i18n.$t("实际二程时间"),
key: "actSecondTime", key: "actSecondTime",
type: "datetime", type: "datetime",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
cabinetUnloadInfo: [ cabinetUnloadInfo: [
{ {
title: $t("到仓时间"), title: i18n.$t("到仓时间"),
key: "ulWarehouseTime", key: "ulWarehouseTime",
type: "date", type: "date",
}, },
{ {
title: $t("卸货时间"), title: i18n.$t("卸货时间"),
key: "ulBoxTime", key: "ulBoxTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
settlementInfo: [ settlementInfo: [
{ {
title: $t("可结算"), title: i18n.$t("可结算"),
key: "slSettlementTime", key: "slSettlementTime",
type: "date", type: "date",
}, },
{ {
title: $t("已结算"), title: i18n.$t("已结算"),
key: "slSettledTime", key: "slSettledTime",
type: "date", type: "date",
}, },
{ {
title: $t("业务员"), title: i18n.$t("业务员"),
key: "operator", key: "operator",
}, },
], ],
...@@ -1263,44 +1261,44 @@ const constantDict = { ...@@ -1263,44 +1261,44 @@ const constantDict = {
saExmtStatus: [ saExmtStatus: [
{ {
value: "1", value: "1",
label: $t("免配"), label: i18n.$t("免配"),
}, },
{ {
value: "2", value: "2",
label: $t("已配"), label: i18n.$t("已配"),
}, },
], ],
// 驳船 // 驳船
bgExmtStatus: [ bgExmtStatus: [
{ {
value: "1", value: "1",
label: $t("无驳船"), label: i18n.$t("无驳船"),
}, },
{ {
value: "2", value: "2",
label: $t("有驳船"), label: i18n.$t("有驳船"),
}, },
], ],
// 出单方式 // 出单方式
billingMethod: [ billingMethod: [
{ {
value: "1", value: "1",
label: $t("电放"), label: i18n.$t("电放"),
}, },
{ {
value: "2", value: "2",
label: $t("正本"), label: i18n.$t("正本"),
}, },
], ],
// 是否有文件 // 是否有文件
isFile: [ isFile: [
{ {
value: "1", value: "1",
label: $t("无需"), label: i18n.$t("无需"),
}, },
{ {
value: "2", value: "2",
label: $t("已做"), label: i18n.$t("已做"),
}, },
], ],
}; };
......
src/views/ecw/financial/creatCollection.vue
View file @ 35b9e1e1
...@@ -862,10 +862,10 @@ export default { ...@@ -862,10 +862,10 @@ export default {
const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1) const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
const dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0) 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 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) const naira = nairaList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0)
this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira] this.form.receiptAccountList[this.form.receiptAccountList.length -1].collectionAmount = [dollar, rmb, naira]
......
src/views/ecw/financial/creatPayment.vue
View file @ 35b9e1e1
...@@ -460,7 +460,8 @@ export default { ...@@ -460,7 +460,8 @@ export default {
if (that.$route.query.payableId && that.$route.query.payableId !== '0') { if (that.$route.query.payableId && that.$route.query.payableId !== '0') {
this.payableId = this.$route.query.payableId; this.payableId = this.$route.query.payableId;
getPayableInfoByIds({ id: this.payableId }).then(res => { 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) this.$set(this.form, 'supplierId', res.data.supplierId)
}) })
} }
......
src/views/ecw/offer/edit.vue
View file @ 35b9e1e1
...@@ -885,7 +885,7 @@ export default { ...@@ -885,7 +885,7 @@ export default {
console.log('选择联系人', contact) console.log('选择联系人', contact)
if(!this.contactChooseType && !this.quickCreateType) return if(!this.contactChooseType && !this.quickCreateType) return
if(!this.contactChooseType && this.quickCreateType){ 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 + 'Company', contact.company)
this.$set(this.form, this.contactChooseType + 'Id', contact.customerContactsId) this.$set(this.form, this.contactChooseType + 'Id', contact.customerContactsId)
......
src/views/ecw/order/prepayDeal.vue
View file @ 35b9e1e1
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
{{orderData?getRouterNameById():''}} {{orderData?getRouterNameById():''}}
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- 单证异常，发货人异常，其他异常 不显示这部分内容 --> <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
<div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1"> <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<!-- 预付异常,提货异常是针对整个订单的 --> <!-- 预付异常,提货异常是针对整个订单的 -->
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<template v-else>{{$t('无入仓数据')}}</template> <template v-else>{{$t('无入仓数据')}}</template>
</el-row> </el-row>
</template> </template>
<el-row :span="12"> <el-row :span="12">
<el-form-item :label="$t('异常描述')+':'"> <el-form-item :label="$t('异常描述')+':'">
<dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" /> <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" />
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
{{ currencyMap[row.currencyId] }} {{ currencyMap[row.currencyId] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('付款人')"> <el-table-column :label="$t('付款人')">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.consigneeName}}({{$t('收货人')}})</span> <span>{{scope.row.consigneeName}}({{$t('收货人')}})</span>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('预付商品货值占佣金额比例')+':'" label-width="200px"> <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="200px">
{{orderFee.paymentGoodsWorthScale}}% {{orderFee.paymentGoodsWorthScale}}%
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
orderExceptionStatus:"1", orderExceptionStatus:"1",
orderExceptionHandlerResult:'' orderExceptionHandlerResult:''
}, },
//发货/收货人信息 //发货/收货人信息
consigneeData:[], consigneeData:[],
routerList:[], routerList:[],
...@@ -522,4 +522,4 @@ ...@@ -522,4 +522,4 @@
display: flex; display: flex;
/* justify-content: space-between; */ /* justify-content: space-between; */
} }
</style> </style>
\ No newline at end of file
src/views/ecw/order/singleApply.vue
View file @ 35b9e1e1
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<el-table-column :label="$t('入仓货物属性')" align="center"> <el-table-column :label="$t('入仓货物属性')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{$t('合计')}}：</span> <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> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('入仓时间')" align="center"> <el-table-column :label="$t('入仓时间')" align="center">
...@@ -221,6 +221,7 @@ export default { ...@@ -221,6 +221,7 @@ export default {
// 执行查询 // 执行查询
getMergeListByOrderNo(this.queryParams).then(response => { getMergeListByOrderNo(this.queryParams).then(response => {
this.loading = false; this.loading = false;
console.log('(response.data',response.data)
if(response.data.mergedList){ if(response.data.mergedList){
this.mergedList = response.data.mergedList; this.mergedList = response.data.mergedList;
} }
......
src/views/ecw/order/warehousing/index.vue
View file @ 35b9e1e1
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</el-form> </el-form>
<warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList" <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> <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
...@@ -431,8 +431,8 @@ export default { ...@@ -431,8 +431,8 @@ export default {
}) })
return result return result
}, },
cityId(){ warehouseId(){
return this.order?.departureVO?.departureId return this.order?.logisticsInfoDto?.startWarehouseId
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment