From be7d738131c8cf9c8e00c6abfde469f2d82cbfb0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 15 三月 2024 16:48:45 +0800
Subject: [PATCH] 1
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 368 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 300 insertions(+), 68 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index f2fb9d3..4bda2a8 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -89,21 +89,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閿�鍞儴闂�</label>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">閿�鍞憳</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞儴闂�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -142,6 +142,15 @@
<select name="HEarnestRate" id="HEarnestRate" lay-filter="HEarnestRate" style="width: 180px; ">
<option style="color:blue;" selected="selected" value="50">50%</option>
<option style="color:blue;" value="100">100%</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
+ <div class="layui-input-inline">
+ <select name="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value="0">鏅�氬崟鎹�</option>
+ <option style="color:blue;" value="1">杩斾慨鍗曟嵁</option>
</select>
</div>
</div>
@@ -454,6 +463,14 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -471,6 +488,14 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -587,7 +612,7 @@
"HMaterID": "0",
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
- "HItemID": "0",
+ "HOrderLevID": "0",
"璁㈠崟绛夌骇浠ｇ爜": "",
"璁㈠崟绛夌骇鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
@@ -610,7 +635,13 @@
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
- "HCusMaterName": ""
+ "HCusMaterName": "",
+ "HRelationQty": "0",
+ "HRelationQty_SellOutCheck": "0",
+ "HRelationMoney_SellOutCheck": "0",
+ "HRelationQty_ICMO": "0",
+ "HRelationQty_SellBack": "0",
+ "HRelationQty_SellBackCheck": "0"
};
switch (obj.event) {
//鏂板涓�琛�
@@ -719,7 +750,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
@@ -730,20 +761,49 @@
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp) || temp == 0) {
- //鎭㈠鏁版嵁鍒扮紪杈戝墠
- obj.update({
- HPrice: oldText
- });
- table.render(option);
+ if ($("#HBillSubType").val() == "0") {
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ table.render(option);
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
- setSelectHisStockGoodsByTableRender();
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
- layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
- return;
+ layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+ } else {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
}
-
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
@@ -774,7 +834,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
@@ -829,7 +889,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
@@ -840,18 +900,48 @@
case "HTaxPrice": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
- if (!ref.test(temp)) {
- //鎭㈠鏁版嵁鍒扮紪杈戝墠
- obj.update({
- HTaxPrice: oldText
- });
- table.render(option);
+ if ($("#HBillSubType").val() == "0") {
+ if (!ref.test(temp) || temp == "0") {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice: oldText
+ });
+ table.render(option);
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
- setSelectHisStockGoodsByTableRender();
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
- layer.msg("鍚◣鍗曟嵁璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
- return;
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+ } else {
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxPrice: oldText
+ });
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ layer.msg("鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
@@ -884,7 +974,7 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
@@ -932,6 +1022,19 @@
if (HEarnestRate != 0) {
HEarnestRateTemp = HEarnestRate;
}
+ });
+ //#endregion
+
+ //#region 閿�鍞鍗曠被鍨嬩笅鎷夊垪琛ㄧ洃鍚�
+ form.on('select(HBillSubType)', function (data) {
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
});
//#endregion
//#endregion
@@ -1061,13 +1164,13 @@
, { field: 'HisStockGoods', title: '鏄惁鍙栧簱瀛�', width: 120, templet: '#HisStockGoods' }
, { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, edit: 'text' }
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
- , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
+ , { field: 'HTaxRate', title: '绋庣巼%', width: 100, edit: 'text' }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text' }
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
, { field: 'HCusMaterNumber', title: '瀹㈡埛鐗╂枡缂栫爜', width: 100, edit: 'text' }
, { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', width: 100, edit: 'text' }
- , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
, { field: 'HDate', title: '浜よ揣鏃ユ湡', event: "HDate", width: 120 }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text', hide: true }
@@ -1076,6 +1179,12 @@
, { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 120, hide: true }
, { field: 'HOutStockQty', title: '鍑哄簱鏁伴噺', width: 100, edit: 'text', hide: true }
, { field: 'HInvoiceQty', title: '寮�绁ㄦ暟閲�', width: 100, edit: 'text', hide: true }
+ , { field: 'HRelationQty', title: '閿�鍞嚭搴撴暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+ , { field: 'HRelationQty_SellOutCheck', title: '閿�鍞嚭搴撳鏍告暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationMoney_SellOutCheck', title: '閿�鍞嚭搴撳鏍搁噾棰�', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
+ , { field: 'HRelationQty_ICMO', title: '鐢熶骇鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+ , { field: 'HRelationQty_SellBack', title: '閿�鍞��搴撴暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
+ , { field: 'HRelationQty_SellBackCheck', title: '閿�鍞��搴撳鏍告暟閲�', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
, done: function (res, curr, count) {
@@ -1122,7 +1231,13 @@
"HRemark": "",
"HCusMaterNumber": "",
"HCusModel": "",
- "HCusMaterName": ""
+ "HCusMaterName": "",
+ "HRelationQty": "0",
+ "HRelationQty_SellOutCheck": "0",
+ "HRelationMoney_SellOutCheck": "0",
+ "HRelationQty_ICMO": "0",
+ "HRelationQty_SellBack": "0",
+ "HRelationQty_SellBackCheck": "0"
}];
option.data = rowdata;
@@ -1192,6 +1307,7 @@
, "HCurName": data.甯佸埆
, "HExRate": data.姹囩巼
, "HEarnestRate": data.瀹氶噾姣斾緥
+ , "HBillSubType": data.HBillSubType
, "HManagerID": data.HManagerID
, "HManagerName": data.涓荤
, "HSellSID": data.HSellSID
@@ -1256,7 +1372,13 @@
"HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
"HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
"HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
- "HCusMaterName": result.data[i]["瀹㈡埛鐗╂枡鍚嶇О"]
+ "HCusMaterName": result.data[i]["瀹㈡埛鐗╂枡鍚嶇О"],
+ "HRelationQty": OperationType == 2 ? "0" : result.data[i]["鍏宠仈鏁伴噺"],
+ "HRelationQty_SellOutCheck": OperationType == 2 ? "0" : result.data[i]["閿�鍞嚭搴撳鏍告暟閲�"],
+ "HRelationMoney_SellOutCheck": OperationType == 2 ? "0" : result.data[i]["閿�鍞嚭搴撳鏍搁噾棰�"],
+ "HRelationQty_ICMO": OperationType == 2 ? "0" : result.data[i]["鐢熶骇鍏宠仈鏁伴噺"],
+ "HRelationQty_SellBack": OperationType == 2 ? "0" : result.data[i]["閿�鍞��搴撴暟閲�"],
+ "HRelationQty_SellBackCheck": OperationType == 2 ? "0" : result.data[i]["閿�鍞��搴撳鏍告暟閲�"],
}
);
}
@@ -1311,15 +1433,23 @@
}
$("#HEmpName").val(checkStatus.data[0].HName);
$("#HEmpID").val(checkStatus.data[0].HItemID);
+
+ getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- , btn2: function (index, layero) { }
+ , btn2: function (index, layero) {
+ $("#HEmpName").val("");
+ $("#HEmpID").val("0");
+
+ getEmpInfoByHEmpID("0");
+ }
})
}
//#endregion
//#region 瀹㈡埛閫夋嫨椤甸潰
function get_checkCus() {
+ var HEmpID = $("#HEmpID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -1602,6 +1732,11 @@
return false;
}
+ if ($("#HBillSubType").val() != "0" && $("#HBillSubType").val()!="1") {
+ layer.msg("璇烽�夋嫨閿�鍞鍗曠被鍨�!");
+ return false;
+ }
+
//if ($("#HSellSID").val() == "0") {
// layer.msg("閿�鍞柟寮忔湭閫夋嫨!");
// return false;
@@ -1651,13 +1786,21 @@
//鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HPrice"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細鍗曚环涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1"){
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
+
//绋庣巼鏍煎紡鏍￠獙
temp = option.data[i]["HTaxRate"] + "";
@@ -1668,32 +1811,54 @@
//鍚◣鍗曚环鏍煎紡鏍￠獙
temp = option.data[i]["HTaxPrice"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1"){
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細鍚◣鍗曚环璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
+
//閲戦鏍煎紡鏍￠獙
temp = option.data[i]["HMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細閲戦涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細閲戦涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細閲戦璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
//浠风◣鍚堣鏍煎紡鏍￠獙
temp = option.data[i]["HlineTotal"] + "";
- if (temp == "0") {
- layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
- return false;
+ if ($("#HBillSubType").val() == "0") {
+ if (temp == "0") {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ return false;
+ }
+ } else if ($("#HBillSubType").val() == "1") {
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + i + "琛岋細浠风◣鍚堣璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+ return false;
+ }
}
if (option.data[i]["HDate"] == "") {
@@ -2214,7 +2379,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID","璁㈠崟绛夌骇浠ｇ爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID","璁㈠崟绛夌骇浠ｇ爜","閿�鍞嚭搴撴暟閲�","閿�鍞嚭搴撳鏍告暟閲�","閿�鍞嚭搴撳鏍搁噾棰�","鐢熶骇鏁伴噺","閿�鍞��搴撴暟閲�","閿�鍞��搴撳鏍告暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//titleData = [];
dataCol = data1.data[0].HGridString.split(',');
@@ -2423,6 +2588,39 @@
}
//#endregion
+ //#region 鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ function setHisStockGoodsByHBillSubType() {
+ if ($("#HBillSubType").val() == "0") {
+ //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+ for (var i = 1; i <= option.data.length; i++) {
+ option.data[i - 1].HisStockGoods = "false";
+ }
+ //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+ var HisStockGoodsList = '<option value="false">鍚�</option>';
+ HisStockGoodsList += '<option value="true">鏄�</option>';
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HisStockGoods' + i + '').empty();
+ $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+ $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+ }
+ form.render('select');
+ } else if ($("#HBillSubType").val() == "1") {
+ //璁剧疆瀛愯〃鏄惁鍙栧簱瀛樺瓧娈靛��
+ for (var i = 1; i <= option.data.length; i++) {
+ option.data[i - 1].HisStockGoods = "true";
+ }
+ //閲嶆柊娓叉煋瀛愯〃鏄惁鍙栧簱瀛樹笅鎷夊垪琛ㄥ苟璧嬪��
+ var HisStockGoodsList = '<option value="true">鏄�</option>';
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HisStockGoods' + i + '').empty();
+ $('#HisStockGoods' + i + '').append(HisStockGoodsList);
+ $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+ }
+ form.render('select');
+ }
+ }
+ //#endregion
+
//#region 鑾峰彇婧愬崟-閿�鍞鍗曞崟鎹姸鎬�
function getSourceBillStatus_SeOrderBill() {
var HSourceBillData = "none";
@@ -2467,6 +2665,8 @@
{
$("#HEmpName").val(obj[0].HName);
$("#HEmpID").val(obj[0].HItemID);
+
+ getEmpInfoByHEmpID(obj[0].HItemID)
}
function GetHSupValue(obj) //杩斿洖瀹㈡埛
@@ -2571,6 +2771,7 @@
type: "GET",
data: {
"HCusID": HCusID
+ , "CurUserName": sessionStorage["HUserName"]
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -2580,7 +2781,38 @@
$("#HCreditRating_Now").val(data.HCreditRating_Now == null ? 0 : data.HCreditRating_Now);
$("#HAvailableBalance").val(data.HAvailableBalance == null ? 0 : data.HAvailableBalance);
} else {
- layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ $("#HCusBalance").val("");
+ $("#HCreditRating_Now").val("");
+ $("#HAvailableBalance").val("");
+ //layer.alert(result.Message, { icon: 5});
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ $("#HCusBalance").val("");
+ $("#HCreditRating_Now").val("");
+ $("#HAvailableBalance").val("");
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬
+ function getEmpInfoByHEmpID(HEmpID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getEmpInfoByHEmpID",
+ async: false,
+ type: "GET",
+ data: {
+ "HEmpID": HEmpID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HDeptID").val(data.HDeptID);
+ $("#HDeptName").val(data.HDeptName);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鍙戠敓閿欒!", { icon: 5 });
--
Gitblit v1.9.1