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

仲国强

2021-08-31 115fdabd4b0da0bb1924a0a54860afdbb0ace5c3

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldConkBookBillList.html

@@ -220,7 +220,7 @@
                        , { field: '行关闭人', title: '行关闭人', width: 115 }
                        , { field: '关闭类型', title: '关闭类型', width: 200 }
                        , { field: '表体备注', title: '表体备注', width: 200, hide: true }
                        , { field: '制单人', title: '制单人', width: 115, hide: true }
                        , { field: '制单人', title: '制单人', width: 115}
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: '审核人', title: '审核人', width: 200 }
                        , { field: '审核日期', title: '审核日期', width: 200, templet: "<div>{{d.审核日期 ==null ? '':layui.util.toDateString(d.审核日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
@@ -241,7 +241,7 @@

            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var index = layer.load();//遮罩
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
@@ -270,16 +270,16 @@
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                if (HBillNo) {
                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HCreateBy) {
                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                    sWhere += " and åˆ¶å•äºº like '%" + HCreateBy + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + EndHCreateDate + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -296,7 +296,7 @@
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../模治具管理/Sc_Add_MouldConkBookBillList.html',
                    content: '../模治具管理/Sc_Add_MouldConkBookBillList.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
@@ -312,7 +312,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].hmainid.toString();
                    var linterid = data[0].hmainid.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
@@ -322,7 +322,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../模治具管理/Sc_Add_MouldConkBookBillList.html?hID=' + hID
                        , content: '../模治具管理/Sc_Add_MouldConkBookBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,