From e50265de5ae4e5e4c8b8852e777216adab7c4ce4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:13:06 +0800
Subject: [PATCH] 合并分支
---
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 15ed0d6..71cb418 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/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
--
Gitblit v1.9.1