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

wtt

2025-04-10 6babdde186564c348a68f1a080b2a6323c5815f6

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldLifeUsePicReport.html

@@ -239,7 +239,7 @@
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldRepairInBillList/Get_Sc_MouldLifeUsePicReport',
                    url: GetWEBURL() + '/Sc_MouldRepairInBillList/Get_Sc_MouldLifeUsePicReport_list',
                    type: "GET",
                    async:false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -253,8 +253,7 @@
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            for (var i = 0; i < data.length; i++) {                               
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
@@ -314,41 +313,28 @@
                var HMouldNo = $("#HMouldNo").val();
                var HName = $("#HName").val();            

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(7),日期, 23) >= '" + HBeginDate + "'";
                 sWhere = {
                     HBeginDate: HBeginDate
                     , HEndDate: HEndDate
                     , HMouldNo: HMouldNo
                     , HName: HName
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(7),日期, 23) <= '" + HEndDate + "'";
                }

                if (HMouldNo != "" || HName != "") {
                    if (HMouldNo) {
                        sWhere += " and æ¨¡å…·ç¼–号 like '%" + HMouldNo + "%'";
                    }
                    if (HName) {
                        sWhere += " and æ¨¡å…·åç§° like '%" + HName + "%'";
                    }
                    get_Display(sWhere);
                    get_Display(JSON.stringify(sWhere));
                    //加载柱状图
                    set_Graphics();
                } else {
                    if (HMouldNo) {
                        sWhere += " and æ¨¡å…·ç¼–号 like '%" + HMouldNo + "%'";
                    }
                    if (HName) {
                        sWhere += " and æ¨¡å…·åç§° like '%" + HName + "%'";
                    }
                    get_Display(sWhere);
                }
                  
               
                    get_Display(JSON.stringify(sWhere));
                }               
                sWhere = "";//调用接口后清空sWhere缓存

            }
            //重置快速查询
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 3)), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期          

                $("#HMouldNo").val("");
                $("#HName").val("");
                $("#btnSearch").click();             
                form.render('select');