From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/views/user/login.html | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 9 deletions(-)
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 71db7ca..aceca20 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -29,7 +29,7 @@
<div class="ax-tab" axTab>
<ul class="ax-row ax-tab-nav ax-menu-tab">
- <a href="###" class="ax-item ax-col" style="font-size: 20px;">鏅轰簯杩堟�滾-MES</a>
+ <a href="###" class="ax-item ax-col" style="font-size: 20px;" id="HLogoLabel">鏅轰簯杩堟�滾-MES</a>
<!--<a href="###" class="ax-item">娉ㄥ唽鏂扮敤鎴�</a>-->
<!--<li class="ax-col"></li>-->
</ul>
@@ -59,9 +59,11 @@
<div class="ax-flex-row">
<div class="ax-form-con">
<div class="ax-form-input">
- <span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span>
- <input name="LAY-user-login-username" value="" placeholder="杈撳叆鐧诲綍鍚嶇О" type="text" id="LAY-user-login-username">
- <span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span></div>
+ <span class="ax-pos-left" style="width: 2.4rem;"><i class="ax-iconfont ax-icon-me-f"></i></span>
+ <input name="LAY-user-login-username" value="" placeholder="杈撳叆鐧诲綍鍚嶇О" type="text" id="LAY-user-login-username">
+ <span class="ax-pos-right" ><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
+ </div>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer"></i>鍒峰崱</button>
</div>
</div>
</div>
@@ -266,6 +268,10 @@
});
}
})
+
+ //鑾峰彇鍩虹淇℃伅
+ getBaseInfo();
+
//鑾峰彇鐧诲綍椤电粍缁囧垪
var Organization = '';
$.ajax({
@@ -290,9 +296,6 @@
layer.closeAll("loading");
}
})
-
-
-
//form.render();
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
@@ -303,6 +306,9 @@
loging();
})
+ form.on("submit(LAY-user-loginICCard-submit)", function (obj) {
+ loginICCard();
+ })
//闊抽
form.on("submit(LAY-user-login-yp)", function (obj) {
playSound();
@@ -320,7 +326,6 @@
$("#LAY-user-login-password").focus();
}
})
-
//璇诲彇閰嶇疆鏂囦欢
function get_ReadConfigFile() {
@@ -352,7 +357,6 @@
//playSound();
layer.msg("璇烽�夋嫨缁勭粐锛�");
return;
-
}
var UserName = $("#LAY-user-login-username").val();
var PassWord = $("#LAY-user-login-password").val();
@@ -365,6 +369,9 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(result.Message, { icon: 1 });
//sessionStorage["HUserName"] = user.username;
+ sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//閲戣澏浜戣处鍙�
+ sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
+ sessionStorage["HMaker"] = result.data[0].Czymc;
sessionStorage["HUserName"] = result.data[0].Czymc;
sessionStorage["HBillerID"] = result.data[0].HK3UserID;
sessionStorage["SourceFlag"] = false;
@@ -385,6 +392,8 @@
sessionStorage["Czmm"] = result.data[0].Czmm;
sessionStorage["Czybm"] = result.data[0].Czybm;
sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
sessionStorage["HGroup"] = result.data[0].HGroup;
sessionStorage["HGroupID"] = result.data[0].HGroupID;
sessionStorage["HProc"] = result.data[0].HProc;
@@ -395,6 +404,8 @@
sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
sessionStorage["HProcName"] = result.data[0].HProcName;
sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
+ sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
sessionStorage["login"] = "login";
sessionStorage["OrganizationID"] = $("#Organization").val();
sessionStorage["Organization"] = $("#Organization option:selected").text();
@@ -420,6 +431,73 @@
})
}
+ //鍒峰崱鐧诲綍
+ function loginICCard() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: 'IC鍒峰崱',
+ closeBtn: 1,
+ shift: 2,
+ area: ['30%', '30%'],
+ maxmin: true,
+ content: '../user/login_ICCard.html',
+ end: function () {
+ if (LoginData.data[0].Czybm != undefined && LoginData.data[0].Czybm != "") {
+ result = LoginData;
+ sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//閲戣澏浜戣处鍙�
+ sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
+ sessionStorage["HMaker"] = result.data[0].Czymc;
+ sessionStorage["HUserName"] = result.data[0].Czymc;
+ sessionStorage["HBillerID"] = result.data[0].HK3UserID;
+ sessionStorage["SourceFlag"] = false;
+ sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
+ sessionStorage["HKeeper"] = result.data[0].HKeeper;
+ sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
+ sessionStorage["HSecManager"] = result.data[0].HSecManager;
+ sessionStorage["HSellManID"] = result.data[0].HSellManID;
+ sessionStorage["HSellMan"] = result.data[0].HSellMan;
+ sessionStorage["HDeptID"] = result.data[0].HDeptID;
+ sessionStorage["HDept"] = result.data[0].HDept;
+ sessionStorage["HWHID"] = result.data[0].HWhID;
+ sessionStorage["HWHName"] = result.data[0].HWHName;
+ sessionStorage["HSPID"] = result.data[0].HSPID;
+ sessionStorage["HSPName"] = result.data[0].HSPName;
+ sessionStorage["HSupID"] = result.data[0].HSupID;
+ sessionStorage["HSupName"] = result.data[0].HSupName;
+ sessionStorage["Czmm"] = result.data[0].Czmm;
+ sessionStorage["Czybm"] = result.data[0].Czybm;
+ sessionStorage["HEmpID"] = result.data[0].HEmpID;
+ sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
+ sessionStorage["HEmpName"] = result.data[0].HEmpName;
+ sessionStorage["HGroup"] = result.data[0].HGroup;
+ sessionStorage["HGroupID"] = result.data[0].HGroupID;
+ sessionStorage["HProc"] = result.data[0].HProc;
+ sessionStorage["HProcNo"] = result.data[0].HProcNo;
+ sessionStorage["HSource"] = result.data[0].HSource;
+ sessionStorage["HSourceID"] = result.data[0].HSourceID;
+ sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
+ sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
+ sessionStorage["HProcName"] = result.data[0].HProcName;
+ sessionStorage["HProcID"] = result.data[0].HProcID;
+ sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
+ sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
+ sessionStorage["login"] = "login";
+ sessionStorage["OrganizationID"] = $("#Organization").val();
+ sessionStorage["Organization"] = $("#Organization option:selected").text();
+ //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
+ if (!judgeMorPCflag) {//绉诲姩绔�
+ window.location.href = '../../views/index_Mobile.html'
+ } else {//PC绔�
+ window.location.href = '../../views/indexMenu.html'
+ }
+ get_WriteConfigFile();
+ }
+ }
+ });
+ }
+
+
function playSound() {
var audio = document.getElementById("cs");
if (audio == null)
@@ -428,8 +506,31 @@
audio.play();
}
+ //鑾峰彇鍩虹淇℃伅
+ function getBaseInfo() {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/BaseInfo",
+ data: {},
+ success: function (res) {
+ //鏌ヨ鎴愬姛
+ if (res.count == 1) {
+ var data = res.data[0];
+ console.log(data);
+ sessionStorage["HCusName"] = data.HCusName;
+ sessionStorage["HLogoLabel"] = data.HLogoLabel;
+ sessionStorage["HMenuLabel"] = data.HMenuLabel;
+ $("#HLogoLabel").text(data.HLogoLabel);
+ }
+ }
+ })
+ }
});
+ function getDataByICCard(obj) {
+ LoginData = obj;
+ }
</script>
+
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1