|
|
@@ -56,7 +56,7 @@
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.hConsigneeCntyName"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="国家" ></el-input>
|
|
|
+ clearable placeholder="收货人提单描述" ></el-input>
|
|
|
</el-col>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
@@ -89,7 +89,7 @@
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.hNotifyCntyName"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="国家" ></el-input>
|
|
|
+ clearable placeholder="通知人提单描述" ></el-input>
|
|
|
</div>
|
|
|
<div style="flex: 1;margin-left: 10px">
|
|
|
<div class="addbuttonClass" @click="hNotifyClick">+</div>
|
|
|
@@ -108,7 +108,6 @@
|
|
|
</div>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
-
|
|
|
<el-col span="8">
|
|
|
<el-row>
|
|
|
<div>
|
|
|
@@ -121,44 +120,63 @@
|
|
|
clearable placeholder="备注唛头" ></el-input>
|
|
|
</div>
|
|
|
<div style="margin-top: 10px">
|
|
|
- <el-form-item label="HS CODE" prop="mShipperCnName" >
|
|
|
+ <el-form-item label="HS CODE" prop="commodityCnName" >
|
|
|
<el-col :span="16">
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.mShipperCnName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择HS CODE" ></el-input>
|
|
|
+ <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')" >
|
|
|
+ </search-query>
|
|
|
</el-col>
|
|
|
<el-col :span="7">
|
|
|
<span style="padding-left: 20px"></span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.mShipperCnName"
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.hscode"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="通知人" ></el-input>
|
|
|
+ clearable placeholder="商品 HS-CODE" ></el-input>
|
|
|
</el-col>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.mShipperCnName"
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.commodityEnName"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择HS CODE" ></el-input>
|
|
|
+ clearable placeholder="商品简称" ></el-input>
|
|
|
</div>
|
|
|
<div style="margin-top: 10px">
|
|
|
- <el-form-item label="货物描述" prop="mShipperCnName" >
|
|
|
- <el-col :span="16">
|
|
|
- <el-checkbox size="medium" v-model="checked">危险品</el-checkbox>
|
|
|
+ <el-form-item label="货物描述" prop="cargoType" >
|
|
|
+ <el-col :span="14">
|
|
|
+ <search-query :datalist="cargoTypeData"
|
|
|
+ :selectValue="assemblyForm.cargoType"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ :buttonIf="false"
|
|
|
+ @remoteMethod="remoteMethod($event,'cargoType')"
|
|
|
+ @corpChange="corpChange($event,'cargoType')" >
|
|
|
+ </search-query>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <span style="margin-left: 10px"></span>
|
|
|
<el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-button size="small">详细内容</el-button>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-button size="small" @click="DangerousGoodsAdd">详细内容</el-button>
|
|
|
</el-col>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mShipperCnName"
|
|
|
+ <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.commodityDescr"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled" rows="8"
|
|
|
- clearable placeholder="备注唛头" ></el-input>
|
|
|
+ clearable placeholder="提单上货物描述" ></el-input>
|
|
|
</div>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
@@ -169,45 +187,56 @@
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
clearable placeholder="请选择客户约号" ></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="船公司" prop="carrierCnName" >
|
|
|
+ <search-query :datalist="carrierData"
|
|
|
+ :selectValue="assemblyForm.carrierCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @remoteMethod="remoteMethod($event,'carrier')"
|
|
|
+ @corpChange="corpChange($event,'carrier')" >
|
|
|
+ </search-query>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="船公司约号" prop="carrierArgreementNo" >
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierArgreementNo"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
clearable placeholder="请选择船公司约号" ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="船公司" prop="carrierCnName" >
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierCnName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择船公司" ></el-input>
|
|
|
- </el-form-item>
|
|
|
<div>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="船名" prop="carrierCnName" label-width="80px" >
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.vesselCnName"
|
|
|
- size="small" autocomplete="off"
|
|
|
+ <el-form-item label="船名" prop="vesselCnName" label-width="80px" >
|
|
|
+ <search-query :datalist="vesselData"
|
|
|
+ :selectValue="assemblyForm.vesselCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择船名" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="航次" prop="carrierCnName" label-width="50px" >
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择航次" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @remoteMethod="remoteMethod($event,'vessel')"
|
|
|
+ @corpChange="corpChange($event,'vessel')" >
|
|
|
+ </search-query>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="航次" prop="voyageNo" label-width="80px" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
|
|
|
+ size="small" autocomplete="off"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ clearable placeholder="请选择航次" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
+
|
|
|
<el-form-item label="ETD" prop="etd">
|
|
|
- <el-date-picker v-model="assemblyForm.etd" clearable
|
|
|
+ <el-date-picker v-model="assemblyForm.etd" clearable style="width: 100%"
|
|
|
type="date" size="small" :disabled="detailData.seeDisabled"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
placeholder="选择日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="订舱日期" prop="bookingDate">
|
|
|
- <el-date-picker v-model="assemblyForm.bookingDate" clearable
|
|
|
+ <el-date-picker v-model="assemblyForm.bookingDate" clearable style="width: 100%"
|
|
|
type="date" size="small" :disabled="detailData.seeDisabled"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
placeholder="选择日期">
|
|
|
@@ -220,11 +249,11 @@
|
|
|
<el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
|
|
|
</div>
|
|
|
|
|
|
- <el-form-item label="箱数或件数大写" prop="carrierCnName" label-width="100px">
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.vesselCnName"
|
|
|
+ <el-form-item label="箱数或件数大写" prop="quantityPackingDescr" label-width="100px">
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityPackingDescr"
|
|
|
size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择ETD" ></el-input>
|
|
|
+ :disabled="true"
|
|
|
+ clearable placeholder="商品包装件数英文" ></el-input>
|
|
|
</el-form-item>
|
|
|
<div>
|
|
|
<el-col :span="12">
|
|
|
@@ -265,7 +294,7 @@
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.measurement"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择尺码" ></el-input>
|
|
|
+ clearable placeholder="请选择尺码/体积" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</div>
|
|
|
@@ -399,11 +428,11 @@
|
|
|
<precontainers :pid="assemblyForm.id"></precontainers>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-form-item label="备注" prop="carrierCnName" >
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mShipperCnName"
|
|
|
+ <el-form-item label="备注" prop="remarks" >
|
|
|
+ <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.remarks"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled" rows="3"
|
|
|
- clearable placeholder="备注内容把" ></el-input>
|
|
|
+ clearable placeholder="备注" ></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
@@ -414,44 +443,57 @@
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
clearable placeholder="请输入外提单号" ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="订舱代理" prop="carrierCnName" >
|
|
|
+ <el-form-item label="订舱代理" prop="bookingAgentCnName" >
|
|
|
<el-col :span="8">
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请输入订舱代理" ></el-input>
|
|
|
+ <search-query :datalist="bookingAgentData"
|
|
|
+ :selectValue="assemblyForm.bookingAgentCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @remoteMethod="remoteMethod($event,'bookingAgent')"
|
|
|
+ @corpChange="corpChange($event,'bookingAgent')" >
|
|
|
+ </search-query>
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingAgentEnName"
|
|
|
size="small" autocomplete="off"
|
|
|
- :disabled="detailData.voyageNo"
|
|
|
- clearable placeholder="请输入订舱代理" ></el-input>
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ clearable placeholder="订舱代理" ></el-input>
|
|
|
</el-col>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="订舱备注" prop="carrierCnName" >
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mShipperCnName"
|
|
|
+ <el-form-item label="订舱备注" prop="bookingRemarks" >
|
|
|
+ <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled" rows="3"
|
|
|
- clearable placeholder="备注内容把" ></el-input>
|
|
|
+ clearable placeholder="订舱备注" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-row>
|
|
|
- <el-col :span="12"></el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="航线" prop="carrierCnName" >
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.voyageNo"
|
|
|
- clearable placeholder="请输入航线" ></el-input>
|
|
|
+ <el-form-item label="航线" prop="lineCnName" >
|
|
|
+ <search-query :datalist="lineData"
|
|
|
+ :selectValue="assemblyForm.lineCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @remoteMethod="remoteMethod($event,'line')"
|
|
|
+ @corpChange="corpChange($event,'line')" >
|
|
|
+ </search-query>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-form-item label="SI备注" prop="carrierCnName" >
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mShipperCnName"
|
|
|
+ <el-form-item label="SI备注" prop="siRemarks" >
|
|
|
+ <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.siRemarks"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled" rows="3"
|
|
|
- clearable placeholder="备注内容把" ></el-input>
|
|
|
+ clearable placeholder="SI备注" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -504,12 +546,90 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="hNotify2Visible = false">取 消</el-button>
|
|
|
- <el-button type="danger" @click="hNotify2Cancellation('删除')">删 除</el-button>
|
|
|
+ <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">
|
|
|
+ <div>
|
|
|
+ <el-form :model="assemblyForm" ref="form" label-width="120px">
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="危险品分类代码" prop="dgImdgCode" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgImdgCode"
|
|
|
+ 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="dgUnCode" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgUnCode"
|
|
|
+ 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="dgPackingLevel" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgPackingLevel"
|
|
|
+ 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="dgFlashPoint" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPoint"
|
|
|
+ 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="dgFlashPointUnit" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPointUnit"
|
|
|
+ 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="dgContacts" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgContacts"
|
|
|
+ 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="dgTel" >
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgTel"
|
|
|
+ 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="dgIsMarinePollutant" >
|
|
|
+ <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.dgIsMarinePollutant"></el-checkbox>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="danger" @click="dgCancellation('清除')">清 除</el-button>
|
|
|
+ <el-button type="primary" @click="dgVisible = false">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -520,6 +640,9 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
|
|
|
import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
|
|
|
import {bportsList} from "@/api/iosBasicData/bports";
|
|
|
import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
+import {bcommodityList} from "@/api/iosBasicData/bcommodity";
|
|
|
+import {getBvesselsList} from "@/api/iosBasicData/bvessels";
|
|
|
+import {blinesList} from "@/api/iosBasicData/blines";
|
|
|
|
|
|
export default {
|
|
|
props:{
|
|
|
@@ -555,9 +678,35 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
destinationData:[],
|
|
|
// 交货地
|
|
|
placeDeliveryData:[],
|
|
|
+ // 商品 HS-CODE
|
|
|
+ commodityData:[],
|
|
|
+ // 货物类别
|
|
|
+ cargoTypeData:[
|
|
|
+ {
|
|
|
+ label:'普货',
|
|
|
+ value:'dry',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label:'危险品',
|
|
|
+ value:'danger',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label:'冻柜',
|
|
|
+ value:'reefer',
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ // 危险品弹窗
|
|
|
+ dgVisible:false,
|
|
|
+ // 船公司数据
|
|
|
+ carrierData:[],
|
|
|
+ // 船名
|
|
|
+ vesselData:[],
|
|
|
// 包装
|
|
|
packingUnitData:[],
|
|
|
-
|
|
|
+ // 订舱代理数据
|
|
|
+ bookingAgentData:[],
|
|
|
+ // 航线
|
|
|
+ lineData:[],
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -566,19 +715,28 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
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:{
|
|
|
// 远程搜索
|
|
|
remoteMethod(value,name){
|
|
|
- let arr = ['hShipper','hConsignee','hNotify','hNotify2']
|
|
|
+ let arr = ['hShipper','hConsignee','hNotify','hNotify2','bookingAgent']
|
|
|
let portArr = ['placeReceipt','pol','pod','destination','placeDelivery']
|
|
|
if (arr.indexOf(name) != -1) {
|
|
|
this[name + 'BcorpsListfun'](value)
|
|
|
@@ -587,13 +745,27 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
else if (portArr.indexOf(name) != -1) {
|
|
|
this[name + 'BportsListfun'](value)
|
|
|
}
|
|
|
+ // 货物
|
|
|
+ else if (name == 'commodity') {
|
|
|
+ this.commodityBcommodityListfun(value)
|
|
|
+ }
|
|
|
// 包装
|
|
|
else if (name == 'packingUnit') {
|
|
|
this.packingUnitBpackagesListfun(value)
|
|
|
}
|
|
|
- else {
|
|
|
-
|
|
|
+ // 船名
|
|
|
+ else if (name == 'vessel') {
|
|
|
+ this.vesselBvesselsListfun(value)
|
|
|
+ }
|
|
|
+ // 船公司
|
|
|
+ else if (name == 'carrier') {
|
|
|
+ this.carrierBcorpslistByTypefun(value)
|
|
|
+ }
|
|
|
+ // 航线
|
|
|
+ else if (name == 'line') {
|
|
|
+ this.lineBlinesListfun(value)
|
|
|
}
|
|
|
+ else {}
|
|
|
},
|
|
|
// 选择框的回调
|
|
|
corpChange(value,name) {
|
|
|
@@ -638,6 +810,37 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ else if (name == 'commodity') {
|
|
|
+ for(let item of this[name + 'Data']) {
|
|
|
+ if (item.cnName == value) {
|
|
|
+ this.$set(this.assemblyForm,'hscode',item.hsCode)
|
|
|
+ this.$set(this.assemblyForm,'commodityShName',item.cnName)
|
|
|
+ this.$set(this.assemblyForm,'commodityCnName',item.cnName)
|
|
|
+ this.$set(this.assemblyForm,'commodityEnName',item.enName)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 船名
|
|
|
+ else if (name == 'vessel') {
|
|
|
+ for(let item of this[name + 'Data']) {
|
|
|
+ if (item.cnName == value) {
|
|
|
+ this.$set(this.assemblyForm,'vesselId',item.id)
|
|
|
+ this.$set(this.assemblyForm,'vesselCnName',item.cnName)
|
|
|
+ this.$set(this.assemblyForm,'vesselEnName',item.enName)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 船公司
|
|
|
+ else if (name == 'carrier') {
|
|
|
+ for(let item of this[name + 'Data']) {
|
|
|
+ if (item.cnName == value) {
|
|
|
+ this.$set(this.assemblyForm,'carrierId',item.id)
|
|
|
+ this.$set(this.assemblyForm,'carrierCnName',item.cnName)
|
|
|
+ this.$set(this.assemblyForm,'carrierEnName',item.enName)
|
|
|
+ this.$set(this.assemblyForm,'carrierArgreementNo',item.agreementNo)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
// 包装
|
|
|
else if (name == 'packingUnit') {
|
|
|
for(let item of this[name + 'Data']) {
|
|
|
@@ -647,20 +850,39 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ // 订舱代理
|
|
|
+ else if (name == 'bookingAgent') {
|
|
|
+ for(let item of this[name + 'Data']) {
|
|
|
+ if (item.cnName == value) {
|
|
|
+ this.$set(this.assemblyForm,'bookingAgentId',item.id)
|
|
|
+ this.$set(this.assemblyForm,'bookingAgentCnName',item.cnName)
|
|
|
+ this.$set(this.assemblyForm,'bookingAgentEnName',item.enName)
|
|
|
+ this.$set(this.assemblyForm,'bookingRemarks',item.remarks)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 航线
|
|
|
+ else if (name == 'line') {
|
|
|
+ for(let item of this[name + 'Data']) {
|
|
|
+ if (item.cnName == value) {
|
|
|
+ this.$set(this.assemblyForm,'lineId',item.id)
|
|
|
+ this.$set(this.assemblyForm,'lineCnName',item.cnName)
|
|
|
+ this.$set(this.assemblyForm,'lineEnName',item.enName)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
else {}
|
|
|
},
|
|
|
// 通知人添加第二个通知人弹窗
|
|
|
hNotifyClick(){
|
|
|
this.hNotify2Visible = true
|
|
|
},
|
|
|
- // 第二通知人弹窗的取消
|
|
|
+ // 第二通知人弹窗的清除
|
|
|
hNotify2Cancellation(name){
|
|
|
let title = ''
|
|
|
- if (name == '删除') {
|
|
|
- title = '确认删除吗？'
|
|
|
- }
|
|
|
- if (name == '取消') {
|
|
|
- title = '确认取消吗？填写的内容不会保存'
|
|
|
+ if (name == '清除') {
|
|
|
+ title = '确认清除吗？'
|
|
|
}
|
|
|
this.$confirm(title)
|
|
|
.then(_ => {
|
|
|
@@ -683,6 +905,39 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
})
|
|
|
.catch(_ => {});
|
|
|
},
|
|
|
+ // 危险品弹窗开启
|
|
|
+ DangerousGoodsAdd(){
|
|
|
+ if (this.assemblyForm.cargoType == 'danger'){
|
|
|
+ this.dgVisible = true
|
|
|
+ }else {
|
|
|
+ this.$message({
|
|
|
+ message: '请选择货物为危险品',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 危险品弹窗的清除
|
|
|
+ dgCancellation(name){
|
|
|
+ let title = ''
|
|
|
+ if (name == '清除') {
|
|
|
+ title = '确认清除吗？'
|
|
|
+ }
|
|
|
+ this.$confirm(title)
|
|
|
+ .then(_ => {
|
|
|
+ this.$set(this.assemblyForm,'dgImdgCode','')
|
|
|
+ this.$set(this.assemblyForm,'dgUnCode','')
|
|
|
+ this.$set(this.assemblyForm,'dgPackingLevel','')
|
|
|
+ this.$set(this.assemblyForm,'dgFlashPoint','')
|
|
|
+ this.$set(this.assemblyForm,'dgFlashPointUnit','')
|
|
|
+ this.$set(this.assemblyForm,'dgContacts','')
|
|
|
+ this.$set(this.assemblyForm,'dgTel','')
|
|
|
+ this.$set(this.assemblyForm,'dgIsMarinePollutant','')
|
|
|
+ this.dgVisible = false
|
|
|
+ })
|
|
|
+ .catch(_ => {});
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
// 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
|
|
|
// 获取发货人数据 （往来单位 前四个代理）
|
|
|
hShipperBcorpsListfun(cnName){
|
|
|
@@ -748,7 +1003,38 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
|
|
|
this.packingUnitData = res.data.data.records
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
+ // 商品 HS-CODE （货物列表）
|
|
|
+ commodityBcommodityListfun(cnName){
|
|
|
+ bcommodityList(1,10,{cnName}).then(res=>{
|
|
|
+ this.commodityData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 获取船公司数据
|
|
|
+ carrierBcorpslistByTypefun(cnName){
|
|
|
+ let corpType = '1712286570540703745'
|
|
|
+ getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
|
|
+ this.carrierData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 船名
|
|
|
+ vesselBvesselsListfun(cnName){
|
|
|
+ getBvesselsList(1,10,{cnName}).then(res=>{
|
|
|
+ this.vesselData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 订舱代理
|
|
|
+ bookingAgentBcorpsListfun(cnName){
|
|
|
+ let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
|
|
|
+ getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
|
|
+ this.bookingAgentData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 航线数据
|
|
|
+ lineBlinesListfun(cnName){
|
|
|
+ blinesList(1,10,{cnName}).then(res=>{
|
|
|
+ this.lineData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
|
|
|
}
|
|
|
|
caojunjie