From a5e8fb4e50f285538ad6800d5abdb66ea367db00 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 14 一月 2026 10:59:42 +0800
Subject: [PATCH] 添康获取多车间订单排产；小卫彩盒SN校验标题调整；过站解绑列表添加日期区间过滤；香囊标签打印，添加暂停打印，继续打印功能
---
WebTM/views/项目管理/周计划/PM_WorkTaskWeekBillList.html | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html"
index cdf315d..4cbd5ce 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html"
@@ -170,6 +170,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
@@ -185,7 +186,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-radio"></i>鎵归噺涓嬫帹</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -217,7 +218,7 @@
var option = [];
var sWhere = "";
var HModName = "h_v_PM_WorkTaskWeekBillList";
-
+ var optionPage = [];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "4756";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -332,14 +333,36 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkTaskWeekBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
+ optionPage.curr = 1;
set_ClearQuery();
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ optionPage.curr = 1;
get_FastQuery(2);
});
//#endregion
@@ -371,7 +394,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, totalRow: true
//, cellMinWidth: 90
, limit: 50
@@ -380,6 +403,26 @@
soulTable.render(this);
}
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 1000, 2000],
+ 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
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//#endregion
@@ -528,6 +571,86 @@
});
}
+
+ //鍒嗛〉
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskWeekBill/page',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
+ success: function (data1) {
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ var totalArray = ["棰勮鏃堕棿", "宸叉眹鎶ユ椂闂�"];
+ 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 if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } 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 });
+ }
+ }
+ }
+ //鎵嬪姩娣诲姞鍛ㄤ竴鑷冲懆鏃ュ瓧娈�
+ col.push({ field: "HMonday", title: "鍛ㄤ竴", align: 'center', sort: true, width: 120 });
+ col.push({ field: "HTuesday", title: "鍛ㄤ簩", align: 'center', sort: true, width: 120 })
+ col.push({ field: "HWednesday", title: "鍛ㄤ笁", align: 'center', sort: true, width: 120 })
+ col.push({ field: "HThursday", title: "鍛ㄥ洓", align: 'center', sort: true, width: 120 })
+ col.push({ field: "HFriday", title: "鍛ㄤ簲", align: 'center', sort: true, width: 120 })
+ col.push({ field: "HSaturday", title: "鍛ㄥ叚", align: 'center', sort: true, width: 120 })
+ col.push({ field: "HSunday", title: "鍛ㄦ棩", align: 'center', sort: true, width: 120 })
+ //璁剧疆鍒�
+ option.cols = [col];
+ //澶勭悊骞惰缃〃鏍兼暟鎹�
+ option.data = dealSearchData(data1.data);
+ laypage.render(optionPage);
+ table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+
//#endregion
//#region 蹇�熻繃婊�
@@ -644,7 +767,7 @@
sWhere += " and 璁″垝浜� like '%" + HPlanEmp + "%'";
}
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
--
Gitblit v1.9.1