From c47dec91c838a2d6ed99f8e057e6e95ffbe77ced Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 31 十二月 2024 15:55:44 +0800
Subject: [PATCH] 模具添加列设置和按钮设置
---
WebTM/views/车间管理/报表分析/Kf_ProdProcessEntryReport_DyeColor.html | 327 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 185 insertions(+), 142 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
index 2cc8a9d..c7a3958 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessEntryReport_DyeColor.html"
@@ -161,6 +161,62 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
+ </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>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <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>
@@ -235,7 +291,9 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var ajaxLoad1 = layer.load();
get_FastQuery();
+ layer.close(ajaxLoad1);
});
//琛岀洃鍚簨浠�-鍗曞嚮
@@ -293,142 +351,29 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//缁撴潫鏃ユ湡
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
- var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
-
- //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var sProcessNo = $("#sProcessNo").val(); //娴佽浆鍗″彿
-
- //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
- var com = "";
- if (ColName != 0 && Comparator != 0) {
- 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;
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
+ , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
+ , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true, width: 200 }
+ , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
+ , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
+ ]]
+ , done: function (res) {
}
- com = " and (" + ColName + " " + com + ")";
- }
-
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
- }
- sWhere = JSON.stringify(sWhere);
-
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
- $.ajax({
- url: GetWEBURL() + "/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor",
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "sProcessNo": '', "user": sessionStorage["HUserName"] },
- //async: false,
- success: function (data1) {
-
- if (data1.count == 1) {
- var totalArray = ["鐢熶骇浠诲姟鍗曟暟閲�", "鐧藉澂鍙戝竷"];
- 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 ($.inArray(data[i].name, "") > -1) {
- 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].ColName == '鐧藉澂鍙戝竷') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- ins = table.render(option);
- } else {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 160 }
- , { field: '瀹㈡埛', title: '瀹㈡埛', width: 160 }
- , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇浠诲姟鍗曟暟閲�', totalRow: true,width: 200 }
- , { field: '鐧藉澂鍙戝竷', title: '鐧藉澂鍙戝竷', width: 160, totalRow: true }
- , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', width: 160 }
- ]]
- , done: function (res) {
- }
- };
- ins = table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
+ };
}
//鍒楁槑鏄剧ず涓嬫媺妗�
@@ -440,16 +385,19 @@
}
}
$("#ColName").empty();
- $("#ColName").append(Organization);
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//鍔犺浇缃戞牸
function get_Display(sWhere,sProcessNo) {
- var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/ProdProcessEntryReport/ProdProcessEntryReport_DyeColor',
+ async: false,
type: "GET",
data: { "sWhere": sWhere, "sProcessNo": sProcessNo, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -468,6 +416,44 @@
data1.data[i].鐢熶骇璁㈠崟鏃ユ湡 = data1.data[i]["鐢熶骇璁㈠崟鏃ユ湡"].split("T")[0];
}
}
+
+
+
+ var totalArray = ["鐢熶骇浠诲姟鍗曟暟閲�", "鐧借儦鍙戝竷"];
+
+ 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 ($.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].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+
+
ins = table.render(option);
//var num = 0;
@@ -502,15 +488,15 @@
var sumCompare = sumHMaterOutQty - sumDyeColorOut;
$("#SumCompare").val(sumCompare);
- layer.close(wait);
+ layer.close(ajaxLoad);
} else {
$("#SumHMaterOutQty").val("");
- layer.close(wait);
+ layer.close(ajaxLoad);
layer.alert(data1.Message, { icon: 5 });
}
}, error: function () {
$("#SumHMaterOutQty").val("");
- layer.close(wait);
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -544,6 +530,12 @@
var sProcessNo = $("#sProcessNo").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();
//鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
var com = "";
if (ColName != 0 && Comparator != 0) {
@@ -566,7 +558,48 @@
}
com = " 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 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
var params = get_UrlVars();
if (params[params[0]] != null && detailBar == 0) {
//姹囨�绘姤琛ㄧ殑鐢熶骇璁㈠崟鍙�
@@ -645,6 +678,13 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
//form.render()
ColFilter();
sWhere = "";
@@ -701,9 +741,11 @@
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
+ var ajaxLoad = layer.load();
ColFilter();
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -776,8 +818,9 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
+ layer.close(ajaxLoad);
}
-
+
//#endregion
});
--
Gitblit v1.9.1