Browse Source

修改货代

Qukatie 5 months ago
parent
commit
0815163c2d

+ 511 - 66
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -302,7 +302,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        // cell:true,
+                        display: false,
                         type: "select",
                         // dicData:[],
                         props: {
@@ -331,7 +331,7 @@ export default {
                         prop: "commodityCnName",
                         labelWidth: 130,
                         width: "120",
-                        // display: false,
+                        display: false,
                         overHidden: true,
                         rules: [{
                             required: true,
@@ -353,7 +353,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "包装等级",
@@ -361,7 +361,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                         rules: [{
                             required: true,
                             message: "",
@@ -374,7 +374,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                         rules: [{
                             required: true,
                             message: "",
@@ -387,7 +387,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                         rules: [{
                             required: true,
                             message: "",
@@ -402,7 +402,7 @@ export default {
                         type: 'number',
                         controls: false,
                         overHidden: true,
-                        cell: true,
+                        display: false,
                         rules: [{
                             required: true,
                             message: "",
@@ -415,9 +415,8 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                         type: "select",
-                        dicData: [],
                         props: {
                             label: "cnName",
                             value: "cnName"
@@ -441,7 +440,7 @@ export default {
                         type: 'number',
                         controls: false,
                         overHidden: true,
-                        cell: true,
+                        display: false,
                         rules: [{
                             required: true,
                             message: "",
@@ -456,7 +455,7 @@ export default {
                         type: 'number',
                         controls: false,
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "装箱体积(CBM)",
@@ -466,7 +465,7 @@ export default {
                         type: 'number',
                         controls: false,
                         overHidden: true,
-                        cell: true,
+                        display: false,
                         rules: [{
                             required: true,
                             message: "",
@@ -485,7 +484,7 @@ export default {
                             label: "dictValue",
                             value: "dictKey"
                         },
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "DG CLASS",
@@ -494,7 +493,6 @@ export default {
                         width: "200",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "DG CLASS NAME",
@@ -503,7 +501,6 @@ export default {
                         width: "140",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "危险品国际代码",
@@ -512,7 +509,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "危险品名称",
@@ -521,7 +517,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "危险品包装",
@@ -530,12 +525,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
-                        // type: "select",
-                        // props: {
-                        //     label: "dictValue",
-                        //     value: "dictKey"
-                        // },
-                        cell: true,
                         // dicUrl: '/api/blade-system/dict-biz/dictionary?code=hazardous_Units',
                     },
                     {
@@ -545,7 +534,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "易燃易爆品闪点",
@@ -556,7 +544,6 @@ export default {
                         controls: false,
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "易燃易爆品闪点单位",
@@ -565,7 +552,6 @@ export default {
                         width: "140",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "危险品联系人",
@@ -574,7 +560,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "危险品联系人电话",
@@ -583,7 +568,6 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
-                        cell: true,
                     },
                     {
                         label: "是否海洋污染物",
@@ -597,7 +581,7 @@ export default {
                             label: "dictValue",
                             value: "dictKey"
                         },
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "是否申报数量",
@@ -611,7 +595,7 @@ export default {
                             label: "dictValue",
                             value: "dictKey"
                         },
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "CAS NO",
@@ -619,7 +603,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "CAA INFO",
@@ -627,7 +611,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "DC Weight",
@@ -637,7 +621,7 @@ export default {
                         type: 'number',
                         controls: false,
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "Emergency温度",
@@ -647,7 +631,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "Emergency温度单位",
@@ -655,7 +639,7 @@ export default {
                         labelWidth: 130,
                         width: "140",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "Control温度",
@@ -665,7 +649,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "Control温度单位",
@@ -673,7 +657,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "左超 厘米",
@@ -683,7 +667,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "右超 厘米",
@@ -693,7 +677,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "前超 厘米",
@@ -703,7 +687,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "后超 厘米",
@@ -713,7 +697,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "超高 厘米",
@@ -723,7 +707,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "CUS CODE",
@@ -731,7 +715,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
                     {
                         label: "NCM",
@@ -739,8 +723,470 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         overHidden: true,
-                        cell: true,
+                        display: false,
                     },
+                ],
+                group: [
+                    {
+                        label: '通用数据',
+                        prop: 'type1',
+                        icon: 'el-icon-edit-outline',
+                        column: [
+                            {
+                                label: "商品HS-CODE",
+                                prop: "hscode",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                // cell:true,
+                                type: "select",
+                                // dicData:[],
+                                props: {
+                                    label: "hsCode",
+                                    value: "hsCode",
+                                    res: 'data.records'
+                                },
+                                remote: true,
+                                dicUrl: '/api/blade-los/bcommodity/list?hsCode={{key}}',
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "商品中文名称",
+                                prop: "commodityCnName",
+                                labelWidth: 130,
+                                width: "120",
+                                // display: false,
+                                overHidden: true,
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "装箱件数",
+                                prop: "quantity",
+                                labelWidth: 130,
+                                width: "120",
+                                type: 'number',
+                                controls: false,
+                                overHidden: true,
+                                cell: true,
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "包装单位",
+                                prop: "packingUnit",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                                type: "select",
+                                props: {
+                                    label: "cnName",
+                                    value: "cnName"
+                                },
+                                remote: true,
+                                dicUrl: '/api/blade-los/bunits/list?cnName={{key}}&whetherDg=0',
+                                dicFormatter: (res => {
+                                    return res.data.records
+                                }),
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "装箱毛重(KGM)",
+                                prop: "grossWeight",
+                                labelWidth: 130,
+                                width: "120",
+                                type: 'number',
+                                controls: false,
+                                overHidden: true,
+                                cell: true,
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "装箱净重(KGM)",
+                                prop: "netWeight",
+                                labelWidth: 130,
+                                width: "120",
+                                type: 'number',
+                                controls: false,
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "装箱体积(CBM)",
+                                prop: "measurement",
+                                labelWidth: 130,
+                                width: "120",
+                                type: 'number',
+                                controls: false,
+                                overHidden: true,
+                                cell: true,
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "货物短描",
+                                prop: "commodityShortDescr",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                display: true,
+                            },
+                            {
+                                label: "货物描述",
+                                prop: "commodityDescr",
+                                type: 'textarea',
+                                minRows: 2,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "唛头",
+                                prop: "marks",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                type: 'textarea',
+                                minRows: 2,
+                                cell: true,
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                        ]
+                    },
+                    {
+                        label: '化工信息',
+                        prop: 'type2',
+                        icon: 'el-icon-edit-outline',
+                        column: [
+                            {
+                                label: "是否危险品",
+                                prop: "isDangerous",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                type: "select",
+                                dicUrl: '/api/blade-system/dict-biz/dictionary?code=ifInvoice',
+                                props: {
+                                    label: "dictValue",
+                                    value: "dictKey"
+                                },
+                                cell: true,
+                            },
+                            {
+                                label: "DG CLASS",
+                                prop: "dgImdgCode",
+                                labelWidth: 130,
+                                width: "200",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "DG CLASS NAME",
+                                prop: "dgImdgName",
+                                labelWidth: 130,
+                                width: "140",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "危险品国际代码",
+                                prop: "dgUnCode",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "危险品名称",
+                                prop: "dgCommodityName",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "危险品包装",
+                                prop: "dgPackingUnit",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                display: false,
+                                // type: "select",
+                                // props: {
+                                //     label: "dictValue",
+                                //     value: "dictKey"
+                                // },
+                                cell: true,
+                                // dicUrl: '/api/blade-system/dict-biz/dictionary?code=hazardous_Units',
+                            },
+                            {
+                                label: "危险品包装等级",
+                                prop: "dgPackingLevel",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "易燃易爆品闪点",
+                                prop: "dgFlashPoint",
+                                labelWidth: 130,
+                                width: "120",
+                                type: 'number',
+                                controls: false,
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "易燃易爆品闪点单位",
+                                prop: "dgFlashPointUnit",
+                                labelWidth: 130,
+                                width: "140",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "危险品联系人",
+                                prop: "dgContacts",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "危险品联系人电话",
+                                prop: "dgTel",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                display: false,
+                                cell: true,
+                            },
+                            {
+                                label: "是否海洋污染物",
+                                prop: "dgIsMarinePollutant",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                type: "select",
+                                dicUrl: '/api/blade-system/dict-biz/dictionary?code=ifInvoice',
+                                props: {
+                                    label: "dictValue",
+                                    value: "dictKey"
+                                },
+                                cell: true,
+                            },
+                            {
+                                label: "包装等级",
+                                prop: "packingLevel",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                                rules: [{
+                                    required: true,
+                                    message: "",
+                                    trigger: "blur"
+                                }]
+                            },
+                            {
+                                label: "是否申报数量",
+                                prop: "dgIsDeclareQuantity",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                type: "select",
+                                dicUrl: '/api/blade-system/dict-biz/dictionary?code=ifInvoice',
+                                props: {
+                                    label: "dictValue",
+                                    value: "dictKey"
+                                },
+                                cell: true,
+                            },
+                            {
+                                label: "CAS NO",
+                                prop: "dgCasNo",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "CAA INFO",
+                                prop: "dgCaaInfo",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "DC Weight",
+                                prop: "dgDcWeight",
+                                labelWidth: 130,
+                                width: "120",
+                                type: 'number',
+                                controls: false,
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "Emergency温度",
+                                prop: "dgEmerTemperature",
+                                type: 'number',
+                                controls: false,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "Emergency温度单位",
+                                prop: "dgEmerTemperatureUnit",
+                                labelWidth: 130,
+                                width: "140",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "Control温度",
+                                prop: "dgCtrlTemperature",
+                                type: 'number',
+                                controls: false,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "Control温度单位",
+                                prop: "dgCtrlTemperatureUnit",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                        ]
+                    },
+                    {
+                        label: '特种箱信息',
+                        prop: 'type3',
+                        icon: 'el-icon-edit-outline',
+                        column: [
+                            {
+                                label: "左超 厘米",
+                                prop: "overLeft",
+                                type: 'number',
+                                controls: false,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "右超 厘米",
+                                prop: "overRight",
+                                type: 'number',
+                                controls: false,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "前超 厘米",
+                                prop: "overFront",
+                                type: 'number',
+                                controls: false,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "后超 厘米",
+                                prop: "overBack",
+                                type: 'number',
+                                controls: false,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "超高 厘米",
+                                prop: "overTop",
+                                type: 'number',
+                                controls: false,
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                        ]
+                    },
+                    {
+                        label: '其他',
+                        prop: 'type4',
+                        icon: 'el-icon-edit-outline',
+                        column: [
+                            {
+                                label: "CUS CODE",
+                                prop: "cusCode",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                            {
+                                label: "NCM",
+                                prop: "ncm",
+                                labelWidth: 130,
+                                width: "120",
+                                overHidden: true,
+                                cell: true,
+                            },
+                        ]
+                    }
                 ]
             },
             selectionDetailList: [], // 选中的数据
@@ -764,29 +1210,25 @@ export default {
             // 执行方法
             handler(oldValue, newValue) {
                 if (oldValue == '1') {
-                    this.findObject(this.optionDetail.column, "dgImdgCode").display = true
-                    this.findObject(this.optionDetail.column, "dgImdgName").display = true
-                    this.findObject(this.optionDetail.column, "dgUnCode").display = true
-                    this.findObject(this.optionDetail.column, "dgCommodityName").display = true
-                    this.findObject(this.optionDetail.column, "dgPackingUnit").display = true
-                    this.findObject(this.optionDetail.column, "dgPackingLevel").display = true
-                    this.findObject(this.optionDetail.column, "dgFlashPoint").display = true
-                    this.findObject(this.optionDetail.column, "dgFlashPointUnit").display = true
-                    this.findObject(this.optionDetail.column, "dgContacts").display = true
-                    this.findObject(this.optionDetail.column, "dgTel").display = true
+                    this.optionDetail.group.forEach(item => {
+                        if (item.prop == 'type2') {
+                            item.column.forEach(row => {
+                                if (row.prop == 'dgImdgCode' || row.prop == 'dgImdgName' || row.prop == 'dgUnCode' || row.prop == 'dgCommodityName' || row.prop == 'dgPackingUnit' || row.prop == 'dgPackingLevel' || row.prop == 'dgFlashPoint' || row.prop == 'dgFlashPointUnit' || row.prop == 'dgContacts' || row.prop == 'dgTel') {
+                                    row.display = true
+                                }
+                            })
+                        }
+                    })
                 } else if (oldValue == '0') {
-                    this.findObject(this.optionDetail.column, "dgImdgCode").display = false
-                    this.findObject(this.optionDetail.column, "dgImdgName").display = false
-                    this.findObject(this.optionDetail.column, "dgUnCode").display = false
-                    this.findObject(this.optionDetail.column, "dgCommodityName").display = false
-                    this.findObject(this.optionDetail.column, "dgPackingUnit").display = false
-                    this.findObject(this.optionDetail.column, "dgPackingLevel").display = false
-                    this.findObject(this.optionDetail.column, "dgFlashPoint").display = false
-                    this.findObject(this.optionDetail.column, "dgFlashPointUnit").display = false
-                    this.findObject(this.optionDetail.column, "dgContacts").display = false
-                    this.findObject(this.optionDetail.column, "dgTel").display = false
-                } else {
-
+                    this.optionDetail.group.forEach(item => {
+                        if (item.prop == 'type2') {
+                            item.column.forEach(row => {
+                                if (row.prop == 'dgImdgCode' || row.prop == 'dgImdgName' || row.prop == 'dgUnCode' || row.prop == 'dgCommodityName' || row.prop == 'dgPackingUnit' || row.prop == 'dgPackingLevel' || row.prop == 'dgFlashPoint' || row.prop == 'dgFlashPointUnit' || row.prop == 'dgContacts' || row.prop == 'dgTel') {
+                                    row.display = false
+                                }
+                            })
+                        }
+                    })
                 }
             },
             deep: true, // 深度监听
@@ -799,6 +1241,9 @@ export default {
     methods: {
         // 货物详情弹窗开启
         DetailAdd() {
+            this.Detailform.packingUnit=this.assemblyForm.packingUnit
+            this.Detailform.commodityDescr=this.assemblyForm.commodityDescr
+            this.Detailform.marks=this.assemblyForm.marks
             this.$refs.crudDetail.rowAdd()
         },
         // 货物明细单个保存接口