智云MES-UI前端
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wtt
2025-10-30 d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a 
 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList2.html


@@ -780,7 +780,7 @@


                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";


                            break;


                    }


                    sWhere += " and " + ColName1 + " " + com1;


                    sqlWhere += " and " + ColName1 + " " + com1;


                }


                if (ColName2 != 0 && Comparator2 != 0) {


                    var com2 = "";


@@ -801,7 +801,7 @@


                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";


                            break;


                    }


                    sWhere += " and " + ColName2 + " " + com2;


                    sqlWhere += " and " + ColName2 + " " + com2;


                }


                if (HBillNo)


                    sqlWhere += " and å•æ®å· like '%" + HBillNo + "%'";


@@ -823,10 +823,10 @@


                    sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";




                if (HDate1) {


                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate1 + "'";


                    sqlWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate1 + "'";


                }


                if (HDate2) {


                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate2 + "'";


                    sqlWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate2 + "'";


                }


                if (number == 2) {


                    if (HProject) {


@@ -882,6 +882,9 @@


                        }


                        if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field


                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串


                        }


                        if (itemobj === '规格型号') {


                            item[itemobj] = item[itemobj].replace(/,/g, '，');  // æ›¿æ¢è‹±æ–‡é€—号为中文逗号


                        }


                    }


                });


@@ -1116,8 +1119,8 @@




            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表


            function setSelect_HInitTimeCycle() {


                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];


                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];


                var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365]; //valuelist数组包含与时间相关的整数值


                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天", "近半年", "近一年"];  //itilelist与valuelist值相对于的表，且作为下拉框文本显示




                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';


                for (var i = 0; i < valueList.length; i++) {