From a52aa2bd6f5d346735a059b63c573120d4f11af7 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 21 二月 2025 14:47:28 +0800
Subject: [PATCH] 齐套报表优化
---
WebTM/views/车间管理/报表分析/Sc_EmployeePieceWorkReport.html | 30 ++++++++++++--
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 27 ++++++++++++-
WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html | 31 ++++++++++++---
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 4 +-
WebTM/layuiadmin/Scripts/webConfig.js | 1
5 files changed, 77 insertions(+), 16 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index e0e2cc9..083ff96 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,4 +1,5 @@
锘�
+
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 7d46883..f424c50 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -101,7 +101,7 @@
<input type="text" class="layui-input" name="HMaterAtt" id="HMaterAtt">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <!--<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">
@@ -183,7 +183,7 @@
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
- </div>
+ </div>-->
</div>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index c354f7c..5cf06a6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -184,6 +184,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -222,6 +223,7 @@
var HICMOInterID = -1;//鏃ヨ鍒掕鍗曚富鍐呯爜
var HModName = "JIT_CompleteDetailList";
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var ins = "";
//#endregion
//#region 鍒濆鍖栫晫闈�
@@ -259,6 +261,10 @@
case 'set_HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
};
});
//#endregion
@@ -292,7 +298,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
ColFilter();
}
@@ -369,7 +375,7 @@
success: function (result) {
if (result.count == 1) {
option.data = result.data;
- table.render(option);
+ ins = table.render(option);
layer.close(ajaxLoad);
DisPlay_HideColumn();
@@ -567,7 +573,20 @@
}
-
+ function 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().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
+ }
//闅愯棌鍒楄缃�
@@ -695,8 +714,10 @@
}
}
table.render(option);
+ console.log(option)
} else {
table.render(option);
+ console.log(option)
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
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/Sc_EmployeePieceWorkReport.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/Sc_EmployeePieceWorkReport.html"
index bfde583..80c4ca3 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/Sc_EmployeePieceWorkReport.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/Sc_EmployeePieceWorkReport.html"
@@ -113,7 +113,7 @@
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <!--<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">
@@ -195,7 +195,7 @@
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
- </div>
+ </div>-->
</div>
</div>
</div>
@@ -204,6 +204,7 @@
<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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -232,6 +233,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins = "";
var HModName = "Sc_EmployeePieceWorkReport";
//#endregion
@@ -252,6 +254,22 @@
//闅愯棌鍒楄缃�
case '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;
};
});
@@ -290,7 +308,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
//DisPlay_HideColumn();
- ColFilter();
+ /*ColFilter();*/
}
//鍒濆鍖栬〃鏍�
@@ -300,7 +318,9 @@
, toolbar: '#toolbarDemo'
, cellMinWidth: 120
, totalRow: true
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , limit: 50 // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , limits: [50, 200, 500, 1000]
+ , page: true
, height: 'full-70'
};
}
@@ -342,7 +362,7 @@
}
option.cols = [col];
option.data = data1.data;
- table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
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/Sc_WorkShopProcessWIPSumReport.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/Sc_WorkShopProcessWIPSumReport.html"
index b0ede26..acd8fdf 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/Sc_WorkShopProcessWIPSumReport.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/Sc_WorkShopProcessWIPSumReport.html"
@@ -100,7 +100,7 @@
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <!--<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">
@@ -182,7 +182,7 @@
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
- </div>
+ </div>-->
<!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍛樺伐宸ュ彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -205,6 +205,7 @@
<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="btn-Print"><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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -234,6 +235,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins = "";
var HModName = "Sc_WorkShopProcessWIPSumReport";
//#endregion
@@ -258,6 +260,22 @@
//闅愯棌鍒楄缃�
case 'btn-Print':
get_Print();
+ 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;
};
@@ -297,7 +315,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
//DisPlay_HideColumn();
- ColFilter();
+/* ColFilter();*/
}
//鍒濆鍖栬〃鏍�
@@ -307,7 +325,9 @@
, toolbar: '#toolbarDemo'
, cellMinWidth: 120
, totalRow: true
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , limit: 50 // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , limits:[50,200,500,1000]
+ , page: true
, height: 'full-70'
};
}
@@ -349,7 +369,7 @@
}
option.cols = [col];
option.data = data1.data;
- table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -679,7 +699,6 @@
}
})
}
-
//#endregion
});
--
Gitblit v1.9.1