From 188b67e8339f8f894a90b6f49838797a8a4b2ec0 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 18 十二月 2024 16:02:02 +0800
Subject: [PATCH] 工作任务列表1、任务汇报列表1、工程项目列表1 增加 按钮设置 的按钮； 工程项目里： 项目经理、结算方、客户
---
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport.html | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 7 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/Mes_OrderProcFlowAllReport.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/Mes_OrderProcFlowAllReport.html"
index fdf3697..ba7d52e 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/Mes_OrderProcFlowAllReport.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/Mes_OrderProcFlowAllReport.html"
@@ -49,6 +49,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-block">
<input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
</div>
@@ -58,6 +64,7 @@
</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>
</div>
</div>
@@ -65,7 +72,8 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -95,6 +103,7 @@
var sWhere = "";
var option = [];
var HModName = "Mes_OrderProcFlowAllReport";
+ var ins;
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -112,8 +121,24 @@
case 'btn-exit': Pub_Close(2);
break;
//闅愯棌鍒楄缃�
- case 'HideColumn':
+ case 'set_HideColumn':
get_HideColumn();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','锛�'); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
break;
};
});
@@ -143,6 +168,8 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
//DisPlay_HideColumn();
+
+ //ColFilter();
}
//鍒濆鍖栬〃鏍�
@@ -151,6 +178,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cellMinWidth: 120
+ , totalRow: true
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 'full-70'
};
@@ -166,6 +194,7 @@
success: function (data1) {
var col = [];
if (data1.count == 1) {
+ var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
var data = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -176,6 +205,9 @@
for (var i = 0; i < data.length; i++) {
if (!patrn.test(data[i].name)) {
col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
}
else {
switch (data[i].Type) {
@@ -189,7 +221,8 @@
}
option.cols = [col];
option.data = data1.data;
- table.render(option);
+ ins = table.render(option);
+ DisPlay_HideColumn();
layer.close(wait);
} else {
layer.close(wait);
@@ -206,12 +239,87 @@
function get_FastQuery() {
var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
+ var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
var check = "";
if (chkHShowUnFinish) {
check = "Y";
}
- sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'";
+ 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;
+ }
+ 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 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
@@ -221,12 +329,38 @@
function set_ClearQuery() {
$("#txtHOrderProcNo").val("");
$("#txtHMaterNumber").val("");
+ $("#txtHDeptName").val("");
$("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
- form.render();
+ $("#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');
+
sWhere = " ";
get_FastQuery();
}
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ 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].title + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
//鐗╂枡
function get_btnHMaterID() {
layer.open({
@@ -256,7 +390,7 @@
function get_HideColumn() {
var colName = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
@@ -278,12 +412,33 @@
}
})
}
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTablemainTable)', 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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -294,7 +449,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -313,6 +470,14 @@
if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
option.cols[0][i + 1]["hide"] = false;
}
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
--
Gitblit v1.9.1