From 43e741c8377b555f4e5ed287bee724e71a11540f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 22 一月 2024 12:41:01 +0800
Subject: [PATCH] 期初余额报表：查询过滤报错“客户名称无效”问题解决
---
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterUnitList.html | 303 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 277 insertions(+), 26 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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
index 1b5e1d7..af94914 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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
@@ -20,7 +20,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">宸ュ崟浠ｇ爜</label>
<div class="layui-input-block">
@@ -37,7 +41,35 @@
<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>
-
+ <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;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -47,6 +79,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
</div>
</script>
@@ -75,6 +108,9 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"]
+ var HModName = "Gy_TechnologyParameterUnitList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -123,6 +159,10 @@
case 'btn-Close':
parent.layui.admin.events.closeThisTabs();
break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
};
});
//#endregion
@@ -138,6 +178,12 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
}
//#endregion
@@ -152,13 +198,37 @@
function get_FastQuery(table, option) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").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;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
+ sWhere += " and 宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
+ sWhere += " and 宸ヨ壓鍙傛暟鍗曚綅鍚嶇О like '%" + HName + "%'";
}
- var index = layer.load(0);
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -174,25 +244,25 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
- , cellMinWidth: 90
+ , limits: [50, 500, 5000, 50000]
, limit: 50
- , limits: [50, 500, 5000, 20000]
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', hide: true }
- , { field: 'HNumber', title: '宸ヨ壓鍗曚綅浠ｇ爜' }
- , { field: 'HName', title: '宸ヨ壓鍗曚綅鍚嶇О' }
- , { field: 'HShortNumber', title: '鐭唬鐮�', hide: true }
- , { field: 'HParentID', title: 'HParentID', hide: true }
- , { field: 'HLevel', title: '宸ヨ壓绛夌骇', hide: true }
- , { field: 'HEndFlag', title: '鏈骇鏍囧織', hide: true }
- , { field: 'HStopflag', title: '绂佺敤鏍囧織' }
- , { field: 'HRemark', title: '澶囨敞' }
- , { field: 'HHelpCode', title: '鍔╄鐮�' }
- , { field: 'HUseFlag', title: '浣跨敤鐘舵��' }
- , { field: 'HMakeTime', title: '寤虹珛鏃堕棿' }
- , { field: 'HMakeEmp', title: '鍒涘缓浜�' }
- ]]
+ , cellMinWidth: 90
+ //, cols: [[
+ // { type: 'checkbox', fixed: 'left' }
+ // , { field: 'HItemID', title: 'HItemID', hide: true }
+ // , { field: 'HNumber', title: '宸ヨ壓鍗曚綅浠ｇ爜' }
+ // , { field: 'HName', title: '宸ヨ壓鍗曚綅鍚嶇О' }
+ // , { field: 'HShortNumber', title: '鐭唬鐮�', hide: true }
+ // , { field: 'HParentID', title: 'HParentID', hide: true }
+ // , { field: 'HLevel', title: '宸ヨ壓绛夌骇', hide: true }
+ // , { field: 'HEndFlag', title: '鏈骇鏍囧織', hide: true }
+ // , { field: 'HStopflag', title: '绂佺敤鏍囧織' }
+ // , { field: 'HRemark', title: '澶囨敞' }
+ // , { field: 'HHelpCode', title: '鍔╄鐮�' }
+ // , { field: 'HUseFlag', title: '浣跨敤鐘舵��' }
+ // , { field: 'HMakeTime', title: '寤虹珛鏃堕棿' }
+ // , { field: 'HMakeEmp', title: '鍒涘缓浜�' }
+ //]]
};
}
//#endregion
@@ -200,6 +270,7 @@
//#region 鍔犺浇缃戠粶
function get_Display(sWhere) {
var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
//鍔犺浇鏁版嵁鍒扮綉鏍�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -208,19 +279,66 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data;
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
table.render(option);
- layer.close(wait);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(wait);
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ layer.close(wait);
}
//#endregion
+
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -318,6 +436,139 @@
}
//#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
//#region 瀹℃牳
//function set_CheckBill() {
//}
--
Gitblit v1.9.1