From c55106b0797ac56f8d3fd55b78a8dcc9b312880c Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 30 八月 2021 08:43:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 192 +++++++++--
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 217 +++++++++++--
WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html | 479 +++++++++++++++--------------
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 22 -
4 files changed, 570 insertions(+), 340 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 328341b..6269bb0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -155,7 +155,6 @@
function get_Display(sWhere) {
var index = layer.load(0, { shade: false });
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_Supplier/list',
type: "GET",
data: { "sWhere": sWhere },
@@ -184,23 +183,7 @@
if (HName) {
sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
}
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Gy_Supplier/list',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
// 閲嶇疆鎸夐挳
@@ -282,9 +265,6 @@
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
-
-
-
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 4d6f323..6658704 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -57,6 +57,7 @@
<label class="layui-form-label">缂栫爜</label>
<div class="layui-input-inline">
<input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+ <input type="hidden" name="HInterID" id="HInterID">
</div>
</div>
<div class="layui-inline">
@@ -168,7 +169,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HAreaID" id="HAreaID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
</div>
@@ -186,7 +187,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCurID" id="HCurID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
</div>
@@ -233,6 +234,7 @@
<label class="layui-form-label">鍒涘缓浜�</label>
<div class="layui-input-inline">
<input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
+
</div>
</div>
<div class="layui-col-xs3">
@@ -336,6 +338,7 @@
set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
+ $("#HInterID").val(linterid);
set_EditFromGrid();
}
else {
@@ -345,52 +348,139 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //閫夋嫨楠屾敹
- form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
- var sMainStr = JSON.stringify(data.field);
+ //缁撶畻鏂瑰紡寮圭獥
+ form.on('submit(btnSearchProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '楠屾敹鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁撶畻鏂瑰紡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/SettleStyleInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSID").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //榛樿璐у竵寮圭獥
+ form.on('submit(btnCurrency)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁撶畻鏂瑰紡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/CurrencyInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCurName").val(checkStatus.data[0].HName);
+ $("#HCurID").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //鍦板尯寮圭獥
+ form.on('submit(btnArea)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁撶畻鏂瑰紡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/AreaInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HAreaName").val(checkStatus.data[0].HName);
+ $("#HAreaID").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
});
//淇濆瓨
form.on('submit(Saver)', function (data) {//鎻愪氦
var ModRightNameAdd = 'Gy_Supplier_Edit';
- var user = sessionStorage["HUserName"];
+ var user ="Admin" /*sessionStorage["HUserName"]*/;
var oMain = JSON.stringify(data.field)
var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
- var index = layer.load();
-
+
if (AllowLoadData()) {
- if (OperationType === 3) {
+ if (OperationType =="3") {
$.ajax({
type: "POST",
url: GetWEBURL() + "/Gy_Supplier/AddBill1",
- //url: "http://localhost:12761/Gy_Supplier/AddBill1",
async: true,
data: { "oMain": sBillModeify },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("淇濆瓨鎴愬姛");
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
}
else {
layer.close(index);
@@ -407,22 +497,16 @@
$.ajax({
type: "POST",
url: GetWEBURL() + "/Gy_Supplier/AddBill",
- //url: "http://localhost:12761/Gy_Supplier/AddBill",
async: true,
data: { "oMain": oMain },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
}
else {
layer.close(index);
@@ -485,6 +569,28 @@
success: function (d) {
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
$("#HNumber").val(d.data[0].HNumber);
+ $("#HCreateOrgID").val(d.data[0].HCREATEORGID);
+ $("#HUseOrgID").val(d.data[0].HUSEORGID);
+ $("#HHelpCode").val(d.data[0].HHelpCode);
+ $("#HShortName").val(d.data[0].HShortName);
+ $("#HAddress").val(d.data[0].HAddress);
+ $("#HLinkMan").val(d.data[0].HLinkMan);
+ $("#HLinkPhone").val(d.data[0].HLinkPhone);
+ $("#HMobilePhone").val(d.data[0].HMobilePhone);
+ $("#HFax").val(d.data[0].HFax);
+ $("#HPostalCode").val(d.data[0].HPostalCode);
+ $("#HEmail").val(d.data[0].HEmail);
+ $("#HCorMan").val(d.data[0].HCorMan);
+ $("#HBank").val(d.data[0].HBank);
+ $("#HTaxNum").val(d.data[0].HTaxNum);
+ $("#HEnglishName").val(d.data[0].HEnglishName);
+ $("#HEnglishAddress").val(d.data[0].HEnglishAddress);
+ $("#HCountry").val(d.data[0].HCountry);
+ $("#HAreaID").val(d.data[0].HAreaID);
+ $("#HTaxRate").val(d.data[0].HTaxRate);
+ $("#HCurID").val(d.data[0].HCurID);
+ $("#HSSID").val(d.data[0].HSSID);
+ $("#HBankAccount").val(d.data[0].HBankAccount);
$("#HName").val(d.data[0].HName);
$("#HRemark").val(d.data[0].HRemark);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
@@ -548,7 +654,7 @@
//#endregion
});
- //浠ヤ笂涓簂ayui妯″潡
+ //浠ヤ笂涓簂ayui妯″潡
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index c81287d..8bd6189 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -185,7 +185,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HAreaID" id="HAreaID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
</div>
@@ -198,7 +198,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCurID" id="HCurID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
</div>
@@ -224,7 +224,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HCusTypeName" id="HCusTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCusTypeID" id="HCusTypeID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCustomerType" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
</div>
@@ -389,6 +389,154 @@
}
})
});
+ //缁撶畻鏂瑰紡寮圭獥
+ form.on('submit(btnSearchProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁撶畻鏂瑰紡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/SettleStyleInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSID").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //榛樿璐у竵寮圭獥
+ form.on('submit(btnCurrency)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁撶畻鏂瑰紡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/CurrencyInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCurName").val(checkStatus.data[0].HName);
+ $("#HCurID").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //瀹㈡埛鍒嗙被寮圭獥
+ form.on('submit(btnCustomerType)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁撶畻鏂瑰紡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/CustomerTypeInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCusTypeName").val(checkStatus.data[0].HName);
+ $("#HCusTypeID").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //鍦板尯寮圭獥
+ form.on('submit(btnArea)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁撶畻鏂瑰紡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/AreaInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HAreaName").val(checkStatus.data[0].HName);
+ $("#HAreaID").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//閫夋嫨浣跨敤缁勭粐
form.on('submit(HUseOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
var sMainStr = JSON.stringify(data.field);
@@ -408,33 +556,27 @@
});
//淇濆瓨
form.on('submit(Saver)', function (data) {//閫夋嫨鍒涘缓缁勭粐
- var oMain = JSON.stringify(data.field)
- var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
- var index = layer.load();
var ModRightNameAdd = 'Gy_Customer_Edit';
var user = sessionStorage["HUserName"];
+ var oMain = JSON.stringify(data.field)
+ var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+ console.log(AllowLoadData());
if (AllowLoadData()) {
//缂栬緫鈥斺�斾繚瀛�
- if (OperationType == 3) {
+ if (OperationType == "3") {
$.ajax({
type: "POST",
- //url: GetWEBURL() + "/Gy_Customer/AddBill1",
- url: "http://localhost:12761/Gy_Customer/AddBill1",
+ url: GetWEBURL() + "/Gy_Customer/AddBill1",
async: true,
data: { "oMain": sBillModeify },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("淇濆瓨鎴愬姛");
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
}
else {
layer.close(index);
@@ -451,23 +593,17 @@
else {
$.ajax({
type: "POST",
- //url: GetWEBURL() + "/Gy_Customer/AddBill",
- url: "http://localhost:12761/Gy_Customer/AddBill",
+ url: GetWEBURL() + "/Gy_Customer/AddBill",
async: true,
- data: { "oMain": oMain },
+ data: { "oMain": sBillModeify },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
- layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
}
else {
layer.close(index);
@@ -572,7 +708,6 @@
function AllowLoadData() {
var HCreateOrg = $("#HCreateOrg").val();
if (HCreateOrg == null || HCreateOrg == undefined || HCreateOrg == "") {
-
layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
return;
@@ -581,36 +716,36 @@
if (HCreateOrgID == null || HCreateOrgID == undefined || HCreateOrgID == "") {
layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
- return;
+ return false;
}
var HUseOrg = $("#HUseOrg").val();
if (HUseOrg == null || HUseOrg == undefined || HUseOrg == "") {
layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
- return;
+ return false;
}
var HUseOrgID = $("#HUseOrgID").val();
if (HUseOrgID == null || HUseOrgID == undefined || HUseOrgID == "") {
layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
- return;
+ return false;
}
var HNumber = $("#HNumber").val();
if (HNumber == null || HNumber == undefined || HNumber == "") {
-
layer.msg("璇疯緭鍏ュ鎴风紪鐮侊紒", { icon: 5 });
- return;
-
+ return false;
}
var HName = $("#HName").val();
if (HName == null || HName == undefined || HName == "") {
layer.msg("璇疯緭鍏ュ鎴峰悕绉帮紒", { icon: 5 });
- return;
-
+ return false;
+ }
+ else {
+ return true;
}
}
//杩斿洖楠屾敹
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\347\256\241\347\220\206/Sc_MouldConkBookBillList.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\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
index e15b169..7af0c98 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\347\256\241\347\220\206/Sc_MouldConkBookBillList.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\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
@@ -1,8 +1,8 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>妯″叿鏁呴殰鐧昏琛ㄥ垪琛�</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>妯″叿鏁呴殰鐧昏琛ㄥ垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -37,7 +37,7 @@
<option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
</select>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -49,30 +49,31 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
</div>
- </div>-->
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<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">
+ <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-inline">
<span>鍏朵粬鏉′欢></span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
- </div>
- </div>
- </div>-->
+
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -106,6 +107,7 @@
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏ㄥ眬鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -117,256 +119,263 @@
, util = layui.util
//鏌ヨ鏉′欢
var sWhere = "";
+ var option = [];
+ //#endregion
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
- , { field: 'hempid', title: 'hempid', width: 160, hide: true }
- , { field: '鍙戠幇浜轰唬鐮�', title: '鍙戠幇浜轰唬鐮�', width: 200 }
- , { field: '鍙戠幇浜�', title: '鍙戠幇浜�', width: 200 }
- , { field: 'HConkTypeID', title: 'HConkTypeID', width: 200, hide: true }
- , { field: '鏁呴殰绫诲埆浠ｇ爜', title: '鏁呴殰绫诲埆浠ｇ爜', width: 200 }
- , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆', width: 200 }
- , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
- , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
- , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
- , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜', width: 200 }
- , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', width: 200 }
- , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
- , { field: '浜у搧妯″叿浠ｇ爜', title: '浜у搧妯″叿浠ｇ爜', width: 200 }
- , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
- , { field: '鏁呴殰鍙戠敓鏃ユ湡', title: '鏁呴殰鍙戠敓鏃ユ湡', width: 200 }
- , { field: '瑕佹眰瀹屽杽鏃ユ湡', title: '瑕佹眰瀹屽杽鏃ユ湡', width: 200 }
- , { field: '鎽樿', title: '鎽樿', width: 200 }
- , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
- , { field: '澶囨敞', title: '澶囨敞', width: 200 }
- , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
- , { field: 'HConkReasonID', title: 'HConkReasonID', width: 115, hide: true }
- , { field: '鏁呴殰鍘熷洜浠ｇ爜', title: '鏁呴殰鍘熷洜浠ｇ爜', width: 200 }
- , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 200 }
- , { field: '鏁呴殰鍘熷洜鎻忚堪', title: '鏁呴殰鍘熷洜鎻忚堪', width: 200 }
- , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
- , { field: '瀛愯礋璐ｄ汉浠ｇ爜', title: '瀛愯礋璐ｄ汉浠ｇ爜', width: 200 }
- , { field: '瀛愯礋璐ｄ汉', title: '瀛愯礋璐ｄ汉', width: 200 }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
- , { field: 'hbilltype', title: 'hbilltype', width: 200 }
- ]]
- };
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
- var index = layer.load(0);
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
- case 'btn-Add':
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板妯″叿鏁呴殰鐧昏鍗�',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html',
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
- }
- });
+ //鏂板
+ case 'btn-Add': set_AddNew();
break;
- case 'btn-Edit':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].hmainid.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫妯″叿鏁呴殰鐧昏鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?hID=' + hID
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
-
+ //缂栬緫
+ case 'btn-Edit': set_ShowBill();
break;
- case 'btn-Delete':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_MouldConkBookBill/DeltetMouldConkBookBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
- 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);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
+ //鍒犻櫎
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
break;
};
});
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
- type: "GET",
- data: { "sWhere": sWhere},
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ get_FastQuery();
});
//閲嶇疆鎸夐挳
- //form.on('submit(btnReSearch)', function (data) {
- // $("#HBillType").val("");//鍗曟嵁绫诲瀷
- // $("#HBillNo").val("");//鍗曟嵁鍙�
- // $("#HSourceBillNo").val("");//婧愬崟鍙�
- // $("#HCreateBy").val("");//鍒跺崟浜�
- // $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
- // $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
- // $("#btnSearch").click();
- //});
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HCreateBy").val("");//鍒跺崟浜�
+ $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+ $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+ $("#btnSearch").click();
+ });
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
- //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
- //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
- //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
- //if (HBillNo) {
- // sWhere += " and HBillNo like '%" + HBillNo + "%'";
- //}
- //if (HCreateBy) {
- // sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
- //}
- //if (BenginHCreateDate) {
- // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
- //}
- //if (EndHCreateDate) {
- // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
- //}
- var index = layer.load(0);
+
+ //#endregion
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+ , { field: 'hempid', title: 'hempid', width: 160, hide: true }
+ , { field: '鍙戠幇浜轰唬鐮�', title: '鍙戠幇浜轰唬鐮�', width: 200 }
+ , { field: '鍙戠幇浜�', title: '鍙戠幇浜�', width: 200 }
+ , { field: 'HConkTypeID', title: 'HConkTypeID', width: 200, hide: true }
+ , { field: '鏁呴殰绫诲埆浠ｇ爜', title: '鏁呴殰绫诲埆浠ｇ爜', width: 200 }
+ , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆', width: 200 }
+ , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+ , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+ , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜', width: 200 }
+ , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', width: 200 }
+ , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+ , { field: '浜у搧妯″叿浠ｇ爜', title: '浜у搧妯″叿浠ｇ爜', width: 200 }
+ , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+ , { field: '鏁呴殰鍙戠敓鏃ユ湡', title: '鏁呴殰鍙戠敓鏃ユ湡', width: 200 }
+ , { field: '瑕佹眰瀹屽杽鏃ユ湡', title: '瑕佹眰瀹屽杽鏃ユ湡', width: 200 }
+ , { field: '鎽樿', title: '鎽樿', width: 200 }
+ , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+ , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+ , { field: 'HConkReasonID', title: 'HConkReasonID', width: 115, hide: true }
+ , { field: '鏁呴殰鍘熷洜浠ｇ爜', title: '鏁呴殰鍘熷洜浠ｇ爜', width: 200 }
+ , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 200 }
+ , { field: '鏁呴殰鍘熷洜鎻忚堪', title: '鏁呴殰鍘熷洜鎻忚堪', width: 200 }
+ , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
+ , { field: '瀛愯礋璐ｄ汉浠ｇ爜', title: '瀛愯礋璐ｄ汉浠ｇ爜', width: 200 }
+ , { field: '瀛愯礋璐ｄ汉', title: '瀛愯礋璐ｄ汉', width: 200 }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+ , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+ ]]
+ };
+ }
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
+ url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
type: "GET",
- data: { "sWhere": sWhere},
+ data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(index);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- sWhere = "";
- //$("#HBillType").val("");//鍗曟嵁绫诲瀷
- //$("#HBillNo").val("");//鍗曟嵁鍙�
- //$("#HSourceBillNo").val("");//婧愬崟鍙�
- //$("#HCreateBy").val("");//鍒跺崟浜�
- //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
- //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
- });
+ }
- //鐩戝惉琛屽弻鍑讳簨浠�
- table.on('rowDouble(mainTable)', function (obj) {
- layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
- });
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+ var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+ var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+ if (HBillNo) {
+ sWhere += " and HBillNo like '%" + HBillNo + "%'";
+ }
+ if (HCreateBy) {
+ sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
+ }
+ if (BenginHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+ }
+ if (EndHCreateDate) {
+ sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //鏂板
+ function set_AddNew() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板妯″叿鏁呴殰鐧昏鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
+ }
+ });
+ }
+
+ //缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫妯″叿鏁呴殰鐧昏鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?hID=' + hID
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ }
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldConkBookBill/DeltetMouldConkBookBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1