From 98841c39d2579baeb81e8a4069ebf481adb05b22 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 27 六月 2024 16:03:07 +0800
Subject: [PATCH] 采购订单，付款单等模块优化
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 26 ++--
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 116 ++++++++++++++++++++---
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 11 -
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 101 ++++++++++++++++----
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 24 ++--
5 files changed, 210 insertions(+), 68 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_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 313b2d6..55bb2df 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"
@@ -686,7 +686,6 @@
// data: ajaxReturnData
//});
}
-
});
}
//杩斿洖楠屾敹
@@ -706,17 +705,17 @@
layer.msg("璇疯緭鍏ヤ緵搴斿晢鍚嶇О", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- var HAddress = $("#HAddress").val();
- if (HAddress == null || HAddress == undefined || HAddress == "") {
- layer.msg("鍦板潃涓嶅緱涓虹┖锛�", { icon: 5 });
- return;
+ //var HAddress = $("#HAddress").val();
+ //if (HAddress == null || HAddress == undefined || HAddress == "") {
+ // layer.msg("鍦板潃涓嶅緱涓虹┖锛�", { icon: 5 });
+ // return;
- }
+ //}
- if ($("#HAreaName").val() == '') {
- layer.msg("娌℃湁閫夋嫨鍦板尯", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HAreaName").val() == '') {
+ // layer.msg("娌℃湁閫夋嫨鍦板尯", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
if ($("#HCurName").val() == '') {
layer.msg("娌℃湁閫夋嫨榛樿璐у竵", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
@@ -727,17 +726,18 @@
}
var reg = /^0\d{2,3}-?\d{7,8}$/;
- if (reg.test($("#HLinkPhone").val()) == false || $("#HLinkPhone").val() == '') {
+ if (reg.test($("#HLinkPhone").val()) == false && $("#HLinkPhone").val() != "") {
layer.msg("鑱旂郴鐢佃瘽鍙风爜鏈夎锛岃杈撳叆鍖哄彿+鍙风爜鏍煎紡鐨勭數璇濆彿鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
- if (reg1.test($("#HEmail").val()) == false || $("#HEmail").val() == '') {
+ if (reg1.test($("#HEmail").val()) == false && $("#HEmail").val() != "" ) {
layer.msg("璇峰～鍐欐纭牸寮忕殑閭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
var reg2 = /^[1][3,4,5,7,8][0-9]{9}$/;
- if (reg2.test($("#HMobilePhone").val()) == false || $("#HMobilePhone").val() == '') {
+ if (reg2.test($("#HMobilePhone").val()) == false && $("#HMobilePhone").val() != "")
+ {
layer.msg("璇峰～鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index 54e3912..2fd66bf 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -187,7 +187,7 @@
<div class="layui-inline">
<label class="layui-form-label">澶у啓閲戦</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBigMoney" id="HBigMoney" value="" autocomplete="off" >
+ <input class="layui-input" name="HBigMoney" id="HBigMoney" value="" autocomplete="off" style="background-color: #efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -439,6 +439,7 @@
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
$("#HRelSumMoney").val(HRelSumMoney);
+ getBigMoneyByRelSumMoney();
});
//#endregion
@@ -466,28 +467,44 @@
$("#HSumMoney").val(HSumMoney);
$("#HDiscountRate").val(HDiscountRate);
$("#HRelSumMoney").val(HRelSumMoney);
+ getBigMoneyByRelSumMoney();
});
//#endregion
});
-
- $(document).ready(function () {
- $("#HBigMoney").blur(function () {
- var num = $(this).val();
- var strOutput = "";
- var strUnit = '浠熶桨鎷句嚎浠熶桨鎷句竾浠熶桨鎷惧厓瑙掑垎';
- num += "00";
- var intPos = num.indexOf('.');
- if (intPos >= 0) {
- num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
- }
- strUnit = strUnit.substr(strUnit.length - num.length);
- for (var i = 0; i < num.length; i++) {
- strOutput += '闆跺９璐板弫鑲嗕紞闄嗘煉鎹岀帠'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
- }
- // 灏嗚浆鎹㈠悗鐨勫ぇ鍐欓噾棰濇浛鎹㈡枃鏈涓殑鍐呭
- $(this).val(strOutput.replace(/闆惰闆跺垎$/, '鏁�').replace(/闆禰浠熶桨鎷綸/g, '闆�').replace(/闆秢2,}/g, '闆�').replace(/闆�([浜縷涓嘳)/g, '$1').replace(/闆�+鍏�/, '鍏�').replace(/浜块浂{0,3}涓�/, '浜�').replace(/^鍏�/, "闆跺厓"));
- });
- });
+ function getBigMoneyByRelSumMoney() {
+ var num = $("#HRelSumMoney").val();
+ var strOutput = "";
+ var strUnit = '浠熶桨鎷句嚎浠熶桨鎷句竾浠熶桨鎷惧厓瑙掑垎';
+ num += "00";
+ var intPos = num.indexOf('.');
+ if (intPos >= 0) {
+ num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
+ }
+ strUnit = strUnit.substr(strUnit.length - num.length);
+ for (var i = 0; i < num.length; i++) {
+ strOutput += '闆跺９璐板弫鑲嗕紞闄嗘煉鎹岀帠'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
+ }
+ // 灏嗚浆鎹㈠悗鐨勫ぇ鍐欓噾棰濇浛鎹㈡枃鏈涓殑鍐呭
+ $("#HBigMoney").val(strOutput.replace(/闆惰闆跺垎$/, '鏁�').replace(/闆禰浠熶桨鎷綸/g, '闆�').replace(/闆秢2,}/g, '闆�').replace(/闆�([浜縷涓嘳)/g, '$1').replace(/闆�+鍏�/, '鍏�').replace(/浜块浂{0,3}涓�/, '浜�').replace(/^鍏�/, "闆跺厓"));
+ }
+ //$(document).ready(function () {
+ // $("#HBigMoney").blur(function () {
+ // var num = $("#HRelSumMoney").val();
+ // var strOutput = "";
+ // var strUnit = '浠熶桨鎷句嚎浠熶桨鎷句竾浠熶桨鎷惧厓瑙掑垎';
+ // num += "00";
+ // var intPos = num.indexOf('.');
+ // if (intPos >= 0) {
+ // num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
+ // }
+ // strUnit = strUnit.substr(strUnit.length - num.length);
+ // for (var i = 0; i < num.length; i++) {
+ // strOutput += '闆跺９璐板弫鑲嗕紞闄嗘煉鎹岀帠'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
+ // }
+ // // 灏嗚浆鎹㈠悗鐨勫ぇ鍐欓噾棰濇浛鎹㈡枃鏈涓殑鍐呭
+ // $(this).val(strOutput.replace(/闆惰闆跺垎$/, '鏁�').replace(/闆禰浠熶桨鎷綸/g, '闆�').replace(/闆秢2,}/g, '闆�').replace(/闆�([浜縷涓嘳)/g, '$1').replace(/闆�+鍏�/, '鍏�').replace(/浜块浂{0,3}涓�/, '浜�').replace(/^鍏�/, "闆跺厓"));
+ // });
+ //});
//#endregion
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
@@ -738,7 +755,49 @@
}
$("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
$("#HSupID").val(checkStatus.data[0].HItemID);
-
+ if ($("#HAccSupName").val() == '') {
+ $("#HAccSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HAccSupID").val(checkStatus.data[0].HItemID);
+ }
+ //鑾峰彇閾惰鐩稿叧鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Supplier/xg",
+ type: "GET",
+ data: {
+ "HInterID": $("#HSupID").val()
+ },
+ success: function (d) {
+ $("#HBankName").val(d.data[0].寮�鎴烽摱琛�);
+ $("#HCurID").val(d.data[0].榛樿璐у竵ID);
+ $("#HCurName").val(d.data[0].榛樿璐у竵);
+ $("#HBankNo").val(d.data[0].閾惰璐﹀彿);
+ $("#HSSID").val(d.data[0].缁撶畻鏂瑰紡ID);
+ $("#HSSName").val(d.data[0].缁撶畻鏂瑰紡);
+ //鑾峰彇榛樿璐у竵姹囩巼
+ $.ajax({
+ url: GetWEBURL() + "GetGy_CurrencyDetail",
+ type: "GET",
+ data: {
+ "HID": $("#HCurID").val()
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Edit_Gy_CurrencyList[0];
+ $("#HExRate").val(data.姹囩巼);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ //table.reload(layTableId, {
+ // data: ajaxReturnData
+ //});
+ },error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index f3cd326..09402f5 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -469,8 +469,8 @@
//#endregion
var rowdata = [{
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0,"HWHName":"", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": 1, "HRelTaxPrice": "", "HTaxRate": 1, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd"),
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": "", "HRemark": ""
+ , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": 1, "HRelTaxPrice": "", "HTaxRate": 0, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd"),
}];
// 鍒濆鍖栫晫
@@ -482,8 +482,8 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "1", "HRelTaxPrice": "", "HTaxRate":1, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd")
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": "", "HRemark": ""
+ , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "1", "HRelTaxPrice": "", "HTaxRate":0, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd")
};
switch (obj.event) {
case 'btn-AddLine':
@@ -530,7 +530,7 @@
form.on('submit(HEmpList)', function () {
get_checkEmp();
});
- //閫夋嫨瀹㈡埛鎸夐挳
+ //閫夋嫨渚涘簲鍟嗘寜閽�
form.on('submit(HSupList)', function () {
get_checkSup();
});
@@ -650,13 +650,13 @@
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
+ if (!ref.test(temp) ) {
//鎭㈠鏁版嵁鍒扮紪杈戝墠
obj.update({
HPrice: oldText
});
- layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ layer.msg("鍗曚环璇疯緭鍏ユ暟瀛�!");
return;
}
@@ -685,7 +685,7 @@
, HlineTotalBB: HlineTotalBB
});
break;
- case "HTaxRate": //鏁伴噺
+ case "HTaxRate": //绋庣巼
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
if (!ref.test(temp)) {
@@ -694,7 +694,7 @@
HTaxRate: oldText
});
- layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ layer.msg("绋庣巼璇疯緭鍏ユ暟瀛�!");
return;
}
@@ -1075,7 +1075,7 @@
for (var i = 0; i < checkStatus.data.length; i++) {
if (rowIndex + i >= option.data.length) {
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "HQty": 1, "HRemark": ""
, "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
};
@@ -1095,6 +1095,7 @@
option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
option.data[rowIndex + i].HUnitID = resultData.HUnitID;
option.data[rowIndex + i].璁￠噺鍗曚綅 = resultData.HUnitName;
+ option.data[rowIndex + i].HQty = 1;
}
table.render(option);
@@ -1112,7 +1113,8 @@
, "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ ,"HQty":1
})
}
});
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index 77102f9..3bb317f 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -258,7 +258,17 @@
<div class="layui-input-inline">
<input class="layui-input" name="HProjectName" id="HProjectName" autocomplete="off" readonly>
</div>
-
+
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
</div>
</div>
</div>
@@ -510,6 +520,10 @@
//閫夋嫨浠撳簱鎸夐挳
form.on('submit(HWHList)', function () {
get_checkWH();
+ });
+ //閫夋嫨缁撶畻鎸夐挳
+ form.on('submit(HSSList)', function () {
+ get_checkSS();
});
//閫夋嫨甯佸埆鎸夐挳
form.on('submit(HCurList)', function () {
@@ -822,6 +836,8 @@
, "HDeptID": data.HDeptID
, "HCurID": data.HCurID
, "HCurName": data.甯佸埆
+ , "HSSID": data.HSSID
+ , "HSSName": data.缁撶畻鏂瑰紡
, "HExRate": data.姹囩巼
, "HManagerName": data.涓荤
, "HManagerID": data.HManagerID
@@ -1025,7 +1041,33 @@
});
}
}
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋��
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
+ $("#HSSID").val(data.HSSID);
+ $("#HSSName").val(data.HSSName);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//琛屽唴蹇嵎閿瓫閫�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1047,20 +1089,35 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
+ }else if (checkStatus.data.length == 1) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": checkStatus.data[0].HItemID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[0].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ ,"HQty": 1
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ } else {
+ table.cache["mainTable"].splice(0, 1);
+ for (var rowData of checkStatus.data) {
+ var NewRow = {
+ "HMaterID": rowData.HItemID, "鐗╂枡浠ｇ爜": rowData.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": rowData.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": rowData.瑙勬牸鍨嬪彿, "HUnitID": rowData.HUnitID, "璁￠噺鍗曚綅": rowData.璁￠噺鍗曚綅鍚嶇О, "HWHID": "0", "鍙戣揣浠撳簱": "",
+ "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ };
+ table.cache["mainTable"].push(NewRow);
+ }
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ layer.close(index);//鍏抽棴寮圭獥
}
-
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
- })
- layer.close(index);//鍏抽棴寮圭獥
+
}
, end: function () {
if (typeof (OptionData.HItemID) != "undefined") {
@@ -1220,6 +1277,7 @@
}
$("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
$("#HCusID").val(checkStatus.data[0].HItemID);
+ getCustomerByCusID($("#HCusID").val());
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1325,7 +1383,29 @@
, btn2: function (index, layero) { }
})
}
-
+ //缁撶畻鏂瑰紡
+ function get_checkSS() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.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].缁撶畻鏂瑰紡鍚嶇О);
+ $("#HSSID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
//椤圭洰浠ｇ爜
function get_checkSearchHProNumber() {
var HOrgID = sessionStorage["OrganizationID"];
@@ -1451,7 +1531,11 @@
}
layui.table.render(option);
}
-
+ function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
+ {
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
+ $("#HSSID").val(obj[0].HItemID);
+ }
//鍙屽嚮杩斿洖浠撳簱
function GetHWHSubValue(data) {
OptionData = data[0]
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 47b55df..667b2e2 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -988,14 +988,14 @@
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
+ if (!ref.test(temp) ) {
//鎭㈠鏁版嵁鍒扮紪杈戝墠
obj.update({
HPrice: oldText
});
table.render(option);
- layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟瀛�!");
return;
}
@@ -2202,11 +2202,8 @@
//鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HPrice"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟瀛楋紒");
return false;
}
--
Gitblit v1.9.1