Browse Source

货代海运出口10.26

caojunjie 1 year ago
parent
commit
3e6cb7445a

+ 2 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox.vue

@@ -2,6 +2,7 @@
     <div>
         <div>
             <containers ref="containers" :assemblyForm="assemblyForm" :pid="assemblyForm.id"
+                        :detailData="detailData"
                         @selectionChange="selectionChange"
                         @rowSavefun="containersSubmitfun"
                         @billsDetailfun="billsDetailfun"
@@ -11,6 +12,7 @@
         <div>
             <PackingBusiness ref="PackingBusiness"
                              :assemblyForm="assemblyForm"
+                             :detailData="detailData"
                              @allocationfun="allocationfun"
                              @withdrawfun="withdrawfun"></PackingBusiness>
         </div>

+ 26 - 13
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -5,7 +5,9 @@
                 :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
                 :cell-style="{padding:'0px',fontSize:'12px'}"
                 :data="assemblyForm.waitingBoxList"
+                :header-cell-style="tableHeaderCellStyle"
                 border
+                stripe
                 height="300px"
                 style="width: 100%">
                 <el-table-column
@@ -31,7 +33,7 @@
                         <el-input v-if="scope.row.edit"
                                   type="numbers" size="small"
                                   v-model="scope.row.editQuantity"
-                                  clearable placeholder="请输入件数"
+                                  clearable placeholder="请输入件数" @blur="quantityBlur(scope.row)"
                         ></el-input>
                         <span v-else>{{scope.row.editQuantity}}</span>
                     </template>
@@ -73,13 +75,14 @@
                     label="总尺码(体积)">
                 </el-table-column>
                 <el-table-column
-                    fixed="right"
                     label="操作"
                     width="100">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="waitingBoxeditfun(scope.row)">编辑</el-button>
+                        <el-button type="text" size="small"
+                                   :disabled="detailData.seeDisabled" @click="waitingBoxeditfun(scope.row)">编辑</el-button>
 
-                        <el-button type="text" size="small" @click="allocationfun(scope.row)">分配</el-button>
+                        <el-button type="text" size="small"
+                                   :disabled="detailData.seeDisabled" @click="allocationfun(scope.row)">分配</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -88,9 +91,12 @@
         <div class="tbasTop">
             <el-table
                 :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
-                :cell-style="{padding:'0px',fontSize:'12px'}"
+                :cell-style="{padding:'0px',fontSize:'12px',textAlign:'center'}"
                 :data="containersBillsList"
+
+                :header-cell-style="tableHeaderCellStyle"
                 border
+                stripe
                 height="300px"
                 style="width: 100%">
                 <el-table-column
@@ -126,11 +132,11 @@
                     label="备注">
                 </el-table-column>
                 <el-table-column
-                    fixed="right"
                     label="操作"
                     width="100">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="withdrawfun(scope.row,scope.$index)">撤回</el-button>
+                        <el-button type="text" size="small"
+                                   :disabled="detailData.seeDisabled" @click="withdrawfun(scope.row,scope.$index)">撤回</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -143,6 +149,7 @@
     export default {
         props:{
             assemblyForm:{},
+            detailData:{}
         },
         data(){
             return {
@@ -157,12 +164,16 @@
         created() {
         },
         mounted() {
-            // console.log(this.assemblyForm,153)
+
         },
         methods:{
+            // 件数input
+            quantityBlur(row){
+                this.$set(row,'editGrossWeight',(row.grossWeight / row.quantity) * row.editQuantity)
+                this.$set(row,'editMeasurement',(row.measurement / row.quantity) * row.editQuantity)
+            },
             // 编辑
             waitingBoxeditfun(row) {
-                console.log(row,160)
                 this.$set(row,'edit',true)
             },
             // 分配
@@ -175,6 +186,11 @@
                 this.$emit('withdrawfun', {row,index})
             },
 
+            // 表头样式
+            tableHeaderCellStyle({row,column,rowIndex, columnIndex}){
+                return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff;textAlign:center"
+            },
+
         }
     }
 
@@ -184,8 +200,5 @@
     .tbasTop {
         margin: 10px 0;
     }
-    ::v-deep.el-table td, .el-table th {
-        padding: 5px 0;
-    }
-
+    ::v-deep.el-table th.gutter { display: table-cell !important }
 </style>

+ 35 - 5
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -6,6 +6,8 @@
                :permission="permissionList"
                :before-open="beforeOpen"
                v-model="form"
+               id="out-table"
+               :header-cell-class-name="headerClassName"
                ref="crud"
                :row-style="{height:'20px'}"
                :cell-style="{padding:'0px'}"
@@ -18,9 +20,9 @@
         <div style="display: flex;align-items: center;justify-content: space-between">
             <div>
                 <!--<el-button type="primary" size="small" @click="DistributionBox">配箱</el-button>-->
-                <el-button type="danger" size="small" @click="revokefun">撤销</el-button>
-                <el-button type="danger" size="small" @click="wholeRevokefun">全部撤销</el-button>
-                <el-button type="warning" size="small" @click="cleanCntrNofun">清除箱号</el-button>
+                <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="revokefun">撤销</el-button>
+                <el-button type="danger" size="small" :disabled="detailData.seeDisabled" @click="wholeRevokefun">全部撤销</el-button>
+                <el-button type="warning" size="small" :disabled="detailData.seeDisabled" @click="cleanCntrNofun">清除箱号</el-button>
                 <el-button type="warning" size="small"
                            :disabled="assemblyForm.billType != 'DD' && numberfalsefun()"
                            @click="equalDistribution">平均分配</el-button>
@@ -37,9 +39,11 @@
                        @click.stop="rowSavefun(scope.row, scope.index)">保存
             </el-button>
             <el-button v-else :type="scope.type" :size="scope.size" icon="el-icon-edit"
+                       :disabled="detailData.seeDisabled"
                        @click.stop="rowCellfun(scope.row, scope.index)">编辑
             </el-button>
             <el-button :type="scope.type" :size="scope.size" icon="el-icon-delete"
+                       :disabled="detailData.seeDisabled"
                        @click.stop="rowDel(scope.row, scope.index)">删除
             </el-button>
         </template>
@@ -94,7 +98,8 @@ import fa from "element-ui/src/locale/lang/fa";
   export default {
       components: {SearchQuery,bports},
       props:{
-          assemblyForm:{}
+          assemblyForm:{},
+          detailData:{}
       },
     data() {
       return {
@@ -405,9 +410,34 @@ import fa from "element-ui/src/locale/lang/fa";
       //     this.selectionClear();
       //   });
       // }
+          // 更改表格颜色
+          headerClassName(tab) {
+              //颜色间隔
+              let back = ""
+              if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                  if (tab.columnIndex % 2 === 0) {
+                      back = "back-one"
+                  } else if (tab.columnIndex % 2 === 1) {
+                      back = "back-two"
+                  }
+              }
+              return back;
+          },
+
     }
   };
 </script>
 
-<style>
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
 </style>

+ 83 - 51
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -29,7 +29,7 @@
                                 </el-col>
                             </div>
                         </el-form-item>
-                        <div style="margin-top: 10px">
+                        <div style="margin-top: 4px">
                             <el-form-item label="" prop="hShipperDetails" >
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hShipperDetails"
                                           size="small" autocomplete="off"
@@ -105,7 +105,7 @@
                             <el-form-item label="" prop="hNotifyDetails" >
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.hNotifyDetails"
                                           size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled" rows="4"
+                                          :disabled="detailData.seeDisabled" rows="5"
                                           clearable placeholder="通知人提单描述" ></el-input>
                             </el-form-item>
                         </div>
@@ -116,13 +116,13 @@
                         <div>
                             <span style="font-size: 14px">唛头</span>
                         </div>
-                        <div style="margin-top: 10px">
+                        <div style="margin-top: 4px">
                             <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.marks"
                                       size="small" autocomplete="off"
                                       :disabled="detailData.seeDisabled" rows="5"
                                       clearable placeholder="备注唛头" ></el-input>
                         </div>
-                        <div style="margin-top: 10px">
+                        <div style="margin-top: 4px">
                             <el-form-item label="HS CODE" prop="commodityCnName" >
                                 <el-col :span="16">
                                     <search-query :datalist="commodityData"
@@ -153,9 +153,12 @@
                                       :disabled="detailData.seeDisabled"
                                       clearable placeholder="商品简称" ></el-input>
                         </div>
-                        <div style="margin-top: 10px">
-                            <el-form-item label="货物描述" prop="cargoType" >
-                                <el-col :span="14">
+                        <div style="margin-top: 4px">
+                            <el-form-item label="货描" prop="cargoType" label-width="30" >
+                                <el-col :span="5">
+                                    <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>
+                                </el-col>
+                                <el-col :span="5">
                                     <search-query :datalist="cargoTypeData"
                                                   :selectValue="assemblyForm.cargoType"
                                                   :filterable="true"
@@ -170,10 +173,7 @@
                                 </el-col>
                                 <el-col :span="5">
                                     <span style="margin-left: 10px"></span>
-                                    <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>
-                                </el-col>
-                                <el-col :span="5">
-                                    <el-button size="small" @click="DangerousGoodsAdd">详细内容</el-button>
+                                    <el-button size="small" @click="DangerousGoodsAdd">危品详细</el-button>
                                 </el-col>
                             </el-form-item>
                         </div>
@@ -186,7 +186,36 @@
                     </el-row>
                 </el-col>
                 <el-col span="8">
-                    <el-form-item label="客户约号" prop="corpArgreementNo" >
+                    <el-form-item label="ETD" prop="etd" label-width="90px">
+                        <el-date-picker v-model="assemblyForm.etd" clearable style="width: 100%"
+                                        type="date" size="small" :disabled="detailData.seeDisabled"
+                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                    <div>
+                        <el-form-item label="船名" prop="vesselCnName" label-width="90px" >
+                            <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-form-item label="航次" prop="voyageNo" label-width="90px"  >
+                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
+                                      size="small" autocomplete="off"
+                                      :disabled="detailData.seeDisabled"
+                                      clearable placeholder="请选择航次" ></el-input>
+                        </el-form-item>
+                    </div>
+                    <el-form-item label="客户约号" prop="corpArgreementNo" label-width="90px">
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpArgreementNo"
                                   size="small" autocomplete="off"
                                   :disabled="detailData.seeDisabled"
@@ -212,36 +241,6 @@
                                   :disabled="detailData.seeDisabled"
                                   clearable placeholder="请选择船公司约号" ></el-input>
                     </el-form-item>
-                    <div>
-                        <el-form-item label="船名" prop="vesselCnName" label-width="80px" >
-                            <search-query :datalist="vesselData"
-                                          :selectValue="assemblyForm.vesselCnName"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :disabled="detailData.seeDisabled"
-                                          :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-form-item label="航次" prop="voyageNo" label-width="80px"  >
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请选择航次" ></el-input>
-                        </el-form-item>
-                    </div>
-
-                    <el-form-item label="ETD" prop="etd">
-                        <el-date-picker v-model="assemblyForm.etd" clearable style="width: 100%"
-                                        type="date" size="small" :disabled="detailData.seeDisabled"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        placeholder="选择日期">
-                        </el-date-picker>
-                    </el-form-item>
                     <el-form-item label="订舱日期" prop="bookingDate">
                         <el-date-picker v-model="assemblyForm.bookingDate" clearable style="width: 100%"
                                         type="date" size="small" :disabled="detailData.seeDisabled"
@@ -438,7 +437,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="16">
-                    <precontainers :assemblyForm="assemblyForm" :pid="assemblyForm.id" @billsDetailfun="billsDetailfun"></precontainers>
+                    <precontainers :assemblyForm="assemblyForm" :seeDisabled="detailData.seeDisabled" :pid="assemblyForm.id" @billsDetailfun="billsDetailfun"></precontainers>
                 </el-col>
             </el-row>
             <el-form-item label="备注" prop="remarks" >
@@ -450,11 +449,20 @@
 
             <el-row :gutter="20">
                 <el-col :span="12">
-                    <el-form-item label="外提单号" prop="refno" >
-                        <el-input type="age" style="width: 100%;" v-model="assemblyForm.refno"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled"
-                                  clearable placeholder="请输入外提单号" ></el-input>
+                    <el-form-item label="COLOADER" prop="coloaderCnName" >
+                        <search-query :datalist="coloaderCnNameData"
+                                      :selectValue="assemblyForm.coloaderCnName"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :disabled="detailData.seeDisabled"
+                                      :buttonIf="true"
+                                      :forParameter="{key:'id',label:'cnName',value:'cnName'}"
+                                      @remoteMethod="remoteMethod($event,'coloaderCnName')"
+                                      @corpChange="corpChange($event,'coloaderCnName')"
+                                      @corpFocus="remoteMethod($event,'coloaderCnName')" >
+                            <bcorpstypedefine></bcorpstypedefine>
+                        </search-query>
                     </el-form-item>
                     <el-form-item label="订舱代理" prop="bookingAgentCnName" >
                         <el-col :span="8">
@@ -659,6 +667,8 @@ import {bpackagesList} from "@/api/iosBasicData/bpackages";
 import {bcommodityList} from "@/api/iosBasicData/bcommodity";
 import {getBvesselsList} from "@/api/iosBasicData/bvessels";
 import {blinesList} from "@/api/iosBasicData/blines";
+import {bcorpstypedefineList} from "@/api/iosBasicData/bcorpstypedefine";
+import bcorpstypedefine from "@/views/iosBasicData/bcorps/bcorpstypedefine.vue";
 
     export default {
         props:{
@@ -669,7 +679,7 @@ import {blinesList} from "@/api/iosBasicData/blines";
                 type:Object,
             }
         },
-        components:{SearchQuery, precontainers},
+        components:{SearchQuery, precontainers,bcorpstypedefine},
         data(){
             return {
                 // 多选的数据
@@ -723,6 +733,8 @@ import {blinesList} from "@/api/iosBasicData/blines";
                 bookingAgentData:[],
                 // 航线
                 lineData:[],
+                // COLOADER
+                coloaderCnNameData:[],
             }
         },
         created() {
@@ -785,6 +797,10 @@ import {blinesList} from "@/api/iosBasicData/blines";
                 else if (name == 'line') {
                     this.lineBlinesListfun(value)
                 }
+                // COLOADER
+                else if (name == 'coloaderCnName') {
+                    this.bcorpstypedefineListfun(value)
+                }
                 else {}
             },
             // 选择框的回调
@@ -891,6 +907,16 @@ import {blinesList} from "@/api/iosBasicData/blines";
                         }
                     }
                 }
+                // COLOADER
+                else if (name == 'coloaderCnName') {
+                    for(let item of this.coloaderCnNameData) {
+                        if (item.cnName == value) {
+                            this.$set(this.assemblyForm,'coloaderId',item.id)
+                            this.$set(this.assemblyForm,'coloaderCnName',item.cnName)
+                            this.$set(this.assemblyForm,'coloaderEnName',item.enName)
+                        }
+                    }
+                }
                 else {
                     this.$set(this.assemblyForm,'cargoType',value)
                 }
@@ -1018,6 +1044,12 @@ import {blinesList} from "@/api/iosBasicData/blines";
                     this.placeDeliveryData = res.data.data.records
                 })
             },
+            // 获取类别 COLOADER 数据
+            bcorpstypedefineListfun(cnName){
+                bcorpstypedefineList(1,10,{cnName}).then(res=>{
+                    this.coloaderCnNameData = res.data.data.records
+                })
+            },
             // 包装数据
             packingUnitBpackagesListfun(cnName) {
                 bpackagesList(1,10,{cnName}).then(res=>{
@@ -1065,7 +1097,7 @@ import {blinesList} from "@/api/iosBasicData/blines";
 
 <style scoped>
 ::v-deep.el-form-item {
-    margin-bottom: 10px;
+    margin-bottom: 2px;
 }
 .addbuttonClass {
     width: 30px;
@@ -1076,7 +1108,7 @@ import {blinesList} from "@/api/iosBasicData/blines";
     font-size: 26px;
     box-sizing: border-box;
     border-radius: 4px;
-    background-color: rgba(16, 16, 16, 1);
+    background-color: #5995fc;
     text-align: center;
 }
 </style>

+ 47 - 7
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -14,14 +14,39 @@
                @selection-change="selectionChange"
                @refresh-change="refreshChange">
       <template slot="menuLeft">
+          <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="small"
+              :disabled="seeDisabled"
+              @click.stop="addfun"
+          >新 增</el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   @click="handleDelete">删 除
+                   :disabled="seeDisabled"
+                   @click.stop="handleDelete">删 除
         </el-button>
-        <el-button type="success" size="small" plain>均分箱量</el-button>
+        <!--<el-button type="success" size="small" plain>均分箱量</el-button>-->
       </template>
+        <template slot-scope="scope" slot="menu">
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click.stop="editfun(scope.row, scope.index)"
+                :disabled="seeDisabled">
+                编辑
+            </el-button>
+            <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                :disabled="seeDisabled"
+                @click.stop="rowDel"
+            >删 除</el-button>
+        </template>
         <template slot-scope="{row}" slot="cntrTypeCodeForm">
             <search-query :datalist="cntrTypeCodeData"
                           :selectValue="form.cntrTypeCode"
@@ -51,6 +76,10 @@
       props:{
           pid:{},
           assemblyForm:{},
+          seeDisabled:{
+              type:Boolean,
+              default:false,
+          }
       },
     data() {
       return {
@@ -224,10 +253,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.precontainers_add, false),
-          // viewBtn: this.vaildData(this.permission.precontainers_view, false),
-          // delBtn: this.vaildData(this.permission.precontainers_delete, false),
-          // editBtn: this.vaildData(this.permission.precontainers_edit, false)
+          addBtn: this.vaildData(this.permission.precontainers_add, false),
+          viewBtn: this.vaildData(this.permission.precontainers_view, false),
+          delBtn: this.vaildData(this.permission.precontainers_delete, false),
+          editBtn: this.vaildData(this.permission.precontainers_edit, false)
         };
       },
       ids() {
@@ -239,7 +268,9 @@
       }
     },
       created() {
-          // this.bcntrtypesListfun()
+          if (this.seeDisabled){
+
+          }
       },
       methods: {
         // 选择框的回调
@@ -326,6 +357,15 @@
             this.$emit('billsDetailfun')
           });
       },
+      // 新增
+      addfun(){
+         this.$refs.crud.rowAdd()
+      },
+      // 编辑
+      editfun(row,index){
+          this.$refs.crud.rowEdit(row,index)
+      },
+      // 多选删除
       handleDelete() {
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");

+ 5 - 2
src/views/iosBasicData/SeafreightExportF/bills/assembly/SplitList.vue

@@ -1,17 +1,19 @@
 <template>
     <div>
         <avue-crud :table-loading="loading" :option="option" :data="data"
-                   @selection-change="selectionChange">
+                   @selection-change="selectionChange" >
             <template slot-scope="scope" slot="menuLeft">
                 <el-button v-if="!typeMenu" type="danger"
                            size="small"
                            icon="el-icon-delete"
                            plain
+                           :disabled="detailData.seeDisabled"
                            @click="batchWithdrawfun">批量撤回
                 </el-button>
             </template>
             <template slot-scope="scope" slot="menu">
                 <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
+                           :disabled="detailData.seeDisabled"
                            @click.stop="withdrawfun(scope.row, scope.index)">撤回
                 </el-button>
             </template>
@@ -33,7 +35,8 @@
             typeMenu:{
                 type:Boolean,
                 default:false,
-            }
+            },
+            detailData:{},
         },
         data(){
             return {

+ 160 - 121
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -80,14 +80,6 @@
                         <span>应收费用</span>
                     </div>
                 </el-col>
-                <el-col :span="4">
-                    <el-switch
-                        v-model="value"
-                        active-color="#5972ef"
-                        active-text="审核应收费用"
-                        inactive-color="#949494">
-                    </el-switch>
-                </el-col>
                 <!--<el-col :span="6">-->
                 <!--    <div class="disabledBox">-->
                 <!--        <span style="font-size: 14px;margin-right: 5px">签单方式</span>-->
@@ -107,16 +99,19 @@
                     <el-button type="primary" plain size="small">打印账单</el-button>
                     <el-button type="success" plain size="small">应收模板</el-button>
                 </el-col>
-                <el-col :span="3">
-                    <el-button type="success" size="small" @click="addDfun">新 增</el-button>
-                </el-col>
+                <!--<el-col :span="3">-->
+                <!--    <el-button type="success" size="small" @click="addDfun">新 增</el-button>-->
+                <!--</el-col>-->
             </el-row>
             <div style="margin-top: 10px">
                 <el-table
-                    :row-style="{height:'20px'}"
-                    :cell-style="{padding:'0px'}"
+                    :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                    :cell-style="{padding:'0px',fontSize:'12px'}"
+                    :header-cell-style="tableHeaderCellStyle"
                     :data="assemblyForm.feeCenterListD"
                     @selection-change="handleSelectionChange"
+                    border
+                    stripe
                     style="width: 100%">
                     <el-table-column
                         type="selection"
@@ -124,7 +119,16 @@
                         width="55">
                     </el-table-column>
                     <el-table-column
+                        fixed="left"
+                        width="90">
+                        <template slot="header" slot-scope="scope">
+                            <el-button type="success" size="small"
+                                       :disabled="detailData.seeDisabled" @click="addDfun">新 增</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
                         prop="corpCnName"
+                        header-align="center"
                         label="单位" width="160px">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
@@ -144,6 +148,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="feeCnName"
+                        header-align="center"
                         label="费用简称" width="160px">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
@@ -163,6 +168,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="paymode"
+                        header-align="center"
                         label="预付/到付" width="120px">
                         <template slot-scope="{ row }">
                             <el-select v-if="row.edit" v-model="row.paymode" placeholder="请选择">
@@ -178,6 +184,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="unitNo"
+                        header-align="center"
                         label="计量单位" width="120px">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
@@ -197,6 +204,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="price"
+                        header-align="center"
                         label="单价" width="120px">
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" type="number" v-model="row.price" size="small"
@@ -206,6 +214,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="quantity"
+                        header-align="center"
                         label="数量" width="120px" >
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small"
@@ -215,6 +224,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="curCode"
+                        header-align="center"
                         label="币种" width="120px">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
@@ -234,18 +244,22 @@
                     </el-table-column>
                     <el-table-column
                         prop="rmbAmount"
-                        label="RMB(含税)">
+                        header-align="center"
+                        label="CNY(含税)" width="100px">
                     </el-table-column>
                     <el-table-column
                         prop="usdAmount"
-                        label="USD(含税)">
+                        header-align="center"
+                        label="USD(含税)" width="100px">
                     </el-table-column>
                     <el-table-column
                         prop="exrate"
-                        label="对RMB汇率">
+                        header-align="center"
+                        label="对CNY汇率" width="100px">
                     </el-table-column>
                     <el-table-column
                         prop="payplace"
+                        header-align="center"
                         label="预付地址">
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" v-model="row.payplace" size="small"
@@ -255,6 +269,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="remarks"
+                        header-align="center"
                         label="备注">
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" v-model="row.remarks" size="small"
@@ -265,9 +280,10 @@
                     <el-table-column
                         fixed="right"
                         label="操作"
+                        header-align="center"
                         width="100">
                         <template slot-scope="scope">
-                            <el-button v-if="scope.row.edit" type="text" size="small" @click="saveDfun(scope.row,scope.$index)">保存</el-button>
+                            <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.$index,'D')">保存</el-button>
                             <el-button v-else type="text" size="small" @click="editDfun(scope.row,scope.$index)">编辑</el-button>
                             <el-button type="text" size="small" @click="deleteDfun(scope.row,scope.$index)">删除</el-button>
                         </template>
@@ -284,25 +300,19 @@
                         <span>应付费用</span>
                     </div>
                 </el-col>
-                <el-col :span="4">
-                    <el-switch
-                        v-model="value"
-                        active-color="#5972ef"
-                        active-text="审核应付费用"
-                        inactive-color="#949494">
-                    </el-switch>
-                </el-col>
                 <el-col :span="8">
                     <el-button type="success" plain size="small">应付模板</el-button>
                 </el-col>
-                <el-col :span="3">
-                    <el-button type="success" size="small" @click="addCfun">新 增</el-button>
-                </el-col>
             </el-row>
             <div style="margin-top: 10px">
                 <el-table
+                    :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                    :cell-style="{padding:'0px',fontSize:'12px'}"
+                    :header-cell-style="tableHeaderCellStyle"
                     :data="assemblyForm.feeCenterListC"
                     @selection-change="handleSelectionChange"
+                    border
+                    stripe
                     style="width: 100%">
                     <el-table-column
                         type="selection"
@@ -310,8 +320,17 @@
                         width="55">
                     </el-table-column>
                     <el-table-column
+                        fixed="left"
+                        width="90">
+                        <template slot="header" slot-scope="scope">
+                            <el-button type="success" size="small"
+                                       :disabled="detailData.seeDisabled" @click="addCfun">新 增</el-button>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
                         prop="corpCnName"
-                        label="单位" width="160px">
+                        label="单位" width="160px"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
                                           :datalist="corpCnNameData"
@@ -330,7 +349,8 @@
                     </el-table-column>
                     <el-table-column
                         prop="feeCnName"
-                        label="费用简称" width="160px">
+                        label="费用简称" width="160px"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
                                           :datalist="feeCnNameData"
@@ -349,7 +369,8 @@
                     </el-table-column>
                     <el-table-column
                         prop="paymode"
-                        label="预付/到付" width="120px">
+                        label="预付/到付" width="120px"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <el-select v-if="row.edit" v-model="row.paymode" placeholder="请选择">
                                 <el-option
@@ -364,7 +385,8 @@
                     </el-table-column>
                     <el-table-column
                         prop="unitNo"
-                        label="计量单位" width="120px">
+                        label="计量单位" width="120px"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
                                           :datalist="unitNoData"
@@ -383,7 +405,8 @@
                     </el-table-column>
                     <el-table-column
                         prop="price"
-                        label="单价" width="120px">
+                        label="单价" width="120px"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" type="number" v-model="row.price" size="small"
                                       placeholder="请输入" @blur="priceinputfun($event,row)"></el-input>
@@ -392,7 +415,8 @@
                     </el-table-column>
                     <el-table-column
                         prop="quantity"
-                        label="数量" width="120px" >
+                        label="数量" width="120px"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" type="number" v-model="row.quantity" size="small"
                                       placeholder="请输入" @blur="quantityinputfun(row)"></el-input>
@@ -401,7 +425,8 @@
                     </el-table-column>
                     <el-table-column
                         prop="curCode"
-                        label="币种" width="120px">
+                        label="币种" width="120px"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
                                           :datalist="curCodeData"
@@ -420,19 +445,23 @@
                     </el-table-column>
                     <el-table-column
                         prop="rmbAmount"
-                        label="RMB(含税)">
+                        label="CNY(含税)" width="100px"
+                        header-align="center">
                     </el-table-column>
                     <el-table-column
                         prop="usdAmount"
-                        label="USD(含税)">
+                        label="USD(含税)" width="100px"
+                        header-align="center">
                     </el-table-column>
                     <el-table-column
                         prop="exrate"
-                        label="对RMB汇率">
+                        label="对CNY汇率" width="100px"
+                        header-align="center">
                     </el-table-column>
                     <el-table-column
                         prop="payplace"
-                        label="预付地址">
+                        label="预付地址"
+                        header-align="center">
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" v-model="row.payplace" size="small"
                                       placeholder="请输入" ></el-input>
@@ -441,7 +470,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="remarks"
-                        label="备注">
+                        label="备注" header-align="center">
                         <template slot-scope="{ row }">
                             <el-input v-if="row.edit" v-model="row.remarks" size="small"
                                       placeholder="请输入" ></el-input>
@@ -451,9 +480,10 @@
                     <el-table-column
                         fixed="right"
                         label="操作"
+                        header-align="center"
                         width="100">
                         <template slot-scope="scope">
-                            <el-button v-if="scope.row.edit" type="text" size="small" @click="saveCfun(scope.row,scope.$index)">保存</el-button>
+                            <el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.$index,'C')">保存</el-button>
                             <el-button v-else type="text" size="small" @click="editCfun(scope.row,scope.$index)">编辑</el-button>
                             <el-button type="text" size="small" @click="deleteDfun(scope.row,scope.$index)">删除</el-button>
                         </template>
@@ -465,62 +495,76 @@
         <div style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <el-card class="box-card">
-                    <div class="bottomFlex">
-                        <div class="bottomFlex-left">
-                            <div class="bottomFlex-leftTop">
-                                <div class="weightfont">¥</div>
-                                <div class="fontText">人民币</div>
-                                <div class="fontText">RMB</div>
+                    <div class="bottomFlex" style="justify-content: space-around">
+                        <div style="text-align: center">
+                            <div class="weightfont">¥</div>
+                            <div>CNY</div>
+                        </div>
+                        <div>
+                            <div style="color: #81B337">
+                                <span>应收:</span>
+                                <span class="weightnum">¥{{assemblyForm.amountDr}}元</span>
                             </div>
-                            <div class="bottomFlex-leftcont">
-                                <div style="color: #81B337">
-                                    <div>应收</div>
-                                    <span class="weightnum">¥295665.55元</span>
-                                </div>
-                                <div style="color: #6BBCD1">
-                                    <div>应付</div>
-                                    <span class="weightnum">¥295665.55元</span>
-                                </div>
+                            <div style="color: #6BBCD1">
+                                <span>应付:</span>
+                                <span class="weightnum">¥{{assemblyForm.amountCr}}元</span>
                             </div>
                         </div>
-                        <div style="height: 90px; border-right: 1px solid #cbcbcb"></div>
-                        <div class="bottomFlex-right">
-                            <div class="fontText positionText">利润</div>
-                            <div class="weightnum">¥95665.55元</div>
+                        <div class="bottomFlex">
+                            <span>利润</span>
+                            <span>¥{{assemblyForm.amountProfit}}元</span>
                         </div>
                     </div>
                 </el-card>
             </div>
-
             <div style="width: 30%">
                 <el-card class="box-card">
-                    <div class="bottomFlex">
-                        <div class="bottomFlex-left">
-                            <div class="bottomFlex-leftTop">
-                                <div class="weightfont">$</div>
-                                <div class="fontText">美金</div>
-                                <div class="fontText">USD</div>
+                    <div class="bottomFlex" style="justify-content: space-around">
+                        <div style="text-align: center">
+                            <div class="weightfont">$</div>
+                            <div>USD</div>
+                        </div>
+                        <div>
+                            <div style="color: #81B337">
+                                <span>应收:</span>
+                                <span class="weightnum">${{assemblyForm.amountDrUsd}}元</span>
                             </div>
-                            <div class="bottomFlex-leftcont">
-                                <div style="color: #81B337">
-                                    <div>应收</div>
-                                    <span class="weightnum">$295665.55元</span>
-                                </div>
-                                <div style="color: #6BBCD1">
-                                    <div>应付</div>
-                                    <span class="weightnum">$295665.55元</span>
-                                </div>
+                            <div style="color: #6BBCD1">
+                                <span>应付:</span>
+                                <span class="weightnum">${{assemblyForm.amountCrUsd}}元</span>
                             </div>
                         </div>
-                        <div style="height: 90px; border-right: 1px solid #cbcbcb"></div>
-                        <div class="bottomFlex-right">
-                            <div class="fontText positionText">利润</div>
-                            <div class="weightnum">$95665.55元</div>
+                        <div class="bottomFlex">
+                            <span>利润</span>
+                            <span>${{assemblyForm.amountProfitUsd}}元</span>
+                        </div>
+                    </div>
+                </el-card>
+            </div>
+            <div style="width: 30%">
+                <el-card class="box-card">
+                    <div class="bottomFlex" style="justify-content: space-around">
+                        <div style="text-align: center">
+                            <div class="weightfont">¥</div>
+                            <div>CNY合计</div>
+                        </div>
+                        <div>
+                            <div style="color: #81B337">
+                                <span>应收:</span>
+                                <span class="weightnum">¥{{assemblyForm.amountDrLoc}}元</span>
+                            </div>
+                            <div style="color: #6BBCD1">
+                                <span>应付:</span>
+                                <span class="weightnum">¥{{assemblyForm.amountCrLoc}}元</span>
+                            </div>
+                        </div>
+                        <div class="bottomFlex">
+                            <span>利润</span>
+                            <span>¥{{assemblyForm.amountProfitLoc}}元</span>
                         </div>
                     </div>
                 </el-card>
             </div>
-
         </div>
     </div>
 
@@ -543,7 +587,8 @@
             },
             assemblyForm:{
                 type:Object
-            }
+            },
+            detailData:{},
         },
         data(){
             return {
@@ -617,24 +662,38 @@
                 this.$delete(this.assemblyForm.feeCenterListC[index], 'edit')
                 this.$set(this.assemblyForm.feeCenterListC[index],'edit',true)
             },
-            // 应收保存
-            saveDfun(row,index){
-                // 收付 D=收 C=付
-                row.dc = 'D'
-                row.pid = this.pid
-                row.sort = index
-                row.billType = this.assemblyForm.billType
-                row.billNo = this.assemblyForm.billNo
-                this.feecenterSubmitfun(row)
-            },
-            // 应付保存
-            saveCfun(row,index){
+            // 应付应付保存
+            savefun(row,index,dc){
                 // 收付 D=收 C=付
-                row.dc = 'C'
+                row.dc = dc
                 row.pid = this.pid
                 row.sort = index
-                row.billType = this.assemblyForm.billType
-                row.billNo = this.assemblyForm.billNo
+                row.businessType = this.assemblyForm.businessType // 业务类型
+                row.billType = this.assemblyForm.billType // 单据类型
+                row.billNo = this.assemblyForm.billNo // 单据编号
+                row.billDate = this.assemblyForm.billDate // 单据日期
+                row.billCorpId = this.assemblyForm.corpId // 主表客户 id
+                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
+                row.lineId = this.assemblyForm.lineId // 航线 id
+                row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
+                row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
+                row.vesselId = this.assemblyForm.vesselId // 船名 id
+                row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
+                row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
+                row.voyageNo = this.assemblyForm.voyageNo // 航次
+                row.mblno = this.assemblyForm.mblno // MB/L NO
+                row.hblno = this.assemblyForm.hblno // HB/L NO
+                row.etd = this.assemblyForm.etd // 开船日期
+                row.eta = this.assemblyForm.eta // 到港日期
+                row.polId = this.assemblyForm.polId // 装货港 id
+                row.polCode = this.assemblyForm.polCode // 装货港代码
+                row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
+                row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
+                row.podId = this.assemblyForm.podId // 卸货港 id
+                row.podCode = this.assemblyForm.podCode // 卸货港代码
+                row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
+                row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
                 this.feecenterSubmitfun(row)
             },
             // 应收删除
@@ -785,6 +844,10 @@
                     }
                 }
             },
+            // 表头样式
+            tableHeaderCellStyle({row,column,rowIndex, columnIndex}){
+                return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff"
+            },
 
 
         },
@@ -807,30 +870,6 @@
     .bottomFlex {
         display: flex;
         align-items: center;
-        justify-content: space-around;
-        .bottomFlex-left {
-            display: flex;
-            align-items: center;
-            .bottomFlex-leftTop {
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-                padding-right: 15px;
-                border-right: 1px solid #cbcbcb;
-            }
-            .bottomFlex-leftcont {
-                margin: 0 30px;
-            }
-        }
-        .bottomFlex-right {
-            position: relative;
-            .positionText {
-                position: absolute;
-                top: -45px;
-                left: 50%;
-                transform: translateX(-50%);
-            }
-        }
     }
     .weightfont {
         font-size: 20px;

+ 4 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -53,6 +53,7 @@
                             style="width: 100%;"
                             value-format="yyyy-MM-dd hh:nn"
                             size="small"
+                            :disabled="detailData.seeDisabled"
                             placeholder="选择背箱时间">
                         </el-date-picker>
                     </el-form-item>
@@ -65,6 +66,7 @@
                             style="width: 100%;"
                             value-format="yyyy-MM-dd hh:nn"
                             size="small"
+                            :disabled="detailData.seeDisabled"
                             placeholder="选择还箱时间">
                         </el-date-picker>
                     </el-form-item>
@@ -129,6 +131,7 @@
                             style="width: 100%;"
                             value-format="yyyy-MM-dd hh:nn"
                             size="small"
+                            :disabled="detailData.seeDisabled"
                             placeholder="签单日期">
                         </el-date-picker>
                     </el-form-item>
@@ -141,6 +144,7 @@
                             style="width: 100%;"
                             value-format="yyyy-MM-dd hh:nn"
                             size="small"
+                            :disabled="detailData.seeDisabled"
                             placeholder="退舱日期">
                         </el-date-picker>
                     </el-form-item>

+ 114 - 100
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -18,8 +18,8 @@
         </div>
 
         <div style="margin-top: 65px">
-            <el-tabs type="border-card">
-                <el-tab-pane label="委托信息">
+            <el-tabs type="border-card" v-model="bigtabs" @tab-click="bigHandleClick">
+                <el-tab-pane label="委托信息" name="wt">
                     <div>
                         <div>
                             <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
@@ -29,87 +29,93 @@
                                         <el-col v-for="(item, index) in basicData.column" :key="index" :span="8">
                                             <!--数组-->
                                             <div v-if="item instanceof Array" style="display: flex;align-items: center;justify-content: space-between">
-                                                <el-form-item :label="item[0].label" :prop="item[0].prop" :rules="item[0].rules"
-                                                              :label-width="item[0].labelWidth">
+                                                <el-row>
+                                                    <el-col :span="item[0].span?item[0].span:12">
+                                                        <el-form-item :label="item[0].label" :prop="item[0].prop" :rules="item[0].rules"
+                                                                      :label-width="item[0].labelWidth">
                                                     <span slot="label" v-if="item[0].label">
                                                         <span style="color: #1e9fff">{{item[0].label}}</span>
                                                     </span>
-                                                    <el-button v-if="item[0].type == 'button'" :disabled="item[0].disabled"
-                                                               size="small" type="success" plain @click="applyforfun(item[0].label)" >
-                                                        {{item[0].label}}
-                                                    </el-button>
-                                                    <search-query v-else-if="item[0].type == 'select'"
-                                                                  :datalist="item[0].dicData"
-                                                                  :selectValue="form[item[0].prop]"
-                                                                  :filterable="true"
-                                                                  :clearable="true"
-                                                                  :remote="true"
-                                                                  :disabled="detailData.seeDisabled || item[0].disabled"
-                                                                  :buttonIf="false"
-                                                                  :forParameter="item[0].forParameter"
-                                                                  @remoteMethod="remoteMethod($event,item[0].prop)"
-                                                                  @corpChange="corpChange($event,item[0].prop)"
-                                                                  @corpFocus="remoteMethod($event,item[0].prop)" >
-                                                    </search-query>
-                                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
-                                                              size="small" autocomplete="off"
-                                                              :disabled="detailData.seeDisabled || item[0].disabled"
-                                                              clearable :placeholder="'请输入' + item[0].label" ></el-input>
-                                                </el-form-item>
-
-                                                <el-form-item :label="item[1].label" :prop="item[1].prop" :rules="item[1].rules"
-                                                              :label-width="item[1].labelWidth">
+                                                            <el-button v-if="item[0].type == 'button'" :disabled="item[0].disabled"
+                                                                       size="small" type="success" plain @click="applyforfun(item[0].label)" >
+                                                                {{item[0].label}}
+                                                            </el-button>
+                                                            <search-query v-else-if="item[0].type == 'select'"
+                                                                          :datalist="item[0].dicData"
+                                                                          :selectValue="form[item[0].prop]"
+                                                                          :filterable="true"
+                                                                          :clearable="true"
+                                                                          :remote="true"
+                                                                          :disabled="detailData.seeDisabled || item[0].disabled"
+                                                                          :buttonIf="false"
+                                                                          :forParameter="item[0].forParameter"
+                                                                          @remoteMethod="remoteMethod($event,item[0].prop)"
+                                                                          @corpChange="corpChange($event,item[0].prop)"
+                                                                          @corpFocus="remoteMethod($event,item[0].prop)" >
+                                                            </search-query>
+                                                            <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]"
+                                                                      size="small" autocomplete="off"
+                                                                      :disabled="detailData.seeDisabled || item[0].disabled"
+                                                                      clearable :placeholder="'请输入' + item[0].label" ></el-input>
+                                                        </el-form-item>
+                                                    </el-col>
+                                                    <el-col :span="item[1].span?item[1].span:12">
+                                                        <el-form-item :label="item[1].label" :prop="item[1].prop" :rules="item[1].rules"
+                                                                      :label-width="item[1].labelWidth">
                                                     <span slot="label" v-if="item[1].label">
                                                         <span style="color: #1e9fff">{{item[1].label}}</span>
                                                     </span>
-                                                    <el-date-picker v-if="item[1].type == 'date'"
-                                                                    v-model="form[item[1].prop]" clearable style="width: 100%;"
-                                                                    type="date" size="small" :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                                                    placeholder="选择日期">
-                                                    </el-date-picker>
-                                                    <search-query v-else-if="item[1].type == 'select'"
-                                                                  :datalist="item[1].dicData"
-                                                                  :selectValue="form[item[1].prop]"
-                                                                  :filterable="true"
-                                                                  :clearable="true"
-                                                                  :remote="true"
-                                                                  :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                  :buttonIf="false"
-                                                                  :forParameter="item[1].forParameter"
-                                                                  @remoteMethod="remoteMethod($event,item[1].prop)"
-                                                                  @corpChange="corpChange($event,item[1].prop)"
-                                                                  @corpFocus="remoteMethod($event,item[1].prop)" >
-                                                    </search-query>
-                                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
-                                                              size="small" autocomplete="off"
-                                                              :disabled="detailData.seeDisabled || item[1].disabled"
-                                                              clearable :placeholder="'请输入' + item[1].label" ></el-input>
-                                                </el-form-item>
-
-                                                <el-form-item v-if="item[2]" :label="item[2].label" :prop="item[2].prop" :rules="item[2].rules"
-                                                              :label-width="item[2].labelWidth">
+                                                            <el-date-picker v-if="item[1].type == 'date'"
+                                                                            v-model="form[item[1].prop]" clearable style="width: 100%;"
+                                                                            type="date" size="small" :disabled="detailData.seeDisabled || item[1].disabled"
+                                                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                                                            placeholder="选择日期">
+                                                            </el-date-picker>
+                                                            <search-query v-else-if="item[1].type == 'select'"
+                                                                          :datalist="item[1].dicData"
+                                                                          :selectValue="form[item[1].prop]"
+                                                                          :filterable="true"
+                                                                          :clearable="true"
+                                                                          :remote="true"
+                                                                          :disabled="detailData.seeDisabled || item[1].disabled"
+                                                                          :buttonIf="false"
+                                                                          :forParameter="item[1].forParameter"
+                                                                          @remoteMethod="remoteMethod($event,item[1].prop)"
+                                                                          @corpChange="corpChange($event,item[1].prop)"
+                                                                          @corpFocus="remoteMethod($event,item[1].prop)" >
+                                                            </search-query>
+                                                            <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
+                                                                      size="small" autocomplete="off"
+                                                                      :disabled="detailData.seeDisabled || item[1].disabled"
+                                                                      clearable :placeholder="'请输入' + item[1].label" ></el-input>
+                                                        </el-form-item>
+                                                    </el-col>
+                                                    <el-col v-if="item[2]" :span="item[2].span?item[2].span:12">
+                                                        <el-form-item :label="item[2].label" :prop="item[2].prop" :rules="item[2].rules"
+                                                                      :label-width="item[2].labelWidth">
                                                     <span slot="label" v-if="item[2].label">
                                                         <span style="color: #1e9fff">{{item[2].label}}</span>
                                                     </span>
-                                                    <search-query v-if="item[2].type == 'select'"
-                                                                  :datalist="item[2].dicData"
-                                                                  :selectValue="form[item[2].prop]"
-                                                                  :filterable="true"
-                                                                  :clearable="true"
-                                                                  :remote="true"
-                                                                  :disabled="detailData.seeDisabled || item[2].disabled"
-                                                                  :buttonIf="false"
-                                                                  :forParameter="item[1].forParameter"
-                                                                  @remoteMethod="remoteMethod($event,item[2].prop)"
-                                                                  @corpChange="corpChange($event,item[2].prop)"
-                                                                  @corpFocus="remoteMethod($event,item[2].prop)" >
-                                                    </search-query>
-                                                    <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
-                                                              size="small" autocomplete="off"
-                                                              :disabled="detailData.seeDisabled || item[1].disabled"
-                                                              clearable :placeholder="'请输入' + item[2].label" ></el-input>
-                                                </el-form-item>
+                                                            <search-query v-if="item[2].type == 'select'"
+                                                                          :datalist="item[2].dicData"
+                                                                          :selectValue="form[item[2].prop]"
+                                                                          :filterable="true"
+                                                                          :clearable="true"
+                                                                          :remote="true"
+                                                                          :disabled="detailData.seeDisabled || item[2].disabled"
+                                                                          :buttonIf="false"
+                                                                          :forParameter="item[1].forParameter"
+                                                                          @remoteMethod="remoteMethod($event,item[2].prop)"
+                                                                          @corpChange="corpChange($event,item[2].prop)"
+                                                                          @corpFocus="remoteMethod($event,item[2].prop)" >
+                                                            </search-query>
+                                                            <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
+                                                                      size="small" autocomplete="off"
+                                                                      :disabled="detailData.seeDisabled || item[1].disabled"
+                                                                      clearable :placeholder="'请输入' + item[2].label" ></el-input>
+                                                        </el-form-item>
+                                                    </el-col>
+                                                </el-row>
                                             </div>
                                             <!--对象-->
                                             <div v-else>
@@ -183,10 +189,10 @@
                         </div>
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="费用信息">
-                    <feecenter :assemblyForm="form" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
+                <el-tab-pane label="费用信息" name="fy">
+                    <feecenter :assemblyForm="form" :detailData="detailData" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
-                <el-tab-pane label="分单列表">
+                <el-tab-pane label="分单列表" name="fd">
                     <Split-list :detailData="detailData" :assemblyForm="form"
                                 :data="billsListAllData"
                                 @billsListAllfun="billsListAllfun(this.form.id)"></Split-list>
@@ -217,7 +223,6 @@ import {getBlocationsList} from "@/api/iosBasicData/blocations";
 import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
 import {getWorkDicts} from "@/api/system/dictbiz";
 import {getDeptLazyTree} from "@/api/system/dept";
-import {bcorpstypedefineList} from "@/api/iosBasicData/bcorpstypedefine";
 import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosBasicData/bills'
     export default {
         components:{
@@ -254,7 +259,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                         [
                             {
                                 label: "业务编号",
-                                prop: "code",
+                                prop: "billNo",
                                 disabled:true,
                             },
                             {
@@ -382,6 +387,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                                 prop: "corpAttnName",
                                 type:'select',
                                 dicData:[],
+                                span:10,
                                 disabled:true,
                                 forParameter:{
                                     key:'id',
@@ -399,6 +405,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                                 prop: "corpAttnTel",
                                 labelWidth:'10px',
                                 disabled:true,
+                                span:7,
                                 rules: [{
                                     required: true,
                                     message: "",
@@ -410,6 +417,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                                 prop: "corpAttnEmail",
                                 labelWidth:'10px',
                                 disabled:true,
+                                span:7,
                                 rules: [{
                                     required: true,
                                     message: "请输入客户联系人邮箱",
@@ -461,6 +469,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                             {
                                 label: "MB/L NO",
                                 prop: "mblno",
+                                span:19,
                                 disabled:false,
 
                             },
@@ -470,6 +479,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                                 type:'select',
                                 labelWidth:'10px',
                                 disabled:false,
+                                span:5,
                                 dicData:[
                                     {
                                         label:'预付',
@@ -536,30 +546,37 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                             disabled:false,
                         },
                         {
-                            label: "COLOADER", // Co-Loader 中文名称  往来单位 类别
-                            prop: "coloaderCnName",
-                            type:'select',
-                            dicData:[],
-                            slot:'bcorpstypedefine',
-                            buttonIf:true,
+                            label: "外提单号", // Co-Loader 中文名称  往来单位 类别
+                            prop: "refno",
                             disabled:false,
-                            forParameter:{
-                                key:'id',
-                                label:'cnName',
-                                value:'cnName',
-                            },
                         },
+                        // {
+                        //     label: "COLOADER", // Co-Loader 中文名称  往来单位 类别
+                        //     prop: "coloaderCnName",
+                        //     type:'select',
+                        //     dicData:[],
+                        //     slot:'bcorpstypedefine',
+                        //     buttonIf:true,
+                        //     disabled:false,
+                        //     forParameter:{
+                        //         key:'id',
+                        //         label:'cnName',
+                        //         value:'cnName',
+                        //     },
+                        // },
                         [
                             {
                                 label: "申请B/L NO",  //弹窗点击确认还是取消申请 调后台接口获取到一个编号
                                 prop: "申请B/L NO",
                                 type:'button',
+                                span:9,
                                 disabled:false,
                             },
                             {
                                 label: "",
                                 prop: "hblno",
                                 labelWidth:'10px',
+                                span:10,
                                 disabled:true,
                             },
                             {
@@ -568,6 +585,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                                 labelWidth:'10px',
                                 disabled:true,
                                 type:'select',
+                                span:5,
                                 dicData:[
                                     {
                                         label:'预付',
@@ -583,6 +601,7 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                     ]
                 },
                 activeName:'first',
+                bigtabs:'wt',
             }
         },
         created() {
@@ -592,7 +611,6 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
             // this.getBlocationsListfun()
             // this.getWorkDictsfun()
             // this.ownDeptLazyTreefun()
-            // this.bcorpstypedefineListfun()
         },
         methods:{
             // 获取用户管理数据
@@ -650,12 +668,6 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                     this.columnforfun('srcCnName').dicData = res.data.data
                 })
             },
-            // 获取类别 COLOADER 数据
-            bcorpstypedefineListfun(cnName){
-                bcorpstypedefineList(1,10,{cnName}).then(res=>{
-                    this.columnforfun('coloaderCnName').dicData = res.data.data.records
-                })
-            },
             // 申请B/L NO
             billsGetBillNofun(){
                 billsGetBillNo({
@@ -689,8 +701,6 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
                         // 代理
                         this.agentBcorpsListfun(value)
                     }
-                }else if (name == 'coloaderCnName') {
-                    this.bcorpstypedefineListfun(value)
                 } else if (name == 'issueType') {
                     // 签单方式
                     this.getWorkDictsfun()
@@ -908,7 +918,11 @@ import {billsDetail, billsGetBillNo, billsListAll, billsSubmit} from '@/api/iosB
             },
             // tbas切换
             handleClick(tba,event) {
-                if (this.activeName == 'eighth') {
+
+            },
+            // 大tbas切换
+            bigHandleClick(){
+                if (this.bigtabs == 'fd') {
                     if (this.form.id) {
                         this.billsListAllfun(this.form.id)
                     }