From 2c4e339508f78a215518a8a12af34ca0b1564d44 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 31 十月 2025 13:07:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/隐藏列设置/Gy_QueryCondition.html | 73 ++++++++++--------------------------
1 files changed, 21 insertions(+), 52 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_QueryCondition.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_QueryCondition.html"
index 3022fe1..2246f98 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_QueryCondition.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_QueryCondition.html"
@@ -6,13 +6,13 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/layui/layui1.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
<style>
/*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
@@ -203,6 +203,7 @@
layer.close(index);
TreeData.push({ "TreeData": [], "id": "0", "title": text });
MenuMain(TreeData);
+ HtitleId = [];
});
});
@@ -256,7 +257,7 @@
return layer.msg("璇烽�変腑闇�瑕佷繚瀛樼殑鏂规!");
}
- layer.confirm('纭瑕佷繚瀛橀�変腑鏂规鍚楋紵', function (index) {
+ layer.confirm('纭瑕佷繚瀛�:' + HtitleId.title + '鏂规鍚楋紵', function (index) {
var TableData = table.cache["mainTable"];
var sMainStr = JSON.stringify(TableData);
var sMainStr1 = JSON.stringify(HtitleId);
@@ -271,11 +272,14 @@
layer.msg(data1.Message);
var index = parent.layer.getFrameIndex(window.name);
//杩斿洖鏂规硶
- var TableDataSql = "";
-
+ var TableDataSql = "and (";
for (var i = 0; i < TableData.length; i++) {
TableDataSql += get_FastQuery(TableData[i]);
+ if ((i + 1) < TableData.length) {
+ TableDataSql += " " + TableData[i]["HRelationCol"] + " ";
+ }
}
+ TableDataSql += ")";
parent.GetDataCol(TableDataSql);
parent.layer.close(index);
} else {
@@ -353,6 +357,7 @@
for (var i = 0; i < data.length; i++) {
if (data[i].title == "榛樿鏂规") {
sWhere = " and HInterID=" + data[i].id;
+ HtitleId = data[i];
}
liStr += '{"title": "' + data[i].title + '", "id": "' + data[i].id + '"},';
};
@@ -411,49 +416,15 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
if (data1.count == 1) {
- var colNames = [];//鐩稿鍗曟嵁浼犺繃鏉ョ殑鍒楀悕
- var cols = [];//瑕佷紶杩涜〃鏍肩殑鏁版嵁
- var dataCol = [];//鑾峰彇杩斿洖鏁版嵁
- dataCol = data1.data;
- option.data = dataCol;
- table.render(option);
+ if (data1.data.length == 0) {
+ set_InitGrid()
+ } else {
+ var dataCol = [];//鑾峰彇杩斿洖鏁版嵁
+ dataCol = data1.data;
+ option.data = dataCol;
+ table.render(option);
+ }
selectCol();
- //colNames = colName.split(',');
- //var HFieldNameCol_s = "";
- //for (var i = 0; i < colNames.length; i++) {
- // HFieldNameCol_s += '<option style="color:blue;" value="' + colNames[i] + '">' + colNames[i] + '</option>';
- //}
-
- //for (var i = 0; i < option.data.length; i++) {
- // $('#HFieldNameCol' + (i + 1)).append(HFieldNameCol_s);;
- //}
- //form.render('select');
-
-
- //for (var i = 0; i < colNames.length; i++) {
- // cols.push({ "HFieldNameCol": colNames[i], "HControlCol": "", "HConditionCol": "", "HRelationCol": "" })
- //}
-
- //for (var i = 0; i < colNames.length; i++) {
- // for (var j = 0; j < dataCol.length; j++) {
- // if (colNames[i] == dataCol[j]["HFieldNameCol"]) {
- // cols[i]["HControlCol"] = dataCol[j]["HControlCol"];
- // cols[i]["HConditionCol"] = dataCol[j]["HConditionCol"];
- // cols[i]["HRelationCol"] = dataCol[j]["HRelationCol"];
-
- // break;
- // }
- // }
- //}
- //option.data = cols;
- //table.render(option);
-
- //for (var i = 0; i < colNames.length; i++) {
- // $('#HControlCol' + (i + 1)).find("option[value='" + option.data[i]["HControlCol"] + "']").attr("selected", true);
- // $('#HRelationCol' + (i + 1)).find("option[value='" + option.data[i]["HRelationCol"] + "']").attr("selected", true);
- //}
- form.render('select');
-
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -465,8 +436,6 @@
}
});
}
-
-
//琛屽唴鍒犻櫎
function set_GridDelete(obj) {
@@ -507,7 +476,7 @@
var ColName = TableData["HFieldNameCol"];//澶嶉�夋
var Comparator = TableData["HControlCol"];
var ColContent = TableData["HConditionCol"];
- var HRelationCol = TableData["HRelationCol"];
+ //var HRelationCol = TableData["HRelationCol"];
var sWheres = "";
if (ColName != 0 && Comparator != 0) {
@@ -516,10 +485,10 @@
case "鍖呭惈":
com = "like'%" + ColContent + "%'";
break;
- case "宸﹀寘鍚�":
+ case "鍙冲寘鍚�":
com = "like'%" + ColContent + "'";
break;
- case "鍙冲寘鍚�":
+ case "宸﹀寘鍚�":
com = "like'" + ColContent + "%'";
break;
case "涓嶅寘鍚�":
@@ -529,7 +498,7 @@
com = "" + Comparator + "'" + ColContent + "'";
break;
}
- sWheres += HRelationCol + " " + ColName + " " + com;
+ sWheres += ColName + " " + com ;
}
return sWheres;
}
--
Gitblit v1.9.1