From 96785ebcfe1bc9210f3d9d4056f4ec29fb60d810 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 02 四月 2026 10:58:22 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/报表分析/Sc_StationOutSumReport.html | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 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/Sc_StationOutSumReport.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_StationOutSumReport.html"
index 3a82c46..d6bd660 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_StationOutSumReport.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_StationOutSumReport.html"
@@ -60,7 +60,7 @@
<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-colla-content" style="padding: 0px; margin-left: 6%;margin-top:5px">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
@@ -196,8 +196,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<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="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -226,6 +225,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var HModName = "DefectiveDetailedYieldReport";
//#endregion
@@ -282,9 +282,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery();
- //DisPlay_HideColumn();
- ColFilter();
+ get_FastQuery();
}
@@ -293,10 +291,13 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , height: 'full-70'
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , page: true
+ , cellMinWidth: 90
};
+
}
//鍔犺浇缃戞牸
@@ -309,24 +310,36 @@
success: function (data1) {
var col = [];
if (data1.count == 1) {
- var data = [];
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
- data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- //鍒ゆ柇鏄惁鏄函鑻辨枃
- var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '璁＄畻', hide: true });
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 }); //闅愯棌鍒�
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
- else {
+ 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 {
switch (data[i].Type) {
+ //int
case 'DateTime':
- col.push({ field: data[i].name, 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: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 160, totalRow: true });
break;
default:
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
}
}
@@ -566,7 +579,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
dataCol = data1.data[0].HGridString.split(',');
--
Gitblit v1.9.1