From e192600a773d5b4afe4c5ad3d4a13773c0f61d29 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 26 五月 2025 09:18:31 +0800
Subject: [PATCH] 报表更新
---
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html | 354 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 256 insertions(+), 98 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/OA_ErrMsgBackSignBill_BrushCard.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/OA_ErrMsgBackSignBill_BrushCard.html"
index 74fc74b..0beed93 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/OA_ErrMsgBackSignBill_BrushCard.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/OA_ErrMsgBackSignBill_BrushCard.html"
@@ -21,7 +21,11 @@
height: 30px;
line-height: 30px;
}
-
+ .layui-table th, .layui-table td {
+ white-space: nowrap; /* 涓嶆崲琛� */
+ overflow: hidden; /* 瓒呭嚭鍐呭闅愯棌 */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
+ }
.btn-title {
font-size: 16px;
}
@@ -45,6 +49,12 @@
.layui-form-label {
width: 25%;
}
+ #mainTable tr {
+ height: 100px; /* 浣犳兂瑕佺殑琛岄珮 */
+ }
+ #btnSignIn,#btnErrMSg,#btnQuery,#btnEdit {
+ font-size: 36px; /* 璁剧疆瀛椾綋澶у皬 */
+ }
</style>
</head>
@@ -54,9 +64,10 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
- <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">绛惧埌</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">鏌ヨ</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 150px;height:120px;width:120px;" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">绛惧埌</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnErrMSg" id="btnErrMSg">澶勭悊</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">鏌ヨ</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<h1 style="text-align: center; padding: 10px 0;"><b>寮傚父鍙嶉鍒峰崱绛惧埌</b></h1>
@@ -92,7 +103,7 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
+ <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;" lay-size="lg"></table>
</form>
</div>
</div>
@@ -121,6 +132,10 @@
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = [];
//#endregion
+
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -188,23 +203,64 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '寮傚父鍙嶉鎺ユ敹鍗曠鍒�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + 0 + '&HSouceBillType=' + 4529 + ''
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- get_FastQuery();//鏌ヨ
- }
- , cancel: function () {
-
- }
- })
+ var HEntryID = data[0].HEntryID.toString();
+ if (data[0].鍗曟嵁鐘舵�� != "宸插弽棣�") {
+ layer.msg('璇ュ崟瀛愬凡绛惧埌鎴栧凡澶勭悊锛屼笉鑳藉啀娆＄鍒帮紒');
+ } else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '寮傚父鍙嶉鎺ユ敹鍗曠鍒�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();//鏌ヨ
+ }
+ , cancel: function () {
+
+ }
+ })
+ }
+
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�涓紓甯稿弽棣堟帴鏀跺崟杩涜绛惧埌锛�');
+ }
+ });
+
+ //澶勭悊
+ form.on('submit(btnErrMSg)', function () {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var HEntryID = data[0].HEntryID.toString();
+ if (data[0].鍗曟嵁鐘舵�� != "宸茬鍒�") {
+ layer.msg('璇ュ崟瀛愭湭绛惧埌,涓嶈兘澶勭悊锛�');
+ } else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '寮傚父鍙嶉鎺ユ敹鍗曠鍒�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();//鏌ヨ
+ }
+ , cancel: function () {
+
+ }
+ })
+ }
+
} else {
layer.msg('璇烽�夋嫨涓�涓紓甯稿弽棣堟帴鏀跺崟杩涜绛惧埌锛�');
@@ -213,8 +269,14 @@
//閫�鍑�
form.on('submit(btnEdit)', function () {
- //鍏抽棴椤电
- Pub_Close(2);
+ if (OperationType == "2") {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ } else {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+
});
//IC鍗″洖杞︽柟娉�
@@ -264,7 +326,7 @@
, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 200
, done: function (res, curr, count) {
- //soulTable.render(this);
+
}
};
option.data = [];
@@ -292,87 +354,183 @@
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
- type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
- success: function (data1) {
- if (data1.count == 1) {
+ if (OperationType == 2) { //淇濈暀鍘熸湁鐨勫埛鍗＄鍒�,鏂板涓�涓姤宸ュ彴鍒峰崱绛惧埌(鑾峰彇鏁版嵁鏂瑰紡涓嶄竴鏍�)
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
+ type: "GET",
+ data: { "sWhere": sWhere, "num":"2","user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
- if (data1.data.length > 0) {
- $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
- } else {
- $("#HSignInEmp").val("");
- layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000});
- }
-
- 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 });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- titleData[key] = data1.list[key].ColmCols;
+ if (data1.data.length > 0) {
+ $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
+ } else {
+ $("#HSignInEmp").val("");
+ layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000 });
}
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- 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: 200 });
- break;
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
}
}
- }
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , cols: [col]
- , data: data1.data
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- , totalRow: true
- , done: function (res, curr, count) {
- //soulTable.render(this);
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
}
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ }
+ }
+
+ ins = table.render(option);
+
+ layer.close(ajaxLoad);
+ } else {
+ option.data = data1.data
+ ins = table.render(option);
+ layer.close(ajaxLoad);
}
-
- ins = table.render(option);
-
- layer.close(ajaxLoad);
- } else {
- option.data = data1.data
- ins = table.render(option);
+ }, error: function () {
layer.close(ajaxLoad);
- //layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
+ type: "GET",
+ data: { "sWhere": sWhere, "num": "1","user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ if (data1.data.length > 0) {
+ $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
+ } else {
+ $("#HSignInEmp").val("");
+ layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000 });
+ }
+
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ //soulTable.render(this);
+ }
+ }
+
+ ins = table.render(option);
+
+ layer.close(ajaxLoad);
+ } else {
+ option.data = data1.data
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
}
//#endregion
--
Gitblit v1.9.1