lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理冲突

Browse Source
szh-new
lijingjia 7 months ago
parent 256212a86d eb829262d8
commit 70c1dafda8
8 changed files with 1353 additions and 1450 deletions
Show Stats Download Patch File Download Diff File

19
src/views/operation/seaexport/api/BookingLedger.js
Unescape Escape View File

@ -34,6 +34,14 @@ export function GetUserQuerySet(parameter) {
params: parameter,
})
}
// 获取船公司
export function GetCarrierlist(parameter) {
return request({
url: '/mainApi/ClientCommon/GetCarrierClientList',
method: 'get',
params: parameter,
})
}
/**
* 获取订舱明细
* @params Id
@ -68,17 +76,6 @@ export function DjyCustomerSuggest(parameter) {
params: parameter,
})
}
/**
* 获取船公司
* @params CnName
*/
export function GetCarrierlist(parameter) {
return request({
url: '/commondb/carrierlist',
method: 'get',
params: parameter,
})
}
/**
* 获取船名

2257
src/views/operation/seaexport/detail/index.vue
View File

File diff suppressed because it is too large Load Diff

7
src/views/operation/seaexport/detail/modules/basicInfo.vue
Unescape Escape View File

@ -6,7 +6,8 @@
ref="basicFrom"
style="margin-bottom: 10px"
size="small"
:self-update="true"
ref="RefbasicFrom"
:selfUpdate="true"
:model="details"
:rules="rules"
>
@ -966,6 +967,7 @@
},
})
const id = ref()
const RefbasicFrom = ref()
watch(
() => props.details,
(nval) => {
@ -1301,6 +1303,9 @@
}
return tree
}
defineExpose({
RefbasicFrom,
})
</script>
<style lang="less" scoped>
/deep/ .ant-form-explain {

10
src/views/operation/seaexport/detail/modules/cargoInfo.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template>
<a-collapse v-model="showKey" class="collapse-box" :bordered="false">
<a-collapse-panel key="1" :show-arrow="false">
<a-collapse class="collapse-box" :bordered="false" v-model:activeKey="showKey">
<a-collapse-panel key="1" :showArrow="false">
<template #header>
<div class="base-tit"
><i class="iconfont icon-goods"></i>货物信息
@ -13,7 +13,7 @@
></div>
</template>
<div class="container cargo-info">
<a-form ref="cargoFrom" :self-update="true" :model="details" :rules="rules">
<a-form :selfUpdate="true" ref="RefcargoFrom" :model="details" :rules="rules">
<a-row :gutter="10">
<a-col :span="5">
<div
@ -639,6 +639,7 @@
const kgstotalRes = ref(0)
const cbmtotalRes = ref(0)
const id = ref()
const RefcargoFrom = ref()
watch(
() => props.details,
(nval) => {
@ -958,6 +959,9 @@
textEntryModalTitle.value = ''
textEntryType.value = false
}
defineExpose({
RefcargoFrom,
})
</script>
<style lang="less" scoped>
.copy-btn {

10
src/views/operation/seaexport/detail/modules/mailingInfo.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template>
<a-collapse v-model="showKey" class="collapse-box" :bordered="false">
<a-collapse-panel key="1" :show-arrow="false">
<a-collapse class="collapse-box" :bordered="false" v-model:activeKey="showKey">
<a-collapse-panel key="1" :showArrow="false">
<template #header>
<div class="base-tit">
<i class="iconfont icon-a-fahuodaifahuo"></i>收发通信息
@ -13,7 +13,7 @@
</div>
</template>
<div class="mail-info" style="padding-bottom: 18px">
<a-form ref="mailingFrom" :self-update="true" :model="details" :rules="rules">
<a-form :selfUpdate="true" ref="RefmailingFrom" :model="details" :rules="rules">
<a-row :gutter="10">
<a-col class="left-sender-box" :xs="24" :sm="24" :md="24" :lg="10" :xl="8">
<a-form-item
@ -1114,6 +1114,7 @@
const shippernameInput = ref()
const consigneenameInput = ref()
const notifypartynameInput = ref()
const RefmailingFrom = ref()
watch(
() => props.details,
(nval) => {
@ -1598,6 +1599,9 @@
function handleOpenFd() {
visibleJW.value = true
}
defineExpose({
RefmailingFrom,
})
</script>
<style lang="less" scoped>
@import url('../index.less');

15
src/views/operation/seaexport/detail/modules/operationArea.vue
Unescape Escape View File

@ -846,7 +846,14 @@
lineHeight: '30px',
})
const mskBookingOrder = ref()
// ===========
// ============================================
//保存
function saveFun() {
if (!appStore.getsaveFlag) {
emit('save')
}
}
// ============================================
function refreshPage() {
emit('refresh')
}
@ -856,11 +863,7 @@
function copyBooking() {
emit('copy')
}
function saveFun() {
if (!appStore.getsaveFlag) {
emit('save')
}
}
function FSnhowPrintModal() {
cateCode.value = 'zhudan_print'
let DprintType = ''

333
src/views/operation/seaexport/detail/rules.js
Unescape Escape View File

@ -1,184 +1,187 @@
export default {
basicRules: {
customername: [{ required: false, message: '请选择委托单位', trigger: 'change' }],
// customername: [{ required: false, message: '请选择委托单位', trigger: 'change' }],
bsno: [{ required: false, message: '请输入业务编号', trigger: 'change' }],
masterNo: [{ required: false, message: '请输入主票业务编号', trigger: 'change' }],
mblno: [{ required: false, message: '请输入提单号', trigger: 'change' }],
carrierid: [{ required: false, message: '请选择船公司', trigger: 'change' }],
forwarder: [{ required: false, message: '请输入订舱代理', trigger: 'change' }],
pono: [{ required: false, message: '请输入PO NO', trigger: 'change' }],
mblno: [{ required: false, message: '选择模板', trigger: 'change' }],
// carrierid: [{ required: false, message: '请选择船公司', trigger: 'change' }],
// forwarder: [{ required: false, message: '请输入订舱代理', trigger: 'change' }],
// pono: [{ required: false, message: '请输入PO NO', trigger: 'change' }],
hblno: [{ required: false, message: '请输入分提单号', trigger: 'change' }],
custno: [{ required: false, message: '请输入订舱编号', trigger: 'change' }],
contractno: [{ required: false, message: '请输入运费协议号', trigger: 'change' }],
tmblno: [{ required: false, message: '请输入真提单号', trigger: 'change' }], // VOLTA WHL CSL
epCode: [{ required: false, message: '请输入EP号', trigger: 'change' }], // esl
vessel: [{ required: false, message: '请输入船名', trigger: 'change' }],
lanecode: [{ required: false, message: '请输入航线代码', trigger: 'change' }], // esl
voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'change' }],
voyno: [{ required: false, message: '请输入航次/海关航次', trigger: 'change' }],
etd: [{ required: false, message: '请选择开船日期', trigger: 'change' }],
zhanCangFlag: [{ required: false, message: '请选择是否占舱', trigger: 'change' }],
// atd: [{ required: false, message: '请选择实际开船日期', trigger: 'change' }],
lanename: [{ required: false, message: '请输入船司航线', trigger: 'change' }],
shipagency: [{ required: false, message: '请输入船代', trigger: 'change' }],
lineName: [{ required: false, message: '请输入航线', trigger: 'change' }],
sale: [{ required: false, message: '请选择揽货人员', trigger: 'change' }],
op: [{ required: false, message: '请选择操作人员', trigger: 'change' }],
doc: [{ required: false, message: '请选择单证人员', trigger: 'change' }],
custservice: [{ required: false, message: '请选择客服人员', trigger: 'change' }],
route: [{ required: false, message: '请选择航线操作', trigger: 'change' }],
lineManage: [{ required: false, message: '请选择航线管理', trigger: 'change' }],
dzRemark: [{ required: false, message: '请选择单证备注', trigger: 'change' }],
czRemark: [{ required: false, message: '请选择操作备注', trigger: 'change' }],
// custno: [{ required: false, message: '请输入订舱编号', trigger: 'change' }],
// contractno: [{ required: false, message: '请输入运费协议号', trigger: 'change' }],
// tmblno: [{ required: false, message: '请输入真提单号', trigger: 'change' }], // VOLTA WHL CSL
// epCode: [{ required: false, message: '请输入EP号', trigger: 'change' }], // esl
// vessel: [{ required: false, message: '请输入船名', trigger: 'change' }],
// lanecode: [{ required: false, message: '请输入航线代码', trigger: 'change' }], // esl
// voynoinner: [{ required: false, message: '请输入内部航次', trigger: 'change' }],
// voyno: [{ required: false, message: '请输入航次/海关航次', trigger: 'change' }],
// etd: [{ required: false, message: '请选择开船日期', trigger: 'change' }],
// zhanCangFlag: [{ required: false, message: '请选择是否占舱', trigger: 'change' }],
// // atd: [{ required: false, message: '请选择实际开船日期', trigger: 'change' }],
// lanename: [{ required: false, message: '请输入船司航线', trigger: 'change' }],
// shipagency: [{ required: false, message: '请输入船代', trigger: 'change' }],
// lineName: [{ required: false, message: '请输入航线', trigger: 'change' }],
// sale: [{ required: false, message: '请选择揽货人员', trigger: 'change' }],
// op: [{ required: false, message: '请选择操作人员', trigger: 'change' }],
// doc: [{ required: false, message: '请选择单证人员', trigger: 'change' }],
// custservice: [{ required: false, message: '请选择客服人员', trigger: 'change' }],
// route: [{ required: false, message: '请选择航线操作', trigger: 'change' }],
// lineManage: [{ required: false, message: '请选择航线管理', trigger: 'change' }],
// dzRemark: [{ required: false, message: '请选择单证备注', trigger: 'change' }],
// czRemark: [{ required: false, message: '请选择操作备注', trigger: 'change' }],
},
mailingRules: {
shipper: [{ required: false, message: '请输入发货人', trigger: 'submit' }],
consignee: [{ required: false, message: '请输入收货人', trigger: 'submit' }],
notifyparty: [{ required: false, message: '请输入通知人', trigger: 'submit' }],
yard: [{ required: false, message: '请输入场站', trigger: 'change' }],
feeself: [{ required: false, message: '请选择场站费自结', trigger: 'change' }],
customser: [{ required: false, message: '请输入报关行', trigger: 'change' }],
trucker: [{ required: false, message: '请输入车队', trigger: 'change' }],
agentname: [{ required: false, message: '请输入国外代理', trigger: 'change' }],
warehouse: [{ required: false, message: '请选择仓库', trigger: 'change' }],
shippingMethod: [{ required: false, message: '请选择装运方式', trigger: 'change' }],
closingdate: [{ required: false, message: '请选择截港时间', trigger: 'change' }],
closedocdate: [{ required: false, message: '请选择截单时间', trigger: 'change' }],
closevgmdate: [{ required: false, message: '请选择VGM时间', trigger: 'change' }],
placereceiptid: [{ required: false, message: '请选择收货地代码', trigger: 'change' }],
placereceipt: [{ required: false, message: '请选择收货地', trigger: 'change' }],
portloadid: [{ required: false, message: '请选择装货港代码', trigger: 'change' }],
portload: [{ required: false, message: '请选择装货港', trigger: 'change' }],
transportid: [{ required: false, message: '请选择中转港代码', trigger: 'change' }],
transport: [{ required: false, message: '请选择中转港', trigger: 'change' }],
portdischargeid: [{ required: false, message: '请选择卸货港代码', trigger: 'change' }],
portdischarge: [{ required: false, message: '请选择卸货港', trigger: 'change' }],
destinationid: [{ required: false, message: '请选择目的代码', trigger: 'change' }],
destination: [{ required: false, message: '请选择目的地', trigger: 'change' }],
placedeliveryid: [{ required: true, message: '请选择交货代码', trigger: 'change' }],
placedelivery: [{ required: true, message: '请选择交货地', trigger: 'change' }],
pkgs: [{ required: false, message: '请输入件数', trigger: 'change' }],
kindpkgs: [{ required: false, message: '请输入包装', trigger: 'change' }],
kgs: [{ required: false, message: '请输入毛重', trigger: 'change' }],
cbm: [{ required: false, message: '请输入尺寸', trigger: 'change' }],
blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
// shipper: [{ required: false, message: '请输入发货人', trigger: 'submit' }],
// consignee: [{ required: false, message: '请输入收货人', trigger: 'submit' }],
// notifyparty: [{ required: false, message: '请输入通知人', trigger: 'submit' }],
// yard: [{ required: false, message: '请输入场站', trigger: 'change' }],
// feeself: [{ required: false, message: '请选择场站费自结', trigger: 'change' }],
// customser: [{ required: false, message: '请输入报关行', trigger: 'change' }],
// trucker: [{ required: false, message: '请输入车队', trigger: 'change' }],
// agentname: [{ required: false, message: '请输入国外代理', trigger: 'change' }],
// warehouse: [{ required: false, message: '请选择仓库', trigger: 'change' }],
// shippingMethod: [{ required: false, message: '请选择装运方式', trigger: 'change' }],
// closingdate: [{ required: false, message: '请选择截港时间', trigger: 'change' }],
// closedocdate: [{ required: false, message: '请选择截单时间', trigger: 'change' }],
// closevgmdate: [{ required: false, message: '请选择VGM时间', trigger: 'change' }],
// placereceiptid: [{ required: false, message: '请选择收货地代码', trigger: 'change' }],
// placereceipt: [{ required: false, message: '请选择收货地', trigger: 'change' }],
// portloadid: [{ required: false, message: '请选择装货港代码', trigger: 'change' }],
// portload: [{ required: false, message: '请选择装货港', trigger: 'change' }],
// transportid: [{ required: false, message: '请选择中转港代码', trigger: 'change' }],
// transport: [{ required: false, message: '请选择中转港', trigger: 'change' }],
// portdischargeid: [{ required: false, message: '请选择卸货港代码', trigger: 'change' }],
// portdischarge: [{ required: false, message: '请选择卸货港', trigger: 'change' }],
// destinationid: [{ required: false, message: '请选择目的代码', trigger: 'change' }],
// destination: [{ required: false, message: '请选择目的地', trigger: 'change' }],
// placedeliveryid: [{ required: true, message: '请选择交货代码', trigger: 'change' }],
// placedelivery: [{ required: true, message: '请选择交货地', trigger: 'change' }],
// pkgs: [{ required: false, message: '请输入件数', trigger: 'change' }],
// kindpkgs: [{ required: false, message: '请输入包装', trigger: 'change' }],
// kgs: [{ required: false, message: '请输入毛重', trigger: 'change' }],
// cbm: [{ required: false, message: '请输入尺寸', trigger: 'change' }],
// blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
},
cargoRules: {
marks: [{ required: false, message: '请输入Seal No. Marks & Nos', trigger: 'change' }],
cargoid: [{ required: false, message: '请选择货物标志', trigger: 'change' }],
hscode: [{ required: false, message: '请输入HS编码', trigger: 'change' }],
description: [{ required: false, message: '请输入包装种类与货名', trigger: 'change' }],
goodsname: [{ required: false, message: '请选择品名', trigger: 'change' }],
// marks: [{ required: false, message: '请输入Seal No. Marks & Nos', trigger: 'change' }],
// cargoid: [{ required: false, message: '请选择货物标志', trigger: 'change' }],
// hscode: [{ required: false, message: '请输入HS编码', trigger: 'change' }],
// description: [{ required: false, message: '请输入包装种类与货名', trigger: 'change' }],
// goodsname: [{ required: false, message: '请选择品名', trigger: 'change' }],
},
billRules: {
issuetype: [{ required: false, message: '请选择签单方式', trigger: 'change' }],
issuedate: [{ required: false, message: '请选择签单日期', trigger: 'change' }],
issueplace: [{ required: false, message: '请选择签单地点', trigger: 'change' }],
issueplaceid: [{ required: false, message: '请输入签单地代码', trigger: 'change' }],
nobill: [{ required: false, message: '请选择提单份数', trigger: 'change' }],
copynobill: [{ required: false, message: '请选择副本份数', trigger: 'change' }],
prepardat: [{ required: false, message: '请选择预付地点', trigger: 'change' }],
payableat: [{ required: false, message: '请选择到付地点', trigger: 'change' }],
blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
thirdpayaddr: [{ required: false, message: '请输入第三付款地', trigger: 'change' }],
service: [{ required: false, message: '请选择运输条款', trigger: 'change' }],
reeferf: [{ required: false, message: '请输入冷藏通风量', trigger: 'change' }],
tempset: [{ required: false, message: '请输入温度', trigger: 'change' }],
tempid: [{ required: false, message: '请选择温度单位', trigger: 'change' }],
tempmin: [{ required: false, message: '请输入最低温度', trigger: 'change' }],
tempmax: [{ required: false, message: '请输入最高温度', trigger: 'change' }],
humidity: [{ required: false, message: '请输入湿度', trigger: 'change' }],
dclass: [{ required: false, message: '请输入危险品等级', trigger: 'change' }],
dunno: [{ required: false, message: '请输入危险品编号', trigger: 'change' }],
dpage: [{ required: false, message: '请输入危险品页号', trigger: 'change' }],
dlabel: [{ required: false, message: '请输入危险品标签', trigger: 'change' }],
linkman: [{ required: false, message: '请输入危险品联系人', trigger: 'change' }],
// issuetype: [{ required: false, message: '请选择签单方式', trigger: 'change' }],
// issuedate: [{ required: false, message: '请选择签单日期', trigger: 'change' }],
// issueplace: [{ required: false, message: '请选择签单地点', trigger: 'change' }],
// issueplaceid: [{ required: false, message: '请输入签单地代码', trigger: 'change' }],
// nobill: [{ required: false, message: '请选择提单份数', trigger: 'change' }],
// copynobill: [{ required: false, message: '请选择副本份数', trigger: 'change' }],
// prepardat: [{ required: false, message: '请选择预付地点', trigger: 'change' }],
// payableat: [{ required: false, message: '请选择到付地点', trigger: 'change' }],
// blfrt: [{ required: false, message: '请选择付费方式', trigger: 'change' }],
// thirdpayaddr: [{ required: false, message: '请输入第三付款地', trigger: 'change' }],
// service: [{ required: false, message: '请选择运输条款', trigger: 'change' }],
// reeferf: [{ required: false, message: '请输入冷藏通风量', trigger: 'change' }],
// tempset: [{ required: false, message: '请输入温度', trigger: 'change' }],
// tempid: [{ required: false, message: '请选择温度单位', trigger: 'change' }],
// tempmin: [{ required: false, message: '请输入最低温度', trigger: 'change' }],
// tempmax: [{ required: false, message: '请输入最高温度', trigger: 'change' }],
// humidity: [{ required: false, message: '请输入湿度', trigger: 'change' }],
// dclass: [{ required: false, message: '请输入危险品等级', trigger: 'change' }],
// dunno: [{ required: false, message: '请输入危险品编号', trigger: 'change' }],
// dpage: [{ required: false, message: '请输入危险品页号', trigger: 'change' }],
// dlabel: [{ required: false, message: '请输入危险品标签', trigger: 'change' }],
// linkman: [{ required: false, message: '请输入危险品联系人', trigger: 'change' }],
},
remarksRules: {
soremark: [{ required: false, message: '请输入订舱备注', trigger: 'change' }],
siremark: [{ required: false, message: '请输入截单备注', trigger: 'change' }],
// soremark: [{ required: false, message: '请输入订舱备注', trigger: 'change' }],
// siremark: [{ required: false, message: '请输入截单备注', trigger: 'change' }],
},
ediRules: {
'bookingEDIExt.sendCode': [
{ required: false, message: '请输入发送方EDI代码', trigger: 'change' },
],
'bookingEDIExt.receiveCode': [
{ required: false, message: '请输入接收方EDI代码', trigger: 'change' },
],
'bookingEDIExt.ediAttn': [
{ required: false, message: '请输入EDI联系人名称', trigger: 'change' },
],
'bookingEDIExt.ediAttnTel': [
{ required: false, message: '请输入EDI联系人电话', trigger: 'change' },
],
'bookingEDIExt.ediAttnMail': [
{ required: false, message: '请输入EDI联系人邮箱', trigger: 'change' },
],
'bookingEDIExt.amsConsignee': [
{ required: false, message: '请输入AMS收货人', trigger: 'change' },
],
'bookingEDIExt.amsNotifyParty': [
{ required: false, message: '请输入AMS通知人', trigger: 'change' },
],
'bookingEDIExt.opEName': [
{ required: false, message: '请输入操作英文名称', trigger: 'change' },
],
'bookingEDIExt.opTel': [{ required: false, message: '请输入操作电话', trigger: 'change' }],
'bookingEDIExt.opEmail': [{ required: false, message: '请输入操作邮箱', trigger: 'change' }],
'bookingEDIExt.goodsName': [{ required: false, message: '请输入商品名称', trigger: 'change' }],
iscontainersoc: [{ required: false, message: '请输入SOC箱', trigger: 'change' }],
scaccode: [{ required: false, message: '请输入SCAC代码', trigger: 'change' }],
itncode: [{ required: false, message: '请输入ITN编号', trigger: 'change' }],
'bookingEDIExt.orderRemark': [
{ required: false, message: '请输入订舱人说明', trigger: 'change' },
],
freightpayer: [{ required: false, message: '请输入付款方', trigger: 'change' }],
'bookingEDIExt.kingTareweight': [
{ required: false, message: '请输入第一层包装皮重', trigger: 'change' },
],
'bookingEDIExt.weiTuoFang': [{ required: false, message: '请输入委托方', trigger: 'change' }],
'bookingEDIExt.exRemark1': [{ required: false, message: '请输入辅助字段1', trigger: 'change' }],
'bookingEDIExt.exRemark2': [{ required: false, message: '请输入辅助字段2', trigger: 'change' }],
'bookingEDIExt.exRemark3': [{ required: false, message: '请输入辅助字段3', trigger: 'change' }],
'bookingEDIExt.exRemark4': [{ required: false, message: '请输入辅助字段4', trigger: 'change' }],
'bookingEDIExt.consigneeEdiCode': [
{ required: false, message: '请输入收货人EDI代码', trigger: 'change' },
],
'bookingEDIExt.shipperEdiCode': [
{ required: false, message: '请输入发货人EDI代码', trigger: 'change' },
],
'bookingEDIExt.notifyCdoe': [
{ required: false, message: '请输入通知方EDI代码', trigger: 'change' },
],
'bookingEDIExt.salerCode': [
{ required: false, message: '请输入太平销售EDI代码', trigger: 'change' },
],
'bookingEDIExt.emanifestHbl': [
{ required: false, message: '请输入EMANIFEST HBL', trigger: 'change' },
],
'bookingEDIExt.masterBolIndicator': [
{ required: false, message: '请输入Master Bol Indicator', trigger: 'change' },
],
'bookingEDIExt.s0CC0C': [{ required: false, message: '请输入S0C C0C', trigger: 'change' }],
'bookingEDIExt.ckhi': [
{ required: false, message: '请输入欧盟港口、伊朗港口、KHI', trigger: 'change' },
],
'bookingEDIExt.cncm': [{ required: false, message: '请输入南美东', trigger: 'change' }],
'bookingEDIExt.wncm': [
{ required: false, message: '请输入巴西线木质包装情况', trigger: 'change' },
],
'bookingEDIExt.acihbl': [{ required: false, message: '请输入ACI HBL', trigger: 'change' }],
// 'bookingEDIExt.sendCode': [
// { required: false, message: '请输入发送方EDI代码', trigger: 'change' },
// ],
// 'bookingEDIExt.receiveCode': [
// { required: false, message: '请输入接收方EDI代码', trigger: 'change' },
// ],
// 'bookingEDIExt.ediAttn': [
// { required: false, message: '请输入EDI联系人名称', trigger: 'change' },
// ],
// 'bookingEDIExt.ediAttnTel': [
// { required: false, message: '请输入EDI联系人电话', trigger: 'change' },
// ],
// 'bookingEDIExt.ediAttnMail': [
// { required: false, message: '请输入EDI联系人邮箱', trigger: 'change' },
// ],
// 'bookingEDIExt.amsConsignee': [
// { required: false, message: '请输入AMS收货人', trigger: 'change' },
// ],
// 'bookingEDIExt.amsNotifyParty': [
// { required: false, message: '请输入AMS通知人', trigger: 'change' },
// ],
// 'bookingEDIExt.opEName': [
// { required: false, message: '请输入操作英文名称', trigger: 'change' },
// ],
// 'bookingEDIExt.opTel': [{ required: false, message: '请输入操作电话', trigger: 'change' }],
// 'bookingEDIExt.opEmail': [{ required: false, message: '请输入操作邮箱', trigger: 'change' }],
// 'bookingEDIExt.goodsName': [{ required: false, message: '请输入商品名称', trigger: 'change' }],
// iscontainersoc: [{ required: false, message: '请输入SOC箱', trigger: 'change' }],
// scaccode: [{ required: false, message: '请输入SCAC代码', trigger: 'change' }],
// itncode: [{ required: false, message: '请输入ITN编号', trigger: 'change' }],
// 'bookingEDIExt.orderRemark': [
// { required: false, message: '请输入订舱人说明', trigger: 'change' },
// ],
// freightpayer: [{ required: false, message: '请输入付款方', trigger: 'change' }],
// 'bookingEDIExt.kingTareweight': [
// { required: false, message: '请输入第一层包装皮重', trigger: 'change' },
// ],
// 'bookingEDIExt.weiTuoFang': [{ required: false, message: '请输入委托方', trigger: 'change' }],
// 'bookingEDIExt.exRemark1': [{ required: false, message: '请输入辅助字段1', trigger: 'change' }],
// 'bookingEDIExt.exRemark2': [{ required: false, message: '请输入辅助字段2', trigger: 'change' }],
// 'bookingEDIExt.exRemark3': [{ required: false, message: '请输入辅助字段3', trigger: 'change' }],
// 'bookingEDIExt.exRemark4': [{ required: false, message: '请输入辅助字段4', trigger: 'change' }],
// 'bookingEDIExt.consigneeEdiCode': [
// { required: false, message: '请输入收货人EDI代码', trigger: 'change' },
// ],
// 'bookingEDIExt.shipperEdiCode': [
// { required: false, message: '请输入发货人EDI代码', trigger: 'change' },
// ],
// 'bookingEDIExt.notifyCdoe': [
// { required: false, message: '请输入通知方EDI代码', trigger: 'change' },
// ],
// 'bookingEDIExt.salerCode': [
// { required: false, message: '请输入太平销售EDI代码', trigger: 'change' },
// ],
// 'bookingEDIExt.emanifestHbl': [
// { required: false, message: '请输入EMANIFEST HBL', trigger: 'change' },
// ],
// 'bookingEDIExt.masterBolIndicator': [
// { required: false, message: '请输入Master Bol Indicator', trigger: 'change' },
// ],
// 'bookingEDIExt.s0CC0C': [{ required: false, message: '请输入S0C C0C', trigger: 'change' }],
// 'bookingEDIExt.ckhi': [
// { required: false, message: '请输入欧盟港口、伊朗港口、KHI', trigger: 'change' },
// ],
// 'bookingEDIExt.cncm': [{ required: false, message: '请输入南美东', trigger: 'change' }],
// 'bookingEDIExt.wncm': [
// { required: false, message: '请输入巴西线木质包装情况', trigger: 'change' },
// ],
// 'bookingEDIExt.acihbl': [{ required: false, message: '请输入ACI HBL', trigger: 'change' }],
},
tableRules: {
ctnall: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
ctnnum: { required: false, title: '箱量', message: '请选择箱量', trigger: 'change' },
cntrno: { required: false, title: '箱号', message: '请选择箱号', trigger: 'change' },
sealno: { required: false, title: '封号', message: '请选择封号', trigger: 'change' },
pkgs: { required: false, title: '件数', message: '请选择件数', trigger: 'change' },
kindpkgs: { required: false, title: '包装', message: '请选择包装', trigger: 'change' },
kgs: { required: false, title: '重量', message: '请选择重量', trigger: 'change' },
cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' },
tareweight: { required: false, title: '箱皮重', message: '请选择箱皮重', trigger: 'change' },
weightype: { required: false, title: '称重方式', message: '请选择称重方式', trigger: 'change' },
weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' },
// ctnall: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },
// ctnnum: { required: false, title: '箱量', message: '请选择箱量', trigger: 'change' },
// cntrno: { required: false, title: '箱号', message: '请选择箱号', trigger: 'change' },
// sealno: { required: false, title: '封号', message: '请选择封号', trigger: 'change' },
// pkgs: { required: false, title: '件数', message: '请选择件数', trigger: 'change' },
// kindpkgs: { required: false, title: '包装', message: '请选择包装', trigger: 'change' },
// kgs: { required: false, title: '重量', message: '请选择重量', trigger: 'change' },
// cbm: { required: false, title: '尺码', message: '请选择尺码', trigger: 'change' },
// tareweight: { required: false, title: '箱皮重', message: '请选择箱皮重', trigger: 'change' },
// weightype: { required: false, title: '称重方式', message: '请选择称重方式', trigger: 'change' },
// weighkgs: { required: false, title: '称重重量', message: '请选择称重重量', trigger: 'change' },
},
preRules: {
ctn: { required: false, title: '箱型', message: '请选择箱型', trigger: 'change' },

152
src/views/operation/seaexport/index.vue
Unescape Escape View File

@ -83,12 +83,9 @@
<vxe-toolbar>
<template #buttons>
<div class="nav-box">
<div class="nav" @click="addBooking"
><i class="iconfont icon-jiahao2fill"></i>新建</div
>
<div class="nav" @click="addBooking2"
><i class="iconfont icon-jiahao2fill"></i>Test跳转</div
>
<div class="nav" @click="addBooking">
<i class="iconfont icon-jiahao2fill"></i>新建
</div>
<div class="nav" @click="copyBooking"
><i class="iconfont icon-fuzhi"></i>复制</div
>
@ -1082,45 +1079,6 @@
</a-spin>
</div>
</a-modal>
<a-modal
:mask-closable="false"
:width="1700"
:visible="addVisible"
@ok="addSubmit"
@cancel="addCancel"
>
<a-radio-group v-model="carrierRadio" class="group-label-box">
<p v-if="RecentlyCarrierData.length" class="Awrapper"
>最近使用 <span class="line"></span
></p>
<div v-if="RecentlyCarrierData.length" class="group-label">
<a-radio
v-for="item in RecentlyCarrierData"
:key="item.code"
:style="radioStyle"
:value="item.code"
>
<img class="radio-logo" :src="item.ImgSrc" />
{{ item.cnName }}
</a-radio>
</div>
<div v-for="e in Object.keys(RcarrierData)" :key="e">
<p class="Awrapper">{{ e }}<span class="line"></span></p>
<div class="group-label">
<a-radio
v-for="item in RcarrierData[e]"
:key="item.code"
:style="radioStyle"
:value="item.code"
>
<img class="radio-logo" :src="item.ImgSrc" />
{{ item.cnName }}
</a-radio>
</div>
</div>
</a-radio-group>
</a-modal>
<a-modal
title="多提单号查询"
:mask-closable="false"
@ -1663,7 +1621,6 @@
})
const tableOrderLabel = ref('')
const tableOrderType = ref('')
const addVisible = ref(false)
const carrierRadio = ref('CMA')
const RecentlyCarrierData = ref([])
const addNum = ref(0)
@ -2036,6 +1993,10 @@
console.log(err)
})
}
function addBooking() {
addNum.value = Math.round(Math.random() * 1000)
go(`/BookingDetail?type=OOCL&addNum=${addNum.value}`)
}
// ====================================================
function getListByone(listId, listIndex) {
PageDataByBooking({ id: listId }).then((res) => {
@ -2139,7 +2100,6 @@
}
FnGetUserQuerySet()
getConfigUser(true)
getCarrier()
}
async function FnGetUserQuerySet() {
const res: API.DataResult = await GetUserQuerySet({
@ -2653,104 +2613,6 @@
return GetTenantLineList
}
}
function addBooking() {
addVisible.value = !addVisible.value
}
function addBooking2() {
go(`/BookingDetail?type=Add`)
}
function addSubmit() {
const data = []
data.push(carrierRadio.value)
if (RecentlyCarrierData.value.length) {
RecentlyCarrierData.value.forEach((item) => {
if (item.code != carrierRadio.value && data.length < 10) {
data.push(item.code)
}
})
}
DjyUserConfigAdd({
type: 'booking_memory',
configJson: JSON.stringify(data),
}).then((res) => {
getCarrier()
addVisible.value = false
addNum.value = Math.round(Math.random() * 1000)
go(`/BookingDetail?type=${carrierRadio.value}&addNum=${addNum.value}`)
})
}
function getCarrier() {
const Rdata = (data) => {
const RData = {}
for (var i = 0; i < 26; i++) {
RData[String.fromCharCode(65 + i)] = []
data.forEach((item) => {
if (String.fromCharCode(65 + i) == item.enName[0].toUpperCase()) {
RData[String.fromCharCode(65 + i)].push(item)
}
})
}
const Obj = {
'A-D': ['A', 'B', 'C', 'D'],
'E-L': ['E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'],
'M-R': ['M', 'N', 'O', 'P', 'Q', 'R'],
'S-U': ['S', 'T', 'U'],
'V-Z': ['V', 'W', 'X', 'Y', 'Z'],
}
const Data = {
'A-D': [],
'E-L': [],
'M-R': [],
'S-U': [],
'V-Z': [],
}
Object.keys(Obj).forEach((e) => {
Obj[e].forEach((item) => {
RData[item].forEach((Ai, AiIndex) => {
let imgSrc = ''
try {
imgSrc = require(`@/assets/logo/${Ai.code}.png`)
} catch (error) {
// imgSrc = require('@/assets/logo/default.png')
}
RData[item][AiIndex].ImgSrc = imgSrc
})
Data[e].push(...RData[item])
})
})
RcarrierData.value = Data
}
GetCarrierlist()
.then((res) => {
if (res.code === 200) {
Rdata(res.data)
DjyUserConfigGet({ type: 'booking_memory' })
.then((e) => {
if (e.data) {
const data = []
JSON.parse(e.data.configJson).forEach((item) => {
res.data.forEach((item2) => {
if (item == item2.code) {
data.push(item2)
}
})
})
RecentlyCarrierData.value = data
}
})
.catch(() => {
Rdata(res.data)
})
}
})
.catch((err) => {
console.log(err)
})
}
function addCancel() {
addVisible.value = false
}
function copyBooking() {
const select = xGrid.value.getCheckboxRecords()
const pkIdArr = select.map((item, index) => {

Write Preview
Loading…
Cancel
Save