合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -366,7 +366,7 @@


            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTablemainTable)', function (obj) {
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
@@ -427,13 +427,14 @@
                //获取项目号
                Get_HProject();
                //查询
                if (HName=="") {
                    get_Display(sWhere);
                } else {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                    get_Display(sWhere);
                }
                //if (HName=="") {
                //    get_Display(sWhere);
                //} else {
                //    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                //    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                //    get_Display(sWhere);
                //}
                get_FastQuery()
                //过滤方案查询
                get_DefaultModule();
            }
@@ -644,6 +645,10 @@
                }
                if (HProject != "" && HProject!=0) {
                    sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                }
                if (HName!="") {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                }
                addSWhereByOpenType();
                get_Display(sWhere);
@@ -942,7 +947,7 @@
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开            
                if (typeof (openType) != "undefined") {
                    sWhere += " and ç¦ç”¨æ ‡è®° = '' ";
                    sWhere += " and å®¡æ ¸äºº != ''";
                }
            }
            //#endregion