|
|
@@ -8,30 +8,20 @@
|
|
|
<span slot="label">
|
|
|
<span style="color: #1e9fff">发货人</span>
|
|
|
</span>
|
|
|
- <div>
|
|
|
- <el-col :span="16">
|
|
|
- <search-query :datalist="hshipperData"
|
|
|
- :selectValue="assemblyForm.hshipperCnName"
|
|
|
- :filterable="true"
|
|
|
- :clearable="true"
|
|
|
- :remote="true"
|
|
|
- :addIf="true"
|
|
|
- :tableIf="false"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
- @addJump="addJump('hshipper')"
|
|
|
- @remoteMethod="remoteMethod($event,'hshipper')"
|
|
|
- @corpChange="corpChange($event,'hshipper')"
|
|
|
- @corpFocus="remoteMethod($event,'hshipper')">
|
|
|
- </search-query>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.hshipperCntyName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="国家" ></el-input>
|
|
|
- </el-col>
|
|
|
- </div>
|
|
|
+ <search-query :datalist="hshipperData"
|
|
|
+ :selectValue="assemblyForm.hshipperCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :addIf="true"
|
|
|
+ :tableIf="false"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @addJump="addJump('hshipper')"
|
|
|
+ @remoteMethod="remoteMethod($event,'hshipper')"
|
|
|
+ @corpChange="corpChange($event,'hshipper')"
|
|
|
+ @corpFocus="remoteMethod($event,'hshipper')">
|
|
|
+ </search-query>
|
|
|
</el-form-item>
|
|
|
<div style="margin-top: 4px">
|
|
|
<el-form-item label="" prop="hshipperDetails" >
|
|
|
@@ -47,7 +37,7 @@
|
|
|
<span style="color: #1e9fff">收货人</span>
|
|
|
</span>
|
|
|
<div>
|
|
|
- <el-col :span="16">
|
|
|
+ <el-col :span="20">
|
|
|
<search-query :datalist="hconsigneeData"
|
|
|
:selectValue="assemblyForm.hconsigneeCnName"
|
|
|
:filterable="true"
|
|
|
@@ -64,13 +54,6 @@
|
|
|
</search-query>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <span style="padding-left: 10px"></span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.hconsigneeCntyName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="收货人" ></el-input>
|
|
|
- </el-col>
|
|
|
- <el-col :span="4">
|
|
|
<span style="margin-left: 20px"></span>
|
|
|
<span style="font-size: 12px;color: #1e9fff;cursor: pointer;"
|
|
|
@click="notifybyfun">同通</span>
|
|
|
@@ -90,37 +73,20 @@
|
|
|
<span slot="label">
|
|
|
<span style="color: #1e9fff">通知人</span>
|
|
|
</span>
|
|
|
- <div>
|
|
|
- <el-col :span="16">
|
|
|
- <search-query :datalist="hnotifyData"
|
|
|
- :selectValue="assemblyForm.hnotifyCnName"
|
|
|
- :filterable="true"
|
|
|
- :clearable="true"
|
|
|
- :remote="true"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- :addIf="true"
|
|
|
- :tableIf="false"
|
|
|
- :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
- @addJump="addJump('hconsignee')"
|
|
|
- @remoteMethod="remoteMethod($event,'hnotify')"
|
|
|
- @corpChange="corpChange($event,'hnotify')"
|
|
|
- @corpFocus="remoteMethod($event,'hnotify')">
|
|
|
- </search-query>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <div style="display: flex;align-items: center;justify-content: space-between;padding-left: 10px">
|
|
|
- <div style="flex: 4">
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.hnotifyCntyName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="通知人" ></el-input>
|
|
|
- </div>
|
|
|
- <div style="flex: 1;margin-left: 10px">
|
|
|
- <div class="addbuttonClass" @click="hnotifyClick">+</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </el-col>
|
|
|
- </div>
|
|
|
+ <search-query :datalist="hnotifyData"
|
|
|
+ :selectValue="assemblyForm.hnotifyCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ :addIf="true"
|
|
|
+ :tableIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @addJump="addJump('hconsignee')"
|
|
|
+ @remoteMethod="remoteMethod($event,'hnotify')"
|
|
|
+ @corpChange="corpChange($event,'hnotify')"
|
|
|
+ @corpFocus="remoteMethod($event,'hnotify')">
|
|
|
+ </search-query>
|
|
|
</el-form-item>
|
|
|
<div>
|
|
|
<el-form-item label="" prop="hnotifyDetails" >
|
|
|
@@ -133,94 +99,95 @@
|
|
|
</div>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-form-item label="收货地" prop="placeReceiptName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">收货地</span>
|
|
|
- </span>
|
|
|
+ <el-form-item label="起运港" prop="departureCnName" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">起运港</span>
|
|
|
+ </span>
|
|
|
<el-row>
|
|
|
<el-col :span="16">
|
|
|
- <search-query :datalist="placeReceiptData"
|
|
|
- :selectValue="assemblyForm.placeReceiptName"
|
|
|
+ <search-query :datalist="departureData"
|
|
|
+ :selectValue="assemblyForm.departureEnName"
|
|
|
:filterable="true"
|
|
|
:clearable="true"
|
|
|
:remote="true"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
+ :disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
:buttonIf="false"
|
|
|
:forParameter="{key:'id',label:'enName',value:'enName'}"
|
|
|
- @remoteMethod="remoteMethod($event,'placeReceipt')"
|
|
|
- @corpChange="corpChange($event,'placeReceipt')"
|
|
|
- @corpFocus="remoteMethod($event,'placeReceipt')" >
|
|
|
+ @remoteMethod="remoteMethod($event,'departure')"
|
|
|
+ @corpChange="corpChange($event,'departure')"
|
|
|
+ @corpFocus="remoteMethod($event,'departure')" >
|
|
|
</search-query>
|
|
|
</el-col>
|
|
|
<el-col :span="7">
|
|
|
<span style="padding-left: 20px"></span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeReceiptNamePrint"
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.departureNamePrint"
|
|
|
size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="收货地" ></el-input>
|
|
|
+ :disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
+ clearable placeholder="起运港" ></el-input>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="装货港" prop="polCnName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">装货港</span>
|
|
|
- </span>
|
|
|
+ <el-form-item label="起运地" prop="departureAddrCnName" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">起运地</span>
|
|
|
+ </span>
|
|
|
<el-row>
|
|
|
<el-col :span="16">
|
|
|
- <search-query :datalist="polData"
|
|
|
- :selectValue="assemblyForm.polEnName"
|
|
|
+ <search-query :datalist="departureAddrData"
|
|
|
+ :selectValue="assemblyForm.departureAddrEnName"
|
|
|
:filterable="true"
|
|
|
:clearable="true"
|
|
|
:remote="true"
|
|
|
:disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
:buttonIf="false"
|
|
|
:forParameter="{key:'id',label:'enName',value:'enName'}"
|
|
|
- @remoteMethod="remoteMethod($event,'pol')"
|
|
|
- @corpChange="corpChange($event,'pol')"
|
|
|
- @corpFocus="remoteMethod($event,'pol')" >
|
|
|
+ @remoteMethod="remoteMethod($event,'departureAddr')"
|
|
|
+ @corpChange="corpChange($event,'departureAddr')"
|
|
|
+ @corpFocus="remoteMethod($event,'departureAddr')" >
|
|
|
</search-query>
|
|
|
</el-col>
|
|
|
<el-col :span="7">
|
|
|
<span style="padding-left: 20px"></span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.polNamePrint"
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.departureAddrNamePrint"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
- clearable placeholder="装货港" ></el-input>
|
|
|
+ clearable placeholder="起运地" ></el-input>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="卸货港" prop="podCnName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">卸货港</span>
|
|
|
- </span>
|
|
|
+
|
|
|
+ <el-form-item label="目的港" prop="finalDestinationName" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">目的港</span>
|
|
|
+ </span>
|
|
|
<el-row>
|
|
|
<el-col :span="16">
|
|
|
- <search-query :datalist="podData"
|
|
|
- :selectValue="assemblyForm.podEnName"
|
|
|
+ <search-query :datalist="finalDestinationData"
|
|
|
+ :selectValue="assemblyForm.finalDestinationName"
|
|
|
:filterable="true"
|
|
|
:clearable="true"
|
|
|
:remote="true"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
+ :disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
:buttonIf="false"
|
|
|
:forParameter="{key:'id',label:'enName',value:'enName'}"
|
|
|
- @remoteMethod="remoteMethod($event,'pod')"
|
|
|
- @corpChange="corpChange($event,'pod')"
|
|
|
- @corpFocus="remoteMethod($event,'pod')" >
|
|
|
+ @remoteMethod="remoteMethod($event,'finalDestination')"
|
|
|
+ @corpChange="corpChange($event,'finalDestination')"
|
|
|
+ @corpFocus="remoteMethod($event,'finalDestination')" >
|
|
|
</search-query>
|
|
|
</el-col>
|
|
|
<el-col :span="7">
|
|
|
<span style="padding-left: 20px"></span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.podNamePrint"
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.finalDestinationNamePrint"
|
|
|
size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="卸货港" ></el-input>
|
|
|
+ :disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
+ clearable placeholder="目的港" ></el-input>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="目的地" prop="destinationName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">目的地</span>
|
|
|
- </span>
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">目的地</span>
|
|
|
+ </span>
|
|
|
<el-row>
|
|
|
<el-col :span="16">
|
|
|
<search-query :datalist="destinationData"
|
|
|
@@ -245,38 +212,11 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="交货地" prop="placeDeliveryName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">交货地</span>
|
|
|
- </span>
|
|
|
- <el-row>
|
|
|
- <el-col :span="16">
|
|
|
- <search-query :datalist="placeDeliveryData"
|
|
|
- :selectValue="assemblyForm.placeDeliveryName"
|
|
|
- :filterable="true"
|
|
|
- :clearable="true"
|
|
|
- :remote="true"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- :buttonIf="false"
|
|
|
- :forParameter="{key:'id',label:'enName',value:'enName'}"
|
|
|
- @remoteMethod="remoteMethod($event,'placeDelivery')"
|
|
|
- @corpChange="corpChange($event,'placeDelivery')"
|
|
|
- @corpFocus="remoteMethod($event,'placeDelivery')" >
|
|
|
- </search-query>
|
|
|
- </el-col>
|
|
|
- <el-col :span="7">
|
|
|
- <span style="padding-left: 20px"></span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeDeliveryNamePrint"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="交货地" ></el-input>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="中转港" prop="potEnName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">中转港</span>
|
|
|
- </span>
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">中转港</span>
|
|
|
+ </span>
|
|
|
<el-row>
|
|
|
<el-col :span="16">
|
|
|
<search-query :datalist="potData"
|
|
|
@@ -318,43 +258,28 @@
|
|
|
@blur="textareaBlur('marks')" ></el-input>
|
|
|
</div>
|
|
|
<div style="margin-top: 4px">
|
|
|
- <el-form-item label="HS CODE" prop="commodityCnName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">HS CODE</span>
|
|
|
- </span>
|
|
|
- <el-col :span="16">
|
|
|
- <search-query :datalist="commodityData"
|
|
|
- :selectValue="assemblyForm.commodityCnName"
|
|
|
- :filterable="true"
|
|
|
- :clearable="true"
|
|
|
- :remote="true"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- :buttonIf="false"
|
|
|
- :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
- @remoteMethod="remoteMethod($event,'commodity')"
|
|
|
- @corpChange="corpChange($event,'commodity')"
|
|
|
- @corpFocus="remoteMethod($event,'commodity')">
|
|
|
- </search-query>
|
|
|
- </el-col>
|
|
|
- <el-col :span="7">
|
|
|
- <span style="padding-left: 20px"></span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.hscode"
|
|
|
- size="small" autocomplete="off"
|
|
|
+ <el-form-item label="HS CODE" prop="commodityCnName" label-width="70px" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">HS CODE</span>
|
|
|
+ </span>
|
|
|
+ <search-query :datalist="commodityData"
|
|
|
+ :selectValue="assemblyForm.commodityCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="商品 HS-CODE" ></el-input>
|
|
|
- </el-col>
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @remoteMethod="remoteMethod($event,'commodity')"
|
|
|
+ @corpChange="corpChange($event,'commodity')"
|
|
|
+ @corpFocus="remoteMethod($event,'commodity')">
|
|
|
+ </search-query>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
- <div>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.commodityEnName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="商品简称" ></el-input>
|
|
|
- </div>
|
|
|
<div style="margin-top: 4px">
|
|
|
- <el-form-item label="货描" prop="cargoType" label-width="40px" >
|
|
|
+ <el-form-item label="货物描述" prop="cargoType" label-width="70px" >
|
|
|
<span slot="label">
|
|
|
- <span style="color: #1e9fff">货描</span>
|
|
|
+ <span style="color: #1e9fff">货物描述</span>
|
|
|
</span>
|
|
|
<!--<el-col :span="5">-->
|
|
|
<!-- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>-->
|
|
|
@@ -388,17 +313,39 @@
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="ETD" prop="etd" label-width="90px"
|
|
|
+ <el-form-item label="航班日期" prop="etd" label-width="90px"
|
|
|
:rules="[{required: true,message: '',trigger: 'blur' }]">
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">ETD</span>
|
|
|
- </span>
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">航班日期</span>
|
|
|
+ </span>
|
|
|
<el-date-picker v-model="assemblyForm.etd" clearable style="width: 100%"
|
|
|
type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
|
|
|
placeholder="选择日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <!--realityEtd-->
|
|
|
+ <el-form-item label="发运日期" prop="realityEtd" label-width="90px" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">发运日期</span>
|
|
|
+ </span>
|
|
|
+ <el-date-picker v-model="assemblyForm.realityEtd" clearable style="width: 100%"
|
|
|
+ type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="ETA" prop="eta" label-width="90px" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">ETA</span>
|
|
|
+ </span>
|
|
|
+ <el-date-picker v-model="assemblyForm.eta" clearable style="width: 100%"
|
|
|
+ type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
|
|
|
+ value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<div>
|
|
|
<el-form-item label="船名" prop="vesselCnName" label-width="90px" >
|
|
|
<span slot="label">
|
|
|
@@ -436,9 +383,9 @@
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
clearable placeholder="请选择客户约号" ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="船公司" prop="carrierCnName" >
|
|
|
+ <el-form-item label="航空公司" prop="carrierCnName" >
|
|
|
<span slot="label">
|
|
|
- <span style="color: #4c9e44;cursor: pointer;text-decoration: underline" @click="emailJump()">船公司</span>
|
|
|
+ <span style="color: #4c9e44;cursor: pointer;text-decoration: underline" @click="emailJump()">航空公司</span>
|
|
|
</span>
|
|
|
<search-query :datalist="carrierData"
|
|
|
:selectValue="assemblyForm.carrierCnName"
|
|
|
@@ -488,6 +435,45 @@
|
|
|
</el-col>
|
|
|
</el-form-item>
|
|
|
<div>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="长度" prop="length" label-width="50px"
|
|
|
+ :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">长度</span>
|
|
|
+ </span>
|
|
|
+ <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.length"
|
|
|
+ size="small" autocomplete="off" min="1"
|
|
|
+ :disabled="detailData.seeDisabled" :controls="false"
|
|
|
+ @focus="quantityFocus"
|
|
|
+ clearable placeholder="长度" ></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="宽度" prop="width" label-width="50px"
|
|
|
+ :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">宽度</span>
|
|
|
+ </span>
|
|
|
+ <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.width"
|
|
|
+ size="small" autocomplete="off" min="1"
|
|
|
+ :disabled="detailData.seeDisabled" :controls="false"
|
|
|
+ @focus="quantityFocus"
|
|
|
+ clearable placeholder="宽度" ></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="高度" prop="height" label-width="50px"
|
|
|
+ :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">宽度</span>
|
|
|
+ </span>
|
|
|
+ <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.height"
|
|
|
+ size="small" autocomplete="off" min="1"
|
|
|
+ :disabled="detailData.seeDisabled" :controls="false"
|
|
|
+ @focus="quantityFocus"
|
|
|
+ clearable placeholder="宽度" ></el-input-number>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="件数" prop="quantity" label-width="80px"
|
|
|
:rules="[{required: true,message: '',trigger: 'blur' }]" >
|
|
|
@@ -549,15 +535,74 @@
|
|
|
clearable placeholder="请选择尺码/体积" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="货物价值" prop="goodsValue" label-width="80px"
|
|
|
+ :rules="[{required: true,message: '',trigger: 'blur' }]" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">货物价值</span>
|
|
|
+ </span>
|
|
|
+ <el-input type="number" step="0.01" style="width: 106%;"
|
|
|
+ v-model="assemblyForm.goodsValue"
|
|
|
+ size="small" autocomplete="off"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ clearable placeholder="请输入货物价值" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="计费重里" prop="billingWeight" label-width="80px"
|
|
|
+ :rules="[{required: true,message: '',trigger: 'blur' }]" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">计费重里</span>
|
|
|
+ </span>
|
|
|
+ <el-input type="number" step="0.01" style="width: 106%;"
|
|
|
+ v-model="assemblyForm.billingWeight"
|
|
|
+ size="small" autocomplete="off"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ clearable placeholder="请输入计费重里" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="计量单位" prop="unit" label-width="80px"
|
|
|
+ :rules="[{required: true,message: '',trigger: 'blur' }]" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">计量单位</span>
|
|
|
+ </span>
|
|
|
+ <search-query :datalist="unitData"
|
|
|
+ :selectValue="assemblyForm.unit"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
|
|
|
+ @corpFocus="getBunitsPagefun"
|
|
|
+ @corpChange="corpChange($event,'unit')">
|
|
|
+ </search-query>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="运价等级" prop="freightRateGrade" label-width="80px"
|
|
|
+ :rules="[{required: true,message: '',trigger: 'blur' }]" >
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">运价等级</span>
|
|
|
+ </span>
|
|
|
+ <search-query :datalist="freightRateGradeData"
|
|
|
+ :selectValue="assemblyForm.freightRateGrade"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
|
|
|
+ @corpFocus="getBunitsPagefun"
|
|
|
+ @corpChange="corpChange($event,'freightRateGrade')">
|
|
|
+ </search-query>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
</div>
|
|
|
</el-col>
|
|
|
- <el-col :span="24">
|
|
|
- <precontainers :assemblyForm="assemblyForm"
|
|
|
- :seeDisabled="detailData.seeDisabled"
|
|
|
- :pid="assemblyForm.id"
|
|
|
- @billsDetailfun="billsDetailfun" >
|
|
|
- </precontainers>
|
|
|
- </el-col>
|
|
|
+
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -624,18 +669,6 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="FORWARDING" prop="bookingRemarks" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">FORWARDING</span>
|
|
|
- </span>
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.forwarding"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled" rows="3"
|
|
|
- clearable placeholder="FORWARDING"
|
|
|
- @blur="textareaBlur('FORWARDING')" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
<el-form-item label="订舱备注" prop="bookingRemarks" >
|
|
|
<span slot="label">
|
|
|
<span style="color: #1e9fff">订舱备注</span>
|
|
|
@@ -648,18 +681,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="SI备注" prop="siRemarks" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">SI备注</span>
|
|
|
- </span>
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.siRemarks"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled" rows="3"
|
|
|
- clearable placeholder="SI备注"
|
|
|
- @blur="textareaBlur('siRemarks')" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
<el-form-item label="备注" prop="remarks" >
|
|
|
<span slot="label">
|
|
|
<span style="color: #1e9fff">备注</span>
|
|
|
@@ -676,64 +697,10 @@
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
- title="第二通知人"
|
|
|
- :visible.sync="hnotify2Visible"
|
|
|
- width="50%"
|
|
|
- append-to-body
|
|
|
- :before-close="hnotify2HandleClose">
|
|
|
- <div>
|
|
|
- <el-form :model="assemblyForm" ref="form" label-width="60px">
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="通知人" prop="hnotify2CnName" >
|
|
|
- <search-query :datalist="hnotify2Data"
|
|
|
- :selectValue="assemblyForm.hnotify2CnName"
|
|
|
- :filterable="true"
|
|
|
- :clearable="true"
|
|
|
- :remote="true"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- :buttonIf="false"
|
|
|
- :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
- @remoteMethod="remoteMethod($event,'hnotify2')"
|
|
|
- @corpChange="corpChange($event,'hnotify2')"
|
|
|
- @corpFocus="remoteMethod($event,'hnotify2')" >
|
|
|
- </search-query>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="国家" prop="hnotify2CntyName" >
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.hnotify2CntyName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="国家" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item label="提单描述" prop="hnotify2Details" >
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hnotify2Details"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled" rows="4"
|
|
|
- clearable placeholder="通知人提单描述"
|
|
|
- @blur="textareaBlur('hnotify2Details')" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- </el-row>
|
|
|
-
|
|
|
- </el-form>
|
|
|
- </div>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
- <el-button type="danger" @click="hnotify2Cancellation('清除')">清 除</el-button>
|
|
|
- <el-button type="primary" @click="hnotify2Visible = false">确 定</el-button>
|
|
|
- </span>
|
|
|
- </el-dialog>
|
|
|
-
|
|
|
- <el-dialog
|
|
|
title="危险品"
|
|
|
:visible.sync="dgVisible"
|
|
|
width="50%"
|
|
|
- append-to-body
|
|
|
- :before-close="hnotify2HandleClose">
|
|
|
+ append-to-body>
|
|
|
<div>
|
|
|
<el-form :model="assemblyForm" ref="form" label-width="120px">
|
|
|
<el-row :gutter="20">
|
|
|
@@ -894,20 +861,14 @@ import {NdayDate} from "@/util/date";
|
|
|
hconsigneeData:[],
|
|
|
// 通知人
|
|
|
hnotifyData:[],
|
|
|
- // 第二通知人
|
|
|
- hnotify2Data:[],
|
|
|
- // 通知人弹窗开启关闭
|
|
|
- hnotify2Visible:false,
|
|
|
- // 收货地
|
|
|
- placeReceiptData:[],
|
|
|
- // 装货港
|
|
|
- polData:[],
|
|
|
- // 卸货港
|
|
|
- podData:[],
|
|
|
+ // 起运港
|
|
|
+ departureData:[],
|
|
|
+ // 起运地
|
|
|
+ departureAddrData:[],
|
|
|
// 目的地
|
|
|
destinationData:[],
|
|
|
- // 交货地
|
|
|
- placeDeliveryData:[],
|
|
|
+ // 目的港
|
|
|
+ finalDestinationData:[],
|
|
|
// 中转港
|
|
|
potData:[],
|
|
|
// 商品 HS-CODE
|
|
|
@@ -929,7 +890,7 @@ import {NdayDate} from "@/util/date";
|
|
|
],
|
|
|
// 危险品弹窗
|
|
|
dgVisible:false,
|
|
|
- // 船公司数据
|
|
|
+ // 航空公司数据
|
|
|
carrierData:[],
|
|
|
// 船名
|
|
|
vesselData:[],
|
|
|
@@ -946,28 +907,8 @@ import {NdayDate} from "@/util/date";
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- // // 往来单位
|
|
|
- // this.hshipperBcorpsListfun()
|
|
|
- // this.hconsigneeBcorpsListfun()
|
|
|
- // this.hnotifyBcorpsListfun()
|
|
|
- // this.hnotify2BcorpsListfun()
|
|
|
- // this.bookingAgentBcorpsListfun()
|
|
|
- // // 港口接口
|
|
|
- // this.placeReceiptBportsListfun()
|
|
|
- // this.polBportsListfun()
|
|
|
- // this.podBportsListfun()
|
|
|
- // this.destinationBportsListfun()
|
|
|
- // this.placeDeliveryBportsListfun()
|
|
|
- // // 货物
|
|
|
- // this.commodityBcommodityListfun()
|
|
|
- // // 包装
|
|
|
- // this.packingUnitBpackagesListfun()
|
|
|
- // // 船公司
|
|
|
+ // // 航空公司
|
|
|
this.carrierBcorpslistByTypefun()
|
|
|
- // // 船名
|
|
|
- // this.vesselBvesselsListfun()
|
|
|
- // // 航线
|
|
|
- // this.lineBlinesListfun()
|
|
|
},
|
|
|
methods:{
|
|
|
// 件数聚焦
|
|
|
@@ -992,8 +933,8 @@ import {NdayDate} from "@/util/date";
|
|
|
},
|
|
|
// 远程搜索
|
|
|
remoteMethod(value,name){
|
|
|
- let arr = ['hshipper','hconsignee','hnotify','hnotify2','bookingAgent']
|
|
|
- let portArr = ['placeReceipt','pol','pod','destination','placeDelivery','pot']
|
|
|
+ let arr = ['hshipper','hconsignee','hnotify','bookingAgent']
|
|
|
+ let portArr = ['departure','departureAddr','destination','finalDestination','pot']
|
|
|
if (arr.indexOf(name) != -1) {
|
|
|
this[name + 'BcorpsListfun'](value)
|
|
|
}
|
|
|
@@ -1013,7 +954,7 @@ import {NdayDate} from "@/util/date";
|
|
|
else if (name == 'vessel') {
|
|
|
this.vesselBvesselsListfun(value)
|
|
|
}
|
|
|
- // 船公司
|
|
|
+ // 航空公司
|
|
|
else if (name == 'carrier') {
|
|
|
this.carrierBcorpslistByTypefun(value)
|
|
|
}
|
|
|
@@ -1029,9 +970,9 @@ import {NdayDate} from "@/util/date";
|
|
|
},
|
|
|
// 选择框的回调
|
|
|
corpChange(value,name) {
|
|
|
- let arr = ['hshipper','hconsignee','hnotify','hnotify2']
|
|
|
- let portArr = ['placeReceipt','destination','placeDelivery']
|
|
|
- let cnPorArr = ['pol','pod','pot']
|
|
|
+ let arr = ['hshipper','hconsignee','hnotify']
|
|
|
+ let portArr = ['destination','finalDestination']
|
|
|
+ let cnPorArr = ['departure','departureAddr','pot']
|
|
|
if (arr.indexOf(name) != -1) {
|
|
|
for(let item of this[name + 'Data']) {
|
|
|
if (item.cnName == value) {
|
|
|
@@ -1056,17 +997,6 @@ import {NdayDate} from "@/util/date";
|
|
|
this.$set(this.assemblyForm,name + 'EnName',item.enName)
|
|
|
this.$set(this.assemblyForm,name + 'Code',item.code)
|
|
|
this.$set(this.assemblyForm,name + 'NamePrint',item.enName)
|
|
|
- // 签单地点 默认 装货港
|
|
|
- if (name == 'pol') {
|
|
|
- this.$set(this.assemblyForm,'issueAt',this.assemblyForm.polCnName)
|
|
|
- }
|
|
|
- // 选择卸货港带出目的地
|
|
|
- if(name == 'pod') {
|
|
|
- this.$set(this.assemblyForm,'destinationId',item.id)
|
|
|
- this.$set(this.assemblyForm,'destinationName',item.enName)
|
|
|
- this.$set(this.assemblyForm,'destinationCode',item.code)
|
|
|
- this.$set(this.assemblyForm,'destinationNamePrint',item.enName)
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1101,7 +1031,7 @@ import {NdayDate} from "@/util/date";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- // 船公司
|
|
|
+ // 航空公司
|
|
|
else if (name == 'carrier') {
|
|
|
if (!value) {
|
|
|
this.$set(this.assemblyForm,'carrierId','')
|
|
|
@@ -1171,37 +1101,6 @@ import {NdayDate} from "@/util/date";
|
|
|
this.$set(this.assemblyForm,name,value)
|
|
|
}
|
|
|
},
|
|
|
- // 通知人添加第二个通知人弹窗
|
|
|
- hnotifyClick(){
|
|
|
- this.hnotify2Visible = true
|
|
|
- },
|
|
|
- // 第二通知人弹窗的清除
|
|
|
- hnotify2Cancellation(name){
|
|
|
- let title = ''
|
|
|
- if (name == '清除') {
|
|
|
- title = '确认清除吗？'
|
|
|
- }
|
|
|
- this.$confirm(title)
|
|
|
- .then(_ => {
|
|
|
- this.$set(this.assemblyForm,'hnotify2Id','')
|
|
|
- this.$set(this.assemblyForm,'hnotify2CnName','')
|
|
|
- this.$set(this.assemblyForm,'hnotify2EnName','')
|
|
|
- this.$set(this.assemblyForm,'hnotify2Code','')
|
|
|
- this.$set(this.assemblyForm,'hnotify2Details','')
|
|
|
- this.$set(this.assemblyForm,'hnotify2CntyName','')
|
|
|
- this.$set(this.assemblyForm,'hnotify2CntyCode','')
|
|
|
- this.hnotify2Visible = false
|
|
|
- })
|
|
|
- .catch(_ => {});
|
|
|
- },
|
|
|
- // 通知人
|
|
|
- hnotify2HandleClose(done){
|
|
|
- this.$confirm('确认关闭？')
|
|
|
- .then(_ => {
|
|
|
- done();
|
|
|
- })
|
|
|
- .catch(_ => {});
|
|
|
- },
|
|
|
// 危险品弹窗开启
|
|
|
DangerousGoodsAdd(){
|
|
|
if (this.assemblyForm.cargoType == 'danger'){
|
|
|
@@ -1254,7 +1153,7 @@ import {NdayDate} from "@/util/date";
|
|
|
type: 'warning'
|
|
|
});
|
|
|
}
|
|
|
- let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr','hnotify2Details']
|
|
|
+ let arr = ['hshipperDetails','hconsigneeDetails','hnotifyDetails','marks','commodityDescr']
|
|
|
if (arr.indexOf(name) != -1) {
|
|
|
console.log(this.assemblyForm[name],1133)
|
|
|
this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
|
|
|
@@ -1275,7 +1174,7 @@ import {NdayDate} from "@/util/date";
|
|
|
emailJump(){
|
|
|
if (!this.assemblyForm.carrierId) {
|
|
|
this.$message({
|
|
|
- message: '请先选择船公司',
|
|
|
+ message: '请先选择航空公司',
|
|
|
type: 'warning'
|
|
|
});
|
|
|
return
|
|
|
@@ -1344,38 +1243,19 @@ import {NdayDate} from "@/util/date";
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- // 获取第二通知人数据 （往来单位 前四个代理）
|
|
|
- hnotify2BcorpsListfun(cnName){
|
|
|
- let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
|
|
|
- getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
|
|
- this.hnotify2Data = res.data.data.records.map(item=>{
|
|
|
- item.cnName = item.cnName + ' - ' + item.code
|
|
|
- return item
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
- // 收货地数据 （港口表）
|
|
|
- placeReceiptBportsListfun(enName){
|
|
|
- bportsList(1,10,{enName}).then(res=>{
|
|
|
- this.placeReceiptData = res.data.data.records.map(item=>{
|
|
|
- item.enName = item.enName + ' - ' + item.code
|
|
|
- return item
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
- // 装货港数据
|
|
|
- polBportsListfun(enName){
|
|
|
+ // 起运港数据
|
|
|
+ departureBportsListfun(enName){
|
|
|
bportsList(1,10,{enName}).then(res=>{
|
|
|
- this.polData = res.data.data.records.map(item=>{
|
|
|
+ this.departureData = res.data.data.records.map(item=>{
|
|
|
item.enName = item.enName + ' - ' + item.code
|
|
|
return item
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- // 卸货港数据
|
|
|
- podBportsListfun(enName){
|
|
|
+ // 起运地数据
|
|
|
+ departureAddrBportsListfun(enName){
|
|
|
bportsList(1,10,{enName}).then(res=>{
|
|
|
- this.podData = res.data.data.records.map(item=>{
|
|
|
+ this.departureAddrData = res.data.data.records.map(item=>{
|
|
|
item.enName = item.enName + ' - ' + item.code
|
|
|
return item
|
|
|
})
|
|
|
@@ -1390,15 +1270,16 @@ import {NdayDate} from "@/util/date";
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- // 交货地
|
|
|
- placeDeliveryBportsListfun(enName){
|
|
|
+ // 目的港
|
|
|
+ finalDestinationBportsListfun(enName){
|
|
|
bportsList(1,10,{enName}).then(res=>{
|
|
|
- this.placeDeliveryData = res.data.data.records.map(item=>{
|
|
|
+ this.finalDestinationData = res.data.data.records.map(item=>{
|
|
|
item.enName = item.enName + ' - ' + item.code
|
|
|
return item
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+
|
|
|
// 中转港
|
|
|
potBportsListfun(enName){
|
|
|
bportsList(1,10,{enName}).then(res=>{
|
|
|
@@ -1430,7 +1311,7 @@ import {NdayDate} from "@/util/date";
|
|
|
this.commodityData = res.data.data.records
|
|
|
})
|
|
|
},
|
|
|
- // 获取船公司数据
|
|
|
+ // 获取航空公司数据
|
|
|
carrierBcorpslistByTypefun(cnName){
|
|
|
let corpType = '1712286570540703745'
|
|
|
getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
caojunjie