海运进出口新加箱属

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

@@ -153,7 +153,7 @@
                 <template slot="eta" slot-scope="scope">
                     <span>{{
                         scope.row.eta ? scope.row.eta.slice(0, 10) : ""
-                    }}</span>
+                        }}</span>
                 </template>
                 <template slot="updateTime" slot-scope="scope">
                     <span>{{
@@ -458,7 +458,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 12,
                 searchLabelWidth: "100",
                 border: true,
                 index: true,
@@ -532,13 +532,13 @@ export default {
                         width: "160",
                         overHidden: true
                     },
-                    {
-                        label: '箱属',
-                        prop: 'boxBelongsTo',
-                        width: 100,
-                        overHidden: true,
-                        disabled: true,
-                    },
+                    // {
+                    //     label: '箱属',
+                    //     prop: 'boxBelongsTo',
+                    //     width: 100,
+                    //     overHidden: true,
+                    //     disabled: true,
+                    // },
                     {
                         label: "MB/L NO",
                         prop: "mblno",
@@ -723,6 +723,19 @@ export default {
                         //showColumn: false
                     },
                     {
+                        label: '箱属',
+                        prop: 'boxBelongsTo',
+                        overHidden: true,
+                        type: 'select',
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
+                        search: true,
+                        searchOrder: 10.1
+                    },
+                    {
                         label: "装货港",
                         prop: "polEnName",
                         width: "120",
@@ -1460,7 +1473,7 @@ export default {
             this.mawbOptionBack
         ); // 主单列表
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 12
+            this.option.searchMenuSpan = 6
             this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -1773,12 +1786,6 @@ export default {
         },
         // 展开和收起
         shiftCollapsiable() {
-            this.fold = !this.fold;
-            if (this.fold) {
-                this.option.searchMenuSpan = 24;
-            } else {
-                this.option.searchMenuSpan = 6;
-            }
         },
         // 下拉的回调
         corpChange(value, name) {
@@ -2526,7 +2533,7 @@ export default {
                 this[optionBack]
             );
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 12
+                this.option.searchMenuSpan = 6
                 this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true

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

@@ -184,7 +184,7 @@
                 <template slot="eta" slot-scope="scope">
                     <span>{{
                         scope.row.eta ? scope.row.eta.slice(0, 10) : ""
-                        }}</span>
+                    }}</span>
                 </template>
                 <template slot="updateTime" slot-scope="scope">
                     <span>{{
@@ -659,13 +659,13 @@ export default {
                         span: 6,
                         searchOrder: 1.1
                     },
-                    {
-                        label: '箱属',
-                        prop: 'boxBelongsTo',
-                        width: 100,
-                        overHidden: true,
-                        disabled: true,
-                    },
+                    // {
+                    //     label: '箱属',
+                    //     prop: 'boxBelongsTo',
+                    //     width: 100,
+                    //     overHidden: true,
+                    //     disabled: true,
+                    // },
                     {
                         label: "MB/L NO",
                         prop: "mblno",
@@ -843,11 +843,19 @@ export default {
                         searchOrder: 10,
                         // hide: true,
                     },
-                    // {
-                    //     label: "承运人",
-                    //     prop: "carrierShortName",
-                    //     overHidden: true
-                    // },
+                    {
+                        label: '箱属',
+                        prop: 'boxBelongsTo',
+                        overHidden: true,
+                        type: 'select',
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
+                        search: true,
+                        searchOrder: 10.1
+                    },
                     {
                         label: "装货港",
                         prop: "polEnName",
@@ -1532,7 +1540,7 @@ export default {
             this.$refs.freightRate.openDialog(obj, ids.join(','))
         },
         checkSubmit() {
-            if (this.selectionList.filter(item => item.whetherExtractCost==1).length) {
+            if (this.selectionList.filter(item => item.whetherExtractCost == 1).length) {
                 this.$confirm('已提取成本，是否再次提取?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',