From 2ace77c833ab4e37b76c644fbdf0f7ce366979cf Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 11 三月 2024 10:58:42 +0800
Subject: [PATCH] 计划平台优化完善 报工平台 报检申请 生产汇报 功能优化完善
---
WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
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/MaterialShorAnalysisReport.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/MaterialShorAnalysisReport.html"
index 37c6c56..9efe59a 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/MaterialShorAnalysisReport.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/MaterialShorAnalysisReport.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
<body>
@@ -50,7 +51,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
-
+
</div>
</div>
</div>
@@ -76,7 +77,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -89,6 +90,7 @@
, util = layui.util
, tree = layui.tree
, util = layui.util
+ , soulTable = layui.soulTable
var sWhere = "";
var option = [];
var HModName = "MaterialShorAnalysisReport";
@@ -154,13 +156,13 @@
function set_InitGrid() {
var columns = [];
- columns.push({ type: 'checkbox', fixed: 'left' });
- columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐' });
- columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜' });
- columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О' });
- columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸' });
- columns.push({ field: 'CountHQty', title: '鍚堣' });
- columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺' });
+ columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐', sort: true });
+ columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true });
+ columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true });
+ columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸', sort: true });
+ columns.push({ field: '鍦ㄩ�旀暟閲�', title: '鍦ㄩ�旀暟閲�', totalRow: true });
+ columns.push({ field: 'CountHQty', title: '鍚堣', sort: true });
+ columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺', sort: true, totalRow: true});
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
@@ -176,7 +178,7 @@
var k = 0;//鏀堕泦寰幆娆℃暟
for (var j = 0; j <= (Days - k); j++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
//璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
if (MM == 12 && (HBEGINDATE + j) == 31) {
yyyy += 1;
@@ -199,11 +201,13 @@
, height: 'full-50'
, page: true
, cellMinWidth: 90
+ , totalRow: true
, limit: 50
, limits: [50, 500, 5000, 20000]
, loading: false
, cols: [columns]
, done: function (res, page, count) {
+ soulTable.render(this);
var that = this.elem.next();
res.data.forEach(function (item, index) {
var NumCount = item.FBASEQTY;//鑾峰彇鎬诲簱瀛樻暟閲�
@@ -213,7 +217,7 @@
if (NumCount > parseFloat(item[dateNowTime])) {
NumCount -= parseFloat(item[dateNowTime]);
} else {
- var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
+ var num = 7;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
rq = tr.children()[num + 1 + i];
rq.style.color = '#f66161';//鐒跺悗鍙樿壊
--
Gitblit v1.9.1