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

杨乐

2022-01-21 273cc468834c39aa634a4ceb45b4ab2136884bea

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú°ü×°µ¥/Sc_PackUnionBill.html

@@ -184,10 +184,12 @@
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                cols_arr = [];
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                cols_arr = [];
                get_FastQuery();
            });

@@ -222,7 +224,6 @@
            }
            //初始化表格
            function set_InitGrid(sWhere) {

                //填充表格头数组
                var data = resultTableHead;
                cols_arr[0] = [];
@@ -235,14 +236,14 @@
                        switch (data[i].Type) {
                            //int
                            case 'Int32':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 100 };
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', width: 100 };
                                break;
                            //Decimal
                            case 'Decimal':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', width: 200 };
                                break;
                            default:
                                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', width: 200 };
                        }
                    }
                }
@@ -317,6 +318,7 @@
                var HMaterNumber = $("#HMaterNumber").val();
                var HMaterName = $("#HMaterName").val();
                var HMakerMan = $("#HMakerMan").val();
                
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }