Skip to content

J
jiedao-app-operator-master
Commit 992ac62c authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

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

parents daaf98a4 ca84f554
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 539 deletions
src/api/ecw/boxAir.js
View file @ 992ac62c
......@@ -253,6 +253,20 @@ export function getMergeTagById(id) {
});
}
/**
* 完成合包
*
* @export
* @param {*} data
* @return {*}
*/
export function finishMergePkg(shipmentId) {
return request({
url: "/ecw/box-merge-pkg/finishMergePkg?shipmentId="+shipmentId,
method: "get"
});
}
/***************************** 合包 end **********************************/
......
src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue
View file @ 992ac62c
......@@ -26,6 +26,7 @@
type="primary"
@click="
addMergedialogVisible = true
isMergeEdit = false
addMergeForm = {}
mergeTitle = $t('新建合包箱号')
"
......@@ -123,7 +124,7 @@
</template>
<script>
import { getMergePkgList, createMergePkg, updateMergePkg, deleteMergePkg, getMergeTagById } from '@/api/ecw/boxAir'
import { getMergePkgList, createMergePkg, updateMergePkg, deleteMergePkg, getMergeTagById, finishMergePkg } from '@/api/ecw/boxAir'
import { formatDate, serviceMsg } from '../../utils'
import unPkgPage from './unPkgPage.vue'
import PkgPage from './pkgPage.vue'
......@@ -249,7 +250,13 @@ export default {
this.getList()
this.pkgPagedialogVisible = false
},
finish() {}
finish() {
finishMergePkg(this.$attrs.shipmentObj.id).then((res) => {
serviceMsg(res, this).then(() => {
this.$emit("closeDialog", "submit");
});
});
}
}
}
</script>
......
src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue
View file @ 992ac62c
......@@ -43,7 +43,7 @@
<el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
<template slot-scope="{ row }">
<div v-for="item in row.orderItemDOS" :key="item.orderItemId">
{{ notset(item.positionNo) }}
{{ notset(getpositionNo(item.warehouseInInfoVO.orderLocationMergeVOSet)) }}
</div>
</template>
</el-table-column>
......@@ -108,6 +108,14 @@ export default {
})
return arr.toString()
},
getpositionNo(arr){
if(!arr) return arr
let data = []
arr.forEach(item=>{
data.push(item.locationName)
})
return data.toString()
},
addPkg(row) {
let data = {
pkgId: this.pkgData.id,
......
src/views/ecw/box/shippingAir/seaStepDetail.vue
View file @ 992ac62c
......@@ -2,7 +2,7 @@
<div class="app-seaStepDetail">
<el-scrollbar :vertical="true" viewClass="shipping-step">
<template v-for="(step, index) in flatSeaStep">
<div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName] && checkPermi(['box:'+step.type+':show'])" class="step-table">
<div :key="index" v-if="shipmentObj[step.voName] && columnsMapping[step.voName] && checkPermi(['boxAir:'+step.type+':show'])" class="step-table">
<div class="step-title">{{step.title}}</div>
<div v-for="(data, index) in columnsMapping[step.voName]" :key="index" class="step-content">
<p>{{data.title}}</p>
......
src/views/ecw/box/shippingAir/shippingAir.vue
View file @ 992ac62c
......@@ -29,7 +29,7 @@
<seaProcess :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :allLading="allLading" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
<!-- 海运步骤图 -->
<seaStepDetail :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />
<seaStepDetail v-if="seaBaseData.length>0" :seaBaseData="seaBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />
</el-col>
</el-row>
</div>
......
src/views/ecw/box/shippingAir/utils.js
View file @ 992ac62c
......@@ -34,7 +34,7 @@ function airBaseData() {
],
[
{
title: i18n.$t("排单"),
title: i18n.$t("分拣"),
imgSrc: {
start: require("@/assets/images/shipping/yz-start.png"),
wait: require("@/assets/images/shipping/yz-wait.png"),
......@@ -326,414 +326,6 @@ function airBaseData() {
];
}
/**
* 海空联运流程
*
* @return {*}
*/
function seaAirBaseData() {
return [
[
{
title: i18n.$t("订舱"),
imgSrc: {
start: require("@/assets/images/shipping/dc-start.png"),
end: require("@/assets/images/shipping/dc-end.png"),
},
type: "booking", // 类型
dataKey: "1", // 字典数据键值
/**
* 订舱状态：11、未订舱；12、已订舱
*/
voName: "bookSeaInfo", // 订舱对象vo
keyName: "bkStatus",
status: {
start: [11],
wait: [],
end: [12],
},
},
],
[
{
title: i18n.$t("排单"),
imgSrc: {
start: require("@/assets/images/shipping/yz-start.png"),
wait: require("@/assets/images/shipping/yz-wait.png"),
end: require("@/assets/images/shipping/yz-end.png"),
},
type: "preinstall",
dataKey: "2", // 字典数据键值
/**
* 预装状态：21、未预装；22、预装中；23、预装审核中；24、预装审核失败；25、预装审核成功
*/
voName: "preInstallInfo",
keyName: "prStatus",
status: {
start: [21],
wait: [22, 23, 24],
end: [25],
},
},
{
title: "AGENT",
imgSrc: {
start: require("@/assets/images/shipping/agent-start.png"),
wait: require("@/assets/images/shipping/agent-wait.png"),
end: require("@/assets/images/shipping/agent-end.png"),
},
type: "agent",
voName: "agentInfo",
currStatus: "start",
},
],
[
{
title: i18n.$t("理货"),
imgSrc: {
start: require("@/assets/images/shipping/lh-start.png"),
wait: require("@/assets/images/shipping/lh-wait.png"),
end: require("@/assets/images/shipping/lh-end.png"),
},
type: "tally",
dataKey: "16", // 字典数据键值
/**
* 理货状态：2111、未理货；2112、已理货
*/
voName: "tallyInfo",
keyName: "tyStatus",
status: {
start: [2111],
wait: [],
end: [2112],
},
},
{
title: i18n.$t("拖车"),
imgSrc: {
start: require("@/assets/images/shipping/tc-start.png"),
wait: require("@/assets/images/shipping/tc-wait.png"),
end: require("@/assets/images/shipping/tc-end.png"),
},
type: "trailer",
dataKey: "3", // 字典数据键值
/**
* 拖车状态：31、未派车；32、已派车
*/
voName: "trailerInfo",
keyName: "tlStatus",
status: {
start: [31],
wait: [],
end: [32],
},
},
],
[
{
title: i18n.$t("装柜"),
imgSrc: {
start: require("@/assets/images/shipping/zg-start.png"),
wait: require("@/assets/images/shipping/zg-wait.png"),
end: require("@/assets/images/shipping/zg-end.png"),
},
type: "cabinet",
dataKey: "4", // 字典数据键值
/**
* 装柜状态：41、未装柜；42、装柜中；43、已装柜、待封柜；44、封柜审核中；45、封柜审核失败；46、封柜审核成功；47、已封柜，待出仓
*/
voName: "cabinetInfo",
keyName: "ldStatus",
status: {
start: [41],
wait: [42, 43, 44, 45, 46],
end: [47],
},
},
],
[
{
title: i18n.$t("报关"),
imgSrc: {
start: require("@/assets/images/shipping/bg-start.png"),
wait: require("@/assets/images/shipping/bg-wait.png"),
end: require("@/assets/images/shipping/bg-end.png"),
},
type: "cusDeclaration",
dataKey: "5", // 字典数据键值
/**
*报关状态：51、未报关；52、报关中；53、已报关
*/
voName: "customsInfo",
keyName: "dcStatus",
status: {
start: [51],
wait: [52],
end: [53],
},
},
{
title: i18n.$t("配船"),
imgSrc: {
start: require("@/assets/images/shipping/pc-start.png"),
wait: require("@/assets/images/shipping/pc-wait.png"),
end: require("@/assets/images/shipping/pc-end.png"),
},
type: "ship",
dataKey: "6", // 字典数据键值
/**
* 配船状态：61、未配船；62、已配船
*/
voName: "shipConfigInfo",
keyName: "saStatus",
status: {
start: [61],
wait: [],
end: [62],
},
},
{
title: i18n.$t("提单补料"),
imgSrc: {
start: require("@/assets/images/shipping/tdcl-start.png"),
wait: require("@/assets/images/shipping/tdcl-wait.png"),
end: require("@/assets/images/shipping/tdcl-end.png"),
},
type: "subMaterial",
dataKey: "7", // 字典数据键值
/**
* 提单补料状态：71、未提单补料；72、已提单补料
*/
voName: "ladingBillInfo",
keyName: "blStatus",
status: {
start: [71],
wait: [],
end: [72],
},
},
],
[
{
title: i18n.$t("驳船"),
imgSrc: {
start: require("@/assets/images/shipping/bc-start.png"),
wait: require("@/assets/images/shipping/bc-wait.png"),
end: require("@/assets/images/shipping/bc-end.png"),
},
type: "barge",
dataKey: "8", // 字典数据键值
/**
* 驳船状态：81、未驳船；82、已驳船
*/
voName: "bargeInfo",
keyName: "bgStatus",
status: {
start: [81],
wait: [],
end: [82],
},
},
],
[
{
title: i18n.$t("起运"),
imgSrc: {
start: require("@/assets/images/shipping/qy-start.png"),
wait: require("@/assets/images/shipping/qy-wait.png"),
end: require("@/assets/images/shipping/qy-end.png"),
},
type: "departure",
dataKey: "9", // 字典数据键值
/**
* 起运状态：91、未起运；92、已起运
*/
voName: "shippingInfo",
keyName: "dtStatus",
status: {
start: [91],
wait: [],
end: [92],
},
},
],
[
{
title: i18n.$t("提单Copy"),
imgSrc: {
start: require("@/assets/images/shipping/tdcopy-start.png"),
wait: require("@/assets/images/shipping/tdcopy-wait.png"),
end: require("@/assets/images/shipping/tdcopy-end.png"),
},
type: "blCopy",
dataKey: "10", // 字典数据键值
/**
* 提单COPY状态：101、未上传；102、已上传
*/
voName: "ladingCopyInfo",
keyName: "cpStatus",
status: {
start: [101],
wait: [],
end: [102],
},
},
{
type: "clrDocument",
imgSrc: {
start: require("@/assets/images/shipping/qg-start.png"),
wait: require("@/assets/images/shipping/qg-wait.png"),
end: require("@/assets/images/shipping/qg-end.png"),
},
title: i18n.$t("清关文件"),
dataKey: "11", // 字典数据键值
/**
* 清关文件状态：111、未清关文件；112、已清关文件
*/
voName: "clearanceDocInfo",
keyName: "cdStatus",
status: {
start: [111],
wait: [],
end: [112],
},
},
],
[
{
title: i18n.$t("到港"),
imgSrc: {
start: require("@/assets/images/shipping/dg-start.png"),
wait: require("@/assets/images/shipping/dg-wait.png"),
end: require("@/assets/images/shipping/dg-end.png"),
},
type: "arrival",
dataKey: "12", // 字典数据键值
/**
* 到港状态：121、未到港；112、已到港
*/
voName: "arrivalInfo",
keyName: "apStatus",
status: {
start: [121],
wait: [],
end: [122],
},
},
],
[
{
title: i18n.$t("清关"),
imgSrc: {
start: require("@/assets/images/shipping/qg-start.png"),
wait: require("@/assets/images/shipping/qg-wait.png"),
end: require("@/assets/images/shipping/qg-end.png"),
},
type: "cusClearance",
dataKey: "13", // 字典数据键值
/**
* 清关状态：131、未清关；132、已清关
*/
voName: "clearanceInfo",
keyName: "clStatus",
status: {
start: [131],
wait: [],
end: [132],
},
},
],
[
{
title: i18n.$t("二程起飞"),
imgSrc: {
start: require("@/assets/images/shipping/ecqf-start.png"),
wait: require("@/assets/images/shipping/ecqf-wait.png"),
end: require("@/assets/images/shipping/ecqf-end.png"),
},
type: "twoWayTakeoff",
dataKey: "14", // 字典数据键值
/**
* 起飞状态：141、未起飞；142、已起飞
*/
voName: "takeOffInfo",
keyName: "stkStatus",
status: {
start: [141],
wait: [],
end: [142],
},
},
],
[
{
title: i18n.$t("二程到港"),
imgSrc: {
start: require("@/assets/images/shipping/ecdg-start.png"),
wait: require("@/assets/images/shipping/ecdg-wait.png"),
end: require("@/assets/images/shipping/ecdg-end.png"),
},
type: "twoWayArrival",
dataKey: "15", // 字典数据键值
/**
* 清关状态：131、未清关；132、已清关
*/
voName: "airArrivalInfo",
keyName: "sapStatus",
status: {
start: [151],
wait: [],
end: [152],
},
},
],
[
{
title: i18n.$t("卸柜"),
imgSrc: {
start: require("@/assets/images/shipping/xg-start.png"),
wait: require("@/assets/images/shipping/xg-wait.png"),
end: require("@/assets/images/shipping/xg-end.png"),
},
type: "unloading",
dataKey: "14", // 字典数据键值
/**
* 卸柜状态：181、未卸柜；182、卸柜中；183、卸柜审核中；184、卸柜审核失败；185、卸柜审核成功；186、已卸柜
*/
voName: "cabinetUnloadInfo",
keyName: "ulStatus",
status: {
start: [181],
wait: [182, 183, 184, 185],
end: [186],
},
},
],
[
{
title: i18n.$t("结算"),
imgSrc: {
start: require("@/assets/images/shipping/js-start.png"),
wait: require("@/assets/images/shipping/js-wait.png"),
end: require("@/assets/images/shipping/js-end.png"),
},
type: "settlement",
dataKey: "15", // 字典数据键值
/**
* 结算状态：191、未结算；192、结算中；193、已结算
*/
voName: "settlementInfo",
keyName: "slStatus",
status: {
start: [191],
wait: [192],
end: [193],
},
},
],
];
}
/**
* 详情显示列
*
......@@ -778,7 +370,7 @@ function getColmnMapping() {
],
preInstallInfo: [
{
title: i18n.$t("预装时间"),
title: i18n.$t("分拣时间"),
key: "createTime",
type: "date",
},
......@@ -787,51 +379,53 @@ function getColmnMapping() {
key: "operator",
},
],
trailerInfo: [
tallyInfo: [
{
title: i18n.$t("货柜号"),
key: "tlContainerNo",
title: i18n.$t("完成理货时间"),
key: "tyTime",
type: "datetime",
},
{
title: i18n.$t("封条"),
key: "tlStripSeal",
title: i18n.$t("业务员"),
key: "operator",
},
],
boxAirShipmentBackVO: [
{
title: i18n.$t("拖车公司"),
key: "tlCompanyId",
type: "supplier",
title: i18n.$t("送货时间"),
key: "deliverTime",
type: "datetime",
},
{
title: i18n.$t("拖车时间"),
key: "tlTime",
type: "date",
title: i18n.$t("送货地址"),
key: "deliverAddress",
},
{
title: i18n.$t("车牌"),
key: "tlLicensePlate",
key: "licensePlate",
},
{
title: i18n.$t("司机"),
key: "tlDriver",
key: "driver",
},
{
title: i18n.$t("联系方式"),
key: "tlDriverContact",
title: i18n.$t("司机联系方式"),
key: "driverPhone"
},
{
title: i18n.$t("业务员"),
key: "operator",
},
],
tallyInfo: [
boxAirCheckoutBackVO: [
{
title: i18n.$t("完成理货时间"),
key: "tyTime",
title: i18n.$t("出仓时间"),
key: "checkoutTime",
type: "datetime",
},
{
title: i18n.$t("业务员"),
key: "tyOperator",
key: "operator",
},
],
agentInfo: [
......@@ -845,32 +439,6 @@ function getColmnMapping() {
key: "operator",
},
],
cabinetInfo: [
{
title: i18n.$t("到仓时间"),
key: "ldInWarehouseTime",
type: "date",
},
{
title: i18n.$t("仓库类型"),
key: "ldWarehouseType",
type: "warehouse",
},
{
title: i18n.$t("装柜时间"),
key: "ldBoxTime",
type: "date",
},
{
title: i18n.$t("出仓时间"),
key: "ldOutWarehouseTime",
type: "date",
},
{
title: i18n.$t("业务员"),
key: "operator",
},
],
customsInfo: [
{
title: i18n.$t("报关方式"),
......@@ -893,36 +461,14 @@ function getColmnMapping() {
type: "shipping_dcCustoms_status",
},
{
title: i18n.$t("放行时间"),
key: "dcPassTime",
title: i18n.$t("查验时间"),
key: "dcCheckTime",
type: "date",
},
{
title: i18n.$t("新封条"),
key: "dcStripSeal",
},
{
title: i18n.$t("柜重"),
key: "dcBoxWgt",
},
{
title: i18n.$t("货重"),
key: "dcGoodsWgt",
},
{
title: i18n.$t("VGM重量"),
key: "dcVgmWgt",
},
{
title: i18n.$t("业务员"),
key: "operator",
},
],
shipConfigInfo: [
{
title: i18n.$t("已配/免配"),
key: "saExmtStatus",
type: "saExmtStatus",
title: i18n.$t("放行时间"),
key: "dcPassTime",
type: "date",
},
{
title: i18n.$t("业务员"),
......@@ -960,33 +506,6 @@ function getColmnMapping() {
key: "operator",
},
],
bargeInfo: [
{
title: i18n.$t("驳船"),
key: "bgExmtStatus",
type: "bgExmtStatus",
},
{
title: i18n.$t("业务员"),
key: "operator",
},
],
shippingInfo: [
{
title: i18n.$t("实际开船时间"),
key: "dtRealShipTime",
type: "datetime",
},
{
title: i18n.$t("预计到港时间"),
key: "dtEstArrivalTime",
type: "date",
},
{
title: i18n.$t("业务员"),
key: "operator",
},
],
clearanceDocInfo: [
{
title: "agent list",
......@@ -1050,27 +569,6 @@ function getColmnMapping() {
key: "operator",
},
],
takeOffInfo: [
{
title: i18n.$t("预计头程时间"),
key: "estHeadTime",
type: "datetime",
},
{
title: i18n.$t("实际头程时间"),
key: "actHeadTime",
type: "datetime",
},
{
title: i18n.$t("预计二程时间"),
key: "estSecondTime",
type: "date",
},
{
title: i18n.$t("业务员"),
key: "operator",
},
],
airArrivalInfo: [
{
title: i18n.$t("预计到达时间"),
......@@ -1436,7 +934,6 @@ export {
getColmnMapping,
getSeaStatus,
airBaseData,
seaAirBaseData,
constantDict,
formatStringNumber,
formatDateStr,
......
src/views/ecw/order/prepayDeal.vue
View file @ 992ac62c
......@@ -958,6 +958,7 @@
changeExceptionStatus(){
this.$set(this.handlerParams,'orderExceptionHandlerResult','')
},
//订单详情
getOrderData(){
getOrder(this.orderId).then(response => {
this.orderData = response.data
......@@ -974,11 +975,11 @@
this.orderData.orderItemVOList.map(v=>{
if(!v.oneSeaFreight){
v.seaFreightCurrency = this.currencyList[0]['id']
v.seaFreightVolume = this.unitList[0]['id']
v.seaFreightVolume = this.unitList[1]['id']
}
if(!v.oneClearanceFreight){
v.clearanceFreightCurrency = this.currencyList[0]['id']
v.clearanceFreightVolume = this.unitList[0]['id']
v.clearanceFreightVolume = this.unitList[1]['id']
}
})
}
......
src/views/ecw/warehouse/index.vue
View file @ 992ac62c
......@@ -856,7 +856,9 @@ export default {
}
serviceConfig({
lineId: this.lineform.lineId,
otherService: otherService.join(',')
otherService: otherService.join(','),
isClientShow:this.ladingform.isClientShow,
makeBillNode:this.ladingform.makeBillNode
}).then(res => {
this.$modal.msgSuccess(this.$t("操作成功"));
......
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