From bd2dd21b6416ef335012bb8f707c00590f3c9881 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 03 八月 2022 19:02:19 +0800
Subject: [PATCH] 工序流转卡 单据号 过滤 登录界面 配置
---
WebTM/views/user/login.html | 34 +++++++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 48 ++++++++++++++----------
2 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index a887f3d..cf6d621 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -121,10 +121,15 @@
}
$("#Organization").append(Organization);
form.render('select');
+
+ //璇诲彇閰嶇疆鏂囦欢
+ get_ReadConfigFile();
}
layer.closeAll("loading");
}
})
+
+
//form.render();
@@ -152,6 +157,33 @@
$("#LAY-user-login-password").focus();
}
})
+
+
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("data");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#LAY-user-login-username").val(data2["UserID"]);
+ $("#Organization").val(data2["OrgID"]);
+ form.render('select');
+ }
+ console.log(JSON.parse(data));
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.clear();
+ var data = {
+ UserID: sessionStorage["Czybm"]
+ , OrgID: sessionStorage["OrganizationID"]
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("data", JSON.stringify(data));
+ }
+
//鐧诲綍
function loging() {
if ($("#Organization").val() == 0) {
@@ -211,6 +243,7 @@
} else {//PC绔�
window.location.href = '../../views/index.html'
}
+ get_WriteConfigFile();
}
else {
// $("#verifycode").click();
@@ -225,6 +258,7 @@
}
})
}
+
function playSound() {
var audio = document.getElementById("cs");
if (audio == null)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 19e8f57..42d1a3e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -56,29 +56,33 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- <div class="layui-colla-content">
- <div class="layui-inline">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </div>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="SHname">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
</div>
</div>
</div>
@@ -225,6 +229,7 @@
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var HWorkBillNo = $("#HWorkBillNo").val();
var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
if (SHPrintQty == "鍏ㄩ儴") {
sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
@@ -254,6 +259,9 @@
if (SHname) {
sWhere += " and 瀛愪欢鍚嶇О like '%" + SHname + "%' or 瀛愪欢瑙勬牸 like '%" + SHname + "%'"
}
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
--
Gitblit v1.9.1