Merge branch 'master' of http://git.echepei.com/caojunjie/digital_transformation_ui

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

@@ -628,11 +628,18 @@ export default {
                         span: 6,
                         searchOrder: 1.1
                     },
-                    {
+/*                    {
                         label: "客户英文",
                         prop: "corpEnName",
                         width: "160",
                         overHidden: true
+                    },*/
+                    {
+                        label: '箱属',
+                        prop: 'boxBelongsTo',
+                        width: 100,
+                        overHidden: true,
+                        disabled: true,
                     },
                     {
                         label: "MB/L NO",
@@ -643,12 +650,13 @@ export default {
                         span: 6,
                         searchOrder: 2
                     },
-                    {
+
+/*                    {
                         label: "M/PayMode",
                         prop: "mpaymode",
                         width: "100",
                         overHidden: true
-                    },
+                    },*/
                     {
                         label: "HB/L NO",
                         prop: "hblno",
@@ -658,14 +666,14 @@ export default {
                         span: 6,
                         searchOrder: 3
                     },
-                    {
-                        label: "H/PayMode",
+/*                    {
+                       label: "H/PayMode",
                         prop: "hpaymode",
                         width: "100",
                         overHidden: true
-                    },
+                    },*/
                     {
-                        label: "主单号",
+                        label: "主业务编号",
                         prop: "masterBillNo",
                         width: "100",
                         overHidden: true
@@ -699,46 +707,7 @@ export default {
                         ],
                         overHidden: true
                     },
-                    {
-                        label: "物流状态",
-                        prop: "logisticsStatus",
-                        type: "select",
-                        search: true,
-                        span: 6,
-                        searchOrder: 3.2,
-                        dicData: [
-                            {
-                                label: "录入",
-                                value: "录入"
-                            },
-                            {
-                                label: "已提交",
-                                value: "已提交"
-                            }
-                        ],
-                        overHidden: true
-                    },
-                    {
-                        label: "转单状态",
-                        prop: "transferOrderStatus",
-                        width: "100",
-                        type: "select",
-                        search: true,
-                        span: 6,
-                        searchOrder: 3.3,
-                        dicData: [
-                            {
-                                label: "录入",
-                                value: "录入"
-                            },
-                            {
-                                label: "已转单",
-                                value: "已转单"
-                            }
-                        ],
-                        overHidden: true
-                    },
-                    {
+                      {
                         label: "单据编号",
                         prop: "billNo",
                         width: "160",
@@ -962,6 +931,45 @@ export default {
                     //     overHidden:true,
                     // },
                     {
+                        label: "物流状态",
+                        prop: "logisticsStatus",
+                        type: "select",
+                        search: true,
+                        span: 6,
+                        searchOrder: 3.2,
+                        dicData: [
+                            {
+                                label: "录入",
+                                value: "录入"
+                            },
+                            {
+                                label: "已提交",
+                                value: "已提交"
+                            }
+                        ],
+                        overHidden: true
+                    },
+                    {
+                        label: "转单状态",
+                        prop: "transferOrderStatus",
+                        width: "100",
+                        type: "select",
+                        search: true,
+                        span: 6,
+                        searchOrder: 3.3,
+                        dicData: [
+                            {
+                                label: "录入",
+                                value: "录入"
+                            },
+                            {
+                                label: "已转单",
+                                value: "已转单"
+                            }
+                        ],
+                        overHidden: true
+                    },
+                    {
                         label: "业务来源",
                         prop: "srcType",
                         type: "select",