From 9f1c2ac41687335fe2faa470cfb63ee3a8ecd821 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 10 十月 2024 14:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html | 192 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 147 insertions(+), 45 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
index 8955797..e737644 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
@@ -200,21 +200,27 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-inline" style="width: 100%;">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div id="page" style="position:relative;bottom:0;"></div>
+ </div>
+
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></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-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -245,6 +251,8 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
var HModName = "Sc_PPBomBillList";
//#endregion
var titleData = ["hmainid", "HDeptID", "HMaterID", "HUnitID", "hsubid", "hmaterid2", "hunitid2", "HWHID", "HSPID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -257,13 +265,22 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//閲嶆柊鍚屾鎸夐挳
@@ -401,14 +418,13 @@
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
- //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -430,10 +446,10 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
+ , height: 'full-180'
+ , page: false
, cellMinWidth: 90
- , totalRow: true
+ , totalRow: false
, limit: 50
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
@@ -481,8 +497,30 @@
, { field: '璁″垝妯″紡', title: '璁″垝妯″紡', sort: true }
]]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ //#region 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
@@ -585,6 +623,70 @@
});
}
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ //var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_PPBomBill/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, 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 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
// 蹇�熻繃婊�
function get_FastQuery() {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -612,19 +714,19 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName + " " + com;
@@ -634,19 +736,19 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like''%" + ColContent1 + "%''";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like''%" + ColContent1 + "''";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like''" + ColContent1 + "%''";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like''%" + ColContent1 + "%''";
break;
default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
break;
}
sWhere += " and " + ColName1 + " " + com1;
@@ -655,55 +757,55 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like''%" + ColContent2 + "%''";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like''%" + ColContent2 + "''";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like''" + ColContent2 + "%''";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like''%" + ColContent2 + "%''";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName2 + " " + com2;
}
if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HDate + "''";
}
if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HDate1 + "''";
}
if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''";
}
if (HDeptID) {
- sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ sWhere += " and 閮ㄩ棬 like ''%" + HDeptID + "%''";
}
if (MaterialCode) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
+ sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + MaterialCode + "%''";
}
if (MaterialName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ sWhere += " and 鐗╂枡鍚嶇О like ''%" + MaterialName + "%''";
}
if (SpecificationModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + SpecificationModel + "%''";
}
if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ sWhere += " and 婧愬崟鍗曞彿 like ''%" + HSourceBillNo + "%''";
}
if (Warehouse) {
- sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'";
+ sWhere += " and 鍙戣揣浠撳簱 like ''%" + Warehouse + "%''";
}
if (Hmaker) {
- sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ sWhere += " and 鍒跺崟浜� like ''%" + Hmaker + "%''";
}
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1006,7 +1108,7 @@
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
- table.on('row(mainTablemainTable)', function (obj) {
+ table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
--
Gitblit v1.9.1