From 81c93ee7a4bc6735ad8f69ea0ee7244eaa58d73f Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 15 二月 2022 08:32:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/模治具管理/器具报表/ReportMaterialReceipt.html | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 ac2a094..54e03d9 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"
@@ -82,8 +82,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 +136,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>
@@ -215,7 +214,6 @@
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
-
};
});
$('.layui-tab-title').on('click', function (title) {
@@ -295,7 +293,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillList',
type: "GET",
- data: { "page": 1, "limit": 500, "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
+ data: { "page": 1, "limit": 50, "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
@@ -315,7 +313,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
type: "GET",
- data: { "page": 1, "limit": 500, "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
+ data: { "page": 1, "limit": 50, "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
@@ -368,7 +366,7 @@
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 涓鸿繑鍥炵殑鏁版嵁
@@ -417,7 +415,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