From f298a12c7f8f09935947e6f7e0f9c9ef01e6b4e5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 16 五月 2025 09:26:35 +0800
Subject: [PATCH] 完成过滤框 动态扩缩容
---
WebTM/views/基础资料/公用基础资料/Gy_MaterialCorrection.html | 455 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 248 insertions(+), 207 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_MaterialCorrection.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_MaterialCorrection.html"
index 1488561..591ff6c 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_MaterialCorrection.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_MaterialCorrection.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鐗╂枡鎵规敼</title>
@@ -16,6 +17,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -32,119 +34,86 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+ <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;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID"
+ class="ForFilteringSchemes">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <div id="filter-group">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<=">
+ <=< <option value="<">
+ << <option value="<>">
+ <>
+ </option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style=" margin-top: 10px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
+ <!-- TODO: 鍔ㄦ�佹坊鍔犺繃婊ゅ櫒锛岄粯璁よ繃婊ゅ櫒涓暟: 1 -->
+ <button type="button" class="layui-btn layui-btn-sm"
+ style="margin: 8px 0 8px 380px;width: 190px;" id="btnAddFilter"
+ lay-filter="btnAddFilter">
+ <i class="layui-icon layui-icon-addition"></i>
+ </button>
</div>
- <div class="layui-row" style=" margin-top: 10px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
- <div class="table-wrapper"></div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-col-md6">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
@@ -166,6 +135,38 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
+ <script type="text/html" id="filterUnit">
+ <div class="layui-row" style=" margin-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ <button id="btn-remove-filter" type="button" class="layui-btn layui-btn-xs layui-btn-danger layui-btn-radius">
+ <i class="layui-icon layui-icon-subtraction"></i>
+ </button>
+ </div>
+ </script>
</form>
</div>
</div>
@@ -178,7 +179,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'laytpl'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -190,6 +191,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, soulTable = layui.soulTable
+ , laytpl = layui.laytpl
var sWhere = "";
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
@@ -197,7 +199,11 @@
var HBillType = "Gy_Source";
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID","HParentID"];
+ var titleData = ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"];
+ // 姝ｅ垯琛ㄨ揪寮�
+ var colNameReg = new RegExp(/^ColName.*/)
+ var comparatorReg = new RegExp(/^Comparator.*/)
+ var colContentReg = new RegExp(/^ColContent.*/)
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -213,7 +219,7 @@
//#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
var Htype = "";
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -226,17 +232,17 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
- //#endregion
+ //#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//瀵煎叆
case 'set_SouceExcel': set_SouceExcel();
- break;
+ break;
//瀵煎嚭excel
case 'get_export':
get_Export();
@@ -255,28 +261,28 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
- break;
+ break;
//娴忚
case 'get_PrintReport': get_PrintReport();
- break;
+ break;
//瀹℃牳鎸夐挳
- case 'btn-Audit':set_CheckBill(0);
+ case 'btn-Audit': set_CheckBill(0);
break;
//鍙嶅鏍告寜閽�
- case 'btn-DeAudit':set_CheckBill(1);
+ case 'btn-DeAudit': set_CheckBill(1);
break;
//绂佺敤鎸夐挳
- case 'btn-Stop':set_De_Stop(0);
+ case 'btn-Stop': set_De_Stop(0);
break;
//鍙嶇鐢ㄦ寜閽�
- case 'btn-DeStop':set_De_Stop(1);
+ case 'btn-DeStop': set_De_Stop(1);
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
- break;
+ break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
break;
@@ -318,8 +324,25 @@
//瀛樺偍鏉′欢
get_WriteConfigFile();
get_FastQuery(2);
-
+
});
+ //#endregion
+
+ //#region 杩囨护鍣ㄧ粍 鍖哄煙 鍒犻櫎浜嬩欢澶勭悊
+ $('#filter-group').on('click', function (e) {
+ // 鍖归厤绂讳簨浠惰Е鍙戞渶杩戠殑button鍏冪礌
+ var $btn = $(e.target).closest('button')
+ switch ($btn[0].id) {
+ case 'btnAddFilter':
+ console.log("娣诲姞杩囨护鍣�");
+ add_Filter();
+ break;
+ case 'btn-remove-filter':
+ console.log("鍒犻櫎杩囨护鍣�");
+ remove_filter($btn[0])
+ ; break;
+ }
+ })
//#endregion
//浠ｇ爜鍥炶溅鏂规硶
@@ -347,23 +370,23 @@
btnrowDouble(obj);
})
- //#endregion
+ //#endregion
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栫粍缁�
- Organ();
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery(1);
get_DefaultModule();//鍔犺浇鏂规
-
+
}
//#endregion
@@ -433,7 +456,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid='+linterid+'&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
get_FastQuery(table, option);
@@ -444,7 +467,7 @@
})
}
});
- //#endregion
+ //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -453,7 +476,7 @@
url: GetWEBURL() + '/Gy_Source/list',
type: "GET",
async: false,
- data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -531,7 +554,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- });
+ });
}
//#endregion
@@ -573,8 +596,43 @@
localStorage.setItem("Gy_SouceList", JSON.stringify(data));
}
+ //#region 鍚戦〉闈腑娣诲姞鏂扮殑杩囨护鍣�
+ function add_Filter() {
+ var filterGroup = $('#filter-group');
+ var filterUnit = $('#filterUnit').clone(true, true);
+ var count = filterGroup.length;
+ // 淇敼鏂版坊鍔犵殑杩囨护鍣ㄤ腑鐨刬d鍊硷紝闃叉纰版挒
+ Array.from(filterUnit.find('select')).forEach(d => {
+ if (colNameReg.test(d.id)) {
+ d.id = d.id + '-' + count;
+ d.name = d.name + '-' + count;
+ } else if (comparatorReg.test(d.id)) {
+ d.id = d.id + '-' + count;
+ d.name = d.name + '-' + count;
+ }
+ })
+ Array.from(filterUnit.find('input')).forEach(d => {
+ if (colContentReg.test(d.id)) {
+ d.id = d.id + '-' + count;
+ d.name = d.name + '-' + count;
+ }
+ })
+
+ filterUnit = filterUnit.html();
+ $('#btnAddFilter').before(filterUnit);
+ ColFilter()
+ }
+ //#endregion
+
+ //#region 浠庨〉闈腑绉婚櫎杩囨护鍣�
+ function remove_filter(e) {
+ var parent = $(e).closest('div')
+ var temp = parent[0]
+ temp.remove();
+ }
+ //#endregion
//璇诲彇閰嶇疆鏂囦欢
function get_ReadConfigFile() {
//鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
@@ -593,12 +651,12 @@
}
-
+
function btnrowDouble(obj) {
var data = [];
data.push(obj.data);
- //杩斿洖鏂规硶
+ //杩斿洖鏂规硶
parent.GetGySource(data);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
@@ -606,84 +664,57 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
-
+
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var HOrgID = "";
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
+ var filterGroup = $("#filter-group")
+
+ var colNameList = []
+ var comparatorList = []
+ var colContentList = []
+
+ Array.from(filterGroup.find('select'))
+ .forEach(d => {
+ if (colNameReg.test(d.id)) {
+ colNameList.push(d.value)
+ } else if (comparatorReg.test(d.id)) {
+ comparatorList.push(d.value)
+ }
+ })
+
+ Array.from(filterGroup.find('input'))
+ .forEach(d => {
+ if (colContentReg.test(d.id)) {
+ colContentList.push(d.value)
+ }
+ })
+
+ comparatorList.forEach((Comparator, index) => {
+ if (colNameList[index] != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + colContentList[index] + "%'";
+ break;
+ case "8":
+ com = "like'%" + colContentList[index] + "'";
+ break;
+ case "9":
+ com = "like'" + colContentList[index] + "%'";
+ break;
+ case "10":
+ com = "not like'%" + colContentList[index] + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + colContentList[index] + "'";
+ break;
+ }
+ sWhere += " and " + colNameList[index] + " " + com;
}
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator2 + "'" + ColContent2 + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
-
+ })
+
if (number == 1) {
HOrgID = sessionStorage["OrganizationID"];
}
@@ -705,7 +736,7 @@
}
if (HName) {
sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName + "%'";
- }
+ }
sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -713,26 +744,33 @@
//#endregion
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
- function set_ClearQuery() {
+ function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
+ // $("#ColContent").val("");
+ // $("#ColName").val("0");
+ // $("#Comparator").val("0");
+
+ var filterGroup = $('#filter-group')
+ Array.from(filterGroup.find('select')).forEach(d => {
+ if (colNameReg.test(d.id) || comparatorReg.test(d.id)) {
+ d.value = "0"
+ }
+ })
+ Array.from(filterGroup.find('input')).forEach(d => {
+ if (colContentReg.test(d.id)) {
+ d.value = ""
+ }
+ })
+
form.render('select');
sWhere = "";
$("#btnSearch").click();
}
//#endregion
-
+
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -897,7 +935,7 @@
get_FastQuery(2);
}
//#endregion
-
+
//#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
@@ -971,7 +1009,7 @@
}
//#endregion
-
+
//#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
@@ -1006,12 +1044,16 @@
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
}
- $("#ColName").empty();
- $("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
- $("#ColName2").append(Organization);
+ // $("#ColName").empty();
+ // $("#ColName").append(Organization);
+
+ var filterGroup = $('#filter-group')
+ Array.from(filterGroup.find('select')).forEach(d => {
+ if (colNameReg.test(d.id)) {
+ $(d).empty();
+ $(d).append(Organization);
+ }
+ })
form.render('select');
}
//#endregion
@@ -1222,9 +1264,9 @@
}
})
}
-
//#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //浠ヤ笂鏄痩ayui妯″潡
+
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
@@ -1264,10 +1306,9 @@
});
}
//#endregion
-
-
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1