修改bug

src/util/calculate.js

@@ -93,13 +93,14 @@ export function costsCal(num, num2, num3) {
   return Number(sum).toFixed(2)
 }
 //产品价格/汇率 计算出出厂价格
-export function sellingCal(num, num2) {
+export function sellingCal(num, num2,num3) {
   //产品价格
   const product = Number(num ? num : 0)
   //汇率
   const exchangeRate = Number(Number(num2) ? num2 : 1)
+  const val3 = Number(num3 ? num3 : 2)
   const sum = _.divide(product, exchangeRate)
-  return Number(sum).toFixed(2)
+  return Number(sum).toFixed(val3)
 }
 //出厂价格乘以数量加运费加保险乘以（折扣除以10） 计算出金额
 export function amountCal(num, num2, num3, num4, num5) {
@@ -198,9 +199,10 @@ export function addPrice(num, num2, num3) {
   return Number(sum).toFixed(2)
 }
 //出厂价格调整 出厂价格*（1+调整价格/100）
-export function priceaAjustment(num, num2) {
+export function priceaAjustment(num, num2,num3) {
   const Sum1 = Number(num ? num : 0)
   const Sum2 = Number(num2 ? num2 : 0)
+  const val3 = Number(num3 ? num3 : 2)
   const sum = _.multiply(Sum1,_.add(1,_.divide(Sum2, 100)))
-  return Number(sum).toFixed(2)
+  return Number(sum).toFixed(val3)
 }

src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -62,7 +62,7 @@
                 {{ row.productPrice | decimalFormat2 }}
             </template>
             <template slot="outFactoryPrice" slot-scope="{row}">
-                {{ row.outFactoryPrice | decimalFormat2 }}
+                {{ row.outFactoryPrice}}
             </template>
             <template slot="shareAmount" slot-scope="{row}">
                 {{ row.shareAmount | decimalFormat2 }}
@@ -253,7 +253,7 @@
             //出厂费用
             <template slot="outFactoryPriceForm" slot-scope="{type,disabled}">
                 <el-input v-model="goodsForm.outFactoryPrice" size="small"
-                    oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+                    oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
                     @change="priceChange(goodsForm)"></el-input>
             </template>
             //分摊金额
@@ -664,7 +664,7 @@ export default {
                     row.itemType = e.specs;
                     row.tradeTerms = null;
                     row.productPrice = productCal(e.purchaseAmount, 0, this.form.coefficient);
-                    row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+                    row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate,3);
                     row.shareAmount = 0;
                     row.internationalAmount = 0;
                     row.orderQuantity = 1;
@@ -746,7 +746,7 @@ export default {
                     productPrice: productCal(e.purchaseAmount, 0, this.form.coefficient),
                     outFactoryPrice: sellingCal(
                         productCal(e.purchaseAmount, 0, this.form.coefficient),
-                        this.form.exchangeRate
+                        this.form.exchangeRate, 3
                     ),
                     shareAmount: 0,
                     internationalAmount: 0,
@@ -1014,7 +1014,7 @@ export default {
         submitPriceAD() {
             this.visible = false;
             this.data.forEach(e => {
-                e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, this.priceAD)
+                e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, this.priceAD,3)
                 e.totalValue = multiply(e.outFactoryPrice, e.orderQuantity)
                 e.price = addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount)
                 e.amount = amountCal(
@@ -1056,7 +1056,7 @@ export default {
                 row.partsPrice,
                 this.form.coefficient
             );
-            row.outFactoryPrice = sellingCal(row.productPrice, this.form.exchangeRate);
+            row.outFactoryPrice = sellingCal(row.productPrice, this.form.exchangeRate,3);
             row.price = addPrice(
                 row.outFactoryPrice,
                 row.shareAmount,
@@ -1277,7 +1277,8 @@ export default {
             );
             this.goodsForm.outFactoryPrice = sellingCal(
                 this.goodsForm.productPrice,
-                this.form.exchangeRate
+                this.form.exchangeRate,
+                3
             );
             this.goodsForm.price = addPrice(
                 this.goodsForm.outFactoryPrice,

src/views/exportTrade/invoice/detailsPage.vue

@@ -73,7 +73,7 @@
             <el-button :type="!form.customsStatus ? 'info' : 'primary'" size="small" :disabled="!form.id"
               @click.native="dialog = true; fudaSatus = 1">已报关</el-button>
             <el-button :type="!form.shippingStatus ? 'info' : 'warning'" size="small" :disabled="!form.id"
-              @click.native="dialog = true; fudaSatus = 2">已出运</el-button>
+              @click.native="inShipped">已出运</el-button>
             <el-button :type="form.documentaryStatus == '已寄单' ? 'success' : 'info'" size="small" :disabled="!form.id"
               @click.native="dialog = true; fudaSatus = 3">已寄单</el-button>
           </template>
@@ -358,31 +358,50 @@ export default {
           }, {
             label: "汇率",
             prop: "exchangeRate",
-            span: 8,
+            span: 6,
             disabled: true,
           }, {
             label: "日期条款",
             prop: "dateClause",
-            span: 8,
+            span: 6,
             disabled: true,
           }, {
             label: "日期说明",
             prop: "dateDesc",
-            span: 8,
+            span: 6,
             disabled: true,
-          }, {
+          },
+          {
+            label: "工作号",
+            prop: "jobNumber",
+            span: 6,
+          },
+          {
             label: "船名",
             prop: "shipName",
-            span: 8,
+            span: 6,
           }, {
             label: "航次",
             prop: "voyage",
-            span: 8,
-          }, {
-            label: "工作号",
-            prop: "jobNumber",
-            span: 8,
-          }, {
+            span: 6,
+          },
+          {
+            label: "开船日期",
+            prop: "creditDate",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00",
+          },
+          {
+            label: "到港日期",
+            prop: "dateOfArrival",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00",
+          },
+          {
             label: "采购备注",
             prop: "purchaseRemark",
             type: "textarea",
@@ -552,6 +571,14 @@ export default {
     }
   },
   methods: {
+    inShipped() {
+    if (!this.form.shipName) return this.$message.error("请输入船名")
+    if (!this.form.voyage) return this.$message.error("请输入航次")
+    if (!this.form.creditDate) return this.$message.error("请选择开船日期")
+    if (!this.form.dateOfArrival) return this.$message.error("请选择到港日期")
+      this.dialog = true
+      this.fudaSatus = 2
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -60,7 +60,7 @@
         {{ row.productPrice | decimalFormat2 }}
       </template>
       <template slot="outFactoryPrice" slot-scope="{row}">
-        {{ row.outFactoryPrice | decimalFormat2 }}
+        {{ row.outFactoryPrice}}
       </template>
       <template slot="shareAmount" slot-scope="{row}">
         {{ row.shareAmount | decimalFormat2 }}
@@ -242,7 +242,7 @@
       //出厂费用
       <template slot="outFactoryPriceForm" slot-scope="{type,disabled}">
         <el-input v-model="goodsForm.outFactoryPrice" size="small"
-          oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
+          oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
           @change="priceChange(goodsForm)" @input="outFactoryPriceInput(goodsForm)"></el-input>
       </template>
       //分摊金额
@@ -681,7 +681,7 @@ export default {
           row.itemType = e.specs;
           row.tradeTerms = null;
           row.productPrice = productCal(e.purchaseAmount, 0, this.form.coefficient);
-          row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
+          row.outFactoryPrice = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate,3);
           row.shareAmount = 0;
           row.internationalAmount = 0;
           row.totalValue = sellingCal(productCal(e.purchaseAmount, 0, this.form.coefficient), this.form.exchangeRate);
@@ -773,7 +773,7 @@ export default {
           productPrice: productCal(e.purchaseAmount, 0, this.form.coefficient),
           outFactoryPrice: sellingCal(
             productCal(e.purchaseAmount, 0, this.form.coefficient),
-            this.form.exchangeRate
+            this.form.exchangeRate,3
           ),
           shareAmount: 0,
           internationalAmount: 0,
@@ -1071,7 +1071,7 @@ export default {
     submitPriceAD() {
       this.visible = false;
       this.data.forEach(e => {
-        e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, this.priceAD)
+        e.outFactoryPrice = priceaAjustment(e.outFactoryPrice, this.priceAD,3)
         e.totalValue = multiply(e.outFactoryPrice, e.orderQuantity)
         e.price = addPrice(e.outFactoryPrice, e.shareAmount, e.internationalAmount)
         e.amount = amountCal(
@@ -1113,7 +1113,7 @@ export default {
         row.partsPrice,
         this.form.coefficient
       );
-      row.outFactoryPrice = sellingCal(row.productPrice, this.form.exchangeRate);
+      row.outFactoryPrice = sellingCal(row.productPrice, this.form.exchangeRate,3);
       row.totalValue = multiply(row.outFactoryPrice, row.orderQuantity)
       row.price = addPrice(
         row.outFactoryPrice,
@@ -1157,10 +1157,6 @@ export default {
         row.insurance,
         row.discount
       );
-      console.log(row.purchaseAmount, 'purchaseAmount')
-      console.log(row.partsPrice, 'partsPrice')
-      console.log(row.outFactoryPrice, 'outFactoryPrice')
-      console.log(this.form.exchangeRate, 'exchangeRate')
       // this.$set(row,'outFactoryChange',true)
       row.itemMargin = grossProfitCal(
         row.purchaseAmount,
@@ -1359,7 +1355,8 @@ export default {
       );
       this.goodsForm.outFactoryPrice = sellingCal(
         this.goodsForm.productPrice,
-        this.form.exchangeRate
+        this.form.exchangeRate,
+        3
       );
       this.goodsForm.price = addPrice(
         this.goodsForm.outFactoryPrice,

src/views/exportTrade/salesContract/config/mainList.json

@@ -167,6 +167,38 @@
       "searchSpan": 8
     },
     {
+      "label": "船名",
+      "prop": "shipName",
+      "minWidth": 100,
+      "index": 8.1,
+      "overHidden": true
+    },
+    {
+      "label": "航次",
+      "prop": "voyage",
+      "minWidth": 100,
+      "index": 8.2,
+      "overHidden": true
+    },
+    {
+      "label": "开船日期",
+      "prop": "creditDate",
+      "minWidth": 100,
+      "index": 8.3,
+      "overHidden": true,
+         "type": "date",
+       "format": "yyyy-MM-dd"
+    },
+    {
+      "label": "到港日期",
+      "prop": "dateOfArrival",
+      "minWidth": 140,
+      "index": 8.4,
+      "overHidden": true,
+      "type": "date",
+       "format": "yyyy-MM-dd"
+    },
+    {
       "label": "数量合计",
       "prop": "orderQuantity",
       "minWidth": 80,

src/views/exportTrade/salesContract/detailsPage.vue

@@ -227,7 +227,7 @@
           </template>
           <template slot="orderNo">
             <el-input size="mini" v-model="form.orderNo" oninput="this.value=this.value.toUpperCase()" placeholder="请输入 "
-              disabled />
+              :disabled="detailData.status == 1"/>
             <!--:disabled="detailData.status == 1"-->
           </template>
         </avue-form>

src/views/exportTrade/salesContract/index.vue

@@ -212,6 +212,7 @@ export default {
     },
     components: { detailPage },
     async created() {
+        console.log('created')
         this.option = await this.getColumnData(this.getColumnName(4), option);
         getPorts().then(res => {
             this.findObject(this.option.column, "portOfLoad").dicData = res.data;
@@ -236,6 +237,7 @@ export default {
         }
     },
     activated() {
+        console.log('activated')
         if (!this.$store.getters.xsStatus && !this.show) {
             this.show = true;
         }
@@ -253,6 +255,7 @@ export default {
             this.$store.commit("IN_XS_STATUS");
         }
         if (this.$route.query.params) {
+            console.log(111111)
             this.detailData = {
                 id: this.$route.query.params
             };
@@ -260,6 +263,9 @@ export default {
             this.$store.commit("IN_XS_STATUS");
         }
     },
+    beforeMounte(){
+        console.log('beforeMounte')
+    },
     methods: {
         handleClick(tab, event) {
             if (this.activeName == 'first') {
@@ -433,7 +439,13 @@ export default {
             });
         },
         goBack() {
-            this.detailData = this.$options.data().detailData;
+            // this.detailData = this.$options.data().detailData;
+            if (JSON.stringify(this.$route.query) != "{}") {
+                this.$router.$avueRouter.closeTag();
+                this.$router.push({
+                    path: "/exportTrade/salesContract/index"
+                });
+            }
             this.show = true;
             this.onLoad(this.page, this.search);
             this.$store.commit("OUT_XS_STATUS");

src/views/iosBasicData/ComputationCenter/index.vue

@@ -49,10 +49,10 @@
                     <span class="pointerClick" @click="editfun(row)">{{ row.billNo }}
                     </span>
                 </template>
-                <template slot="requestNo" slot-scope="{row}">
+                <!-- <template slot="requestNo" slot-scope="{row}">
                     <span class="pointerClick" @click="editfun2(row)">{{ row.requestNo }}
                     </span>
-                </template>
+                </template> -->
             </avue-crud>
         </basic-container>
 
@@ -340,7 +340,6 @@ export default {
         },
         // 编辑
         editfun(row) {
-            console.log(this.tabsValue)
             if (this.tabsValue == 'C') {
                 if (this.$store.getters.payAppStatus) {
                     this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
@@ -387,19 +386,37 @@ export default {
         // 编辑
         editfun2(row) {
             if (row.dc == 'C') {
-                this.$router.push({
-                    path: "/iosBasicData/PaymentApplication/index",
-                    query: {
-                        id: row.id
-                    }
-                });
+                if (this.$store.getters.payAppStatus) {
+                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/PaymentApplication/index`,
+                        query: {
+                            id: row.id
+                        }
+                    })
+                }
             } else {
-                this.$router.push({
-                    path: "/iosBasicData/fininvoicesOutput/index",
-                    query: {
-                        id: row.id
-                    }
-                });
+                if (this.$store.getters.finOutStatus) {
+                    this.$alert("销项发票页面已存在,请关闭销项发票再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/fininvoicesOutput/index`,
+                        query: {
+                            id: row.id
+                        }
+                    })
+                }
             }
         },
         // 详情的返回列表

src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -566,34 +566,6 @@ export default {
                 align: 'center',
                 column: [
                     {
-                        label: "单据类型",
-                        prop: "billType",
-                        type: 'select',
-                        search: true,
-                        span: 6,
-                        searchOrder: 4,
-                        dicData: [{
-                            label: '直单',
-                            value: 'DD'
-                        }, {
-                            label: '主单',
-                            value: 'MM'
-                        }, {
-                            label: '分单',
-                            value: 'MH'
-                        }],
-                        overHidden: true,
-                    },
-                    {
-                        label: "单据编号",
-                        prop: "billNo",
-                        width: "160",
-                        overHidden: true,
-                        search: true,
-                        span: 6,
-                        searchOrder: 3,
-                    },
-                    {
                         label: "所属团队",
                         prop: "teamName",
                         overHidden: true,
@@ -615,7 +587,7 @@ export default {
                             res: 'data.records'
                         },
                         span: 6,
-                        searchOrder: 2,
+                        searchOrder: 1,
                     },
                     {
                         label: "客户英文",
@@ -624,6 +596,53 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 2,
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 3,
+                    },
+                    {
+                        label: "单据类型",
+                        prop: "billType",
+                        type: 'select',
+                        search: true,
+                        span: 6,
+                        searchOrder: 4,
+                        dicData: [{
+                            label: '直单',
+                            value: 'DD'
+                        }, {
+                            label: '主单',
+                            value: 'MM'
+                        }, {
+                            label: '分单',
+                            value: 'MH'
+                        }],
+                        overHidden: true,
+                    },
+                    
+                    {
+                        label: "单据编号",
+                        prop: "billNo",
+                        width: "160",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 5,
+                    },
+                    {
                         label: "船名",
                         prop: "vesselCnName",
                         overHidden: true,
@@ -648,25 +667,7 @@ export default {
                         overHidden: true,
                         search: true,
                         span: 6,
-                        searchOrder: 6,
-                    },
-                    {
-                        label: "MB/L NO",
-                        prop: "mblno",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        span: 6,
-                        searchOrder: 1,
-                    },
-                    {
-                        label: "HB/L NO",
-                        prop: "hblno",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        span: 6,
-                        searchOrder: 5,
+                        searchOrder: 7,
                     },
                     {
                         label: "开船日期",
@@ -681,7 +682,7 @@ export default {
                         searchDefaultTime: ["00:00:00", "23:59:59"],
                         search: true,
                         span: 6,
-                        searchOrder: 14,
+                        searchOrder: 8,
                     },
                     {
                         label: "到港日期",
@@ -697,7 +698,7 @@ export default {
                         searchDefaultTime: ["00:00:00", "23:59:59"],
                         search: true,
                         span: 6,
-                        searchOrder: 15,
+                        searchOrder: 9,
                     },
                     {
                         label: "船公司",
@@ -715,7 +716,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 8,
+                        searchOrder: 10,
                     },
                     {
                         label: "装货港",
@@ -740,7 +741,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 9,
+                        searchOrder: 11,
                     },
                     {
                         label: "航线",
@@ -759,7 +760,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 10,
+                        searchOrder: 12,
                     },
                     {
                         label: "场站",
@@ -778,7 +779,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 11,
+                        searchOrder: 13,
                     },
                     {
                         label: "箱型/箱量",
@@ -807,7 +808,7 @@ export default {
                         overHidden: true,
                         search: true,
                         span: 6,
-                        searchOrder: 12,
+                        searchOrder: 14,
                     },
                     {
                         label: "来源详情",
@@ -816,7 +817,7 @@ export default {
                         overHidden: true,
                         search: true,
                         span: 6,
-                        searchOrder: 13,
+                        searchOrder: 15,
                     },
                     {
                         label: "装箱方式",
@@ -881,7 +882,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 16,
+                        searchOrder: 17,
                     },
                     {
                         label: "收货人",
@@ -916,7 +917,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 17,
+                        searchOrder: 19,
                     },
                     {
                         label: "唛头",

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -13,7 +13,7 @@
                 <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
-                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id || editPower"
+                <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id || editPower||$route.query.id"
                             v-if="form.status == '0' || form.status == '4'"
                             :loading="saveLoading" @click="editCustomer('申请')">提交申请
                 </el-button>
@@ -23,7 +23,7 @@
                 </el-button>
                 <span v-if="form.status == '3'" style="font-size: 12px;padding-right: 10px;" >审核通过</span>
                 <el-button  size="small" type="primary" style="margin-right: 8px"
-                            :disabled="!(form.status == '0' || form.status == '4') || editPower"
+                            :disabled="!(form.status == '0' || form.status == '4') || editPower||$route.query.id"
                             v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
                 </el-button>

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -557,7 +557,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 24,
                 searchLabelWidth: '100',
                 border: true,
                 index: true,
@@ -574,34 +574,6 @@ export default {
                 menuWidth: 'auto',
                 align: 'center',
                 column: [
-                    {
-                        label: "单据类型",
-                        prop: "billType",
-                        type: 'select',
-                        search: true,
-                        span: 6,
-                        searchOrder: 4,
-                        dicData: [{
-                            label: '直单',
-                            value: 'DD'
-                        }, {
-                            label: '主单',
-                            value: 'MM'
-                        }, {
-                            label: '分单',
-                            value: 'MH'
-                        }],
-                        overHidden: true,
-                    },
-                    {
-                        label: "单据编号",
-                        prop: "billNo",
-                        width: "160",
-                        overHidden: true,
-                        search: true,
-                        span: 6,
-                        searchOrder: 3,
-                    },
                     // {
                     //     label: "所属团队",
                     //     prop: "teamName",
@@ -624,7 +596,7 @@ export default {
                             res: 'data.records'
                         },
                         span: 6,
-                        searchOrder: 2,
+                        searchOrder: 1,
                     },
                     {
                         label: "客户英文",
@@ -633,6 +605,52 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "MB/L NO",
+                        prop: "mblno",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 2,
+                    },
+                    {
+                        label: "HB/L NO",
+                        prop: "hblno",
+                        width: "80",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 3,
+                    },
+                    {
+                        label: "单据类型",
+                        prop: "billType",
+                        type: 'select',
+                        search: true,
+                        span: 6,
+                        searchOrder: 3.1,
+                        dicData: [{
+                            label: '直单',
+                            value: 'DD'
+                        }, {
+                            label: '主单',
+                            value: 'MM'
+                        }, {
+                            label: '分单',
+                            value: 'MH'
+                        }],
+                        overHidden: true,
+                    },
+                    {
+                        label: "单据编号",
+                        prop: "billNo",
+                        width: "160",
+                        overHidden: true,
+                        search: true,
+                        span: 6,
+                        searchOrder: 4,
+                    },
+                    {
                         label: "船名",
                         prop: "vesselCnName",
                         overHidden: true,
@@ -648,7 +666,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 6,
+                        searchOrder: 5,
                     },
                     {
                         label: "航次",
@@ -660,31 +678,13 @@ export default {
                         searchOrder: 6,
                     },
                     {
-                        label: "MB/L NO",
-                        prop: "mblno",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        span: 6,
-                        searchOrder: 1,
-                    },
-                    {
-                        label: "HB/L NO",
-                        prop: "hblno",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        span: 6,
-                        searchOrder: 5,
-                    },
-                    {
                         label: "booking NO",
                         prop: "bookingNo",
                         width: "120",
                         overHidden: true,
                         search: true,
                         span: 6,
-                        searchOrder: 5,
+                        searchOrder: 7,
                     },
                     {
                         label: "开船日期",
@@ -699,7 +699,7 @@ export default {
                         searchDefaultTime: ["00:00:00", "23:59:59"],
                         search: true,
                         span: 6,
-                        searchOrder: 14,
+                        searchOrder: 8,
                     },
                     {
                         label: "到港日期",
@@ -715,7 +715,7 @@ export default {
                         searchDefaultTime: ["00:00:00", "23:59:59"],
                         search: true,
                         span: 6,
-                        searchOrder: 15,
+                        searchOrder: 9,
                     },
                     {
                         label: "船公司",
@@ -733,7 +733,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 8,
+                        searchOrder: 10,
                     },
                     {
                         label: "装货港",
@@ -758,7 +758,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 9,
+                        searchOrder: 11,
                     },
                     {
                         label: "航线",
@@ -777,7 +777,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 10,
+                        searchOrder: 12,
                     },
                     {
                         label: "场站",
@@ -796,7 +796,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 11,
+                        searchOrder: 13,
                     },
                     {
                         label: "箱型/箱量",
@@ -831,7 +831,7 @@ export default {
                         overHidden: true,
                         search: true,
                         span: 6,
-                        searchOrder: 12,
+                        searchOrder: 14,
                     },
                     {
                         label: "来源详情",
@@ -840,7 +840,7 @@ export default {
                         overHidden: true,
                         search: true,
                         span: 6,
-                        searchOrder: 13,
+                        searchOrder: 15,
                     },
                     {
                         label: "装箱方式",
@@ -905,7 +905,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 16,
+                        searchOrder: 17,
                     },
                     {
                         label: "收货人",
@@ -940,7 +940,7 @@ export default {
                         },
                         search: true,
                         span: 6,
-                        searchOrder: 17,
+                        searchOrder: 19,
                     },
                     {
                         label: "唛头",