From beca721acf4e026640d9ff22862136ea8c6df96c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 14 九月 2024 08:50:47 +0800
Subject: [PATCH] 物料列表后端分页完善
---
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillList.html | 122 +++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 33 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
index 8dfad6e..fb30bdb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
@@ -101,11 +101,11 @@
<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_Reply"><i class="layui-icon layui-icon-survey"></i>鍥炲</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Resume"><i class="layui-icon layui-icon-survey"></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" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTHand"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉澶勭悊鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉绛惧埌鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Test" id="btn-Test" style="display:none;"><i class="layui-icon layui-icon-circle"></i>楠岃瘉</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -180,7 +180,10 @@
break;
//鍥炲鎸夐挳
case 'btn_Reply': set_ReplyBill();
- break;
+ break;
+ //璺熻釜鎸夐挳
+ case 'btn_Resume': set_ResumeBill();
+ break;
//鍒犻櫎鎸夐挳
case 'btn-Delete':set_DeleteBill();
break;
@@ -193,9 +196,7 @@
//涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�
case 'btn-XTReceive': set_XTReceive();
break;
- //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
- case 'btn-XTHand': set_XTHand();
- break;
+
//涓嬫帹寮傚父鍙嶉绛惧埌鍗�
case 'btn-XTSign-in': set_XTSign();
break;
@@ -278,6 +279,35 @@
}
};
}
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Sc_Add_MESExecptFeedBackBillList.html?OperationType=3&linterid=' + linterid + '&HEntryID=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
+
//鍔犺浇缃戞牸
function get_Display(sWhere) {
var ajaxLoad = layer.load();//閬僵
@@ -291,6 +321,7 @@
if (data1.count == 1) {
var data = [];
var col = [];
+ var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -301,6 +332,10 @@
// 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 ($.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 if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
}
else {
switch (data[i].Type) {
@@ -320,11 +355,26 @@
}
}
}
-
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
option.cols = [col];
option.data = data1.data;
table.render(option);
-
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -386,7 +436,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
//var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var titleData = ["HInterID", "HEntryID", "HDeptID", "HBillStatus"];
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -553,29 +603,7 @@
}
}
- //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
- function set_XTReceive() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].HInterID.toString();
- var HEntryID = data[0].HEntryID.toString();
- layer.open({
- type: 2
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['100%', '100%']
- , title: '鏂板寮傚父鍙嶉澶勭悊鍗�'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
- , btn: [],
- end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
- }
- })
- }
- }
-
+
//涓嬫帹寮傚父鍙嶉绛惧埌鍗�
function set_XTSign() {
var checkStatus = table.checkStatus('mainTable')
@@ -629,6 +657,34 @@
}
}
+ //璺熻釜鍗曟嵁
+ function set_ResumeBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '璺熻釜寮傚父鍙嶉鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Sc_MESExecptFeedBackBillResumeList.html?OperationType=1&linterid=' + HInterID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ /*get_FastQuery(table, option);*/
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -746,7 +802,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString(); //鍗曟嵁鐘舵��
var InterID = data[0].HInterID.toString();
if (HBillStatus > 1) {
layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬�,涓嶈兘鍐嶆瀹℃牳锛�');
@@ -787,7 +843,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+ var HBillStatus = data[0].鍗曟嵁鐘舵��.toString(); //鍗曟嵁鐘舵��
var InterID = data[0].HInterID.toString();
if (HBillStatus==1) {
layer.msg('鍗曟嵁鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
--
Gitblit v1.9.1