From c4e556a509b7fd8084a4aee8f4221158bac6cd3a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 25 三月 2024 13:11:56 +0800
Subject: [PATCH] 设备负荷分析表

---
 WebTM/views/模治具管理/器具报表/ReportInventoryAccount.html |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 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/ReportInventoryAccount.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/ReportInventoryAccount.html"
index 8a66bb0..690ab36 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/ReportInventoryAccount.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/ReportInventoryAccount.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;
@@ -68,8 +69,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>
@@ -96,7 +97,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
@@ -107,6 +108,7 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
+                , soulTable = layui.soulTable
             //鏌ヨ鏉′欢
             var HStartDate = "";
             var HEndDate = "";
@@ -171,14 +173,14 @@
                 laydate.render({
                     elem: '#HEndDate'
                 });
+                $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             }
             //#endregion
 
             // #region 鍒濆鍖栫晫闈�
             function set_ClearBill(HStartDate, HEndDate, HSupName) {
                 resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
-                $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鏌ヨ
                 get_Display(HStartDate, HEndDate, HSupName);
 
@@ -195,7 +197,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sc_MESReportFrom/ReportInventoryAccountBillList',
                     type: "GET",
-                    data: { "page": 1, "limit": 500, "HStartDate": HStartDate, "HEndDate": HEndDate, "HSupName": HSupName },
+                    data: { "page": 1, "limit": 50, "HStartDate": HStartDate, "HEndDate": HEndDate, "HSupName": HSupName },
                     async: false,
                     dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
                     success: function (data1) {
@@ -224,7 +226,11 @@
                     else {
                         switch (data[i].Type) {
                             //int
+                            case 'long':
                             case 'Int32':
+                            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 };
                                 break;
                             //Decimal
@@ -236,6 +242,7 @@
                         }
                     }
                 }
+
                 //濉厖琛ㄦ牸鏁版嵁
                 table.render({
                     elem: '#layTable',
@@ -248,9 +255,18 @@
                     page: true,   //寮�鍚垎椤�
                     totalRow: true, //寮�鍚悎璁�
                     limit: 50,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
-                    limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+                    limits: [50, 500, 5000, 20000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
                     method: 'get',  //鎻愪氦鏂瑰紡
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    parseData: function (res) {  //res 涓鸿繑鍥炵殑鏁版嵁
+                        soulTable.render(this);
+                        if (res.code == "0") {
+                            return {
+                                "msg": res.Message
+
+                            }
+                        }
+                    },
                     response: {
                         statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
                     },
@@ -274,8 +290,8 @@
 
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
-                $("#HStartDate").val("");//鏃ユ湡
-                $("#HEndDate").val("");//鐗╂枡
+                $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HSupName").val("");//寰�鏉ュ崟浣�
                 get_FastQuery();
 

--
Gitblit v1.9.1