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/基础资料/公用基础资料/Gy_EnvironmentTestItem.html | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EnvironmentTestItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EnvironmentTestItem.html"
index 85eafbb..b08c431 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EnvironmentTestItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EnvironmentTestItem.html"
@@ -33,14 +33,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妫�娴嬩唬鐮�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <label class="layui-form-label" style="width: 120px;">鐜妫�娴嬮」鐩唬鐮�</label>
+ <div class="layui-input-block" style="margin-left: 150px;">
<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">妫�娴嬪悕绉�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <label class="layui-form-label" style="width: 120px;">鐜妫�娴嬮」鐩悕绉�</label>
+ <div class="layui-input-block" style="margin-left: 150px;">
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
</div>
@@ -212,17 +212,18 @@
//#endregion
//#endregion
- //琛岀偣鍑�
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
if (flag) {
obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- //$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
} else {
obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- //$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
}
//mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
layui.each(table.cache.mainTable, function (i, l) {
@@ -231,6 +232,7 @@
}
});
})
+ //#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
@@ -339,7 +341,7 @@
var data = obj.data;
//鍗曟嵁鍙疯秴閾炬帴
- if (obj.event == '妫�娴嬩唬鐮�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ if (obj.event == '鐜妫�娴嬮」鐩唬鐮�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
@@ -391,8 +393,12 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '妫�娴嬩唬鐮�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '妫�娴嬩唬鐮�' });
+ } else if (data[i].name == '鐜妫�娴嬮」鐩唬鐮�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐜妫�娴嬮」鐩唬鐮�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鐜妫�娴嬮」鐩唬鐮� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -533,10 +539,10 @@
sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
if (HNumber) {
- sWhere += " and 妫�娴嬩唬鐮� like '%" + HNumber + "%'";
+ sWhere += " and 鐜妫�娴嬮」鐩唬鐮� like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and 妫�娴嬪悕绉� like '%" + HName + "%'";
+ sWhere += " and 鐜妫�娴嬮」鐩悕绉� like '%" + HName + "%'";
}
addSWhereByOpenType();
get_Display(sWhere);
--
Gitblit v1.9.1