修改BUG

dev
lilu 2 years ago
parent ed25a78c66
commit adc79274a9

@ -4,6 +4,7 @@
:width="900"
:visible="visible"
:confirmLoading="confirmLoading"
:maskClosable="false"
@ok="handleSubmit"
@cancel="handleCancel"
>

@ -10,7 +10,7 @@
<a-tab-pane key="1" tab="主单信息">
<a-row :gutter="24">
<a-col :span="18">
<template v-if="!inPageLoading">
<template>
<operationArea
:details="bookingDetails"
@refresh="refreshPage"
@ -38,7 +38,7 @@
<!-- 备注信息 -->
<remarksInfo :details="bookingDetails" @changeDetail="changeDetailFun"></remarksInfo>
<!-- 箱型 -->
<goodsTable :details="bookingDetails" @changeDetail="changeDetailFun"></goodsTable>
<goodsTable :details="bookingDetails" @changeDetail="changeDetailFun" v-if="!inPageLoading"></goodsTable>
</div>
</a-tab-pane>
<a-tab-pane key="2-2" tab="EDI补充信息">
@ -46,33 +46,32 @@
class="pane-box"
:details="bookingDetails"
@changeDetail="changeDetailFun"
v-if="!inPageLoading"
></ediMore>
</a-tab-pane>
</a-tabs>
</template>
<template v-else>
<!-- <template v-if="inPageLoading">
<div class="load-block" style="width: 100%; height: 107px;"></div>
<div class="load-block" style="width: 100%; height: 390px;"></div>
<div class="load-block" style="width: 100%; height: 690px;"></div>
<div class="load-block" style="width: 100%; height: 390px;"></div>
</template>
</template> -->
</a-col>
<a-col :span="6">
<rightContent
v-if="!inPageLoading"
:id="id"
:details="bookingDetails"
:excuteRules="excuteRules"
:excuteRulesType="excuteRulesType"
@changeDetail="changeDetailFun"
@rules="getRules"
></rightContent>
<template v-else>
<!-- <template v-if="inPageLoading">
<div class="load-block" style="width: 100%; height: 206px;"></div>
<div class="load-block" style="width: 100%; height: 142px;"></div>
<div class="load-block" style="width: 100%; height: 208px;"></div>
<div class="load-block" style="width: 100%; height: 249px;"></div>
</template>
</template> -->
</a-col>
</a-row>
</a-tab-pane>
@ -334,114 +333,117 @@ export default {
init() {
// this.bookingDetails = {}
this.bookingDetails = initDetail
this.excuteRules = []
this.excuteRulesType = ''
if (this.id) {
this.isAdd = false
this.getDetail()
} else {
this.isAdd = true
this.bookingDetails = {
id: 0,
parentId: 0,
//
customername: '',
customerid: '',
carrier: '',
carrierid: this.type,
forwarder: '',
pono: '',
mblno: '',
hblno: '',
bookingno: '',
contractno: '',
vessel: '',
voyno: '',
voynoinner: '',
lanecode: '',
etd: '',
atd: '',
lanename: '',
shipagency: '',
sale: '',
op: '',
doc: '',
custservice: '',
//
shipper: '',
consignee: '',
notifyparty: '',
yard: '',
customser: '',
trucker: '',
agentid: '',
eta: '',
closingdate: '',
closedocdate: '',
closevgmdate: '',
portload: '',
portloadid: '',
transport: '',
transportid: '',
portdischarge: '',
portdischargeid: '',
destination: '',
destinationid: '',
placedelivery: '',
placedeliveryid: '',
placereceipt: '',
placereceiptid: '',
pkgs: 0,
kindpkgs: '',
kgs: 0,
cbm: 0,
//
marks: '',
cargoid: '',
hscode: '',
description: '',
totalno: '',
//
issuetype: '',
issuedate: '',
issueplace: '',
issueplaceid: '',
nobill: 'THREE',
copynobilll: 'THREE',
prepardat: '',
payableat: '',
blfrt: '',
thirdpayaddr: '',
service: '',
reeferf: '',
tempset: '',
tempid: '',
tempmin: '',
tempmax: '',
humidity: '',
dclass: '',
dunno: '',
dpage: '',
dlabel: '',
linkman: '',
//
soremark: '',
siremark: '',
//
ctnInputs: [],
// edi (edi)
weituo: '',
freightpayer: '',
scaccode: '',
itncode: '',
iscontainersoc: 0,
bookingEDIExt: {
weiTuoFang: '',
ediAttn: '',
ediAttnTel: '',
ediAttnMail: ''
},
//
hbList: []
}
// this.bookingDetails = {
// id: 0,
// parentId: 0,
// //
// customername: '',
// customerid: '',
// carrier: '',
// carrierid: this.type,
// forwarder: '',
// pono: '',
// mblno: '',
// hblno: '',
// bookingno: '',
// contractno: '',
// vessel: '',
// voyno: '',
// voynoinner: '',
// lanecode: '',
// etd: '',
// atd: '',
// lanename: '',
// shipagency: '',
// sale: '',
// op: '',
// doc: '',
// custservice: '',
// //
// shipper: '',
// consignee: '',
// notifyparty: '',
// yard: '',
// customser: '',
// trucker: '',
// agentid: '',
// eta: '',
// closingdate: '',
// closedocdate: '',
// closevgmdate: '',
// portload: '',
// portloadid: '',
// transport: '',
// transportid: '',
// portdischarge: '',
// portdischargeid: '',
// destination: '',
// destinationid: '',
// placedelivery: '',
// placedeliveryid: '',
// placereceipt: '',
// placereceiptid: '',
// pkgs: 0,
// kindpkgs: '',
// kgs: 0,
// cbm: 0,
// //
// marks: '',
// cargoid: '',
// hscode: '',
// description: '',
// totalno: '',
// //
// issuetype: '',
// issuedate: '',
// issueplace: '',
// issueplaceid: '',
// nobill: 'THREE',
// copynobilll: 'THREE',
// prepardat: '',
// payableat: '',
// blfrt: '',
// thirdpayaddr: '',
// service: '',
// reeferf: '',
// tempset: '',
// tempid: '',
// tempmin: '',
// tempmax: '',
// humidity: '',
// dclass: '',
// dunno: '',
// dpage: '',
// dlabel: '',
// linkman: '',
// //
// soremark: '',
// siremark: '',
// //
// ctnInputs: [],
// // edi (edi)
// weituo: '',
// freightpayer: '',
// scaccode: '',
// itncode: '',
// iscontainersoc: 0,
// bookingEDIExt: {
// weiTuoFang: '',
// ediAttn: '',
// ediAttnTel: '',
// ediAttnMail: ''
// },
// //
// hbList: []
// }
this.bookingDetails.carrierid = this.type
this.bookingDetails.carrier = this.enmuCarrier(this.type)
}
},
@ -470,19 +472,19 @@ export default {
},
getDetail() {
this.inPageLoading = false
// if (this.inPageLoading) {
// return false
// }
// this.inPageLoading = true
// this.$message.loading({ content: '...' });
// this.inPageLoading = false
if (this.inPageLoading) {
return false
}
this.inPageLoading = true
this.$message.loading({ content: '加载中...' });
BookingOrderGet({
id: this.id
})
.then(res => {
this.inPageLoading = false
this.$message.destroy()
// this.$message.success({ content: '' })
this.$message.success({ content: '加载完成' })
if (this.isCopy) {
res.data.mblno = ''
this.isAdd = true

@ -336,6 +336,7 @@
:width="1200"
:visible="customerVisible"
:confirmLoading="customerModelconfirm"
:maskClosable="false"
@ok="handleModelSubmit"
@cancel="handleModelCancel"
>

@ -23,7 +23,7 @@
</div>
<div class="input cargo-mark">
<div>货物标志</div>
<a-select :default-value="details.cargoid || 'S'" style="width: 120px" @change="handleChange">
<a-select :default-value="details.cargoid || 'S'" v-model="details.cargoid" style="width: 120px" @change="handleChange">
<a-select-option value="S"> S 普通货 </a-select-option>
<a-select-option value="R"> R 冻柜 </a-select-option>
<a-select-option value="D"> D 危险品 </a-select-option>

@ -5,15 +5,9 @@
<div class="left">
<a-button class="btn btn-add" type="primary" @click="addboxLine"></a-button>
<a-button class="btn btn-delete" @click="removeLine" :style="{ marginRight: '50px' }">删除</a-button>
<a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0"
><a-icon type="appstore" />多品名</a-button
>
<a-button class="btn btn-import-station" type="primary" @click="importYarn" :loading="YarnLoading"
><a-icon type="import" />引入场站数据</a-button
>
<a-button class="btn btn-weight" type="primary" @click="importWeight" :loading="WeightLoading"
><a-icon type="import" />引入箱皮重</a-button
>
<a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0"><a-icon type="appstore" />多品名 </a-button>
<a-button class="btn btn-import-station" type="primary" @click="importYarn" :loading="YarnLoading"><a-icon type="import" />引入场站数据</a-button>
<a-button class="btn btn-weight" type="primary" @click="importWeight" :loading="WeightLoading"><a-icon type="import" />引入箱皮重</a-button>
</div>
<div class="table-right">
<!-- <span>合计: {{ totalCtnall }}</span> -->
@ -43,6 +37,7 @@
width="80%"
:visible="moreVisible"
:confirmLoading="moreModelconfirm"
:maskClosable="false"
@cancel="handleModelCancel"
>
<div class="model-content">
@ -658,6 +653,12 @@ export default {
this.details.ctnInputs = nval
},
deep: true
},
'$route.query': {
immediate: true,
handler(nD, oD) {
this.init()
}
}
},
@ -932,17 +933,17 @@ export default {
console.log('selectionRangeKeys::', selectionRangeKeys)
},
calc(num1, num2, calcStr) {
var str1, //
str2,
ws1 = 0, // ws1ws2 num
ws2 = 0, //
bigger, // biggersmaller0
smaller, // 1.001 + 2.03 2.0301001+2031.12*1.1112*111000112*11/1000=1.232
zeroCount, // 0
isExistDot1, //
isExistDot2,
sum,
beishu = 1
var str1; //
var str2;
var ws1 = 0; // ws1ws2 num
var ws2 = 0; //
var bigger; // biggersmaller0
var smaller; // 1.001 + 2.03 2.0301001+2031.12*1.1112*111000112*11/1000=1.232
var zeroCount; // 0
var isExistDot1; //
var isExistDot2;
var sum;
var beishu = 1
//
str1 = num1.toString()
str2 = num2.toString()

@ -532,6 +532,7 @@
:width="900"
:visible="modelVisible"
:confirmLoading="modelconfirm"
:maskClosable="false"
@ok="handleModelSubmit"
@cancel="handleModelCancel"
>
@ -544,6 +545,7 @@
:title="yardType === 'remark' ? '场站备注' : '场站联系人'"
:width="1200"
:visible="yardVisible"
:maskClosable="false"
@ok="ModelyardTypeOk"
@cancel="ModelyardTypeCancel"
>

@ -72,6 +72,7 @@
:width="1200"
:visible="bookingModelvisible"
:confirmLoading="bookingModelconfirm"
:maskClosable="false"
@ok="handleModelSubmit"
@cancel="handleModelCancel"
>
@ -411,7 +412,7 @@
</a-modal>
<!-- 弹窗部分 end -->
<!-- 打印弹窗 start -->
<a-modal width="50vw" v-model="PrintModalVisible" title="打印">
<a-modal width="50vw" :maskClosable="false" v-model="PrintModalVisible" title="打印">
<template slot="footer"> <span></span> </template>
<div class="PrintMain">
<div class="PrintTitle">
@ -796,7 +797,7 @@ export default {
if (this.modelType === 'bookingSpace') {
this.bookingModelFrom.sendType = 'B'
} else if (this.modelType === 'cutOff') {
this.bookingModelFrom.sendType = '' //
this.bookingModelFrom.sendType = 'E'
}
this.bookingModelFrom.send = type === 'send'
this.bookingModelFrom.orderNo = this.details.mblno
@ -809,6 +810,13 @@ export default {
.then(res => {
//
if (res.success) {
// this.pdfUrl = `${}${res.data}`
// const fname = res.data.substring(res.data.lastIndexOf("/") + 1, res.data.lastIndexOf(".")) //
// const link = document.createElement('a')
// link.href = this.pdfUrl
// link.setAttribute('download', fname)
// document.body.appendChild(link)
// link.click()
this.$message.success(`${type === 'send' ? '发送' : '保存'}成功`)
this.handleModelCancel()
} else {
@ -1096,7 +1104,11 @@ export default {
.then(res => {
if (res.success) {
this.$message.destroy()
if (!res.succ) {
this.$message.error(res.data.msg)
} else {
this.$message.success({ content: '校验完成' })
}
this.$emit('rules', {
rows: res.data.rows,
type: res.data.succ ? 'success' : 'fail'
@ -1105,7 +1117,7 @@ export default {
this.$message.error(res.message)
}
})
.catch(err => {
.catch(() => {
this.$message.destroy()
this.$message.success({ content: '校验失败' })
})

@ -16,9 +16,14 @@
<i class="iconfont icon-chenggong Success"></i><span>校验完成无异常信息</span>
</div>
</div>
<div class="tip" v-else-if="excuteRulesType === 'fail'">
<div class="rules-label">
<i class="iconfont icon-shibai Warning"></i><span>校验失败</span>
</div>
</div>
<div class="tip no-data" v-else>
<i class="iconfont icon-meiyoudingdan"></i>
<div class="text">暂无校验<span>立即校验</span></div>
<div class="text">暂无校验, <a-button size="small" type="link" class="btn" @click="checkFun"> </a-button></div>
</div>
</div>
</a-card>
@ -175,6 +180,7 @@
:width="900"
:visible="remarkModelvisible"
:confirmLoading="bookingModelconfirm"
:maskClosable="false"
cancelText="取消"
okText="确定"
@ok="handleModelSubmit"
@ -188,6 +194,7 @@
:width="900"
:visible="fileModelvisible"
:confirmLoading="uploading"
:maskClosable="false"
cancelText="关闭"
okText="保存"
@ok="handleUpload"
@ -225,6 +232,7 @@ import {
GetLog,
AddFile,
BookingOrderGetFile,
ExcuteRulesOceanBooking,
BookingOrderDownload
} from '@/api/modular/main/BookingLedger'
@ -311,6 +319,31 @@ export default {
this.bookingServiceItem = this.$options.filters['dictData']('booking_service_item')
this.bookingAttachType = this.$options.filters['dictData']('booking_attach_type')
},
//
checkFun() {
this.$message.loading({ content: '校验中...' })
ExcuteRulesOceanBooking(this.id)
.then(res => {
if (res.success) {
this.$message.destroy()
if (!res.succ) {
this.$message.error(res.data.msg)
} else {
this.$message.success({ content: '校验完成' })
}
this.$emit('rules', {
rows: res.data.rows,
type: res.data.succ ? 'success' : 'fail'
})
} else {
this.$message.error(res.message)
}
})
.catch(() => {
this.$message.destroy()
this.$message.success({ content: '校验失败' })
})
},
// - start
getRemark() {
GetRemark({
@ -579,9 +612,11 @@ export default {
.text {
font-size: 13px;
color: #999;
span {
.btn {
color: @primary-color;
cursor: pointer;
display: inline-block;
}
}
}
@ -830,6 +865,10 @@ export default {
color: #999;
padding: 20px 0;
line-height: 30px;
.text{
display: inline-block;
}
}
}
.collapse-box {

@ -93,7 +93,7 @@
</a-col>
</a-row>
<a-modal title="新增船公司" :width="600" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
<a-modal :maskClosable="false" :width="600" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
<a-radio-group v-model="carrierRadio">
<div class="group-label">
<div class="label-flex">
@ -128,7 +128,7 @@
</a-radio-group>
</a-modal>
<a-modal title="多提单号查询" :width="400" :visible="moreNumVisible" @ok="moreNumSubmit" @cancel="moreNumCancel">
<a-modal title="多提单号查询" :maskClosable="false" :width="400" :visible="moreNumVisible" @ok="moreNumSubmit" @cancel="moreNumCancel">
<div>
<a-textarea v-model="moreNumVal" style="height: 200px" />
</div>
@ -603,8 +603,7 @@ export default {
}
}
/*列表表头 */
.vxe-table--header-wrapper {
// background-color: #f5f9fe !important;
.vxe-header--row{
position: relative;
background: #fff !important;
.vxe-cell--sort {

Loading…
Cancel
Save