From 24efc0b0d99502afdebb6ef678b0cf4e91dcb084 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 16 五月 2025 15:49:51 +0800
Subject: [PATCH] 组织物料启动检查项目防错装置优化
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckNoteItem.html | 39 +++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_PreventErrMould.html | 37 +++
WebTM/views/Baseset/基础资料/Gy_UnitGroup.html | 12 +
WebTM/views/基础资料/公用基础资料/Add_Edit_Xt_ORGANIZATIONSList.html | 170 +++++++++++---
WebTM/views/基础资料/公用基础资料/Gy_CheckNoteItem.html | 4
WebTM/views/基础资料/公用基础资料/Gy_MaterType.html | 14 +
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html | 159 +++++++++++++-
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 190 ++++++++++++++--
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 13
WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html | 4
WebTM/views/Baseset/基础资料/Gy_HProjectGroup.html | 16 +
12 files changed, 553 insertions(+), 107 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 966482a..7d9b88b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html"
index d557238..cc8ae3a 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_HProjectGroup.html"
@@ -29,7 +29,7 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable"></table>
+ <table class="" id="mainTable" lay-filter="mainTable" ></table>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -51,7 +51,7 @@
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
-
+
RoadQuery($('#Value').val());
table.render({
@@ -69,7 +69,7 @@
, limits: [50, 500, 5000, 50000],
limit: 50
});
-
+
///鍔犺浇鏄剧ず鏁版嵁
function RoadQuery(Where) {
var Value = Where;
@@ -98,6 +98,16 @@
}
});
};
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHProjectGroupNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
});
</script>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitGroup.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitGroup.html"
index c016317..f1fe31b 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitGroup.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitGroup.html"
@@ -29,7 +29,7 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable"></table>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -98,6 +98,16 @@
}
});
};
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHUnitGroupNameValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
});
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckNoteItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckNoteItem.html"
index 041751b..86c9459 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckNoteItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckNoteItem.html"
@@ -25,6 +25,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -32,7 +33,7 @@
<div class="layui-tab layui-tab-brief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
- <li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -85,7 +86,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">纭鑰呰鑹�</label>
+ <label class="layui-form-label" style="width: 85px;">纭鑰呭矖浣�</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HCheckPostName" id="HCheckPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCheckPostID" id="HCheckPostID" value="0">
@@ -259,7 +260,12 @@
Pub_Close(1);
}
});
-
+
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -313,6 +319,31 @@
//#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BadReason/AuditGy_CheckNoteItem',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
//鍒濆鍖栫晫闈�
function set_ClearBill() {
$("#HUSEORGID").attr("disabled", true);
@@ -350,7 +381,7 @@
$("#HName").val(data.鍚姩妫�鏌ラ」鐩悕绉�);//鍚嶇О
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
$("#HCheckPostID").val(data.HCheckPostID);//澶囨敞
- $("#HCheckPostName").val(data.纭鑰呰鑹�);
+ $("#HCheckPostName").val(data.纭鑰呭矖浣�);
$("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
$("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 02228cc..d726b32 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -53,6 +53,7 @@
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>琛ュ厖淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
<li>闄勪欢淇℃伅</li>
</ul>
<h1 style="text-align:center;"><b>鐗╂枡璁剧疆</b></h1>
@@ -244,7 +245,7 @@
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織锛�</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" name="UnitType" id="UnitType">
</div>
</div>
@@ -693,6 +694,54 @@
</div>
</div>
</div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </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="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
<!--闄勪欢淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding-top: 10px;">
@@ -747,6 +796,7 @@
var hID = params[params[0]];//缂栬緫鏌ョ湅
var OperationType = params[params[1]];//1 鏂板 2澶嶅埗 3缂栬緫 4娴佹按鍙锋柊澧�
var HMaterTypeID = params[params[2]];//绫诲瀷id
+ var OptionData = [];
//鍒濆鍖� 鍙� 鍏敤鍙橀噺
var date = new Date();
var day = date.getDate();
@@ -805,12 +855,20 @@
PicUpload();
}
});
-
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 2) {
//淇敼鏃朵富琛↖D
RoadBillMain(hID);
$("#HItemID").val(0);
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
}
@@ -1114,6 +1172,12 @@
, "HSizing_M": data.瀹氬瀷娴嗘枡
, "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
, "HCubicleQty": data.宸ヤ綅鏁伴噺
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
});
colorpicker.render({
@@ -1512,7 +1576,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1525,6 +1589,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Fst").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Fst").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1537,7 +1608,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1550,6 +1621,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Proc").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Proc").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1562,7 +1640,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1575,6 +1653,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Patrol").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Patrol").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1589,7 +1674,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1606,6 +1691,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HUnitName").val(OptionData[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HUnitID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
});
@@ -1618,7 +1710,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html?HType=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1630,7 +1722,7 @@
if (checkStatus.data.length != 1) {
return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
}
- $("#HMaterClsName").val(checkStatus.data[0].鍚嶇О);
+ $("#HMaterClsName").val(checkStatus.data[0].鐗╂枡鍒嗙被鍚嶇О);
$("#HMaterTypeID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1648,7 +1740,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1665,6 +1757,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HSecUnitName").val(OptionData[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HSecUnitID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
});
@@ -1735,7 +1834,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?HType=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1763,7 +1862,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1780,6 +1879,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HSALEUNITName").val(OptionData[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HSALEUNITID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
});
//閫夋嫨閿�鍞浠疯閲忓崟浣�
@@ -1791,7 +1897,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1808,6 +1914,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HSALEPRICEUNITName").val(OptionData[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HSALEPRICEUNITID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
});
//閫夋嫨鍩烘湰璁￠噺鍗曚綅
@@ -1819,7 +1932,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1836,6 +1949,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HBASEUNITName").val(OptionData[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HBASEUNITID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
});
//閫夋嫨搴撳瓨璁￠噺鍗曚綅
@@ -1847,7 +1967,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1864,6 +1984,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HSTOREUNITName").val(OptionData[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HSTOREUNITID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
});
//閫夋嫨閲囪喘璁￠噺鍗曚綅
@@ -1875,7 +2002,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1892,6 +2019,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HPOUnitName").val(OptionData[0].璁￠噺鍗曚綅鍚嶇О);
+ $("#HPOUnitID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
});
//娓呯┖鐣岄潰
@@ -2080,7 +2214,7 @@
//杩斿洖浠撳簱
function GetHWHValue(obj) {
- $("#HWhName").val(obj[0].HName);
+ $("#HWhName").val(obj[0].浠撳簱鍚嶇О);
$("#HWhID").val(obj[0].HItemID);
}
//杩斿洖璁￠噺鍗曚綅缁�
@@ -2094,19 +2228,19 @@
$("#HProjectName").val(obj[0].椤圭洰缁�);
$("#HProjectBillMainID").val(obj[0].HInterID);
}
-
- //杩斿洖璁￠噺鍗曚綅
- function GetHUnitNameValue(obj) {
- if ($("#UnitType").val() == 1) {
- $("#HUnitName").val(obj[0].HName);
- $("#HUnitID").val(obj[0].HItemID);
- }
- else if ($("#UnitType").val() == 2) {
- $("#HSecUnitName").val(obj[0].HName);
- $("#HSecUnitID").val(obj[0].HItemID);
- }
+ //杩斿洖鐗╂枡鍒嗙被
+ function GetMaterTypeValue(obj) {
+ $("#HMaterClsName").val(obj[0].鐗╂枡鍒嗙被鍚嶇О);
+ $("#HMaterTypeID").val(obj[0].HItemID);
}
-
+ //杩斿洖璁￠噺鍗曚綅
+ function GetUnitValue(obj) {
+ OptionData = obj;
+ }
+ //鏂规杩斿洖
+ function GetCheckProjectValue(obj) {
+ OptionData = obj;
+ }
function previewImg(obj) {
var img = new Image();
img.src = obj.src;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.html"
index 753e8aa..1a0955e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.html"
@@ -25,6 +25,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -32,7 +33,7 @@
<div class="layui-tab layui-tab-brief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
- <li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -76,7 +77,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
<div class="layui-input-inline">
- <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" disabled>
<option value="鏈娴�" selected>鏈娴�</option>
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
@@ -88,7 +89,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="" disabled>
</div>
</div>
</div>
@@ -253,6 +254,11 @@
}
});
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -268,6 +274,31 @@
//#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BadReason/AuditGy_PreventErrMould',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
//鍒濆鍖栫晫闈�
function set_ClearBill() {
$("#HUSEORGID").attr("disabled", true);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html"
index 3b4d183..e4c5430 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html"
@@ -39,48 +39,125 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
- <div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁勭粐浠ｇ爜</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
- <input id="HItemID" name="HItemID" type="hidden" />
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ <h1 style="text-align:center;"><b>璁￠噺鍗曚綅</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" id="HName" autocomplete="off">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="HMakeTime" id="HMakeTime" style="width:190px;">
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤"disabled>
+ <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ </div>
+ </div>
+
+
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+ </div>
+ </div>
+
+ </div>
+ <input type="hidden" value="0" name="HParentID" id="HParentID">
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁勭粐鍚嶇О</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" id="HName" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="HMakeTime" id="HMakeTime" style="width:190px;">
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </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="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </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="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+ </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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ </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="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+ </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="HModifyTime" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
- <input type="hidden" value="false" name="HStopflag" id="HStopflag">
- </div>
- </div>
-
-
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
- </div>
- </div>
- </div>
-
</div>
- <input type="hidden" value="0" name="HParentID" id="HParentID">
+
+
+
+
</form>
</div>
</div>
@@ -112,7 +189,7 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
- $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+
var ItemID;
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
@@ -147,12 +224,16 @@
layer.alert("閿欒:" + err, { icon: 5 });
console.log("Reason" + sMainStr);
}
- });
+ });
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
+ $("#HModifyEmp").val(sessionStorage["HUserName"]);
+ $("#HModifyTime").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 4) {//娴忚
$("#HItemID").val(linterid);//
@@ -224,7 +305,7 @@
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
var ajaxLoad = layer.load();
- $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+
$.ajax({
url: GetWEBURL() + "Xt_ORGANIZATIONS/cx",
@@ -251,8 +332,15 @@
//, "HMakeTime": data.鏃ユ湡
, "HStopflag": data.绂佺敤鐘舵��
, "HRemark": data.澶囨敞
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeTime": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckTime": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopTime": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
+
});
- $("#HMakeTime").val(Format(data.鏃ユ湡, "yyyy-MM-dd"));
+
layer.close(ajaxLoad);
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckNoteItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckNoteItem.html"
index 2a4b849..b1985d8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckNoteItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckNoteItem.html"
@@ -700,7 +700,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && (data[0].瀹℃牳浜� === "" || data[0].瀹℃牳浜� == null)) {
var HItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
@@ -729,7 +729,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
index 0aab23e..eba5cf6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterType.html"
@@ -607,6 +607,7 @@
if (sql != "") {
sWhere += sql;
}
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -853,7 +854,20 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var addSWhere = "";
+
+ if ((typeof (openType) != "undefined") /*&& typeof(HOrgName) != "undefined"*/) {
+ addSWhere = " and 绂佺敤鏍囧織 = 0 and 瀹℃牳浜� !='' ";
+ }
+ return addSWhere;
+ }
+ //#endregion
//#region 鍒锋柊
function get_Refresh() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 4a99690..78630d3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -264,7 +264,7 @@
, laydate = layui.laydate
, tree = layui.tree
, carousel = layui.carousel
- var sWhere = " and 1=0";
+ var sWhere = " and 1=1";
var sql = "";
var option = [];
var Organization = sessionStorage["Organization"];
@@ -535,8 +535,7 @@
//鑾峰彇椤圭洰鍙�
Get_HProject();
get_FastQuery()
- //杩囨护鏂规
- get_DefaultModule()
+
}
//#endregion
@@ -753,6 +752,8 @@
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
ColFilter();
+ //杩囨护鏂规
+ get_DefaultModule()
}
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -946,7 +947,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -979,7 +980,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -1517,7 +1518,7 @@
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
//鏌ヨ
- get_FastQuery();
+ //get_FastQuery();
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PreventErrMould.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PreventErrMould.html"
index 8e33120..b6828d4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PreventErrMould.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PreventErrMould.html"
@@ -697,7 +697,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && (data[0].瀹℃牳浜� == "" || data[0].瀹℃牳浜� == null)) {
var HItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
@@ -726,7 +726,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
index 9d93442..6a66684 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -77,21 +78,26 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="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"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
</div>
</script>
@@ -115,7 +121,8 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var Organization = sessionStorage["Organization"]
+ var Organization = sessionStorage["Organization"];
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var HModName = "Xt_ORGANIZATIONSList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID", "HParentID"];
@@ -136,6 +143,22 @@
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
@@ -154,6 +177,10 @@
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);//绗簩涓弬鏁板簲涓築illType鍩虹璧勬枡绫诲瀷鏃燘illType鐢∕odname琛ㄧず
break;
};
});
@@ -230,6 +257,12 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
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 == '缁勭粐浠ｇ爜') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '缁勭粐浠ｇ爜', templet: function (d) {
+ return '<span style="color: blue;">' + d.缁勭粐浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -259,7 +292,8 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
-
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
@@ -374,6 +408,78 @@
})
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xt_ORGANIZATIONS/AuditXt_ORGANIZATIONS", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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 set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xt_ORGANIZATIONS/StopXt_ORGANIZATIONS", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": 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 set_AddNew() {
@@ -387,6 +493,26 @@
})
}
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '缁勭粐浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缁勭粐'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Xt_ORGANIZATIONSList.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 瀵煎嚭Execel
function get_Export() {
@@ -434,7 +560,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -466,7 +592,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
@@ -519,6 +645,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
--
Gitblit v1.9.1