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

yusijie

2024-03-07 877db34b03c39f2ae2270a9d66f21a63e9791e66

 WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html

@@ -287,6 +287,7 @@
                    , height: 550
                    , page: true
                    //, cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
@@ -373,6 +374,13 @@
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>"});
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
@@ -434,6 +442,13 @@
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -446,6 +461,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [col]
                                , data: data1.data
                                , totalRow: true
                                , height: 550
                                , page: true
                                //, cellMinWidth: 90