Browse Source

货代空运 2024-1-23

caojunjie 1 year ago
parent
commit
3a093cfd5f

+ 286 - 479
src/views/iosBasicData/AirtransportExport/bills/assembly/EntrustmentLnformation.vue

@@ -2,7 +2,7 @@
     <div>
         <el-form :model="assemblyForm" ref="form" label-width="90px" class="demo-ruleForm">
             <el-row :gutter="20">
-                <el-col span="8">
+                <el-col :span="8">
                     <el-row>
                         <el-form-item label="发货人" prop="hshipperCnName" >
                             <span slot="label">
@@ -155,68 +155,54 @@
                                 </el-col>
                             </el-row>
                         </el-form-item>
-
-                        <el-form-item label="目的港" prop="finalDestinationName" >
+                    </el-row>
+                </el-col>
+                <el-col :span="16">
+                    <el-col :span="12">
+                        <el-row>
+                            <el-form-item label="目的港" prop="finalDestinationName" >
                             <span slot="label">
                                 <span style="color: #1e9fff">目的港</span>
                             </span>
-                            <el-row>
-                                <el-col :span="16">
-                                    <search-query :datalist="finalDestinationData"
-                                                  :selectValue="assemblyForm.finalDestinationName"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled || generateBillsfalse"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                                  @remoteMethod="remoteMethod($event,'finalDestination')"
-                                                  @corpChange="corpChange($event,'finalDestination')"
-                                                  @corpFocus="remoteMethod($event,'finalDestination')" >
-                                    </search-query>
-                                </el-col>
-                                <el-col :span="7">
-                                    <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.finalDestinationNamePrint"
-                                              size="small" autocomplete="off"
+                                <search-query :datalist="finalDestinationData"
+                                              :selectValue="assemblyForm.finalDestinationName"
+                                              :filterable="true"
+                                              :clearable="true"
+                                              :remote="true"
                                               :disabled="detailData.seeDisabled || generateBillsfalse"
-                                              clearable placeholder="目的港" ></el-input>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="目的地" prop="destinationName" >
+                                              :buttonIf="false"
+                                              :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                              @remoteMethod="remoteMethod($event,'finalDestination')"
+                                              @corpChange="corpChange($event,'finalDestination')"
+                                              @corpFocus="remoteMethod($event,'finalDestination')" >
+                                </search-query>
+                            </el-form-item>
+                            <el-form-item label="目的地" prop="destinationName"  >
                             <span slot="label">
                                 <span style="color: #1e9fff">目的地</span>
                             </span>
-                            <el-row>
-                                <el-col :span="16">
-                                    <search-query :datalist="destinationData"
-                                                  :selectValue="assemblyForm.destinationName"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled || generateBillsfalse"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                                  @remoteMethod="remoteMethod($event,'destination')"
-                                                  @corpChange="corpChange($event,'destination')"
-                                                  @corpFocus="remoteMethod($event,'destination')" >
-                                    </search-query>
-                                </el-col>
-                                <el-col :span="7">
-                                    <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.destinationNamePrint"
-                                              size="small" autocomplete="off"
+                                <search-query :datalist="destinationData"
+                                              :selectValue="assemblyForm.destinationName"
+                                              :filterable="true"
+                                              :clearable="true"
+                                              :remote="true"
                                               :disabled="detailData.seeDisabled || generateBillsfalse"
-                                              clearable placeholder="目的地" ></el-input>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                    </el-row>
-                </el-col>
-                <el-col :span="16">
-                    <el-col :span="12">
-                        <el-row>
+                                              :buttonIf="false"
+                                              :forParameter="{key:'id',label:'enName',value:'enName'}"
+                                              @remoteMethod="remoteMethod($event,'destination')"
+                                              @corpChange="corpChange($event,'destination')"
+                                              @corpFocus="remoteMethod($event,'destination')" >
+                                </search-query>
+                            </el-form-item>
+                            <el-form-item label="三检单号" prop="voyageNo">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">三检单号</span>
+                                </span>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.iqNo"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled || generateBillsfalse"
+                                          clearable placeholder="请输入三检单号" ></el-input>
+                            </el-form-item>
                             <div>
                                 <span style="font-size: 14px;color: #1e9fff;margin-right: 40px">唛头</span>
                                 <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isGoodsTracking">需货物跟踪</el-checkbox>
@@ -230,7 +216,7 @@
                                           @blur="textareaBlur('marks')" ></el-input>
                             </div>
                             <div style="margin-top: 4px">
-                                <el-form-item label="品名" prop="commodityCnName" label-width="70px" >
+                                <el-form-item label="品名" prop="commodityCnName" >
                                     <span slot="label">
                                         <span style="color: #1e9fff">品名</span>
                                     </span>
@@ -284,47 +270,6 @@
                                           @blur="textareaBlur('commodityDescr')" ></el-input>
                             </div>
                         </el-row>
-                        <el-form-item label="三检单号" prop="voyageNo" label-width="80px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">三检单号</span>
-                            </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.iqNo"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse"
-                                      clearable placeholder="请输入三检单号" ></el-input>
-                        </el-form-item>
-                        <el-form-item label="主运单类型" prop="voyageNo" label-width="80px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">主运单类型</span>
-                            </span>
-                            <search-query :datalist="cargoTypeData"
-                                          :selectValue="assemblyForm.waybillType"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          @remoteMethod="remoteMethod($event,'waybillType')"
-                                          @corpChange="corpChange($event,'waybillType')"
-                                          @corpFocus="remoteMethod($event,'waybillType')" >
-                            </search-query>
-                        </el-form-item>
-                        <el-form-item label="主运单提供者" prop="voyageNo" label-width="90px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">主运单提供者</span>
-                            </span>
-                            <search-query :datalist="cargoTypeData"
-                                          :selectValue="assemblyForm.waybillCnName"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :buttonIf="false"
-                                          @remoteMethod="remoteMethod($event,'waybillCnName')"
-                                          @corpChange="corpChange($event,'waybillCnName')"
-                                          @corpFocus="remoteMethod($event,'waybillCnName')" >
-                            </search-query>
-                        </el-form-item>
                         <el-form-item label="制单人" prop="voyageNo" label-width="80px" >
                             <span slot="label">
                                 <span style="color: #1e9fff">制单人</span>
@@ -341,453 +286,308 @@
                                           @corpFocus="remoteMethod($event,'createUserName')" >
                             </search-query>
                         </el-form-item>
-                        <el-form-item label="中转港" prop="potEnName" >
+                        <el-form-item label="出口代理" prop="voyageNo" label-width="80px" >
                             <span slot="label">
-                                <span style="color: #1e9fff">中转港</span>
+                                <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'}"
-                                          @remoteMethod="remoteMethod($event,'pot')"
-                                          @corpChange="corpChange($event,'pot')"
-                                          @corpFocus="remoteMethod($event,'pot')" >
-                            </search-query>
-                        </el-form-item>
-                        <el-form-item label="中转航班" prop="potEnName" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">中转航班</span>
-                            </span>
-                            <search-query :datalist="potData"
-                                          :selectValue="assemblyForm.potVoyageNo"
+                            <search-query :datalist="cargoTypeData"
+                                          :selectValue="assemblyForm.bookingAgentCnName"
                                           :filterable="true"
                                           :clearable="true"
                                           :remote="true"
                                           :disabled="detailData.seeDisabled"
                                           :buttonIf="false"
-                                          :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                          @remoteMethod="remoteMethod($event,'pot')"
-                                          @corpChange="corpChange($event,'pot')"
-                                          @corpFocus="remoteMethod($event,'pot')" >
+                                          @remoteMethod="remoteMethod($event,'bookingAgentCnName')"
+                                          @corpChange="corpChange($event,'bookingAgentCnName')"
+                                          @corpFocus="remoteMethod($event,'bookingAgentCnName')" >
                             </search-query>
                         </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="选择日期">
-                            </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="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
 
                     </el-col>
                     <el-col :span="12">
-                        <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="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                        <!--realityEtd-->
-                        <el-form-item label="发运日期" prop="realityEtd" label-width="90px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">发运日期</span>
-                            </span>
-                            <el-date-picker v-model="assemblyForm.realityEtd" clearable style="width: 100%"
-                                            type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                            value-format="yyyy-MM-dd"
-                                            placeholder="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="ETA" prop="eta" label-width="90px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">ETA</span>
-                            </span>
-                            <el-date-picker v-model="assemblyForm.eta" clearable style="width: 100%"
-                                            type="date" size="small" :disabled="detailData.seeDisabled || generateBillsfalse"
-                                            value-format="yyyy-MM-dd" :picker-options="etdPickerOptions"
-                                            placeholder="选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-
-                        <div>
-                            <el-form-item label="船名" prop="vesselCnName" label-width="90px" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">船名</span>
-                            </span>
-                                <search-query :datalist="vesselData"
-                                              :selectValue="assemblyForm.vesselEnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled || generateBillsfalse"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                              @remoteMethod="remoteMethod($event,'vessel')"
-                                              @corpChange="corpChange($event,'vessel')"
-                                              @corpFocus="remoteMethod($event,'vessel')" >
-                                </search-query>
-                            </el-form-item>
-                            <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>
-                        </div>
-                        <el-form-item label="客户约号" prop="corpArgreementNo" label-width="90px">
-                        <span slot="label">
-                            <span style="color: #1e9fff">客户约号</span>
-                        </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpArgreementNo"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请选择客户约号" ></el-input>
-                        </el-form-item>
-                        <el-form-item label="航空公司" prop="carrierCnName" >
-                        <span slot="label">
-                            <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'}"
-                                          @remoteMethod="remoteMethod($event,'carrier')"
-                                          @corpChange="corpChange($event,'carrier')"
-                                          @corpFocus="remoteMethod($event,'carrier')" >
-                            </search-query>
-                        </el-form-item>
-                        <el-form-item label="船司约号" prop="carrierArgreementNo" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">船司约号</span>
-                        </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierArgreementNo"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请选择船司约号" ></el-input>
-                        </el-form-item>
-                        <el-form-item label="出口代理" prop="bookingAgentCnName" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">出口代理</span>
-                        </span>
-                            <el-col :span="9" style="margin-left: -10px">
-                                <search-query :datalist="bookingAgentData"
-                                              :selectValue="assemblyForm.bookingAgentCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'bookingAgent')"
-                                              @corpChange="corpChange($event,'bookingAgent')"
-                                              @corpFocus="remoteMethod($event,'bookingAgent')">
-                                </search-query>
-                            </el-col>
-                            <el-col :span="15">
-                                <el-input type="age" style="width: 100%;margin-left: 20px;" v-model="assemblyForm.bookingAgentEnName"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="订舱代理" ></el-input>
-                            </el-col>
-                        </el-form-item>
-                        <div>
-                            <el-col :span="8">
-                                <el-form-item label="长度" prop="length" label-width="50px"
-                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
+                        <el-col :span="8">
+                            <el-form-item label="长度" prop="length" label-width="50px"
+                                          :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">长度</span>
                                 </span>
-                                    <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.length"
-                                              size="small" autocomplete="off" min="1"
-                                              :disabled="detailData.seeDisabled" :controls="false"
-                                              @focus="quantityFocus"
-                                              clearable placeholder="长度" ></el-input-number>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="宽度" prop="width" label-width="50px"
-                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
+                                <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.length"
+                                                 size="small" autocomplete="off" min="1"
+                                                 :disabled="detailData.seeDisabled" :controls="false"
+                                                 @focus="quantityFocus"
+                                                 clearable placeholder="长度" ></el-input-number>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="宽度" prop="width" label-width="50px"
+                                          :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">宽度</span>
                                 </span>
-                                    <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.width"
-                                                     size="small" autocomplete="off" min="1"
-                                                     :disabled="detailData.seeDisabled" :controls="false"
-                                                     @focus="quantityFocus"
-                                                     clearable placeholder="宽度" ></el-input-number>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="高度" prop="height" label-width="50px"
-                                              :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
+                                <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.width"
+                                                 size="small" autocomplete="off" min="1"
+                                                 :disabled="detailData.seeDisabled" :controls="false"
+                                                 @focus="quantityFocus"
+                                                 clearable placeholder="宽度" ></el-input-number>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="高度" prop="height" label-width="50px"
+                                          :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">宽度</span>
                                 </span>
-                                    <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.height"
-                                                     size="small" autocomplete="off" min="1"
-                                                     :disabled="detailData.seeDisabled" :controls="false"
-                                                     @focus="quantityFocus"
-                                                     clearable placeholder="宽度" ></el-input-number>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="件数" prop="quantity" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                <el-input-number ref="quantityRef" style="width: 100%;" v-model="assemblyForm.height"
+                                                 size="small" autocomplete="off" min="1"
+                                                 :disabled="detailData.seeDisabled" :controls="false"
+                                                 @focus="quantityFocus"
+                                                 clearable placeholder="宽度" ></el-input-number>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="件数" prop="quantity" label-width="50px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">件数</span>
                                 </span>
-                                    <el-input ref="quantityRef" type="number" style="width: 100%;" v-model="assemblyForm.quantity"
-                                              size="small" autocomplete="off" min="1"
-                                              :disabled="detailData.seeDisabled" @input="quantityInput"
-                                              @focus="quantityFocus"
-                                              clearable placeholder="件数" ></el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="包装" prop="packingUnit" label-width="50px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]"  >
+                                <el-input ref="quantityRef" type="number" style="width: 100%;" v-model="assemblyForm.quantity"
+                                          size="small" autocomplete="off" min="1"
+                                          :disabled="detailData.seeDisabled" @input="quantityInput"
+                                          @focus="quantityFocus"
+                                          clearable placeholder="件数" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="包装" prop="packingUnit" label-width="50px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]"  >
                                 <span slot="label">
                                     <span style="color: #1e9fff">包装</span>
                                 </span>
-                                    <search-query :datalist="packingUnitData"
-                                                  style="margin-right: -10px;"
-                                                  :selectValue="assemblyForm.packingUnit"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled || generateBillsfalse"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                                  @remoteMethod="remoteMethod($event,'packingUnit')"
-                                                  @corpChange="corpChange($event,'packingUnit')"
-                                                  @corpFocus="remoteMethod($event,'packingUnit')" >
-                                    </search-query>
-                                </el-form-item>
-                            </el-col>
-                        </div>
-                        <div>
-                            <el-col :span="12">
-                                <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                <search-query :datalist="packingUnitData"
+                                              style="margin-right: -10px;"
+                                              :selectValue="assemblyForm.packingUnit"
+                                              :filterable="true"
+                                              :clearable="true"
+                                              :remote="true"
+                                              :disabled="detailData.seeDisabled || generateBillsfalse"
+                                              :buttonIf="false"
+                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                              @remoteMethod="remoteMethod($event,'packingUnit')"
+                                              @corpChange="corpChange($event,'packingUnit')"
+                                              @corpFocus="remoteMethod($event,'packingUnit')" >
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="90px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">毛重(KGS)</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
-                                              clearable placeholder="请选择毛重" ></el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="尺码(CBM)" prop="measurement" label-width="90px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                <el-input type="number" step="0.01" style="width: 100%;" v-model="assemblyForm.grossWeight"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="请选择毛重" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="尺码(CBM)" prop="measurement" label-width="90px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">尺码(CBM)</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 106%;"
-                                              v-model="assemblyForm.measurement"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
-                                              clearable placeholder="请选择尺码/体积" ></el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="货物价值" prop="goodsValue" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                <el-input type="number" step="0.01" style="width: 100%;"
+                                          v-model="assemblyForm.measurement"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="请选择尺码/体积" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="货物价值" prop="goodsValue" label-width="70px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">货物价值</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 106%;"
-                                              v-model="assemblyForm.goodsValue"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
-                                              clearable placeholder="请输入货物价值" ></el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="计费重里" prop="billingWeight" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                <el-input type="number" step="0.01" style="width: 100%;"
+                                          v-model="assemblyForm.goodsValue"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="请输入货物价值" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="计费重里" prop="billingWeight" label-width="70px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">计费重里</span>
                                 </span>
-                                    <el-input type="number" step="0.01" style="width: 106%;"
-                                              v-model="assemblyForm.billingWeight"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
-                                              clearable placeholder="请输入计费重里" ></el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="计量单位" prop="unit" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                <el-input type="number" step="0.01" style="width: 100%;"
+                                          v-model="assemblyForm.billingWeight"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="请输入计费重里" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="计量单位" prop="unit" label-width="70px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">计量单位</span>
                                 </span>
-                                    <search-query :datalist="unitData"
-                                                  :selectValue="assemblyForm.unit"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
-                                                  @corpFocus="getBunitsPagefun"
-                                                  @corpChange="corpChange($event,'unit')">
-                                    </search-query>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="运价等级" prop="freightRateGrade" label-width="80px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
+                                <search-query :datalist="unitData"
+                                              :selectValue="assemblyForm.unit"
+                                              :filterable="true"
+                                              :clearable="true"
+                                              :remote="true"
+                                              :buttonIf="false"
+                                              :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
+                                              @corpFocus="getBunitsPagefun"
+                                              @corpChange="corpChange($event,'unit')">
+                                </search-query>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="运价等级" prop="freightRateGrade" label-width="70px"
+                                          :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">运价等级</span>
                                 </span>
-                                    <search-query :datalist="freightRateGradeData"
-                                                  :selectValue="assemblyForm.freightRateGrade"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
-                                                  @corpFocus="getBunitsPagefun"
-                                                  @corpChange="corpChange($event,'freightRateGrade')">
-                                    </search-query>
-                                </el-form-item>
-                            </el-col>
-
-                            <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.quantityDescribe"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled" rows="2"
-                                          clearable placeholder="订舱备注"
-                                          @blur="textareaBlur('bookingRemarks')" ></el-input>
+                                <search-query :datalist="freightRateGradeData"
+                                              :selectValue="assemblyForm.freightRateGrade"
+                                              :filterable="true"
+                                              :clearable="true"
+                                              :remote="true"
+                                              :buttonIf="false"
+                                              :forParameter="{key:'id',label:'code',value:'code',disabled:'status'}"
+                                              @corpFocus="getBunitsPagefun"
+                                              @corpChange="corpChange($event,'freightRateGrade')">
+                                </search-query>
                             </el-form-item>
-
-
-                        </div>
-                    </el-col>
-
-                </el-col>
-            </el-row>
-
-            <el-row :gutter="0">
-                <el-col :span="12">
-                    <el-form-item label="COLOADER" prop="coloaderCnName" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">COLOADER</span>
-                        </span>
-                        <search-query :datalist="coloaderCnNameData"
-                                      :selectValue="assemblyForm.coloaderCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
+                        </el-col>
+                        <el-form-item label="件数描述" prop="bookingRemarks" label-width="70px" >
+                            <span slot="label">
+                                <span style="color: #1e9fff">件数描述</span>
+                            </span>
+                            <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.quantityDescribe"
+                                      size="small" autocomplete="off"
+                                      :disabled="detailData.seeDisabled" rows="2"
+                                      clearable placeholder="订舱备注"
+                                      @blur="textareaBlur('bookingRemarks')" ></el-input>
+                        </el-form-item>
+                        <el-form-item label="Declared value for Carrier:" prop="declaredCarrier" label-width="170px" >
+                            <span slot="label">
+                                <span style="color: #1e9fff">Declared value for Carrier:</span>
+                            </span>
+                            <el-input style="width: 100%;" v-model="assemblyForm.declaredCarrier"
+                                      size="small" autocomplete="off"
                                       :disabled="detailData.seeDisabled"
-                                      :buttonIf="true"
-                                      :addIf="true"
-                                      @addJump="addJump"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'coloaderCnName')"
-                                      @corpChange="corpChange($event,'coloaderCnName')"
-                                      @corpFocus="remoteMethod($event,'coloaderCnName')" >
-                            <bcorps></bcorps>
-                            <!--<bcorpstypedefine></bcorpstypedefine>-->
-                        </search-query>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-row>
+                                      clearable placeholder="请输入承运人的申报价值" ></el-input>
+                        </el-form-item>
+                        <el-form-item label="Declared value for Customs:" prop="declsredCustoms" label-width="170px" >
+                            <span slot="label">
+                                <span style="color: #1e9fff">Declared value for Carrier:</span>
+                            </span>
+                            <el-input style="width: 100%;" v-model="assemblyForm.declsredCustoms"
+                                      size="small" autocomplete="off"
+                                      :disabled="detailData.seeDisabled"
+                                      clearable placeholder="请输入海关申报价值" ></el-input>
+                        </el-form-item>
+                        <el-form-item label="Amount of Insurance:" prop="amountOfInsursnee" label-width="145px" >
+                            <span slot="label">
+                                <span style="color: #1e9fff">Amount of Insurance:</span>
+                            </span>
+                            <el-input style="width: 100%;" v-model="assemblyForm.amountOfInsursnee"
+                                      size="small" autocomplete="off"
+                                      :disabled="detailData.seeDisabled"
+                                      clearable placeholder="请输入保险金额" ></el-input>
+                        </el-form-item>
+                        <el-col :span="12">
+                            <el-form-item label="Currency:" prop="currency" label-width="70px" >
+                                <span slot="label">
+                                    <span style="color: #1e9fff">Currency:</span>
+                                </span>
+                                <el-input style="width: 100%;" v-model="assemblyForm.currency"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="请输入宽度" ></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="Chgs代码:" prop="chgsCode" label-width="70px" >
+                                <span slot="label">
+                                    <span style="color: #1e9fff">Chgs代码:</span>
+                                </span>
+                                <el-input style="width: 100%;" v-model="assemblyForm.chgsCode"
+                                          size="small" autocomplete="off"
+                                          :disabled="detailData.seeDisabled"
+                                          clearable placeholder="请输入Chgs代码" ></el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="12">
-                            <el-form-item label="航线" prop="lineCnName" >
+                            <el-form-item label="主运单类型" prop="voyageNo" label-width="80px" >
                                 <span slot="label">
-                                    <span style="color: #1e9fff">航线</span>
+                                    <span style="color: #1e9fff">主运单类型</span>
                                 </span>
-                                <search-query :datalist="lineData"
-                                              :selectValue="assemblyForm.lineCnName"
+                                <search-query :datalist="cargoTypeData"
+                                              :selectValue="assemblyForm.waybillType"
                                               :filterable="true"
                                               :clearable="true"
                                               :remote="true"
                                               :disabled="detailData.seeDisabled"
                                               :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'line')"
-                                              @corpChange="corpChange($event,'line')"
-                                              @corpFocus="remoteMethod($event,'line')" >
+                                              @remoteMethod="remoteMethod($event,'waybillType')"
+                                              @corpChange="corpChange($event,'waybillType')"
+                                              @corpFocus="remoteMethod($event,'waybillType')" >
                                 </search-query>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="订舱日期" prop="bookingDate">
+                            <el-form-item label="主运单提供者" prop="voyageNo" label-width="90px" >
                                 <span slot="label">
-                                    <span style="color: #1e9fff">订舱日期</span>
+                                    <span style="color: #1e9fff">主运单提供者</span>
                                 </span>
-                                <el-date-picker v-model="assemblyForm.bookingDate" clearable style="width: 100%"
-                                                type="date" size="small" :disabled="detailData.seeDisabled"
-                                                value-format="yyyy-MM-dd HH:mm:ss"
-                                                placeholder="选择日期">
-                                </el-date-picker>
+                                <search-query :datalist="cargoTypeData"
+                                              :selectValue="assemblyForm.waybillCnName"
+                                              :filterable="true"
+                                              :clearable="true"
+                                              :remote="true"
+                                              :disabled="detailData.seeDisabled"
+                                              :buttonIf="false"
+                                              @remoteMethod="remoteMethod($event,'waybillCnName')"
+                                              @corpChange="corpChange($event,'waybillCnName')"
+                                              @corpFocus="remoteMethod($event,'waybillCnName')" >
+                                </search-query>
                             </el-form-item>
                         </el-col>
-                    </el-row>
-
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="订舱备注" prop="bookingRemarks" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">订舱备注</span>
-                        </span>
-                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="订舱备注"
-                                  @blur="textareaBlur('bookingRemarks')" ></el-input>
-                    </el-form-item>
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedDeclare">需报关</el-checkbox>
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isStorage">需仓储</el-checkbox>
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedLand">需陆运</el-checkbox>
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isGoodsTracking">需货物跟踪</el-checkbox>
+                    </el-col>
                 </el-col>
-                <el-col :span="6">
-                    <el-form-item label="备注" prop="remarks" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">备注</span>
-                        </span>
-                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.remarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="备注"
-                                  @blur="textareaBlur('remarks')" ></el-input>
-                    </el-form-item>
+                <el-col :span="24">
+                    <div style="display: flex;align-items: center;">
+                        <el-checkbox size="medium" true-label="随机" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">是否随机</el-checkbox>
+                        <el-checkbox size="medium" true-label="合同" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.contract">合同</el-checkbox>
+                        <el-checkbox size="medium" true-label="发票" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.invoice">发票</el-checkbox>
+                        <el-checkbox size="medium" true-label="装箱单" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.Packing">装箱单</el-checkbox>
+                        <el-checkbox size="medium" true-label="配额证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.quota">配额证</el-checkbox>
+                        <el-checkbox size="medium" true-label="许可证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.license">许可证</el-checkbox>
+                        <el-checkbox size="medium" true-label="产地证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.producer">产地证</el-checkbox>
+                        <el-checkbox size="medium" true-label="手册" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.manual">手册</el-checkbox>
+                        <el-checkbox size="medium" true-label="核销单" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.writeoffDoc">核销单</el-checkbox>
+                        <div style="width: 40px;font-size: 14px;">其他:</div>
+                        <el-input type="age" style="width: 200px;" v-model="comprehensiveForm.other"
+                                  size="mini" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="其他" >
+                        </el-input>
+                    </div>
                 </el-col>
             </el-row>
+
         </el-form>
 
 
@@ -924,7 +724,10 @@ import {NdayDate} from "@/util/date";
     export default {
         props:{
             detailData:{
-                type:Object
+                type:Object,
+                default: {
+                    seeDisabled:false,
+                }
             },
             assemblyForm:{
                 type:Object,
@@ -947,6 +750,10 @@ import {NdayDate} from "@/util/date";
                         return time.getTime() < Date.parse(NdayDate(-45)) - 86400000 || time.getTime() > Date.parse(NdayDate(45))
                     }
                 },
+                // 下面的多选
+                comprehensiveForm:{
+                    random:'', // 是否随机
+                },
                 emailhash:emailhash, // 邮箱跳转地址
                 // 多选的数据
                 tabsMultipleChoice:[],

+ 18 - 12
src/views/iosBasicData/AirtransportExport/bills/assembly/formbottom.vue

@@ -4,7 +4,7 @@
             <el-row>
                 <el-col :span="12">
                     <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>
@@ -304,17 +304,23 @@
             </el-row>
             <el-row>
                 <el-col :span="24">
-                    <el-checkbox size="medium" true-label="随机" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">是否随机</el-checkbox>
-                    <el-checkbox size="medium" true-label="合同" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">合同</el-checkbox>
-                    <el-checkbox size="medium" true-label="发票" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">发票</el-checkbox>
-                    <el-checkbox size="medium" true-label="装箱单" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">装箱单</el-checkbox>
-                    <el-checkbox size="medium" true-label="配额证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">配额证</el-checkbox>
-                    <el-checkbox size="medium" true-label="许可证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">许可证</el-checkbox>
-                    <el-checkbox size="medium" true-label="产地证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">产地证</el-checkbox>
-                    <el-checkbox size="medium" true-label="手册" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">手册</el-checkbox>
-                    <el-checkbox size="medium" true-label="核销单" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">核销单</el-checkbox>
-
-
+                    <div style="display: flex;align-items: center;">
+                        <el-checkbox size="medium" true-label="随机" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.random">是否随机</el-checkbox>
+                        <el-checkbox size="medium" true-label="合同" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.contract">合同</el-checkbox>
+                        <el-checkbox size="medium" true-label="发票" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.invoice">发票</el-checkbox>
+                        <el-checkbox size="medium" true-label="装箱单" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.Packing">装箱单</el-checkbox>
+                        <el-checkbox size="medium" true-label="配额证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.quota">配额证</el-checkbox>
+                        <el-checkbox size="medium" true-label="许可证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.license">许可证</el-checkbox>
+                        <el-checkbox size="medium" true-label="产地证" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.producer">产地证</el-checkbox>
+                        <el-checkbox size="medium" true-label="手册" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.manual">手册</el-checkbox>
+                        <el-checkbox size="medium" true-label="核销单" :false-label="null" :disabled="detailData.seeDisabled" v-model="comprehensiveForm.writeoffDoc">核销单</el-checkbox>
+                        <div style="width: 40px;font-size: 14px;">其他:</div>
+                        <el-input type="age" style="width: 200px;" v-model="comprehensiveForm.other"
+                                  size="mini" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable placeholder="其他" >
+                        </el-input>
+                    </div>
                 </el-col>
             </el-row>
         </el-form>

+ 360 - 157
src/views/iosBasicData/AirtransportExport/bills/assembly/mbinformation.vue

@@ -2,82 +2,108 @@
     <div>
         <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>
+                </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="选择日期">
+                        </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-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="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
                 <el-col :span="12">
-                    <el-form-item label="提单号" prop="mblno" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">提单号</span>
-                        </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.mblno"
+                    <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>
+                            <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'}"
+                                          @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.carrierArgreementNo"
                                   size="small" autocomplete="off"
                                   :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请填写提单号" ></el-input>
-                    </el-form-item>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="船名" prop="vesselCnName" >
+                                  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 style="color: #1e9fff">订舱日期</span>
                                 </span>
-                                <search-query :datalist="vesselData"
-                                              :selectValue="assemblyForm.vesselCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'vessel')"
-                                              @corpChange="corpChange($event,'vessel')"
-                                              @corpFocus="remoteMethod($event,'vessel')" >
-                                </search-query>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="航次" prop="voyageNo" >
+                        <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="bookingDate" >
                                 <span slot="label">
-                                    <span style="color: #1e9fff">航次</span>
+                                    <span style="color: #1e9fff">送货时间</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="请填写航次" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-form-item label="船公司" prop="carrierCnName" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">船公司</span>
-                        </span>
-                        <search-query :datalist="carrierData"
-                                      :selectValue="assemblyForm.carrierCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'carrier')"
-                                      @corpChange="corpChange($event,'carrier')"
-                                      @corpFocus="remoteMethod($event,'carrier')" >
-                        </search-query>
-                    </el-form-item>
-                    <el-form-item label="订舱代理" prop="bookingAgentCnName" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">订舱代理</span>
-                        </span>
-                        <search-query :datalist="bookingAgentData"
-                                      :selectValue="assemblyForm.bookingAgentCnName"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'bookingAgent')"
-                                      @corpChange="corpChange($event,'bookingAgent')"
-                                      @corpFocus="remoteMethod($event,'bookingAgent')" >
-                        </search-query>
+                        <el-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="18">
                     <el-form-item label="订舱备注" prop="bookingRemarks" >
                         <span slot="label">
                             <span style="color: #1e9fff">订舱备注</span>
@@ -88,98 +114,22 @@
                                   clearable placeholder="请输入订舱备注" ></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
-                    <el-form-item label="外提单号" prop="refno" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">外提单号</span>
-                        </span>
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.refno"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请填写外提单号" ></el-input>
+                <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-date-picker>
                     </el-form-item>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="ETD" prop="etd" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">ETD</span>
-                                </span>
-                                <el-date-picker v-model="assemblyForm.etd"
-                                                clearable type="date" size="small"
-                                                :disabled="detailData.seeDisabled"
-                                                value-format="yyyy-MM-dd HH:mm:ss"
-                                                :picker-options="etdPickerOptions"
-                                                placeholder="选择日期">
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="ETA" prop="eta" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">ETA</span>
-                                </span>
-                                <el-date-picker v-model="assemblyForm.eta"
-                                                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-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="订舱日期" prop="bookingDate" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">订舱日期</span>
-                                </span>
-                                <el-date-picker v-model="assemblyForm.bookingDate"
-                                                clearable 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="12">
-                            <el-form-item label="航线" prop="lineCnName" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">航线</span>
-                                </span>
-                                <search-query :datalist="lineData"
-                                              :selectValue="assemblyForm.lineCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'line')"
-                                              @corpChange="corpChange($event,'line')"
-                                              @corpFocus="remoteMethod($event,'line')" >
-                                </search-query>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="船司约号" prop="carrierArgreementNo" >
-                                <span slot="label">
-                                    <span style="color: #1e9fff">船司约号</span>
-                                </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierArgreementNo"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="船公司约号" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-
                 </el-col>
             </el-row>
 
             <el-row>
-                <el-col :span="6">
+                <el-col :span="8">
                     <el-form-item label="MB/L 发货人" prop="mshipperCnName" >
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 发货人</span>
@@ -206,7 +156,7 @@
                         </el-form-item>
                     </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="8">
                     <el-form-item label="MB/L 收货人" prop="mconsigneeCnName" >
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 收货人</span>
@@ -233,7 +183,7 @@
                         </el-form-item>
                     </div>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="8">
                     <el-form-item label="MB/L 通知人" prop="mnotifyCnName" >
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L 通知人</span>
@@ -261,6 +211,259 @@
                     </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'}"
+                                      @remoteMethod="remoteMethod($event,'pot')"
+                                      @corpChange="corpChange($event,'pot')"
+                                      @corpFocus="remoteMethod($event,'pot')" >
+                        </search-query>
+                    </el-form-item>
+                    <el-form-item label="中转航班" prop="potEnName" >
+                            <span slot="label">
+                                <span style="color: #1e9fff">中转航班</span>
+                            </span>
+                        <search-query :datalist="potData"
+                                      :selectValue="assemblyForm.potVoyageNo"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="false"
+                                      :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="中转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="选择日期">
+                        </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="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="16">
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="航站" prop="cyCnName" >
+                                <span slot="label">
+                                    <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'}"
+                                              @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>
+                        </el-col>
+                    </el-row>
+                    <el-col :span="8">
+                        <el-form-item label="联系人" prop="cyContacts" >
+                                <span slot="label">
+                                    <span style="color: #1e9fff">联系人</span>
+                                </span>
+                            <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.cyContacts"-->
+                            <!--          size="small" autocomplete="off"-->
+                            <!--          :disabled="detailData.seeDisabled || generateBillsfalse"-->
+                            <!--          clearable placeholder="请输入联系人" ></el-input>-->
+                            <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>
+                    </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>
+                    </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-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <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'}"
+                                          @remoteMethod="remoteMethod($event,'hpayplace')"
+                                          @corpChange="corpChange($event,'hpayplace')"
+                                          @corpFocus="remoteMethod($event,'hpayplace')" >
+                            </search-query>
+                            <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.hpayplace"-->
+                            <!--          size="small" autocomplete="off"-->
+                            <!--          :disabled="detailData.seeDisabled"-->
+                            <!--          clearable placeholder="请输入HB/L付款地点" ></el-input>-->
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <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'}"
+                                          @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"-->
+                            <!--          :disabled="detailData.seeDisabled"-->
+                            <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12" >
+                        <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-form-item>
+                    </el-col>
+                    <el-col :span="12" >
+                        <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-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <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="12" >
+                        <el-form-item label="签发地点" prop="issueAt" >
+                        <span slot="label">
+                            <span style="color: #1e9fff">签发地点</span>
+                        </span>
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.issueAt"
+                                      size="small" autocomplete="off"
+                                      :disabled="detailData.seeDisabled"
+                                      clearable placeholder="请输入签发地点" ></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12" >
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedDeclare">是否提单确认</el-checkbox>
+                    </el-col>
+                    <el-col :span="12" >
+                        <el-form-item label="提单确认日期" prop="billConfirmDate" >
+                        <span slot="label">
+                            <span style="color: #1e9fff">提单确认日期</span>
+                        </span>
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.issueAt"
+                                      size="small" autocomplete="off"
+                                      :disabled="detailData.seeDisabled"
+                                      clearable placeholder="请输入提单确认日期" ></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                </el-col>
+            </el-row>
         </el-form>
     </div>
 </template>

+ 9 - 14
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -215,9 +215,9 @@
                                 </el-tab-pane>
                             </el-tabs>
                         </basic-container>
-                        <basic-container :showBtn="true" v-if="activeName == 'first' || activeName == 'third'">
-                            <formbottom :assemblyForm="form" :generateBillsfalse="generateBillsfalse" :detailData="detailData"></formbottom>
-                        </basic-container>
+                        <!--<basic-container :showBtn="true" v-if="activeName == 'first' || activeName == 'third'">-->
+                        <!--    <formbottom :assemblyForm="form" :generateBillsfalse="generateBillsfalse" :detailData="detailData"></formbottom>-->
+                        <!--</basic-container>-->
                     </div>
                 </el-tab-pane>
                 <el-tab-pane label="费用信息" name="fy">
@@ -502,8 +502,8 @@ import {
                             },
                         ],
                         {
-                            label: "ReferenceNO", // Co-Loader 中文名称  往来单位 类别
-                            text:"Reference NO",
+                            label: "RET MBLNO", // Co-Loader 中文名称  往来单位 类别
+                            text:"RET MBLNO",
                             prop: "refno",
                             disabled:false,
                         },
@@ -522,23 +522,18 @@ import {
                             },
                         ],
                         {
-                            label: "操作人",  // 操作id 用户管理下拉 模糊搜索
-                            text:"操作人",
-                            prop: "operatorName",
+                            label: "制单人",  // 操作id 用户管理下拉 模糊搜索
+                            text:"制单人",
+                            prop: "createUserName",
                             type:'select',
                             dicData:[],
-                            disabled:false,
+                            disabled:true,
                             buttonIf:false,
                             forParameter:{
                                 key:'id',
                                 label:'name',
                                 value:'name',
                             },
-                            rules: [{
-                                required: true,
-                                message: " ",
-                                trigger: "blur"
-                            }]
                         },
                         [
                             {

+ 2 - 22
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -36,17 +36,6 @@
                                       clearable placeholder="箱型箱量" ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="booking NO" prop="bookingNo" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">booking NO</span>
-                            </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingNo"
-                                      size="small" autocomplete="off"
-                                      disabled
-                                      clearable placeholder="booking NO" ></el-input>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
             </el-form>
         </div>
@@ -1047,14 +1036,6 @@
                         value:'mblno',
                     },
                     {
-                        name:'booking NO',
-                        value:'bookingNo',
-                    },
-                    {
-                        name:'外提单号',
-                        value:'refno',
-                    },
-                    {
                         name:'船名(VSL)',
                         value:'vesselCnName',
                     },
@@ -1063,8 +1044,8 @@
                         value:'voyageNo',
                     },
                     {
-                        name:'ETD',
-                        value:'etd',
+                        name:'ETA',
+                        value:'eta',
                     },
                     {
                         name:'装货港',
@@ -2022,7 +2003,6 @@
                     billNoFormat:'HYZD',
                     accountType:'LOCAL',
                     refno:this.assemblyForm.refno,
-                    bookingNo:this.assemblyForm.bookingNo,
                     polNamePrint:this.assemblyForm.polNamePrint,
                     podNamePrint:this.assemblyForm.podNamePrint,
                 }

+ 11 - 13
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -687,7 +687,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
             // 判断是否员id, 有id 就不显示
             if (!this.form.id) {
-                this.deptGetDetailPolfun() // 收货地 装货港 当前登录人的默认
+                this.deptGetDetailPolfun() // 目的地 卸货港 当前登录人的默认
                 this.userGetListfun(undefined,true) // 获取用户管理数据
             }
             this.ownDeptLazyTreefun() // 获取公司数据
@@ -722,20 +722,18 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             choceScheduleFun() {
                 this.checkScheduleDialog = false
             },
-            // 收货地 装货港 当前登录人的默认
+            // 目的地 卸货港 当前登录人的默认
             deptGetDetailPolfun(){
                 deptGetDetailPol(this.saberUserInfo.dept_id).then(res=>{
-                    // 收货地
-                    this.form.placeReceiptName = res.data.data.polEnName
-                    this.form.placeReceiptId = res.data.data.polId
-                    this.form.placeReceiptNamePrint = res.data.data.polEnName
-                    // 装货港
-                    this.form.polCnName = res.data.data.polCnName
-                    this.form.polEnName = res.data.data.polEnName
-                    this.form.polId = res.data.data.polId
-                    this.form.polNamePrint = res.data.data.polEnName
-                    // 签单地点 默认 装货港
-                    this.$set(this.form,'issueAt',this.form.polEnName)
+                    // 目的地
+                    this.form.destinationName = res.data.data.polEnName
+                    this.form.destinationId = res.data.data.polId
+                    this.form.destinationNamePrint = res.data.data.polEnName
+                    // 卸货港
+                    this.form.podCnName = res.data.data.polCnName
+                    this.form.podEnName = res.data.data.polEnName
+                    this.form.podId = res.data.data.polId
+                    this.form.podNamePrint = res.data.data.polEnName
                 })
             },
             // 获取用户管理数据

+ 1 - 1
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -475,7 +475,7 @@
                 <el-table-column prop="accountName" label="账户名称" width="180" />
                 <el-table-column prop="accountBank" label="开户银行" width="180" />
                 <el-table-column prop="accountNo" label="银行账号" width="180" />
-                <el-table-column prop="curId" label="币别" width="180" />
+                <el-table-column prop="curNo" label="币别" width="180" />
                 <el-table-column prop="subjectNumber" label="科目编码" width="180" />
                 <el-table-column prop="address" label="地址" width="180" />
                 <el-table-column prop="swiftCode" label="Swift Code" width="180" />

+ 1 - 1
src/views/iosBasicData/seamends/assembly/billgenerated.vue

@@ -12,7 +12,7 @@
             :row-style="rowStyle"
             :row-class-name="rowClassName" >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="lineNo" label="行号" width="50px" ></el-table-column>
+            <el-table-column prop="sort" label="行号" width="50px" ></el-table-column>
             <el-table-column label="账单" prop="accStatus" width="60px" >
                 <template slot-scope="{ row }">
                     <span>{{row.accStatus?'是':'否'}}</span>