From 3e67f57cd1eb83e41f232a3e3bd8f753d020125a Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 03 八月 2021 10:20:17 +0800
Subject: [PATCH] nothing
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 67 ++++++++++-----------
WebTM/layuiadmin/PubJs/PubCheck.js | 31 ++++++++++
WebTM/views/user/login.html | 6 +
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 10 +-
WebTM/layuiadmin/Scripts/webConfig.js | 7 -
WebTM/WebTM.csproj | 1
6 files changed, 76 insertions(+), 46 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 043b565..abe926a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -83,6 +83,7 @@
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\treeTable.js" />
<Content Include="layuiadmin\PubCustom.js" />
+ <Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Sc_ICMOBillListView2.html" />
diff --git a/WebTM/layuiadmin/PubJs/PubCheck.js b/WebTM/layuiadmin/PubJs/PubCheck.js
new file mode 100644
index 0000000..8c1ad1d
--- /dev/null
+++ b/WebTM/layuiadmin/PubJs/PubCheck.js
@@ -0,0 +1,31 @@
+/**
+ *鍏敤鐨勶紝閫夋嫨鍩虹璧勬枡鏂规硶锛屾瘡涓熀纭�璧勬枡涓ょ鏍峰紡锛屼竴绉嶆槸鏈夋爲褰㈢殑锛屼竴绉嶆槸娌℃湁鐨勩��
+ * 闇�瑕佹敞鎰忕殑鏄寜閽洖璋冪殑鏂规硶涓殑id瑕佸拰椤甸潰涓婂瓧娈电殑id淇濇寔涓�鑷淬��
+ *by zgq
+ */
+
+//#region 閫夋嫨閮ㄩ棬銆侀�夋嫨杞﹂棿銆侀�夋嫨鐢熶骇杞﹂棿
+function Pub_checkDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/DeptInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+}
+//#endregion
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7818b9f..b71b61c 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,13 +1,10 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
- //var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//鐜嬫案娉㈡湰鍦伴厤缃紝璇峰嬁鏇存敼
- //var WEBURL = "http://101.37.171.70/API/"; //鍏徃鏈嶅姟鍣�
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- //var WEBURL = "http://10.1.4.154/API/"; //姹熶赴瀹㈡埛
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 10abe80..b2f1473 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -99,7 +99,7 @@
}
})
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '<option value="" style="color:red;">缁勭粐</option>';
+ var Organization = '<option value="0" style="color:red;">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -142,6 +142,10 @@
//鐧诲綍
function loging() {
+ if ($("#Organization").val() == 0) {
+ layer.msg("璇烽�夋嫨缁勭粐锛�");
+ return;
+ }
var UserName = $("#LAY-user-login-username").val();
var PassWord = $("#LAY-user-login-password").val();
layer.load(3);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 28c900a..34db1d9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -117,7 +117,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDepName" id="HDepName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" value="0">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -258,7 +258,7 @@
//閫夋嫨閮ㄩ棬鎸夐挳
form.on('submit(HDepart-BT)', function () {
- get_checkDepart();
+ get_checkDept();
});
//閫夋嫨宸ヤ綔涓績鎸夐挳
@@ -324,7 +324,7 @@
, "HCenterID": data.宸ヤ綔涓績ID
, "HGroup": data.鐝粍鍚嶇О
, "HGroupID": data.鐝粍ID
- , "HDepName": data.閮ㄩ棬鍚嶇О
+ , "HDeptName": data.閮ㄩ棬鍚嶇О
, "HDeptID": data.閮ㄩ棬ID
, "HProcName": data.宸ュ簭
, "HProcID": data.宸ュ簭ID
@@ -402,7 +402,7 @@
//#endregion
//#region 閫夋嫨閮ㄩ棬鏂规硶
- function get_checkDepart() {
+ function get_checkDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -417,7 +417,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDepName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].HName);
$("#HDeptID").val(checkStatus.data[0].HItemID);
$("#HDeptNumber").val(checkStatus.data[0].HNumber);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 54f6c8e..d56edbc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -62,7 +62,8 @@
<label class="layui-form-label">鐢熶骇杞﹂棿</label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+ <input type="hidden" name="HDeptNumber" id="HDeptNumber">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HShopList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -233,39 +234,9 @@
});
//#endregion
- //#region 琛ㄥご淇℃伅杞﹂棿寮圭獥
+ //#region 閫夋嫨鐢熶骇杞﹂棿鎸夐挳
form.on('submit(HShopList)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '杞﹂棿鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HDeptName").val(checkStatus.data[0].HName);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
- },
- success: function (layero, index) {
- }
- });
+ get_checkDept();
});
//#endregion
@@ -310,7 +281,7 @@
//#region 閫夋嫨缁熻鍛樻寜閽�
form.on('submit(HEmpList)', function () {
- get_checkWorkEmp();
+ get_checkEmp();
});
//#endregion
@@ -972,7 +943,7 @@
//#endregion
//#region 閫夋嫨缁熻鍛樻柟娉�
- function get_checkWorkEmp() {
+ function get_checkEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -996,6 +967,32 @@
}
//#endregion
+ //#region 閫夋嫨閮ㄩ棬鏂规硶
+ function get_checkDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/DeptInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
//#endregion
--
Gitblit v1.9.1