whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改列表样式， 船名带出etd, 太平edi等

Browse Source
dev
lilu 2 years ago
parent a2012e7390
commit 8be6728b8a
6 changed files with 479 additions and 323 deletions
Show Stats Download Patch File Download Diff File

9
src/api/modular/main/BookingLedger.js
Unescape Escape View File

@ -638,3 +638,12 @@ export function BookingOrderBachUpdate(parameter) {
data: parameter
})
}
// 根据船名航次，获取海关航次等信息
export function getVesselInfoService(parameter) {
return axios({
url: '/DjyVesselInfoService/GetList',
method: 'get',
params: parameter
})
}

659
src/views/main/BookingLedger/detail/components/ediMore.vue
Unescape Escape View File

@ -2,274 +2,370 @@
<div class="more-edi" :style="{paddingTop:'25px'}">
<a-form-model ref="ediFrom" :model="details" :rules="rules">
<a-row :gutter="16">
<a-col :span="8">
<a-form-model-item
label="发送方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.sendCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.sendCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="接收方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.receiveCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.receiveCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="通知方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.notifyCdoe"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.notifyCdoe" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="销售EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.salerCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.salerCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="Master Bol Indicator"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.masterBolIndicator"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.masterBolIndicator" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EMANIFEST HBL"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.emanifestHbl"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.emanifestHbl" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="收货人EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.consigneeEdiCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.consigneeEdiCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="发货人EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.shipperEdiCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.shipperEdiCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EDI联系人名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.ediAttn"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttn" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EDI联系人电话"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.ediAttnTel"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttnTel" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EDI联系人邮箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.ediAttnMail"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttnMail" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="AMS收货人"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.amsConsignee"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.amsConsignee" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="AMS通知人"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.amsNotifyParty"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.amsNotifyParty" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="操作英文名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.opEName"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.opEName" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="操作电话"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.opTel"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.opTel" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="操作邮箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.opEmail"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.opEmail" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="ACI HBL:"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.acihbl"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.acihbl" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="S0C C0C:"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.s0CC0C"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.s0CC0C" />
</a-form-model-item>
</a-col>
<div class="normal">
<a-col :span="8">
<a-form-model-item
label="发送方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.sendCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.sendCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="接收方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.receiveCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.receiveCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="通知方EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.notifyCdoe"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.notifyCdoe" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="销售EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.salerCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.salerCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="Master Bol Indicator"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.masterBolIndicator"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.masterBolIndicator" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EMANIFEST HBL"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.emanifestHbl"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.emanifestHbl" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="收货人EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.consigneeEdiCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.consigneeEdiCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="发货人EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.shipperEdiCode"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.shipperEdiCode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EDI联系人名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.ediAttn"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttn" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EDI联系人电话"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.ediAttnTel"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttnTel" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="EDI联系人邮箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.ediAttnMail"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.ediAttnMail" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="AMS收货人"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.amsConsignee"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.amsConsignee" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="AMS通知人"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.amsNotifyParty"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.amsNotifyParty" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="操作英文名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.opEName"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.opEName" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="操作电话"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.opTel"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.opTel" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="操作邮箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.opEmail"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.opEmail" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="ACI HBL:"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.acihbl"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.acihbl" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="S0C C0C:"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.s0CC0C"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.s0CC0C" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="商品名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.goodsName"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.goodsName" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="SOC箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="iscontainersoc"
>
<a-select :default-value="iscontainersoc" style="width: 120px" v-model="iscontainersoc">
<a-select-option value="1"> 是 </a-select-option>
<a-select-option value="0"> 否 </a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="SCAC代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="scaccode"
>
<a-input :allowClear="true" v-model="details.scaccode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="ITN编号"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="itncode"
>
<a-input :allowClear="true" v-model="details.itncode" />
</a-form-model-item>
</a-col>
<a-col :span="23">
<a-form-model-item
label="付款方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
has-feedback
prop="freightpayer"
>
<a-input :allowClear="true" v-model="details.freightpayer" />
</a-form-model-item>
</a-col>
<a-col :span="23">
<a-form-model-item
label="委托方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
has-feedback
prop="bookingEDIExt.weiTuoFang"
>
<a-textarea v-model="details.bookingEDIExt.weiTuoFang" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="商品名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.goodsName"
>
<a-input :allowClear="true" v-model="details.bookingEDIExt.goodsName" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="SOC箱"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="iscontainersoc"
>
<a-select :default-value="iscontainersoc" style="width: 120px" v-model="iscontainersoc">
<a-select-option value="1"> 是 </a-select-option>
<a-select-option value="0"> 否 </a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="SCAC代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="scaccode"
>
<a-input :allowClear="true" v-model="details.scaccode" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item
label="ITN编号"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="itncode"
>
<a-input :allowClear="true" v-model="details.itncode" />
</a-form-model-item>
</a-col>
<a-col :span="23">
<a-form-model-item
label="付款方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
has-feedback
prop="freightpayer"
>
<a-input :allowClear="true" v-model="details.freightpayer" />
</a-form-model-item>
</a-col>
<a-col :span="23">
<a-form-model-item
label="委托方"
:labelCol="{ xs: { span: 24 }, sm: { span: 3 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 21 } }"
has-feedback
prop="bookingEDIExt.weiTuoFang"
>
<a-textarea v-model="details.bookingEDIExt.weiTuoFang" />
</a-form-model-item>
</a-col>
</div>
<!-- === 太平添加 start === -->
<div class="taiping" v-if="false">
<a-col :span="12">
<a-form-model-item
label="订舱人说明"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.orderRemark"
>
<a-input v-model="details.bookingEDIExt.orderRemark" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
label="通知人EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.notifyCdoe"
>
<a-input v-model="details.bookingEDIExt.notifyCdoe" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
label="太平销售EDI代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.salerCodeName"
>
<a-select default-value="CN087 | GRACE SUN" v-model="details.bookingEDIExt.salerCodeName">
<a-select-option v-for="(sales, sindex) in StoreSalesRepCode" :value="sales.NAME" :key="sindex">
{{ sales.NAME }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
label="Master Bol Indicator名称"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.masterBolIndicatorName"
>
<a-select default-value="CN087 | GRACE SUN" v-model="details.bookingEDIExt.masterBolIndicatorName">
<a-select-option v-for="(master, mindex) in StoreMasterBOLIndicator" :value="master.NAME" :key="mindex">
{{ master.NAME }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
label="欧盟港口、伊朗港口、KHI"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.ckhi"
>
<a-input v-model="details.bookingEDIExt.ckhi" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
label="南美东"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.cncm"
>
<a-input v-model="details.bookingEDIExt.cncm" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
label="巴西线木质包装情况"
:labelCol="{ xs: { span: 24 }, sm: { span: 9 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
has-feedback
prop="bookingEDIExt.wncm"
>
<a-input v-model="details.bookingEDIExt.wncm" />
</a-form-model-item>
</a-col>
</div>
<!-- === 太平添加 END === -->
</a-row>
</a-form-model>
</div>
@ -292,7 +388,24 @@ export default {
},
data() {
return {
iscontainersoc: ''
iscontainersoc: '',
// 销售EDI代码
StoreSalesRepCode: [
{ ID: 'CN087', NAME: 'CN087 | GRACE SUN' },
{ ID: 'CN096', NAME: 'CN096 | LEON LIANG' },
{ ID: 'CN097', NAME: 'CN097 | CHARLES GAO' },
{ ID: 'CN098', NAME: 'CN098 | TERESA LIU SHAN' },
{ ID: 'CN106', NAME: 'CN106 | HOKI YU' },
{ ID: 'CN107', NAME: 'CN107 | WILLIAM YANG JING YU' },
{ ID: 'CN099', NAME: 'CN099 | HELEN ZHANG' },
{ ID: 'CN100', NAME: 'CN100 | LEOREN' }
],
// Master BOL Indicator
StoreMasterBOLIndicator: [
{ ID: '1', NAME: 'Carrier filing HBL | 船公司发HBL' },
{ ID: '2', NAME: 'Self filing HBL | 自己发' },
{ ID: '3', NAME: 'Not Applicable/Straight bl | 无HBL' }
]
}
},
watch: {
@ -360,4 +473,14 @@ export default {
margin-left: 20px;
}
}
.normal{
margin-bottom: 10px;
overflow: hidden;
}
.taiping{
border-top: 1px dashed #ddd;
margin-top: 10px;
padding-top: 10px;
overflow: hidden;
}
</style>

16
src/views/main/BookingLedger/detail/components/sedOrder.vue
Unescape Escape View File

@ -470,7 +470,7 @@ export default {
remarksFrom = valid
})
if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
this.$message.error('请填写完整数据')
this.$message.error('保存失败，请检查必填项')
return false
}
if (this.$refs.ediMore) {
@ -480,7 +480,7 @@ export default {
})
if (!ediFrom) {
this.mainOrderActiveKey = '2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
} else {
@ -493,7 +493,7 @@ export default {
})
if (this.hasEdiRules) {
this.mainOrderActiveKey = '2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
}
@ -509,7 +509,7 @@ export default {
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}
@ -561,7 +561,7 @@ export default {
remarksFrom = valid
})
if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
this.$message.error('请填写完整数据')
this.$message.error('保存失败，请检查必填项')
return false
}
if (this.$refs.ediMore) {
@ -571,7 +571,7 @@ export default {
})
if (!ediFrom) {
this.mainOrderActiveKey = '2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
} else {
@ -584,7 +584,7 @@ export default {
})
if (this.hasEdiRules) {
this.mainOrderActiveKey = '2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
}
@ -600,7 +600,7 @@ export default {
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}

22
src/views/main/BookingLedger/detail/index.vue
Unescape Escape View File

@ -123,8 +123,8 @@ const initDetail = {
// 基本信息
customername: '',
customerid: '',
carrier: '',
carrierid: '',
carrier: 'CMA',
carrierid: 'CMA',
forwarder: '',
pono: '',
mblno: '',
@ -238,7 +238,7 @@ export default {
},
data() {
return {
type: this.$route.query.type,
type: this.$route.query.type || 'CMA',
id: this.$route.query.id,
isCopy: this.$route.query.isCopy || false,
inPageLoading: false,
@ -855,7 +855,7 @@ export default {
remarksFrom = valid
})
if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
this.$message.error('请填写完整数据')
this.$message.error('保存失败，请检查必填项')
return false
}
if (this.$refs.ediMore) {
@ -865,7 +865,7 @@ export default {
})
if (!ediFrom) {
this.mainOrderActiveKey = '2-2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
} else {
@ -878,7 +878,7 @@ export default {
})
if (this.hasEdiRules) {
this.mainOrderActiveKey = '2-2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
}
@ -895,7 +895,7 @@ export default {
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}
@ -965,7 +965,7 @@ export default {
remarksFrom = valid
})
if (!basicFrom || !mailingFrom || !cargoFrom || !billFrom || !remarksFrom) {
this.$message.error('请填写完整数据')
this.$message.error('保存失败，请检查必填项')
return false
}
if (this.$refs.ediMore) {
@ -975,7 +975,7 @@ export default {
})
if (!ediFrom) {
this.mainOrderActiveKey = '2-2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
} else {
@ -988,7 +988,7 @@ export default {
})
if (this.hasEdiRules) {
this.mainOrderActiveKey = '2-2'
this.$message.error('请填写完整EDI数据')
this.$message.error('保存失败，请检查EDI必填项')
return false
}
}
@ -1004,7 +1004,7 @@ export default {
})
})
if (tableErrTip !== '') {
this.$message.error(`箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
this.$message.error(`保存失败， 箱信息错误： ${tableErrTip.substr(0, tableErrTip.length - 1)}`, 3)
return false
}
}

86
src/views/main/BookingLedger/detail/modules/basicInfo.vue
Unescape Escape View File

@ -173,13 +173,23 @@
:allowClear="true"
class="customer-input"
v-model="details.vessel"
:data-source="vesselDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '200px' }"
option-label-prop="value"
@select="vesselSelect"
@change="vesselChange"
@focus="vesselChange"
/>
>
<template slot="dataSource">
<a-select-option v-for="(vessel, index) in vesselData" :key="index" :value="index + ''">
<div class="vessel-label">
<div class="title"> {{ vessel.vessel }} </div>
<div class="voyno">航次： <span>{{ vessel.voyno || '--' }}</span></div>
<div class="etd">etd： <span>{{ vessel.etd || '--' }}</span></div>
</div>
</a-select-option>
</template>
</auto-complete>
</a-form-model-item>
</a-col>
<template v-if="details.carrierid === 'ESL'">
@ -538,7 +548,8 @@ import {
GetForwarderlist,
DjyCustomerdetail,
BookingOrderContactSavebatch,
BookingOrderContactPage
BookingOrderContactPage,
getVesselInfoService
} from '@/api/modular/main/BookingLedger'
export default {
@ -747,22 +758,6 @@ export default {
return []
}
},
vesselDataArr() {
if (this.vesselData) {
const arr = []
this.vesselData.map((item, index) => {
// if (!arr.includes(item.fullName)) {
// arr.push(item.fullName)
// }
if (!arr.includes(item.name)) {
arr.push(item.name)
}
})
return arr
} else {
return []
}
},
voynoinnerDataArr() {
if (this.voynoinnerData) {
const arr = []
@ -1136,23 +1131,31 @@ export default {
// 船名 - start
getVessel(name = '') {
GetVessellist({
if (!this.details.carrierid) {
this.details.carrierid = 'CMA'
this.details.carrier = 'CMA'
}
getVesselInfoService({
CarrierID: this.details.carrierid,
KeyWord: name
})
.then(res => {
if (res.code === 200) {
this.vesselData = res.data
this.$forceUpdate()
}
})
.catch(err => {
console.log(err)
})
.then(res => {
if (res.code === 200) {
this.vesselData = res.data
this.$forceUpdate()
}
})
.catch(err => {
console.log(err)
})
},
vesselSelect(value) {
this.details.vessel = value
const index = this.vesselDataArr.indexOf(value)
this.details.vesselid = this.vesselData[index].code
const index = Number(value)
this.details.vessel = this.vesselData[index].vessel
this.details.atd = this.vesselData[index].atd
this.details.etd = this.vesselData[index].etd
this.details.voyno = this.vesselData[index].voyno
this.details.voynoinner = this.vesselData[index].voynoInside
},
vesselChange(value) {
if (!value) {
@ -1463,7 +1466,24 @@ export default {
.ant-input[type="text"]{
height: 28px !important;
}
.vessel-label{
// border-bottom:1px solid #eee;
.title{
height: 28px;
line-height: 28px;
font-size: 14px;
font-weight:600;
color: #666;
border-bottom:1px dashed #ddd;
margin-bottom: 4px;
}
.voyno, .etd {
height: 22px;
line-height: 22px;
font-size: 12px;
color: #999;
}
}
// .ant-calendar-picker-input{
// padding: 0 4px;

10
src/views/main/BookingLedger/list/index.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template>
<div>
<a-row :gutter="24">
<a-col :md="24" :sm="24" style="padding: 0 0 0 0">
<a-col :md="24" :sm="24" style="padding: 0 0 0 0" class="content-box">
<!-- <div class="nav-box">
<div class="nav" @click="addBooking"><i class="iconfont icon-jiahao2fill"></i>新建</div>
<div class="nav" @click="copyBooking"><i class="iconfont icon-fuzhi"></i>复制</div>
@ -11,7 +11,7 @@
<div class="nav"><i class="iconfont icon-shishijifei"></i>定时订舱</div>
<div class="nav"><i class="iconfont icon-xiaopiaodayin"></i>小票状态</div>
</div> -->
<x-card>
<x-card class="content-nav">
<div slot="content" class="table-page-search-wrapper">
<a-form layout="inline">
<a-row :gutter="48" class="booking-from-box">
@ -106,6 +106,7 @@
ref="xGrid"
v-bind="gridOptions"
row-class-name="line-box"
:height="tableHeight"
@page-change="handlePageChange"
@cell-dblclick="handledbclick"
@resizable-change="resizableChange"
@ -525,7 +526,7 @@ export default {
formMoreTableData: null,
// 新增弹窗
addVisible: false,
carrierRadio: '',
carrierRadio: 'CMA',
radioStyle: {
display: 'block',
height: '50px',
@ -551,6 +552,7 @@ export default {
],
traceValue: [],
addNum: 0,
tableHeight: 0,
// 批量编辑
editingForm: this.$form.createForm(this),
vesselData: [],
@ -563,6 +565,8 @@ export default {
this.showColumns = JSON.parse(JSON.stringify(initData.columns))
this.formAllData = JSON.parse(JSON.stringify(initData.condAllData))
this.fromTableAllData = JSON.parse(JSON.stringify(initData.columnsAllData))
this.tableHeight = document.body.clientHeight - 300
console.log('table-height', this.tableHeight)
this.getFormData()
this.getTableList()
this.getPageSize()

Write Preview
Loading…
Cancel
Save