Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-03-06 aa95c69b8ab25f467c82364e4bd102525289ce5a

 WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html

@@ -349,12 +349,20 @@
                    else {
                        switch (data[i].Type) {
                            //int
                            //case 'Int32':
                            //    cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 100 };
                            //    break;
                            ////Decimal
                            //case 'Decimal':
                            //    cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };
                            //    break;
                            case 'long':
                            case 'Int32':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 100 };
                                break;
                            //Decimal
                            case 'Int64':
                            case 'double':
                            case 'Decimal':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };
                                cols_arr[0][i + 1] = {
                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true };
                                break;
                            default:
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };