From 1d814f4106bfa845010cc5160e915ca9d4917816 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 28 十二月 2024 10:55:24 +0800
Subject: [PATCH] 刷卡登录页面修改,器具领用出库单添加关闭按钮，页面优化
---
WebTM/views/user/login.html | 9 ++--
WebTM/views/user/login_ICCard.html | 13 ++++--
WebTM/layuiadmin/ax/images/iccard-bg.jpg | 0
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html | 82 +++++++++++++++++++++++++++++++++++++---
4 files changed, 88 insertions(+), 16 deletions(-)
diff --git a/WebTM/layuiadmin/ax/images/iccard-bg.jpg b/WebTM/layuiadmin/ax/images/iccard-bg.jpg
new file mode 100644
index 0000000..9788d1b
--- /dev/null
+++ b/WebTM/layuiadmin/ax/images/iccard-bg.jpg
Binary files differ
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 5ec04df..aceca20 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -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>
@@ -123,7 +125,6 @@
<div class="ax-form-group">
<div class="ax-flex-row">
<div class="ax-flex-block">
- <div class="ax-form-input"><button type="button" lay-submit="" class="ax-btn ax-primary ax-full" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="margin-bottom:7px">鍒峰崱鐧诲綍</button></div>
<div class="ax-form-input"><button type="button" lay-submit="" class="ax-btn ax-primary ax-full" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧诲綍</button></div>
</div>
</div>
diff --git a/WebTM/views/user/login_ICCard.html b/WebTM/views/user/login_ICCard.html
index 31fcd77..eb1d1f3 100644
--- a/WebTM/views/user/login_ICCard.html
+++ b/WebTM/views/user/login_ICCard.html
@@ -23,11 +23,11 @@
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px; background-image: url(../../layuiadmin/ax/images/login-bg.jpg); height: 200px; background-size: cover; ">
- <div class="layui-row header">
- <h1 class="layui-col-xs4 layui-col-xs-offset4" style="color: #1e9fff ">鍒峰崱鐧诲綍</h1>
- </div>
- <div style="margin-top:40px">
+ <div style="padding: 10px; height: 280px; background-image: url(../../layuiadmin/ax/images/iccard-bg.jpg); height: 240px; background-size: 100% 100%;">
+ <!--<div class="layui-row header">
+ <h1 class="layui-col-xs4 layui-col-xs-offset4" style="color: #1e9fff ">鍒峰崱鐧诲綍</h1>
+ </div>-->
+ <div style="margin-top:5px">
<label class="layui-form-label">
<i class="layui-icon layui-icon-username"></i>
</label>
@@ -35,6 +35,9 @@
<input type="text" class="layui-input" placeholder="璇峰埛IC鍗�" id="HBardCode" autocomplete="off" name="HBardCode" lay-verify="HBardCode" style="">
</div>
</div>
+ <!--<div style="background-image: url(../../layuiadmin/ax/images/iccard-bg.jpg); height: 240px; background-size: 100% 100%;margin-top:40px">
+
+ </div>-->
</div>
</form>
</div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
index 0d22213..e89e07c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
@@ -120,6 +120,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -207,6 +209,13 @@
});
//#endregion
+
+ //杈撳叆妗嗗洖杞︽柟娉�
+ $('input').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -368,7 +377,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
- if (data1.count != 0) {
+ if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
laypage.render(optionPage);
@@ -393,7 +402,7 @@
option.data = [];
ins = table.render(option);
layer.close(ajaxLoad);
- /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -476,7 +485,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -501,6 +510,14 @@
break;
//鍙嶅鏍�
case 'btn-Faudit': get_FAudit();
+ break;
+ //鍏抽棴鎸夐挳 锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+ case 'btn-Close':
+ set_CloseBill(0);
+ break;
+ //鍙嶅叧闂寜閽�
+ case 'btn-DeClose':
+ set_CloseBill(1);
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -585,7 +602,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -623,6 +640,21 @@
})
//#endregion
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
//鍙嶅鏍�
function get_FAudit() {
var checkStatus = table.checkStatus('mainTable')
@@ -640,7 +672,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -655,6 +687,42 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
}
}
+
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdOutBill/CloseSc_MouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+ }
+ }
+ //#endregion
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
@@ -713,14 +781,14 @@
$("#HSupName").val("");
$("#HStockOrgName").val("");
sWhere = "";
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//#endregion
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//#endregion
--
Gitblit v1.9.1