Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

payne

2024-04-26 bac077fc7f67a1002b4dafa64e069cbbaabc646a

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue

@@ -616,26 +616,26 @@
                    sorter: true,
                    dataIndex: 'translateRate'
                },
                {
                    title: '批次属性规则',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'batchRuleId'
                },
                // {
                //     title: '批次属性规则',
                //     align: 'center',
                //     customHeaderCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     customCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     sorter: true,
                //     dataIndex: 'batchRuleId'
                // },
                // {
                //     title: '控制属性规则',
                //     align: 'center',