From c4e556a509b7fd8084a4aee8f4221158bac6cd3a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 25 三月 2024 13:11:56 +0800
Subject: [PATCH] 设备负荷分析表
---
WebTM/views/模治具管理/器具报表/ReportMaterialReceipt.html | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
index 575be4a..9a6662e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMaterialReceipt.html"
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -82,8 +83,8 @@
<table class="" id="layTable" lay-filter="layTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" ><i class="layui-icon layui-icon-refresh"></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>
@@ -136,9 +137,8 @@
<table class="" id="layTable1" lay-filter="layTable1"></table>
<script type="text/html" id="toolbarDemo1">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
</div>
@@ -164,7 +164,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙fā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
// #region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -175,6 +175,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鏌ヨ鏉′欢
var HStartDate = "";
var HEndDate = "";
@@ -215,7 +216,6 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
-
};
});
$('.layui-tab-title').on('click', function (title) {
@@ -339,20 +339,24 @@
cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
for (var i = 0; i < data.length; i++) {
if (data[i].name == 'HItemID') {
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true, width: 200 }; //闅愯棌id鍒�
}
else {
switch (data[i].Type) {
//int
+ case 'long':
case 'Int32':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
break;
//Decimal
case 'Decimal':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200};
break;
default:
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
}
}
}
@@ -384,6 +388,7 @@
},
done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ soulTable.render(this);
}
});
}
@@ -395,20 +400,24 @@
cols_arr1[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
for (var i = 0; i < data.length; i++) {
if (data[i].name == 'HItemID') {
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true, width: 200 }; //闅愯棌id鍒�
}
else {
switch (data[i].Type) {
//int
+ case 'long':
case 'Int32':
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200};
break;
//Decimal
case 'Decimal':
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
break;
default:
- cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ cols_arr1[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200};
}
}
}
@@ -417,7 +426,7 @@
elem: '#layTable1',
url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
toolbar: '#toolbarDemo1', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
- title: '鍣ㄥ叿鍗虫椂搴撳瓨姹囨�昏〃',
+ //title: '鍣ㄥ叿鍗虫椂搴撳瓨姹囨�昏〃',
cols: cols_arr1, //濉厖琛ㄦ牸澶存暟鎹�,
id: 'layTable1', //琛ㄦ牸id
where: { "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
--
Gitblit v1.9.1