|
|
@@ -60,13 +60,18 @@
|
|
|
@corpFocus="remoteMethod($event,'hConsignee')">
|
|
|
</search-query>
|
|
|
</el-col>
|
|
|
- <el-col :span="7">
|
|
|
- <span style="padding-left: 20px"></span>
|
|
|
+ <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>
|
|
|
+ </el-col>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<div>
|
|
|
@@ -170,14 +175,14 @@
|
|
|
clearable placeholder="商品简称" ></el-input>
|
|
|
</div>
|
|
|
<div style="margin-top: 4px">
|
|
|
- <el-form-item label="货描" prop="cargoType" label-width="90px" >
|
|
|
+ <el-form-item label="货描" prop="cargoType" label-width="40px" >
|
|
|
<span slot="label">
|
|
|
<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>
|
|
|
- </el-col>
|
|
|
- <el-col :span="5">
|
|
|
+ <!--<el-col :span="5">-->
|
|
|
+ <!-- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>-->
|
|
|
+ <!--</el-col>-->
|
|
|
+ <el-col :span="18">
|
|
|
<search-query :datalist="cargoTypeData"
|
|
|
:selectValue="assemblyForm.cargoType"
|
|
|
:filterable="true"
|
|
|
@@ -270,41 +275,56 @@
|
|
|
@corpFocus="remoteMethod($event,'carrier')" >
|
|
|
</search-query>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="船公司约号" prop="carrierArgreementNo" >
|
|
|
+ <el-form-item label="船司约号" prop="carrierArgreementNo" >
|
|
|
<span slot="label">
|
|
|
- <span style="color: #1e9fff">船公司约号</span>
|
|
|
+ <span style="color: #1e9fff">船司约号</span>
|
|
|
</span>
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierArgreementNo"
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="请选择船公司约号" ></el-input>
|
|
|
+ clearable placeholder="请选择船司约号" ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="订舱日期" prop="bookingDate">
|
|
|
+ <el-form-item label="订舱代理" prop="bookingAgentCnName" >
|
|
|
<span slot="label">
|
|
|
- <span style="color: #1e9fff">订舱日期</span>
|
|
|
+ <span style="color: #1e9fff">订舱代理</span>
|
|
|
</span>
|
|
|
- <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="选择日期">
|
|
|
- </el-date-picker>
|
|
|
+ <el-col :span="8">
|
|
|
+ <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')"
|
|
|
+ @corpFocus="remoteMethod($event,'bookingAgent')">
|
|
|
+ </search-query>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="16">
|
|
|
+ <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingAgentEnName"
|
|
|
+ size="small" autocomplete="off"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
+ clearable placeholder="订舱代理" ></el-input>
|
|
|
+ </el-col>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <div>
|
|
|
- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isNeedLand">陆运</el-checkbox>
|
|
|
- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isNeedDeclare">需报关</el-checkbox>
|
|
|
- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
|
|
|
- </div>
|
|
|
+ <!--<div>-->
|
|
|
+ <!-- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isNeedLand">陆运</el-checkbox>-->
|
|
|
+ <!-- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isNeedDeclare">需报关</el-checkbox>-->
|
|
|
+ <!-- <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>-->
|
|
|
+ <!--</div>-->
|
|
|
|
|
|
- <el-form-item label="箱数或件数大写" prop="quantityPackingDescr" label-width="100px">
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">箱数或件数大写</span>
|
|
|
- </span>
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityPackingDescr"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="true"
|
|
|
- clearable placeholder="商品包装件数英文" ></el-input>
|
|
|
- </el-form-item>
|
|
|
+ <!--<el-form-item label="箱数或件数大写" prop="quantityPackingDescr" label-width="100px">-->
|
|
|
+ <!-- <span slot="label">-->
|
|
|
+ <!-- <span style="color: #1e9fff">箱数或件数大写</span>-->
|
|
|
+ <!-- </span>-->
|
|
|
+ <!-- <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityPackingDescr"-->
|
|
|
+ <!-- size="small" autocomplete="off"-->
|
|
|
+ <!-- :disabled="true"-->
|
|
|
+ <!-- clearable placeholder="商品包装件数英文" ></el-input>-->
|
|
|
+ <!--</el-form-item>-->
|
|
|
<div>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="件数" prop="quantity" label-width="80px" >
|
|
|
@@ -313,7 +333,7 @@
|
|
|
</span>
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.quantity"
|
|
|
size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
clearable placeholder="件数" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -345,7 +365,7 @@
|
|
|
</span>
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.grossWeight"
|
|
|
size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
clearable placeholder="请选择毛重" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -356,7 +376,7 @@
|
|
|
</span>
|
|
|
<el-input type="age" style="width: 100%;" v-model="assemblyForm.measurement"
|
|
|
size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled || assemblyForm.billType == 'MM'"
|
|
|
+ :disabled="detailData.seeDisabled"
|
|
|
clearable placeholder="请选择尺码/体积" ></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -538,22 +558,12 @@
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
<precontainers :assemblyForm="assemblyForm"
|
|
|
- :seeDisabled="detailData.seeDisabled || assemblyForm.billType == 'MH'"
|
|
|
+ :seeDisabled="detailData.seeDisabled"
|
|
|
:pid="assemblyForm.id"
|
|
|
@billsDetailfun="billsDetailfun" >
|
|
|
</precontainers>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-form-item label="备注" prop="remarks" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">备注</span>
|
|
|
- </span>
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.remarks"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled" rows="3"
|
|
|
- clearable placeholder="备注"
|
|
|
- @blur="textareaBlur('remarks')" ></el-input>
|
|
|
- </el-form-item>
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
@@ -575,41 +585,6 @@
|
|
|
<bcorpstypedefine></bcorpstypedefine>
|
|
|
</search-query>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="订舱代理" prop="bookingAgentCnName" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">订舱代理</span>
|
|
|
- </span>
|
|
|
- <el-col :span="8">
|
|
|
- <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')"
|
|
|
- @corpFocus="remoteMethod($event,'bookingAgent')">
|
|
|
- </search-query>
|
|
|
- </el-col>
|
|
|
- <el-col :span="16">
|
|
|
- <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingAgentEnName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled"
|
|
|
- clearable placeholder="订舱代理" ></el-input>
|
|
|
- </el-col>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="订舱备注" prop="bookingRemarks" >
|
|
|
- <span slot="label">
|
|
|
- <span style="color: #1e9fff">订舱备注</span>
|
|
|
- </span>
|
|
|
- <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="detailData.seeDisabled" rows="3"
|
|
|
- clearable placeholder="订舱备注"
|
|
|
- @blur="textareaBlur('bookingRemarks')" ></el-input>
|
|
|
- </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-row>
|
|
|
@@ -632,7 +607,48 @@
|
|
|
</search-query>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="订舱日期" prop="bookingDate">
|
|
|
+ <span slot="label">
|
|
|
+ <span style="color: #1e9fff">订舱日期</span>
|
|
|
+ </span>
|
|
|
+ <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="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ </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>
|
|
|
+ </span>
|
|
|
+ <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks"
|
|
|
+ size="small" autocomplete="off"
|
|
|
+ :disabled="detailData.seeDisabled" rows="3"
|
|
|
+ clearable placeholder="订舱备注"
|
|
|
+ @blur="textareaBlur('bookingRemarks')" ></el-input>
|
|
|
+ </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>
|
|
|
@@ -644,6 +660,18 @@
|
|
|
@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>
|
|
|
+ </span>
|
|
|
+ <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.remarks"
|
|
|
+ size="small" autocomplete="off"
|
|
|
+ :disabled="detailData.seeDisabled" rows="3"
|
|
|
+ clearable placeholder="备注"
|
|
|
+ @blur="textareaBlur('remarks')" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -1054,8 +1082,15 @@ import Vue from "vue";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- else {
|
|
|
+ else if (name == 'cargoType') {
|
|
|
this.$set(this.assemblyForm,'cargoType',value)
|
|
|
+ if (value == 'danger') {
|
|
|
+ // 危险品
|
|
|
+ this.DangerousGoodsAdd()
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ this.$set(this.assemblyForm,name,value)
|
|
|
}
|
|
|
},
|
|
|
// 通知人添加第二个通知人弹窗
|
|
|
@@ -1130,30 +1165,50 @@ import Vue from "vue";
|
|
|
}
|
|
|
let arr = ['hShipperDetails','hConsigneeDetails','hNotifyDetails','marks','commodityDescr','hNotify2Details']
|
|
|
if (arr.indexOf(name) != -1) {
|
|
|
+ console.log(this.assemblyForm[name],1133)
|
|
|
this.assemblyForm[name] = this.assemblyForm[name].toUpperCase()
|
|
|
}
|
|
|
this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
|
|
|
},
|
|
|
+ // 同通知人
|
|
|
+ notifybyfun(){
|
|
|
+ this.$set(this.assemblyForm,'hNotifyId',this.assemblyForm.hConsigneeId)
|
|
|
+ this.$set(this.assemblyForm,'hNotifyCnName',this.assemblyForm.hConsigneeCnName)
|
|
|
+ this.$set(this.assemblyForm,'hNotifyEnName',this.assemblyForm.hConsigneeEnName)
|
|
|
+ this.$set(this.assemblyForm,'hNotifyCode',this.assemblyForm.hConsigneeCode)
|
|
|
+ this.$set(this.assemblyForm,'hNotifyDetails',this.assemblyForm.hConsigneeDetails)
|
|
|
+ this.$set(this.assemblyForm,'hNotifyCntyName',this.assemblyForm.hConsigneeCntyName)
|
|
|
+ this.$set(this.assemblyForm,'hNotifyCntyCode',this.assemblyForm.hConsigneeCntyCode)
|
|
|
+ },
|
|
|
// 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
|
|
|
// 获取发货人数据 （往来单位 前四个代理）
|
|
|
hShipperBcorpsListfun(cnName){
|
|
|
let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
|
|
|
getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
|
|
- this.hShipperData = res.data.data.records
|
|
|
+ this.hShipperData = res.data.data.records.map(item=>{
|
|
|
+ item.cnName = item.cnName + ' - ' + item.code
|
|
|
+ return item
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 获取收货人数据 （往来单位 前四个代理）
|
|
|
hConsigneeBcorpsListfun(cnName){
|
|
|
let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
|
|
|
getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
|
|
- this.hConsigneeData = res.data.data.records
|
|
|
+ this.hConsigneeData = res.data.data.records.map(item=>{
|
|
|
+ item.cnName = item.cnName + ' - ' + item.code
|
|
|
+ return item
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 获取通知人数据 （往来单位 前四个代理）
|
|
|
hNotifyBcorpsListfun(cnName){
|
|
|
let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
|
|
|
getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
|
|
- this.hNotifyData = res.data.data.records
|
|
|
+ this.hNotifyData = res.data.data.records.map(item=>{
|
|
|
+ item.cnName = item.cnName + ' - ' + item.code
|
|
|
+ return item
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 获取第二通知人数据 （往来单位 前四个代理）
|
|
|
@@ -1221,7 +1276,10 @@ import Vue from "vue";
|
|
|
carrierBcorpslistByTypefun(cnName){
|
|
|
let corpType = '1712286570540703745'
|
|
|
getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
|
|
|
- this.carrierData = res.data.data.records
|
|
|
+ this.carrierData = res.data.data.records.map(item=>{
|
|
|
+ item.cnName = item.cnName + ' - ' + item.code
|
|
|
+ return item
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 船名
|
caojunjie