From db877741ea3c8c03ca6ce7f80fc226b3cbe3723e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 15 一月 2024 13:31:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
index 658d68e..5b68efb 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
@@ -250,7 +250,7 @@
async: false,
type: "GET",
async: false,
- data: { "sWhere": sWhere, "num": 1},
+ data: { "sWhere": sWhere, "num": 1, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -263,12 +263,12 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣-灏忔瘺鐨垚鍝�' });
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣-灏忔瘺鐨垚鍝�' });
for (var i = 0; i < data.length; i++) {
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 == '瀹為檯鏁伴噺(绫�)' || data[i].name == '鍖规暟(浠�)' || data[i].name == '閲嶉噺(鍗冨厠)' ) {
+ else if (data[i].name == '瀹為檯鏁伴噺(绫�)' || data[i].name == '鍖规暟(浠�)' || data[i].name == '閲嶉噺(鍗冨厠)') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
}
else {
@@ -302,6 +302,8 @@
}
};
table.render(option);
+ } else {
+ layer.alert(data1.count + data1.Message, { icon: 5 })
}
},
error: function (err) {
@@ -322,7 +324,7 @@
async: false,
type: "GET",
async: false,
- data: { "sWhere": sWhere,"num":2 },
+ data: { "sWhere": sWhere, "num": 2, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -381,6 +383,8 @@
HNumberOH = 0;
HActualHQty = 0;
+ } else {
+ layer.alert(data1.count + data1.Message, { icon: 5 })
}
},
error: function (err) {
--
Gitblit v1.9.1