Browse Source

修改bug

Qukatie 1 year ago
parent
commit
f6da805766

+ 7 - 0
src/api/iosBasicData/bvessels.js

@@ -47,4 +47,11 @@ export const updateBvessels = (row) => {
     data: row
   })
 }
+export const synchronizationExchangeRate = (data) => {
+  return request({
+    url: '/api/blade-los/aeabills/synchronizationExchangeRate',
+    method: 'get',
+    params: data
+  })
+}
 

+ 1 - 1
src/views/boxManagement/boxTrack/detailsPage.vue

@@ -17,7 +17,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3" v-if="!detailData.id">撤销请核</el-dropdown-item>
             <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
           </el-dropdown-menu>
         </el-dropdown>

+ 1 - 1
src/views/boxManagement/boxWashing/detailsPage.vue

@@ -22,7 +22,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status"
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3"
                               v-if="!detailData.id">撤销请核
             </el-dropdown-item>
             <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->

+ 1 - 1
src/views/boxManagement/buyContainer/detailsPage.vue

@@ -20,7 +20,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id" :disabled="!form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3" v-if="!detailData.id">撤销请核</el-dropdown-item>
             <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批
             </el-dropdown-item>
           </el-dropdown-menu>

+ 1 - 1
src/views/boxManagement/exportShipment/detailsPage.vue

@@ -20,7 +20,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id" :disabled="!form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status"
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3"
                               v-if="!detailData.id">撤销请核
             </el-dropdown-item>
             <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批

+ 1 - 1
src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -20,7 +20,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id" :disabled="!form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3" v-if="!detailData.id">撤销请核
             </el-dropdown-item>
             <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批
             </el-dropdown-item>

+ 1 - 1
src/views/boxManagement/leaseIn/detailsPage.vue

@@ -20,7 +20,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3" v-if="!detailData.id">撤销请核</el-dropdown-item>
             <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批
             </el-dropdown-item>
           </el-dropdown-menu>

+ 1 - 1
src/views/boxManagement/leaseOut/detailsPage.vue

@@ -20,7 +20,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3" v-if="!detailData.id">撤销请核</el-dropdown-item>
             <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批
             </el-dropdown-item>
           </el-dropdown-menu>

+ 1 - 1
src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -20,7 +20,7 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id" :disabled="!form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核</el-dropdown-item>
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status||form.status>=3" v-if="!detailData.id">撤销请核</el-dropdown-item>
             <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批
             </el-dropdown-item>
           </el-dropdown-menu>

+ 571 - 626
src/views/iosBasicData/AirtransportExport/bills/assembly/mbinformation.vue

@@ -3,127 +3,110 @@
         <el-form :model="assemblyForm" ref="form" label-width="90px" class="demo-ruleForm">
             <el-row :gutter="20">
                 <el-col :span="6">
-                    <el-form-item label="航班号" prop="voyageNo" label-width="90px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">航班号</span>
-                            </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled || generateBillsfalse"
-                                  clearable placeholder="请输入航班号" ></el-input>
+                    <el-form-item label="航班号" prop="voyageNo" label-width="90px">
+                        <span slot="label">
+                            <span style="color: #1e9fff">航班号</span>
+                        </span>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                            placeholder="请输入航班号"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
                     <el-form-item label="航班日期" prop="etd" label-width="90px"
-                                  :rules="[{required: true,message: ' ',trigger: 'blur' }]">
-                            <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="请选择航班日期">
+                        :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                        <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="请选择航班日期" @change="handlePick">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <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-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-col>
                 <el-col :span="6">
-                    <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="请选择ETA日期">
+                    <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="请选择ETA日期">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-col :span="12" >
-                        <el-form-item label="航空公司" prop="carrierCnName" >
+                    <el-col :span="12">
+                        <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"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                          placeholder="请选择航空公司"
-                                          @remoteMethod="remoteMethod($event,'carrier')"
-                                          @corpChange="corpChange($event,'carrier')"
-                                          @corpFocus="remoteMethod($event,'carrier')" >
+                            <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
+                                :filterable="true" :clearable="true" :remote="true"
+                                :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择航空公司"
+                                @remoteMethod="remoteMethod($event, 'carrier')" @corpChange="corpChange($event, 'carrier')"
+                                @corpFocus="remoteMethod($event, 'carrier')">
                             </search-query>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierEnName"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="航空公司英文" ></el-input>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierEnName" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" clearable placeholder="航空公司英文"></el-input>
                     </el-col>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="订舱日期" prop="bookingDate" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">订舱日期</span>
-                                </span>
-                        <el-date-picker style="width: 100%;" v-model="assemblyForm.bookingDate"
-                                        clearable type="date" size="small"
-                                        :disabled="detailData.seeDisabled"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        placeholder="请选择订舱日期">
+                    <el-form-item label="订舱日期" prop="bookingDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">订舱日期</span>
+                        </span>
+                        <el-date-picker style="width: 100%;" v-model="assemblyForm.bookingDate" clearable 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-col :span="6">
-                    <el-form-item label="送货时间" prop="deliverGoodsDate" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">送货时间</span>
-                                </span>
-                        <el-date-picker style="width: 100%;" v-model="assemblyForm.deliverGoodsDate"
-                                        clearable type="date" size="small"
-                                        :disabled="detailData.seeDisabled"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        placeholder="请选择送货日期">
+                    <el-form-item label="送货时间" prop="deliverGoodsDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">送货时间</span>
+                        </span>
+                        <el-date-picker style="width: 100%;" v-model="assemblyForm.deliverGoodsDate" clearable 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-col :span="18">
-                    <el-form-item label="订舱备注" prop="bookingRemarks" >
+                    <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="请输入订舱备注" ></el-input>
+                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
+                            placeholder="请输入订舱备注"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="入货时间" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">入货时间</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.incomingGoodsDate" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择入货日期">
+                    <el-form-item label="入货时间" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">入货时间</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.incomingGoodsDate" 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>
                 </el-col>
@@ -131,265 +114,203 @@
 
             <el-row>
                 <el-col :span="8">
-                    <el-form-item label="MB/L 发货人" prop="mshipperCnName" >
+                    <el-form-item label="MB/L 发货人" prop="mshipperCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 发货人</span>
                         </span>
-                        <search-query :datalist="mshipperData"
-                                      :selectValue="assemblyForm.mshipperCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择MB/L 发货人"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mshipper')"
-                                      @corpChange="corpChange($event,'mshipper')"
-                                      @corpFocus="remoteMethod($event,'mshipper')" >
+                        <search-query :datalist="mshipperData" :selectValue="assemblyForm.mshipperCnName" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            placeholder="请选择MB/L 发货人" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mshipper')" @corpChange="corpChange($event, 'mshipper')"
+                            @corpFocus="remoteMethod($event, 'mshipper')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mshipperDetails" >
+                        <el-form-item label="" prop="mshipperDetails">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mshipperDetails"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="请输入发货人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="请输入发货人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="MB/L 收货人" prop="mconsigneeCnName" >
+                    <el-form-item label="MB/L 收货人" prop="mconsigneeCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 收货人</span>
                         </span>
-                        <search-query :datalist="mconsigneeData"
-                                      :selectValue="assemblyForm.mconsigneeCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      placeholder="请选择MB/L 收货人"
-                                      @remoteMethod="remoteMethod($event,'mconsignee')"
-                                      @corpChange="corpChange($event,'mconsignee')"
-                                      @corpFocus="remoteMethod($event,'mconsignee')" >
+                        <search-query :datalist="mconsigneeData" :selectValue="assemblyForm.mconsigneeCnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            placeholder="请选择MB/L 收货人" @remoteMethod="remoteMethod($event, 'mconsignee')"
+                            @corpChange="corpChange($event, 'mconsignee')" @corpFocus="remoteMethod($event, 'mconsignee')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mconsigneeCntyName" >
+                        <el-form-item label="" prop="mconsigneeCntyName">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mconsigneeCntyName"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="请输入发货人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="请输入发货人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="MB/L 通知人" prop="mnotifyCnName" >
+                    <el-form-item label="MB/L 通知人" prop="mnotifyCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 通知人</span>
                         </span>
-                        <search-query :datalist="mnotifyData"
-                                      :selectValue="assemblyForm.mnotifyCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      placeholder="请选择MB/L 通知人"
-                                      @remoteMethod="remoteMethod($event,'mnotify')"
-                                      @corpChange="corpChange($event,'mnotify')"
-                                      @corpFocus="remoteMethod($event,'mnotify')" >
+                        <search-query :datalist="mnotifyData" :selectValue="assemblyForm.mnotifyCnName" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择MB/L 通知人"
+                            @remoteMethod="remoteMethod($event, 'mnotify')" @corpChange="corpChange($event, 'mnotify')"
+                            @corpFocus="remoteMethod($event, 'mnotify')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mnotifyCntyName" >
+                        <el-form-item label="" prop="mnotifyCntyName">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mnotifyCntyName"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="请输入通知人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="请输入通知人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
             </el-row>
             <el-row>
                 <el-col :span="8">
-                    <el-form-item label="中转港" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转港</span>
-                            </span>
-                        <search-query :datalist="potData"
-                                      :selectValue="assemblyForm.potEnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      placeholder="请选择中转港"
-                                      @remoteMethod="remoteMethod($event,'pot')"
-                                      @corpChange="corpChange($event,'pot')"
-                                      @corpFocus="remoteMethod($event,'pot')" >
+                    <el-form-item label="中转港" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转港</span>
+                        </span>
+                        <search-query :datalist="potData" :selectValue="assemblyForm.potEnName" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择中转港"
+                            @remoteMethod="remoteMethod($event, 'pot')" @corpChange="corpChange($event, 'pot')"
+                            @corpFocus="remoteMethod($event, 'pot')">
                         </search-query>
                     </el-form-item>
-                    <el-form-item label="中转航班" prop="potVoyageNo" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转航班</span>
-                            </span>
-                            <el-input style="width: 100%;" v-model="assemblyForm.potVoyageNo"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入中转航班" ></el-input>
+                    <el-form-item label="中转航班" prop="potVoyageNo">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转航班</span>
+                        </span>
+                        <el-input style="width: 100%;" v-model="assemblyForm.potVoyageNo" size="small" autocomplete="off"
+                            :disabled="detailData.seeDisabled" clearable placeholder="请输入中转航班"></el-input>
                     </el-form-item>
-                    <el-form-item label="中转ETD" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转ETD</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.potEtd" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择ETD日期">
+                    <el-form-item label="中转ETD" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转ETD</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.potEtd" clearable style="width: 100%" type="date" size="small"
+                            :disabled="detailData.seeDisabled || generateBillsfalse" value-format="yyyy-MM-dd"
+                            :picker-options="etdPickerOptions" placeholder="请选择ETD日期">
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item label="中转ETA" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转ETA</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.potEta" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择ETA日期">
+                    <el-form-item label="中转ETA" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转ETA</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.potEta" clearable style="width: 100%" type="date" size="small"
+                            :disabled="detailData.seeDisabled || generateBillsfalse" value-format="yyyy-MM-dd"
+                            :picker-options="etdPickerOptions" placeholder="请选择ETA日期">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="16">
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="航站" prop="cyCnName" >
+                            <el-form-item label="航站" prop="cyCnName">
                                 <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="cyData"
-                                              :selectValue="assemblyForm.cyCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled || generateBillsfalse"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              placeholder="请选择航战"
-                                              @remoteMethod="remoteMethod($event,'cy')"
-                                              @corpChange="corpChange($event,'cy')"
-                                              @corpFocus="remoteMethod($event, 'cy')" >
+                                <search-query :datalist="cyData" :selectValue="assemblyForm.cyCnName" :filterable="true"
+                                    :clearable="true" :remote="true"
+                                    :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                    :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择航战"
+                                    @remoteMethod="remoteMethod($event, 'cy')" @corpChange="corpChange($event, 'cy')"
+                                    @corpFocus="remoteMethod($event, 'cy')">
                                 </search-query>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="地址" prop="cyAddress" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">地址</span>
-                            </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyAddress"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
-                                          clearable placeholder="请输入地址" ></el-input>
+                            <el-form-item label="地址" prop="cyAddress">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">地址</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyAddress" size="small"
+                                    autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                                    placeholder="请输入地址"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-col :span="8">
-                        <el-form-item label="联系人" prop="cyContacts" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">联系人</span>
-                                </span>
-                            <search-query :datalist="cyContactsData"
-                                          :selectValue="assemblyForm.cyContacts"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'cname',value:'cname'}"
-                                          placeholder="请选择联系人"
-                                          @corpChange="corpChange($event,'cyContacts')"
-                                          @corpFocus="remoteMethod($event, 'cyContacts')" >
+                        <el-form-item label="联系人" prop="cyContacts">
+                            <span slot="label">
+                                <span style="color: #1e9fff">联系人</span>
+                            </span>
+                            <search-query :datalist="cyContactsData" :selectValue="assemblyForm.cyContacts"
+                                :filterable="true" :clearable="true"
+                                :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择联系人"
+                                @corpChange="corpChange($event, 'cyContacts')"
+                                @corpFocus="remoteMethod($event, 'cyContacts')">
                             </search-query>
                         </el-form-item>
                     </el-col>
                     <el-col :span="16">
-                        <el-form-item label="联系电话" prop="cyTel" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">联系电话</span>
-                                </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyTel"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse"
-                                      clearable placeholder="请输入联系电话" ></el-input>
+                        <el-form-item label="联系电话" prop="cyTel">
+                            <span slot="label">
+                                <span style="color: #1e9fff">联系电话</span>
+                            </span>
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyTel" size="small"
+                                autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                                placeholder="请输入联系电话"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="场站备注" prop="cyRemarks" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">场站备注</span>
-                        </span>
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.cyRemarks"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse" rows="3"
-                                      clearable placeholder="请输入场站备注" ></el-input>
+                        <el-form-item label="场站备注" prop="cyRemarks">
+                            <span slot="label">
+                                <span style="color: #1e9fff">场站备注</span>
+                            </span>
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.cyRemarks" size="small"
+                                autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" rows="3"
+                                clearable placeholder="请输入场站备注"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="24" >
-                        <el-form-item label="HANDLTNG INFORMATION" prop="hakdlthgIformation" label-width="200px" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">HANDLTNG INFORMATION:</span>
-                                </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hakdlthgIformation"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse"
-                                      clearable placeholder="请输入HANDLTNG INFORMATION" ></el-input>
+                    <el-col :span="24">
+                        <el-form-item label="HANDLTNG INFORMATION" prop="hakdlthgIformation" label-width="200px">
+                            <span slot="label">
+                                <span style="color: #1e9fff">HANDLTNG INFORMATION:</span>
+                            </span>
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hakdlthgIformation" size="small"
+                                autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                                placeholder="请输入HANDLTNG INFORMATION"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-col>
             </el-row>
             <el-row>
                 <el-col :span="6">
-                    <el-form-item label="HB/L付款地点" prop="hpayplace" >
+                    <el-form-item label="HB/L付款地点" prop="hpayplace">
                         <span slot="label">
                             <span style="color: #1e9fff">HB/L付款地点</span>
                         </span>
-                        <search-query :datalist="hpayplaceData"
-                                      :selectValue="assemblyForm.hpayplace"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      placeholder="请选择HB/L付款地点"
-                                      @remoteMethod="remoteMethod($event,'hpayplace')"
-                                      @corpChange="corpChange($event,'hpayplace')"
-                                      @corpFocus="remoteMethod($event,'hpayplace')" >
+                        <search-query :datalist="hpayplaceData" :selectValue="assemblyForm.hpayplace" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择HB/L付款地点"
+                            @remoteMethod="remoteMethod($event, 'hpayplace')" @corpChange="corpChange($event, 'hpayplace')"
+                            @corpFocus="remoteMethod($event, 'hpayplace')">
                         </search-query>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="MB/L付款地点" prop="mPayplace" >
+                    <el-form-item label="MB/L付款地点" prop="mPayplace">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L付款地点</span>
                         </span>
-                        <search-query :datalist="mpayplaceData"
-                                      :selectValue="assemblyForm.mpayplace"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      placeholder="请选择MB/L付款地点"
-                                      @remoteMethod="remoteMethod($event,'mpayplace')"
-                                      @corpChange="corpChange($event,'mpayplace')"
-                                      @corpFocus="remoteMethod($event,'mpayplace')" >
+                        <search-query :datalist="mpayplaceData" :selectValue="assemblyForm.mpayplace" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择MB/L付款地点"
+                            @remoteMethod="remoteMethod($event, 'mpayplace')" @corpChange="corpChange($event, 'mpayplace')"
+                            @corpFocus="remoteMethod($event, 'mpayplace')">
                         </search-query>
                         <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.mPayplace"-->
                         <!--          size="small" autocomplete="off"-->
@@ -397,78 +318,66 @@
                         <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="预付总额" prop="hPayAmount" >
+                <el-col :span="6">
+                    <el-form-item label="预付总额" prop="hPayAmount">
                         <span slot="label">
                             <span style="color: #1e9fff">预付总额</span>
                         </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入预付总额" ></el-input>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            placeholder="请输入预付总额"></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="运输条款" prop="serviceTerms" >
+                <el-col :span="6">
+                    <el-form-item label="运输条款" prop="serviceTerms">
                         <span slot="label">
                             <span style="color: #1e9fff">运输条款</span>
                         </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入运输条款" ></el-input>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            placeholder="请输入运输条款"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="签发日期" prop="issueDate" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">签发日期</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.issueDate" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择签发日期">
+                    <el-form-item label="签发日期" prop="issueDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">签发日期</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.issueDate" 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>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="签发地点" prop="issueAt" >
+                <el-col :span="6">
+                    <el-form-item label="签发地点" prop="issueAt">
                         <span slot="label">
                             <span style="color: #1e9fff">签发地点</span>
                         </span>
-                        <search-query :datalist="issueAtData"
-                                      :selectValue="assemblyForm.issueAt"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      placeholder="请选择签发地点"
-                                      @remoteMethod="remoteMethod($event,'issueAt')"
-                                      @corpChange="corpChange($event,'issueAt')"
-                                      @corpFocus="remoteMethod($event,'issueAt')" >
+                        <search-query :datalist="issueAtData" :selectValue="assemblyForm.issueAt" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            :forParameter="{ key: 'id', label: 'enName', value: 'enName' }" placeholder="请选择签发地点"
+                            @remoteMethod="remoteMethod($event, 'issueAt')" @corpChange="corpChange($event, 'issueAt')"
+                            @corpFocus="remoteMethod($event, 'issueAt')">
                         </search-query>
 
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="" prop="billConfirmDate" >
-                        <el-checkbox size="medium" :true-label="1" :false-label="0"
-                                     :disabled="detailData.seeDisabled"
-                                     v-model="assemblyForm.billStatus">是否提单确认
+                <el-col :span="6">
+                    <el-form-item label="" prop="billConfirmDate">
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled"
+                            v-model="assemblyForm.billStatus">是否提单确认
                         </el-checkbox>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="提单确认日期" prop="billConfirmDate" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">提单确认日期</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.billConfirmDate" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择提单确认日期" >
+                <el-col :span="6">
+                    <el-form-item label="提单确认日期" prop="billConfirmDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">提单确认日期</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.billConfirmDate" 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>
                 </el-col>
@@ -478,360 +387,396 @@
 </template>
 
 <script>
-    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBvesselsList} from "@/api/iosBasicData/bvessels";
-    import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
-    import {blinesList} from "@/api/iosBasicData/blines";
-    import {NdayDate} from "@/util/date";
-    import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
-    import {bportsList} from "@/api/iosBasicData/bports";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { getBvesselsList, synchronizationExchangeRate } from "@/api/iosBasicData/bvessels";
+import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+import { blinesList } from "@/api/iosBasicData/blines";
+import { NdayDate } from "@/util/date";
+import { getBcorpsattnList } from "@/api/iosBasicData/bcorpsattn";
+import { bportsList } from "@/api/iosBasicData/bports";
 
-    export default {
-        components: {SearchQuery},
-        props:{
-            assemblyForm:{
-                type:Object
-            },
-            detailData:{
-                type:Object,
-            },
-            generateBillsfalse:{
-                type:Boolean
-            }
+export default {
+    components: { SearchQuery },
+    props: {
+        assemblyForm: {
+            type: Object
         },
-        data(){
-            return {
-                // 设置当前时间选择的范围
-                etdPickerOptions:{
-                    disabledDate(time) {
-                        // 获取当前后45天 Date.parse(NdayDate(45))
-                        return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
-                    }
-                },
-                vesselData:[], // 船名数据
-                carrierData:[], // 船公司
-                lineData:[], // 航线
-                bookingAgentData:[], // 订舱代理
+        detailData: {
+            type: Object,
+        },
+        generateBillsfalse: {
+            type: Boolean
+        }
+    },
+    data() {
+        return {
+            // 设置当前时间选择的范围
+            etdPickerOptions: {
+                disabledDate(time) {
+                    // 获取当前后45天 Date.parse(NdayDate(45))
+                    return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
+                }
+            },
+            vesselData: [], // 船名数据
+            carrierData: [], // 船公司
+            lineData: [], // 航线
+            bookingAgentData: [], // 订舱代理
 
-                // MB/L 发货人
-                mshipperData:[],
-                // MB/L 收货人
-                mconsigneeData:[],
-                // MB/L 通知人
-                mnotifyData:[],
-                // MB/L 第二通知人
-                mnotify2Data:[],
-                cyData:[], // 航站
-                cyContactsData:[], // 航战联系人
-                // HB/L付款地点数据
-                hpayplaceData:[],
-                // MB/L付款地点
-                mpayplaceData:[],
-                // 签单地点
-                issueAtData:[],
-                // 中转港
-                potData:[],
+            // MB/L 发货人
+            mshipperData: [],
+            // MB/L 收货人
+            mconsigneeData: [],
+            // MB/L 通知人
+            mnotifyData: [],
+            // MB/L 第二通知人
+            mnotify2Data: [],
+            cyData: [], // 航站
+            cyContactsData: [], // 航战联系人
+            // HB/L付款地点数据
+            hpayplaceData: [],
+            // MB/L付款地点
+            mpayplaceData: [],
+            // 签单地点
+            issueAtData: [],
+            // 中转港
+            potData: [],
 
+        }
+    },
+    created() {
+
+    },
+    methods: {
+        //航班日期
+        //ETD监听
+        handlePick(val) {
+            console.log('handlePick')
+            if (this.assemblyForm.id) {
+                this.$confirm('是否同步汇率, 是否继续?', '提示', {
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
+                    type: 'warning'
+                }).then(() => {
+                    let obj = {}
+                    obj = {
+                        date: this.assemblyForm.etd,
+                        type: 1,
+                        billId: this.assemblyForm.id
+                    }
+                    console.log(obj)
+                    synchronizationExchangeRate(obj).then(res => {
+                        this.billsDetailfun()
+                    })
+                }).catch(() => {
+                    let obj = {}
+                    obj = {
+                        date: this.assemblyForm.etd,
+                        type: 0,
+                        billId: this.assemblyForm.id
+                    }
+                    synchronizationExchangeRate(obj).then(res => {
+                        this.billsDetailfun()
+                    })
+                });
             }
         },
-        created() {
+        billsDetailfun() {
+            this.$emit('billsDetailfun')
+        },
+        /* 远程模糊查询操作用户 */
+        remoteMethod(value, name) {
+            let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            let payplaceArr = ['hpayplace', 'mpayplace', 'issueAt']
+            if (name == 'vessel') {
+                this.vesselBvesselsListfun(value)
+            }
+            else if (name == 'carrier') {
+                this.carrierBcorpsListfun(value)
+            }
+            else if (name == 'line') {
+                this.lineblinesListfun(value)
+            }
+            else if (name == 'bookingAgent') {
+                this.bookingAgentBcorpsListfun(value)
+            }
+            else if (arr.indexOf(name) != -1) {
+                this[name + 'BcorpsListfun'](value)
+            }
+            else if (name == 'cy') {
+                this.cyBcorpslistByType(value)
+            }
+            // 场站联系人
+            else if (name == 'cyContacts') {
+                this.cyBcorpsattnListfun()
+            }
+            // HB/L付款状态 MB/L 付款状态
+            else if (payplaceArr.indexOf(name) != -1) {
+                this[name + 'BportsListfun'](value)
+            }
+            else if (name == 'pot') {
+                this.potBportsListfun()
+            }
+            else { }
 
         },
-        methods:{
-            /* 远程模糊查询操作用户 */
-            remoteMethod(value,name){
-                let arr = ['mshipper','mconsignee','mnotify','mnotify2']
-                let payplaceArr = ['hpayplace','mpayplace','issueAt']
-                if (name == 'vessel'){
-                    this.vesselBvesselsListfun(value)
-                }
-                else if (name == 'carrier'){
-                    this.carrierBcorpsListfun(value)
-                }
-                else if (name == 'line'){
-                    this.lineblinesListfun(value)
+        // 下拉的监听事件
+        corpChange(value, name) {
+            let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            if (name == 'vessel') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'vesselId', '')
+                    this.$set(this.assemblyForm, 'vesselCnName', '')
+                    this.$set(this.assemblyForm, 'vesselEnName', '')
                 }
-                else if (name == 'bookingAgent'){
-                    this.bookingAgentBcorpsListfun(value)
+                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 (arr.indexOf(name) != -1) {
-                    this[name + 'BcorpsListfun'](value)
+            }
+            else if (name == 'carrier') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'carrierId', '')
+                    this.$set(this.assemblyForm, 'carrierCnName', '')
+                    this.$set(this.assemblyForm, 'carrierEnName', '')
+                    this.$set(this.assemblyForm, 'carrierArgreementNo', '')
                 }
-                else if (name == 'cy') {
-                    this.cyBcorpslistByType(value)
+                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 == 'cyContacts') {
-                    this.cyBcorpsattnListfun()
+            }
+            // 订舱代理
+            else if (name == 'bookingAgent') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'bookingAgentId', '')
+                    this.$set(this.assemblyForm, 'bookingAgentCnName', '')
+                    this.$set(this.assemblyForm, 'bookingAgentEnName', '')
+                    this.$set(this.assemblyForm, 'bookingRemarks', '')
                 }
-                // HB/L付款状态 MB/L 付款状态
-                else if (payplaceArr.indexOf(name) != -1) {
-                    this[name + 'BportsListfun'](value)
+                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 == 'pot') {
-                    this.potBportsListfun()
+            }
+            // 航站
+            else if (name == 'cy') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'cyId', '')
+                    this.$set(this.assemblyForm, 'cyCode', '')
+                    this.$set(this.assemblyForm, 'cyCnName', '')
+                    this.$set(this.assemblyForm, 'cyEnName', '')
+                    this.$set(this.assemblyForm, 'cyRemarks', '')
+                    // 联系人
+                    this.$set(this.assemblyForm, 'cyTel', '')
+                    this.$set(this.assemblyForm, 'cyAddress', '')
+                    this.$set(this.assemblyForm, 'cyContacts', '')
                 }
-                else {}
-
-            },
-            // 下拉的监听事件
-            corpChange(value,name){
-                let arr = ['mshipper','mconsignee','mnotify','mnotify2']
-                if (name == 'vessel') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'vesselId','')
-                        this.$set(this.assemblyForm,'vesselCnName','')
-                        this.$set(this.assemblyForm,'vesselEnName','')
-                    }
-                    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)
-                        }
+                for (let item of this.cyData) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, 'cyId', item.id)
+                        this.$set(this.assemblyForm, 'cyCode', item.code)
+                        this.$set(this.assemblyForm, 'cyCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'cyEnName', item.enName)
+                        this.$set(this.assemblyForm, 'cyRemarks', item.details) // 客户里的详情信息
+                        // 查询场站联系人
+                        getBcorpsattnList(1, 20, { pid: this.assemblyForm.cyId }).then(res => {
+                            this.$set(this.assemblyForm, 'cyTel', res.data.data.records[0].tel)
+                            this.$set(this.assemblyForm, 'cyAddress', res.data.data.records[0].addr)
+                            this.$set(this.assemblyForm, 'cyContacts', res.data.data.records[0].cname)
+                        })
                     }
                 }
-                else if (name == 'carrier') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'carrierId','')
-                        this.$set(this.assemblyForm,'carrierCnName','')
-                        this.$set(this.assemblyForm,'carrierEnName','')
-                        this.$set(this.assemblyForm,'carrierArgreementNo','')
-                    }
-                    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 == 'cyContacts') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'cyTel', '')
+                    this.$set(this.assemblyForm, 'cyAddress', '')
+                    this.$set(this.assemblyForm, 'cyContacts', '')
                 }
-                // 订舱代理
-                else if (name == 'bookingAgent') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'bookingAgentId','')
-                        this.$set(this.assemblyForm,'bookingAgentCnName','')
-                        this.$set(this.assemblyForm,'bookingAgentEnName','')
-                        this.$set(this.assemblyForm,'bookingRemarks','')
-                    }
-                    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)
-                        }
+                for (let item of this.cyContactsData) {
+                    if (item.cname == value) {
+                        this.$set(this.assemblyForm, 'cyTel', item.tel)
+                        this.$set(this.assemblyForm, 'cyAddress', item.addr)
+                        this.$set(this.assemblyForm, 'cyContacts', item.cname)
                     }
                 }
-                // 航站
-                else if (name == 'cy') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'cyId','')
-                        this.$set(this.assemblyForm,'cyCode','')
-                        this.$set(this.assemblyForm,'cyCnName','')
-                        this.$set(this.assemblyForm,'cyEnName','')
-                        this.$set(this.assemblyForm,'cyRemarks','')
-                        // 联系人
-                        this.$set(this.assemblyForm,'cyTel','')
-                        this.$set(this.assemblyForm,'cyAddress','')
-                        this.$set(this.assemblyForm,'cyContacts','')
-                    }
-                    for(let item of this.cyData) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'cyId',item.id)
-                            this.$set(this.assemblyForm,'cyCode',item.code)
-                            this.$set(this.assemblyForm,'cyCnName',item.cnName)
-                            this.$set(this.assemblyForm,'cyEnName',item.enName)
-                            this.$set(this.assemblyForm,'cyRemarks',item.details) // 客户里的详情信息
-                            // 查询场站联系人
-                            getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
-                                this.$set(this.assemblyForm,'cyTel',res.data.data.records[0].tel)
-                                this.$set(this.assemblyForm,'cyAddress',res.data.data.records[0].addr)
-                                this.$set(this.assemblyForm,'cyContacts',res.data.data.records[0].cname)
-                            })
-                        }
-                    }
+            }
+            // 航线
+            else if (name == 'line') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'lineId', '')
+                    this.$set(this.assemblyForm, 'lineCnName', '')
+                    this.$set(this.assemblyForm, 'lineEnName', '')
                 }
-                // 场站联系人
-                else if (name == 'cyContacts') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'cyTel','')
-                        this.$set(this.assemblyForm,'cyAddress','')
-                        this.$set(this.assemblyForm,'cyContacts','')
-                    }
-                    for(let item of this.cyContactsData) {
-                        if (item.cname == value) {
-                            this.$set(this.assemblyForm,'cyTel',item.tel)
-                            this.$set(this.assemblyForm,'cyAddress',item.addr)
-                            this.$set(this.assemblyForm,'cyContacts',item.cname)
-                        }
+                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 if (name == 'line') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'lineId','')
-                        this.$set(this.assemblyForm,'lineCnName','')
-                        this.$set(this.assemblyForm,'lineEnName','')
-                    }
-                    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 if (arr.indexOf(name) != -1) {
+                if (!value) {
+                    this.$set(this.assemblyForm, name + 'Id', '')
+                    this.$set(this.assemblyForm, name + 'CnName', '')
+                    this.$set(this.assemblyForm, name + 'EnName', '')
+                    this.$set(this.assemblyForm, name + 'Code', '')
+                    this.$set(this.assemblyForm, name + 'Details', '')
+                    // 国家名称
+                    this.$set(this.assemblyForm, name + 'CntyName', '')
+                    // 国家代码
+                    this.$set(this.assemblyForm, name + 'CntyCode', '')
                 }
-                // 四个主表
-                else if (arr.indexOf(name) != -1) {
-                    if (!value) {
-                        this.$set(this.assemblyForm,name + 'Id','')
-                        this.$set(this.assemblyForm,name + 'CnName','')
-                        this.$set(this.assemblyForm,name + 'EnName','')
-                        this.$set(this.assemblyForm,name + 'Code','')
-                        this.$set(this.assemblyForm,name + 'Details','')
+                for (let item of this[name + 'Data']) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, name + 'Id', item.id)
+                        this.$set(this.assemblyForm, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm, name + 'Code', item.code)
+                        this.$set(this.assemblyForm, name + 'Details', item.details)
                         // 国家名称
-                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        this.$set(this.assemblyForm, name + 'CntyName', item.cntyName)
                         // 国家代码
-                        this.$set(this.assemblyForm,name + 'CntyCode','')
-                    }
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,name + 'Id',item.id)
-                            this.$set(this.assemblyForm,name + 'CnName',item.cnName)
-                            this.$set(this.assemblyForm,name + 'EnName',item.enName)
-                            this.$set(this.assemblyForm,name + 'Code',item.code)
-                            this.$set(this.assemblyForm,name + 'Details',item.details)
-                            // 国家名称
-                            this.$set(this.assemblyForm,name + 'CntyName',item.cntyName)
-                            // 国家代码
-                            this.$set(this.assemblyForm,name + 'CntyCode',item.cntyCode)
-                        }
+                        this.$set(this.assemblyForm, name + 'CntyCode', item.cntyCode)
                     }
                 }
-                // 中转港
-                else if (name == 'pot') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'potId','')
-                        this.$set(this.assemblyForm,'potCode','')
-                        this.$set(this.assemblyForm,'potCnName','')
-                        this.$set(this.assemblyForm,'potEnName','')
-                    }
-                    for (let item of this.potData) {
-                        if (item.enName == value) {
-                            this.$set(this.assemblyForm,'potId',item.id)
-                            this.$set(this.assemblyForm,'potCode',item.code)
-                            this.$set(this.assemblyForm,'potCnName',item.cnName)
-                            this.$set(this.assemblyForm,'potEnName',item.enName)
-                        }
-                    }
+            }
+            // 中转港
+            else if (name == 'pot') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'potId', '')
+                    this.$set(this.assemblyForm, 'potCode', '')
+                    this.$set(this.assemblyForm, 'potCnName', '')
+                    this.$set(this.assemblyForm, 'potEnName', '')
                 }
-                else {
-                    this.assemblyForm[name] = value?value:''
+                for (let item of this.potData) {
+                    if (item.enName == value) {
+                        this.$set(this.assemblyForm, 'potId', item.id)
+                        this.$set(this.assemblyForm, 'potCode', item.code)
+                        this.$set(this.assemblyForm, 'potCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'potEnName', item.enName)
+                    }
                 }
-            },
+            }
+            else {
+                this.assemblyForm[name] = value ? value : ''
+            }
+        },
 
 
-            // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
-            // 中转港
-            potBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.potData = res.data.data.records.map(item=>{
-                        item.enName = item.enName + ' - ' + item.code
-                        return item
-                    })
-                })
-            },
-            // 获取船名数据
-            vesselBvesselsListfun(cnName){
-                getBvesselsList(1,10,{cnName}).then(res=>{
-                    this.vesselData = res.data.data.records
-                })
-            },
-            // 获取航空公司数据
-            carrierBcorpsListfun(cnName){
-                let corpTypeName = '航空公司'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.carrierData = res.data.data.records
-                })
-            },
-            // 获取航站数据
-            cyBcorpslistByType(cnName){
-                let corpTypeName = '航站'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.cyData = res.data.data.records
-                })
-            },
-            // 获取场站下的联系人数据
-            cyBcorpsattnListfun(){
-                getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
-                    this.cyContactsData = res.data.data.records
+        // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
+        // 中转港
+        potBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.potData = res.data.data.records.map(item => {
+                    item.enName = item.enName + ' - ' + item.code
+                    return item
                 })
-            },
-            // HB/L 付款地点
-            hpayplaceBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.hpayplaceData = res.data.data.records
-                })
-            },
-            // MB/L 付款地点
-            mpayplaceBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.mpayplaceData = res.data.data.records
-                })
-            },
-            // 签单地点
-            issueAtBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.issueAtData = res.data.data.records
-                })
-            },
+            })
+        },
+        // 获取船名数据
+        vesselBvesselsListfun(cnName) {
+            getBvesselsList(1, 10, { cnName }).then(res => {
+                this.vesselData = res.data.data.records
+            })
+        },
+        // 获取航空公司数据
+        carrierBcorpsListfun(cnName) {
+            let corpTypeName = '航空公司'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.carrierData = res.data.data.records
+            })
+        },
+        // 获取航站数据
+        cyBcorpslistByType(cnName) {
+            let corpTypeName = '航站'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.cyData = res.data.data.records
+            })
+        },
+        // 获取场站下的联系人数据
+        cyBcorpsattnListfun() {
+            getBcorpsattnList(1, 20, { pid: this.assemblyForm.cyId }).then(res => {
+                this.cyContactsData = res.data.data.records
+            })
+        },
+        // HB/L 付款地点
+        hpayplaceBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.hpayplaceData = res.data.data.records
+            })
+        },
+        // MB/L 付款地点
+        mpayplaceBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.mpayplaceData = res.data.data.records
+            })
+        },
+        // 签单地点
+        issueAtBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.issueAtData = res.data.data.records
+            })
+        },
 
-            // 获取航线数据
-            lineblinesListfun(cnName){
-                blinesList(1,10,{cnName}).then(res=>{
-                    this.lineData = res.data.data.records
-                })
-            },
-            // 获取订舱代理数据
-            bookingAgentBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.bookingAgentData = res.data.data.records
-                })
-            },
-            // 获取MB/L 发货人数据 (往来单位 前四个代理)
-            mshipperBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mshipperData = res.data.data.records
-                })
-            },
-            // 获取收货人数据 (往来单位 前四个代理)
-            mconsigneeBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mconsigneeData = res.data.data.records
-                })
-            },
-            // 获取通知人数据 (往来单位 前四个代理)
-            mnotifyBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mnotifyData = res.data.data.records
-                })
-            },
-            // 获取第二通知人数据 (往来单位 前四个代理)
-            mnotify2BcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mnotify2Data = res.data.data.records
-                })
-            },
+        // 获取航线数据
+        lineblinesListfun(cnName) {
+            blinesList(1, 10, { cnName }).then(res => {
+                this.lineData = res.data.data.records
+            })
+        },
+        // 获取订舱代理数据
+        bookingAgentBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.bookingAgentData = res.data.data.records
+            })
+        },
+        // 获取MB/L 发货人数据 (往来单位 前四个代理)
+        mshipperBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mshipperData = res.data.data.records
+            })
+        },
+        // 获取收货人数据 (往来单位 前四个代理)
+        mconsigneeBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mconsigneeData = res.data.data.records
+            })
+        },
+        // 获取通知人数据 (往来单位 前四个代理)
+        mnotifyBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mnotifyData = res.data.data.records
+            })
+        },
+        // 获取第二通知人数据 (往来单位 前四个代理)
+        mnotify2BcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mnotify2Data = res.data.data.records
+            })
+        },
 
-        }
     }
+}
 </script>
 
 <style scoped>

+ 2 - 1
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -210,7 +210,8 @@
                                 <el-tab-pane label="MB/L信息" name="third">
                                     <mbinformation :assemblyForm="form"
                                                    :generateBillsfalse="generateBillsfalse"
-                                                   :detailData="detailData">
+                                                   :detailData="detailData"
+                                                   @billsDetailfun="billsDetailfun(form.id)">
                                     </mbinformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false"  >

+ 573 - 626
src/views/iosBasicData/AirtransportImport/bills/assembly/mbinformation.vue

@@ -3,127 +3,111 @@
         <el-form :model="assemblyForm" ref="form" label-width="90px" class="demo-ruleForm">
             <el-row :gutter="20">
                 <el-col :span="6">
-                    <el-form-item label="航班号" prop="voyageNo" label-width="90px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">航班号</span>
-                            </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled || generateBillsfalse"
-                                  clearable placeholder="请输入航班号" ></el-input>
+                    <el-form-item label="航班号" prop="voyageNo" label-width="90px">
+                        <span slot="label">
+                            <span style="color: #1e9fff">航班号</span>
+                        </span>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                            placeholder="请输入航班号"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="航班日期" prop="etd" label-width="90px">
-                            <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-form-item label="航班日期" prop="eta" label-width="90px">
+                        <span slot="label">
+                            <span style="color: #1e9fff">航班日期</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="请选择航班日期" @change="handlePick">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <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-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-col>
                 <el-col :span="6">
                     <el-form-item label="ETA" prop="eta" label-width="90px"
-                                  :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
-                            <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="请选择ETA日期">
+                        :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                        <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="请选择ETA日期">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-col :span="12" >
-                        <el-form-item label="航空公司" prop="carrierCnName" >
+                    <el-col :span="12">
+                        <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"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
-                                          :buttonIf="false"
-                                          placeholder="请选择航空公司"
-                                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                          @remoteMethod="remoteMethod($event,'carrier')"
-                                          @corpChange="corpChange($event,'carrier')"
-                                          @corpFocus="remoteMethod($event,'carrier')" >
+                            <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
+                                :filterable="true" :clearable="true" :remote="true"
+                                :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                placeholder="请选择航空公司" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                @remoteMethod="remoteMethod($event, 'carrier')" @corpChange="corpChange($event, 'carrier')"
+                                @corpFocus="remoteMethod($event, 'carrier')">
                             </search-query>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierEnName"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入航空公司英文" ></el-input>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierEnName" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            placeholder="请输入航空公司英文"></el-input>
                     </el-col>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="订舱日期" prop="bookingDate" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">订舱日期</span>
-                                </span>
-                        <el-date-picker style="width: 100%;" v-model="assemblyForm.bookingDate"
-                                        clearable type="date" size="small"
-                                        :disabled="detailData.seeDisabled"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        placeholder="请选择订舱日期">
+                    <el-form-item label="订舱日期" prop="bookingDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">订舱日期</span>
+                        </span>
+                        <el-date-picker style="width: 100%;" v-model="assemblyForm.bookingDate" clearable 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-col :span="6">
-                    <el-form-item label="送货时间" prop="deliverGoodsDate" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">送货时间</span>
-                                </span>
-                        <el-date-picker style="width: 100%;" v-model="assemblyForm.deliverGoodsDate"
-                                        clearable type="date" size="small"
-                                        :disabled="detailData.seeDisabled"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        placeholder="请选择送货日期">
+                    <el-form-item label="送货时间" prop="deliverGoodsDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">送货时间</span>
+                        </span>
+                        <el-date-picker style="width: 100%;" v-model="assemblyForm.deliverGoodsDate" clearable 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-col :span="18">
-                    <el-form-item label="订舱备注" prop="bookingRemarks" >
+                    <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="请输入订舱备注" ></el-input>
+                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" rows="3" clearable
+                            placeholder="请输入订舱备注"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="入货时间" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">入货时间</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.incomingGoodsDate" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择入货日期">
+                    <el-form-item label="入货时间" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">入货时间</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.incomingGoodsDate" 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>
                 </el-col>
@@ -131,265 +115,204 @@
 
             <el-row>
                 <el-col :span="8">
-                    <el-form-item label="MB/L 发货人" prop="mshipperCnName" >
+                    <el-form-item label="MB/L 发货人" prop="mshipperCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 发货人</span>
                         </span>
-                        <search-query :datalist="mshipperData"
-                                      :selectValue="assemblyForm.mshipperCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择MB/L 发货人"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mshipper')"
-                                      @corpChange="corpChange($event,'mshipper')"
-                                      @corpFocus="remoteMethod($event,'mshipper')" >
+                        <search-query :datalist="mshipperData" :selectValue="assemblyForm.mshipperCnName" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            placeholder="请选择MB/L 发货人" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mshipper')" @corpChange="corpChange($event, 'mshipper')"
+                            @corpFocus="remoteMethod($event, 'mshipper')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mshipperDetails" >
+                        <el-form-item label="" prop="mshipperDetails">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mshipperDetails"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="请输入发货人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="请输入发货人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="MB/L 收货人" prop="mconsigneeCnName" >
+                    <el-form-item label="MB/L 收货人" prop="mconsigneeCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 收货人</span>
                         </span>
-                        <search-query :datalist="mconsigneeData"
-                                      :selectValue="assemblyForm.mconsigneeCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择MB/L 收货人"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mconsignee')"
-                                      @corpChange="corpChange($event,'mconsignee')"
-                                      @corpFocus="remoteMethod($event,'mconsignee')" >
+                        <search-query :datalist="mconsigneeData" :selectValue="assemblyForm.mconsigneeCnName"
+                            :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
+                            :buttonIf="false" placeholder="请选择MB/L 收货人"
+                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mconsignee')" @corpChange="corpChange($event, 'mconsignee')"
+                            @corpFocus="remoteMethod($event, 'mconsignee')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mconsigneeCntyName" >
+                        <el-form-item label="" prop="mconsigneeCntyName">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mconsigneeCntyName"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="请输入发货人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="请输入发货人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="MB/L 通知人" prop="mnotifyCnName" >
+                    <el-form-item label="MB/L 通知人" prop="mnotifyCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 通知人</span>
                         </span>
-                        <search-query :datalist="mnotifyData"
-                                      :selectValue="assemblyForm.mnotifyCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择MB/L 通知人"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'mnotify')"
-                                      @corpChange="corpChange($event,'mnotify')"
-                                      @corpFocus="remoteMethod($event,'mnotify')" >
+                        <search-query :datalist="mnotifyData" :selectValue="assemblyForm.mnotifyCnName" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            placeholder="请选择MB/L 通知人" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            @remoteMethod="remoteMethod($event, 'mnotify')" @corpChange="corpChange($event, 'mnotify')"
+                            @corpFocus="remoteMethod($event, 'mnotify')">
                         </search-query>
                     </el-form-item>
                     <div style="margin-top: 10px">
-                        <el-form-item label="" prop="mnotifyCntyName" >
+                        <el-form-item label="" prop="mnotifyCntyName">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.mnotifyCntyName"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled" rows="4"
-                                      clearable placeholder="请输入通知人提单描述" ></el-input>
+                                size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="4" clearable
+                                placeholder="请输入通知人提单描述"></el-input>
                         </el-form-item>
                     </div>
                 </el-col>
             </el-row>
             <el-row>
                 <el-col :span="8">
-                    <el-form-item label="中转港" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转港</span>
-                            </span>
-                        <search-query :datalist="potData"
-                                      :selectValue="assemblyForm.potEnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择中转港"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'pot')"
-                                      @corpChange="corpChange($event,'pot')"
-                                      @corpFocus="remoteMethod($event,'pot')" >
+                    <el-form-item label="中转港" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转港</span>
+                        </span>
+                        <search-query :datalist="potData" :selectValue="assemblyForm.potEnName" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            placeholder="请选择中转港" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                            @remoteMethod="remoteMethod($event, 'pot')" @corpChange="corpChange($event, 'pot')"
+                            @corpFocus="remoteMethod($event, 'pot')">
                         </search-query>
                     </el-form-item>
-                    <el-form-item label="中转航班" prop="potVoyageNo" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转航班</span>
-                            </span>
-                        <el-input style="width: 100%;" v-model="assemblyForm.potVoyageNo"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入中转航班" ></el-input>
+                    <el-form-item label="中转航班" prop="potVoyageNo">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转航班</span>
+                        </span>
+                        <el-input style="width: 100%;" v-model="assemblyForm.potVoyageNo" size="small" autocomplete="off"
+                            :disabled="detailData.seeDisabled" clearable placeholder="请输入中转航班"></el-input>
                     </el-form-item>
-                    <el-form-item label="中转ETD" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转ETD</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.potEtd" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择中转ETD日期">
+                    <el-form-item label="中转ETD" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转ETD</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.potEtd" clearable style="width: 100%" type="date" size="small"
+                            :disabled="detailData.seeDisabled || generateBillsfalse" value-format="yyyy-MM-dd"
+                            :picker-options="etdPickerOptions" placeholder="请选择中转ETD日期">
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item label="中转ETA" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转ETA</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.potEta" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择中转ETA日期">
+                    <el-form-item label="中转ETA" prop="potEnName">
+                        <span slot="label">
+                            <span style="color: #1e9fff">中转ETA</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.potEta" clearable style="width: 100%" type="date" size="small"
+                            :disabled="detailData.seeDisabled || generateBillsfalse" value-format="yyyy-MM-dd"
+                            :picker-options="etdPickerOptions" placeholder="请选择中转ETA日期">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
                 <el-col :span="16">
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="航站" prop="cyCnName" >
+                            <el-form-item label="航站" prop="cyCnName">
                                 <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="cyData"
-                                              :selectValue="assemblyForm.cyCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled || generateBillsfalse"
-                                              :buttonIf="false"
-                                              placeholder="请选择航战"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'cy')"
-                                              @corpChange="corpChange($event,'cy')"
-                                              @corpFocus="remoteMethod($event, 'cy')" >
+                                <search-query :datalist="cyData" :selectValue="assemblyForm.cyCnName" :filterable="true"
+                                    :clearable="true" :remote="true"
+                                    :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                    placeholder="请选择航战" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                                    @remoteMethod="remoteMethod($event, 'cy')" @corpChange="corpChange($event, 'cy')"
+                                    @corpFocus="remoteMethod($event, 'cy')">
                                 </search-query>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="地址" prop="cyAddress" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">地址</span>
-                            </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyAddress"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
-                                          clearable placeholder="请输入地址" ></el-input>
+                            <el-form-item label="地址" prop="cyAddress">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">地址</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyAddress" size="small"
+                                    autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                                    placeholder="请输入地址"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
                     <el-col :span="8">
-                        <el-form-item label="联系人" prop="cyContacts" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">联系人</span>
-                                </span>
-                            <search-query :datalist="cyContactsData"
-                                          :selectValue="assemblyForm.cyContacts"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :disabled="detailData.seeDisabled || generateBillsfalse"
-                                          :buttonIf="false"
-                                          :forParameter="{key:'id',label:'cname',value:'cname'}"
-                                          placeholder="请选择联系人"
-                                          @corpChange="corpChange($event,'cyContacts')"
-                                          @corpFocus="remoteMethod($event, 'cyContacts')" >
+                        <el-form-item label="联系人" prop="cyContacts">
+                            <span slot="label">
+                                <span style="color: #1e9fff">联系人</span>
+                            </span>
+                            <search-query :datalist="cyContactsData" :selectValue="assemblyForm.cyContacts"
+                                :filterable="true" :clearable="true"
+                                :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"
+                                :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" placeholder="请选择联系人"
+                                @corpChange="corpChange($event, 'cyContacts')"
+                                @corpFocus="remoteMethod($event, 'cyContacts')">
                             </search-query>
                         </el-form-item>
                     </el-col>
                     <el-col :span="16">
-                        <el-form-item label="联系电话" prop="cyTel" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">联系电话</span>
-                                </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyTel"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse"
-                                      clearable placeholder="请输入联系电话" ></el-input>
+                        <el-form-item label="联系电话" prop="cyTel">
+                            <span slot="label">
+                                <span style="color: #1e9fff">联系电话</span>
+                            </span>
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyTel" size="small"
+                                autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                                placeholder="请输入联系电话"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="场站备注" prop="cyRemarks" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">场站备注</span>
-                        </span>
-                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.cyRemarks"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse" rows="3"
-                                      clearable placeholder="请输入场站备注" ></el-input>
+                        <el-form-item label="场站备注" prop="cyRemarks">
+                            <span slot="label">
+                                <span style="color: #1e9fff">场站备注</span>
+                            </span>
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.cyRemarks" size="small"
+                                autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" rows="3"
+                                clearable placeholder="请输入场站备注"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="24" >
-                        <el-form-item label="HANDLTNG INFORMATION" prop="hakdlthgIformation" label-width="200px" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">HANDLTNG INFORMATION:</span>
-                                </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hakdlthgIformation"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse"
-                                      clearable placeholder="请输入HANDLTNG INFORMATION" ></el-input>
+                    <el-col :span="24">
+                        <el-form-item label="HANDLTNG INFORMATION" prop="hakdlthgIformation" label-width="200px">
+                            <span slot="label">
+                                <span style="color: #1e9fff">HANDLTNG INFORMATION:</span>
+                            </span>
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.hakdlthgIformation" size="small"
+                                autocomplete="off" :disabled="detailData.seeDisabled || generateBillsfalse" clearable
+                                placeholder="请输入HANDLTNG INFORMATION"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-col>
             </el-row>
             <el-row>
                 <el-col :span="6">
-                    <el-form-item label="HB/L付款地点" prop="hpayplace" >
+                    <el-form-item label="HB/L付款地点" prop="hpayplace">
                         <span slot="label">
                             <span style="color: #1e9fff">HB/L付款地点</span>
                         </span>
-                        <search-query :datalist="hpayplaceData"
-                                      :selectValue="assemblyForm.hpayplace"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择HB/L付款地点"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'hpayplace')"
-                                      @corpChange="corpChange($event,'hpayplace')"
-                                      @corpFocus="remoteMethod($event,'hpayplace')" >
+                        <search-query :datalist="hpayplaceData" :selectValue="assemblyForm.hpayplace" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            placeholder="请选择HB/L付款地点" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                            @remoteMethod="remoteMethod($event, 'hpayplace')" @corpChange="corpChange($event, 'hpayplace')"
+                            @corpFocus="remoteMethod($event, 'hpayplace')">
                         </search-query>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="MB/L付款地点" prop="mPayplace" >
+                    <el-form-item label="MB/L付款地点" prop="mPayplace">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L付款地点</span>
                         </span>
-                        <search-query :datalist="mpayplaceData"
-                                      :selectValue="assemblyForm.mpayplace"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择MB/L付款地点"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'mpayplace')"
-                                      @corpChange="corpChange($event,'mpayplace')"
-                                      @corpFocus="remoteMethod($event,'mpayplace')" >
+                        <search-query :datalist="mpayplaceData" :selectValue="assemblyForm.mpayplace" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            placeholder="请选择MB/L付款地点" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                            @remoteMethod="remoteMethod($event, 'mpayplace')" @corpChange="corpChange($event, 'mpayplace')"
+                            @corpFocus="remoteMethod($event, 'mpayplace')">
                         </search-query>
                         <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.mPayplace"-->
                         <!--          size="small" autocomplete="off"-->
@@ -397,78 +320,66 @@
                         <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="预付总额" prop="hPayAmount" >
+                <el-col :span="6">
+                    <el-form-item label="预付总额" prop="hPayAmount">
                         <span slot="label">
                             <span style="color: #1e9fff">预付总额</span>
                         </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入预付总额" ></el-input>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.hPayAmount" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            placeholder="请输入预付总额"></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="运输条款" prop="serviceTerms" >
+                <el-col :span="6">
+                    <el-form-item label="运输条款" prop="serviceTerms">
                         <span slot="label">
                             <span style="color: #1e9fff">运输条款</span>
                         </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入运输条款" ></el-input>
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.serviceTerms" size="small"
+                            autocomplete="off" :disabled="detailData.seeDisabled" clearable
+                            placeholder="请输入运输条款"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="签发日期" prop="issueDate" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">签发日期</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.issueDate" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择签发日期">
+                    <el-form-item label="签发日期" prop="issueDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">签发日期</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.issueDate" 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>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="签发地点" prop="issueAt" >
+                <el-col :span="6">
+                    <el-form-item label="签发地点" prop="issueAt">
                         <span slot="label">
                             <span style="color: #1e9fff">签发地点</span>
                         </span>
-                        <search-query :datalist="issueAtData"
-                                      :selectValue="assemblyForm.issueAt"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      placeholder="请选择签发地点"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'issueAt')"
-                                      @corpChange="corpChange($event,'issueAt')"
-                                      @corpFocus="remoteMethod($event,'issueAt')" >
+                        <search-query :datalist="issueAtData" :selectValue="assemblyForm.issueAt" :filterable="true"
+                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled" :buttonIf="false"
+                            placeholder="请选择签发地点" :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
+                            @remoteMethod="remoteMethod($event, 'issueAt')" @corpChange="corpChange($event, 'issueAt')"
+                            @corpFocus="remoteMethod($event, 'issueAt')">
                         </search-query>
 
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="" >
-                        <el-checkbox size="medium" :true-label="1" :false-label="0"
-                                     :disabled="detailData.seeDisabled"
-                                     v-model="assemblyForm.billStatus">是否提单确认
+                <el-col :span="6">
+                    <el-form-item label="">
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled"
+                            v-model="assemblyForm.billStatus">是否提单确认
                         </el-checkbox>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6" >
-                    <el-form-item label="提单确认日期" prop="billConfirmDate" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">提单确认日期</span>
-                            </span>
-                        <el-date-picker v-model="assemblyForm.billConfirmDate" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                        value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                        placeholder="请选择提单确认日期" >
+                <el-col :span="6">
+                    <el-form-item label="提单确认日期" prop="billConfirmDate">
+                        <span slot="label">
+                            <span style="color: #1e9fff">提单确认日期</span>
+                        </span>
+                        <el-date-picker v-model="assemblyForm.billConfirmDate" 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>
                 </el-col>
@@ -478,360 +389,396 @@
 </template>
 
 <script>
-    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBvesselsList} from "@/api/iosBasicData/bvessels";
-    import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
-    import {blinesList} from "@/api/iosBasicData/blines";
-    import {NdayDate} from "@/util/date";
-    import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
-    import {bportsList} from "@/api/iosBasicData/bports";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { getBvesselsList, synchronizationExchangeRate } from "@/api/iosBasicData/bvessels";
+import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+import { blinesList } from "@/api/iosBasicData/blines";
+import { NdayDate } from "@/util/date";
+import { getBcorpsattnList } from "@/api/iosBasicData/bcorpsattn";
+import { bportsList } from "@/api/iosBasicData/bports";
 
-    export default {
-        components: {SearchQuery},
-        props:{
-            assemblyForm:{
-                type:Object
-            },
-            detailData:{
-                type:Object,
-            },
-            generateBillsfalse:{
-                type:Boolean
-            }
+export default {
+    components: { SearchQuery },
+    props: {
+        assemblyForm: {
+            type: Object
         },
-        data(){
-            return {
-                // 设置当前时间选择的范围
-                etdPickerOptions:{
-                    disabledDate(time) {
-                        // 获取当前后45天 Date.parse(NdayDate(45))
-                        return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
-                    }
-                },
-                vesselData:[], // 船名数据
-                carrierData:[], // 船公司
-                lineData:[], // 航线
-                bookingAgentData:[], // 订舱代理
+        detailData: {
+            type: Object,
+        },
+        generateBillsfalse: {
+            type: Boolean
+        }
+    },
+    data() {
+        return {
+            // 设置当前时间选择的范围
+            etdPickerOptions: {
+                disabledDate(time) {
+                    // 获取当前后45天 Date.parse(NdayDate(45))
+                    return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
+                }
+            },
+            vesselData: [], // 船名数据
+            carrierData: [], // 船公司
+            lineData: [], // 航线
+            bookingAgentData: [], // 订舱代理
 
-                // MB/L 发货人
-                mshipperData:[],
-                // MB/L 收货人
-                mconsigneeData:[],
-                // MB/L 通知人
-                mnotifyData:[],
-                // MB/L 第二通知人
-                mnotify2Data:[],
-                cyData:[], // 航站
-                cyContactsData:[], // 航战联系人
-                // HB/L付款地点数据
-                hpayplaceData:[],
-                // MB/L付款地点
-                mpayplaceData:[],
-                // 签单地点
-                issueAtData:[],
-                // 中转港
-                potData:[],
+            // MB/L 发货人
+            mshipperData: [],
+            // MB/L 收货人
+            mconsigneeData: [],
+            // MB/L 通知人
+            mnotifyData: [],
+            // MB/L 第二通知人
+            mnotify2Data: [],
+            cyData: [], // 航站
+            cyContactsData: [], // 航战联系人
+            // HB/L付款地点数据
+            hpayplaceData: [],
+            // MB/L付款地点
+            mpayplaceData: [],
+            // 签单地点
+            issueAtData: [],
+            // 中转港
+            potData: [],
 
+        }
+    },
+    created() {
+
+    },
+    methods: {
+        //航班日期
+        //ETD监听
+        handlePick(val) {
+            console.log('handlePick')
+            if (this.assemblyForm.id) {
+                this.$confirm('是否同步汇率, 是否继续?', '提示', {
+                    confirmButtonText: '是',
+                    cancelButtonText: '否',
+                    type: 'warning'
+                }).then(() => {
+                    let obj = {}
+                    obj = {
+                        date: this.assemblyForm.eta,
+                        type: 1,
+                        billId: this.assemblyForm.id
+                    }
+                    console.log(obj)
+                    synchronizationExchangeRate(obj).then(res => {
+                        this.billsDetailfun()
+                    })
+                }).catch(() => {
+                    let obj = {}
+                    obj = {
+                        date: this.assemblyForm.eta,
+                        type: 0,
+                        billId: this.assemblyForm.id
+                    }
+                    synchronizationExchangeRate(obj).then(res => {
+                        this.billsDetailfun()
+                    })
+                });
             }
         },
-        created() {
+        billsDetailfun() {
+            this.$emit('billsDetailfun')
+        },
+        /* 远程模糊查询操作用户 */
+        remoteMethod(value, name) {
+            let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            let payplaceArr = ['hpayplace', 'mpayplace', 'issueAt']
+            if (name == 'vessel') {
+                this.vesselBvesselsListfun(value)
+            }
+            else if (name == 'carrier') {
+                this.carrierBcorpsListfun(value)
+            }
+            else if (name == 'line') {
+                this.lineblinesListfun(value)
+            }
+            else if (name == 'bookingAgent') {
+                this.bookingAgentBcorpsListfun(value)
+            }
+            else if (arr.indexOf(name) != -1) {
+                this[name + 'BcorpsListfun'](value)
+            }
+            else if (name == 'cy') {
+                this.cyBcorpslistByType(value)
+            }
+            // 场站联系人
+            else if (name == 'cyContacts') {
+                this.cyBcorpsattnListfun()
+            }
+            // HB/L付款状态 MB/L 付款状态
+            else if (payplaceArr.indexOf(name) != -1) {
+                this[name + 'BportsListfun'](value)
+            }
+            else if (name == 'pot') {
+                this.potBportsListfun()
+            }
+            else { }
 
         },
-        methods:{
-            /* 远程模糊查询操作用户 */
-            remoteMethod(value,name){
-                let arr = ['mshipper','mconsignee','mnotify','mnotify2']
-                let payplaceArr = ['hpayplace','mpayplace','issueAt']
-                if (name == 'vessel'){
-                    this.vesselBvesselsListfun(value)
-                }
-                else if (name == 'carrier'){
-                    this.carrierBcorpsListfun(value)
-                }
-                else if (name == 'line'){
-                    this.lineblinesListfun(value)
+        // 下拉的监听事件
+        corpChange(value, name) {
+            let arr = ['mshipper', 'mconsignee', 'mnotify', 'mnotify2']
+            if (name == 'vessel') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'vesselId', '')
+                    this.$set(this.assemblyForm, 'vesselCnName', '')
+                    this.$set(this.assemblyForm, 'vesselEnName', '')
                 }
-                else if (name == 'bookingAgent'){
-                    this.bookingAgentBcorpsListfun(value)
+                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 (arr.indexOf(name) != -1) {
-                    this[name + 'BcorpsListfun'](value)
+            }
+            else if (name == 'carrier') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'carrierId', '')
+                    this.$set(this.assemblyForm, 'carrierCnName', '')
+                    this.$set(this.assemblyForm, 'carrierEnName', '')
+                    this.$set(this.assemblyForm, 'carrierArgreementNo', '')
                 }
-                else if (name == 'cy') {
-                    this.cyBcorpslistByType(value)
+                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 == 'cyContacts') {
-                    this.cyBcorpsattnListfun()
+            }
+            // 订舱代理
+            else if (name == 'bookingAgent') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'bookingAgentId', '')
+                    this.$set(this.assemblyForm, 'bookingAgentCnName', '')
+                    this.$set(this.assemblyForm, 'bookingAgentEnName', '')
+                    this.$set(this.assemblyForm, 'bookingRemarks', '')
                 }
-                // HB/L付款状态 MB/L 付款状态
-                else if (payplaceArr.indexOf(name) != -1) {
-                    this[name + 'BportsListfun'](value)
+                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 == 'pot') {
-                    this.potBportsListfun()
+            }
+            // 航站
+            else if (name == 'cy') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'cyId', '')
+                    this.$set(this.assemblyForm, 'cyCode', '')
+                    this.$set(this.assemblyForm, 'cyCnName', '')
+                    this.$set(this.assemblyForm, 'cyEnName', '')
+                    this.$set(this.assemblyForm, 'cyRemarks', '')
+                    // 联系人
+                    this.$set(this.assemblyForm, 'cyTel', '')
+                    this.$set(this.assemblyForm, 'cyAddress', '')
+                    this.$set(this.assemblyForm, 'cyContacts', '')
                 }
-                else {}
-
-            },
-            // 下拉的监听事件
-            corpChange(value,name){
-                let arr = ['mshipper','mconsignee','mnotify','mnotify2']
-                if (name == 'vessel') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'vesselId','')
-                        this.$set(this.assemblyForm,'vesselCnName','')
-                        this.$set(this.assemblyForm,'vesselEnName','')
-                    }
-                    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)
-                        }
+                for (let item of this.cyData) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, 'cyId', item.id)
+                        this.$set(this.assemblyForm, 'cyCode', item.code)
+                        this.$set(this.assemblyForm, 'cyCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'cyEnName', item.enName)
+                        this.$set(this.assemblyForm, 'cyRemarks', item.details) // 客户里的详情信息
+                        // 查询场站联系人
+                        getBcorpsattnList(1, 20, { pid: this.assemblyForm.cyId }).then(res => {
+                            this.$set(this.assemblyForm, 'cyTel', res.data.data.records[0].tel)
+                            this.$set(this.assemblyForm, 'cyAddress', res.data.data.records[0].addr)
+                            this.$set(this.assemblyForm, 'cyContacts', res.data.data.records[0].cname)
+                        })
                     }
                 }
-                else if (name == 'carrier') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'carrierId','')
-                        this.$set(this.assemblyForm,'carrierCnName','')
-                        this.$set(this.assemblyForm,'carrierEnName','')
-                        this.$set(this.assemblyForm,'carrierArgreementNo','')
-                    }
-                    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 == 'cyContacts') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'cyTel', '')
+                    this.$set(this.assemblyForm, 'cyAddress', '')
+                    this.$set(this.assemblyForm, 'cyContacts', '')
                 }
-                // 订舱代理
-                else if (name == 'bookingAgent') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'bookingAgentId','')
-                        this.$set(this.assemblyForm,'bookingAgentCnName','')
-                        this.$set(this.assemblyForm,'bookingAgentEnName','')
-                        this.$set(this.assemblyForm,'bookingRemarks','')
-                    }
-                    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)
-                        }
+                for (let item of this.cyContactsData) {
+                    if (item.cname == value) {
+                        this.$set(this.assemblyForm, 'cyTel', item.tel)
+                        this.$set(this.assemblyForm, 'cyAddress', item.addr)
+                        this.$set(this.assemblyForm, 'cyContacts', item.cname)
                     }
                 }
-                // 航站
-                else if (name == 'cy') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'cyId','')
-                        this.$set(this.assemblyForm,'cyCode','')
-                        this.$set(this.assemblyForm,'cyCnName','')
-                        this.$set(this.assemblyForm,'cyEnName','')
-                        this.$set(this.assemblyForm,'cyRemarks','')
-                        // 联系人
-                        this.$set(this.assemblyForm,'cyTel','')
-                        this.$set(this.assemblyForm,'cyAddress','')
-                        this.$set(this.assemblyForm,'cyContacts','')
-                    }
-                    for(let item of this.cyData) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'cyId',item.id)
-                            this.$set(this.assemblyForm,'cyCode',item.code)
-                            this.$set(this.assemblyForm,'cyCnName',item.cnName)
-                            this.$set(this.assemblyForm,'cyEnName',item.enName)
-                            this.$set(this.assemblyForm,'cyRemarks',item.details) // 客户里的详情信息
-                            // 查询场站联系人
-                            getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
-                                this.$set(this.assemblyForm,'cyTel',res.data.data.records[0].tel)
-                                this.$set(this.assemblyForm,'cyAddress',res.data.data.records[0].addr)
-                                this.$set(this.assemblyForm,'cyContacts',res.data.data.records[0].cname)
-                            })
-                        }
-                    }
+            }
+            // 航线
+            else if (name == 'line') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'lineId', '')
+                    this.$set(this.assemblyForm, 'lineCnName', '')
+                    this.$set(this.assemblyForm, 'lineEnName', '')
                 }
-                // 场站联系人
-                else if (name == 'cyContacts') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'cyTel','')
-                        this.$set(this.assemblyForm,'cyAddress','')
-                        this.$set(this.assemblyForm,'cyContacts','')
-                    }
-                    for(let item of this.cyContactsData) {
-                        if (item.cname == value) {
-                            this.$set(this.assemblyForm,'cyTel',item.tel)
-                            this.$set(this.assemblyForm,'cyAddress',item.addr)
-                            this.$set(this.assemblyForm,'cyContacts',item.cname)
-                        }
+                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 if (name == 'line') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'lineId','')
-                        this.$set(this.assemblyForm,'lineCnName','')
-                        this.$set(this.assemblyForm,'lineEnName','')
-                    }
-                    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 if (arr.indexOf(name) != -1) {
+                if (!value) {
+                    this.$set(this.assemblyForm, name + 'Id', '')
+                    this.$set(this.assemblyForm, name + 'CnName', '')
+                    this.$set(this.assemblyForm, name + 'EnName', '')
+                    this.$set(this.assemblyForm, name + 'Code', '')
+                    this.$set(this.assemblyForm, name + 'Details', '')
+                    // 国家名称
+                    this.$set(this.assemblyForm, name + 'CntyName', '')
+                    // 国家代码
+                    this.$set(this.assemblyForm, name + 'CntyCode', '')
                 }
-                // 四个主表
-                else if (arr.indexOf(name) != -1) {
-                    if (!value) {
-                        this.$set(this.assemblyForm,name + 'Id','')
-                        this.$set(this.assemblyForm,name + 'CnName','')
-                        this.$set(this.assemblyForm,name + 'EnName','')
-                        this.$set(this.assemblyForm,name + 'Code','')
-                        this.$set(this.assemblyForm,name + 'Details','')
+                for (let item of this[name + 'Data']) {
+                    if (item.cnName == value) {
+                        this.$set(this.assemblyForm, name + 'Id', item.id)
+                        this.$set(this.assemblyForm, name + 'CnName', item.cnName)
+                        this.$set(this.assemblyForm, name + 'EnName', item.enName)
+                        this.$set(this.assemblyForm, name + 'Code', item.code)
+                        this.$set(this.assemblyForm, name + 'Details', item.details)
                         // 国家名称
-                        this.$set(this.assemblyForm,name + 'CntyName','')
+                        this.$set(this.assemblyForm, name + 'CntyName', item.cntyName)
                         // 国家代码
-                        this.$set(this.assemblyForm,name + 'CntyCode','')
-                    }
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,name + 'Id',item.id)
-                            this.$set(this.assemblyForm,name + 'CnName',item.cnName)
-                            this.$set(this.assemblyForm,name + 'EnName',item.enName)
-                            this.$set(this.assemblyForm,name + 'Code',item.code)
-                            this.$set(this.assemblyForm,name + 'Details',item.details)
-                            // 国家名称
-                            this.$set(this.assemblyForm,name + 'CntyName',item.cntyName)
-                            // 国家代码
-                            this.$set(this.assemblyForm,name + 'CntyCode',item.cntyCode)
-                        }
+                        this.$set(this.assemblyForm, name + 'CntyCode', item.cntyCode)
                     }
                 }
-                // 中转港
-                else if (name == 'pot') {
-                    if (!value) {
-                        this.$set(this.assemblyForm,'potId','')
-                        this.$set(this.assemblyForm,'potCode','')
-                        this.$set(this.assemblyForm,'potCnName','')
-                        this.$set(this.assemblyForm,'potEnName','')
-                    }
-                    for (let item of this.potData) {
-                        if (item.enName == value) {
-                            this.$set(this.assemblyForm,'potId',item.id)
-                            this.$set(this.assemblyForm,'potCode',item.code)
-                            this.$set(this.assemblyForm,'potCnName',item.cnName)
-                            this.$set(this.assemblyForm,'potEnName',item.enName)
-                        }
-                    }
+            }
+            // 中转港
+            else if (name == 'pot') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'potId', '')
+                    this.$set(this.assemblyForm, 'potCode', '')
+                    this.$set(this.assemblyForm, 'potCnName', '')
+                    this.$set(this.assemblyForm, 'potEnName', '')
                 }
-                else {
-                    this.assemblyForm[name] = value?value:''
+                for (let item of this.potData) {
+                    if (item.enName == value) {
+                        this.$set(this.assemblyForm, 'potId', item.id)
+                        this.$set(this.assemblyForm, 'potCode', item.code)
+                        this.$set(this.assemblyForm, 'potCnName', item.cnName)
+                        this.$set(this.assemblyForm, 'potEnName', item.enName)
+                    }
                 }
-            },
+            }
+            else {
+                this.assemblyForm[name] = value ? value : ''
+            }
+        },
 
 
-            // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
-            // 中转港
-            potBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.potData = res.data.data.records.map(item=>{
-                        item.enName = item.enName + ' - ' + item.code
-                        return item
-                    })
-                })
-            },
-            // 获取船名数据
-            vesselBvesselsListfun(cnName){
-                getBvesselsList(1,10,{cnName}).then(res=>{
-                    this.vesselData = res.data.data.records
-                })
-            },
-            // 获取航空公司数据
-            carrierBcorpsListfun(cnName){
-                let corpTypeName = '航空公司'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.carrierData = res.data.data.records
-                })
-            },
-            // 获取航站数据
-            cyBcorpslistByType(cnName){
-                let corpTypeName = '航站'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.cyData = res.data.data.records
-                })
-            },
-            // 获取场站下的联系人数据
-            cyBcorpsattnListfun(){
-                getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
-                    this.cyContactsData = res.data.data.records
+        // 接口数据请求🙏🙏🙏🙏🙏🙏🙏🙏🙏🙏
+        // 中转港
+        potBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.potData = res.data.data.records.map(item => {
+                    item.enName = item.enName + ' - ' + item.code
+                    return item
                 })
-            },
-            // HB/L 付款地点
-            hpayplaceBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.hpayplaceData = res.data.data.records
-                })
-            },
-            // MB/L 付款地点
-            mpayplaceBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.mpayplaceData = res.data.data.records
-                })
-            },
-            // 签单地点
-            issueAtBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.issueAtData = res.data.data.records
-                })
-            },
+            })
+        },
+        // 获取船名数据
+        vesselBvesselsListfun(cnName) {
+            getBvesselsList(1, 10, { cnName }).then(res => {
+                this.vesselData = res.data.data.records
+            })
+        },
+        // 获取航空公司数据
+        carrierBcorpsListfun(cnName) {
+            let corpTypeName = '航空公司'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.carrierData = res.data.data.records
+            })
+        },
+        // 获取航站数据
+        cyBcorpslistByType(cnName) {
+            let corpTypeName = '航站'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.cyData = res.data.data.records
+            })
+        },
+        // 获取场站下的联系人数据
+        cyBcorpsattnListfun() {
+            getBcorpsattnList(1, 20, { pid: this.assemblyForm.cyId }).then(res => {
+                this.cyContactsData = res.data.data.records
+            })
+        },
+        // HB/L 付款地点
+        hpayplaceBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.hpayplaceData = res.data.data.records
+            })
+        },
+        // MB/L 付款地点
+        mpayplaceBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.mpayplaceData = res.data.data.records
+            })
+        },
+        // 签单地点
+        issueAtBportsListfun(enName) {
+            bportsList(1, 10, { enName }).then(res => {
+                this.issueAtData = res.data.data.records
+            })
+        },
 
-            // 获取航线数据
-            lineblinesListfun(cnName){
-                blinesList(1,10,{cnName}).then(res=>{
-                    this.lineData = res.data.data.records
-                })
-            },
-            // 获取订舱代理数据
-            bookingAgentBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.bookingAgentData = res.data.data.records
-                })
-            },
-            // 获取MB/L 发货人数据 (往来单位 前四个代理)
-            mshipperBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mshipperData = res.data.data.records
-                })
-            },
-            // 获取收货人数据 (往来单位 前四个代理)
-            mconsigneeBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mconsigneeData = res.data.data.records
-                })
-            },
-            // 获取通知人数据 (往来单位 前四个代理)
-            mnotifyBcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mnotifyData = res.data.data.records
-                })
-            },
-            // 获取第二通知人数据 (往来单位 前四个代理)
-            mnotify2BcorpsListfun(cnName){
-                let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-                getBcorpslistByType(1,10,{cnName,corpTypeName}).then(res=>{
-                    this.mnotify2Data = res.data.data.records
-                })
-            },
+        // 获取航线数据
+        lineblinesListfun(cnName) {
+            blinesList(1, 10, { cnName }).then(res => {
+                this.lineData = res.data.data.records
+            })
+        },
+        // 获取订舱代理数据
+        bookingAgentBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.bookingAgentData = res.data.data.records
+            })
+        },
+        // 获取MB/L 发货人数据 (往来单位 前四个代理)
+        mshipperBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mshipperData = res.data.data.records
+            })
+        },
+        // 获取收货人数据 (往来单位 前四个代理)
+        mconsigneeBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mconsigneeData = res.data.data.records
+            })
+        },
+        // 获取通知人数据 (往来单位 前四个代理)
+        mnotifyBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mnotifyData = res.data.data.records
+            })
+        },
+        // 获取第二通知人数据 (往来单位 前四个代理)
+        mnotify2BcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.mnotify2Data = res.data.data.records
+            })
+        },
 
-        }
     }
+}
 </script>
 
 <style scoped>

+ 2 - 1
src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -210,7 +210,8 @@
                                 <el-tab-pane label="MB/L信息" name="third">
                                     <mbinformation :assemblyForm="form"
                                                    :generateBillsfalse="generateBillsfalse"
-                                                   :detailData="detailData">
+                                                   :detailData="detailData"
+                                                   @billsDetailfun="billsDetailfun(form.id)">
                                     </mbinformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('报表管理') != -1?true:false" >

+ 5 - 1
src/views/iosBasicData/fingenleg/index.vue

@@ -536,15 +536,19 @@ import {CurrentMonth, dateFormat, defaultDate4} from "@/util/date";
             startDate:Number(this.query.startDate.split('-')[1]),
             endDate:Number(this.query.endDate.split('-')[1]),
         }).then(res => {
+          this.data=[]
           const data = res.data.data;
           this.page.total = data.total;
-          this.data = data.records.map(item=>{
+          this.$nextTick(()=>{
+            this.data = data.records.map(item=>{
               item.children = item.finGenlegs.map((ite,inde)=>{
                   ite.id = Number(inde) + 1
                   return ite
               })
               return item
           })
+        })
+         
           this.loading = false;
           this.selectionClear();
         });

+ 8 - 8
src/views/iosBasicData/release/jobApplication/detailsPage.vue

@@ -464,17 +464,17 @@ export default {
                     {
                         label: 'ETD开始日期',
                         prop: "dateFrom",
-                        type: "datetime",
-                        format: "yyyy-MM-dd HH:mm",
-                        valueFormat: "yyyy-MM-dd HH:mm",
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00",
                         span: 4
                     },
                     {
                         label: 'ETD结束日期',
                         prop: "dateTo",
-                        type: "datetime",
-                        format: "yyyy-MM-dd HH:mm",
-                        valueFormat: "yyyy-MM-dd HH:mm",
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 23:59",
                         span: 6
                     },
                     {
@@ -516,6 +516,7 @@ export default {
                         prop: "unreleaseBills",
                         type: 'textarea',
                         disabled: false,
+                        placeholder: '后续有货',
                         span: 12,
                         minRows: 2
                     },
@@ -888,7 +889,6 @@ export default {
                     this.form.runnerName = null
                 }
             }
-
         },
         getRemote(val, name) {
             if (name == 'corpCnName') {
@@ -897,7 +897,7 @@ export default {
                 })
             }
             if (name == 'carrierCnName') {
-                getListByType({ current: 1, size: 10, cnName: val ? val : null }).then(res => {
+                getListByType({ current: 1, size: 10,corpTypeName:'船公司',status:0, cnName: val ? val : null }).then(res => {
                     this.carrierData = res.data.data.records
                 })
             }

+ 5 - 5
src/views/iosBasicData/release/releaseManagement/detailsPage.vue

@@ -417,16 +417,16 @@ export default {
                         label: 'ETD开始日期',
                         prop: "dateFrom",
                         type: "datetime",
-                        format: "yyyy-MM-dd HH:mm",
-                        valueFormat: "yyyy-MM-dd HH:mm",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00",
                         span: 4
                     },
                     {
                         label: 'ETD结束日期',
                         prop: "dateTo",
                         type: "datetime",
-                        format: "yyyy-MM-dd HH:mm",
-                        valueFormat: "yyyy-MM-dd HH:mm",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 23:59",
                         span: 6
                     },
                     {
@@ -586,7 +586,7 @@ export default {
                             label: '自取',
                             value: 0
                         }, {
-                            label: '送单,',
+                            label: '送单',
                             value: 1
                         }, {
                             label: '寄送,',

+ 7 - 1
src/views/iosBasicData/release/schedulingManagement/index.vue

@@ -132,11 +132,17 @@ export default {
             overHidden: true,
           },
           {
+            label: 'MBL NO',
+            prop: 'mblno',
+            search: true,
+            overHidden: true,
+          },
+          {
             label: '客户简称',
             prop: "corpCnName",
             search: true,
             overHidden: true,
-            filterable:true,
+            filterable: true,
             type: 'select',
             props: {
               label: 'cnName',