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 | 827 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 682 insertions(+), 145 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 94cfd97..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"
@@ -15,24 +15,36 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <style type="text/css">
- /*.layui-form-item .layui-inline {
- margin-right: 0;
- }
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <style>
+ /*.main-btn {*/ /*澶撮儴涓绘寜閽�*/
+ /*padding: 0 2px;*/ /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ /*height: 30px;
+ line-height: 30px;
+ }*/
- html {
- background-color: white;
- color: white;
+ .btn-title {
+ font-size: 16px;
}
-
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
overflow: visible !important;
}
-
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
td .layui-form-select {
margin-top: -10px;
margin-left: -15px;
margin-right: -15px;
+ }
+
+ /* .layui-form-item .layui-inline {
+ margin-top: 0px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
}*/
</style>
</head>
@@ -46,6 +58,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck">鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -76,16 +89,6 @@
</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>
@@ -95,8 +98,28 @@
</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>
+ </div>
</div>
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
+ <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" 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 style="color:red"> * </label></label>
<div class="layui-input-inline">
@@ -113,14 +136,22 @@
<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline" style="width:900px;">
- <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
- <div class="layui-input-inline" style="width:700px;">
- <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float: left; width: 465px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹氶噾姣斾緥%</label>
+ <div class="layui-input-inline">
+ <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>
</div>
@@ -146,24 +177,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 501px;">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">閿�鍞富绠�</label>
- <div class="layui-input-inline">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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 class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off" value="">
@@ -175,13 +188,8 @@
<input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off" value="">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍐呴儴璁㈠崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color: #efefef4d;" autocomplete="off" readonly>
- </div>
- </div>
</div>
+
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
@@ -228,6 +236,30 @@
</div>
<!--闅愯棌瀛楁锛氭殏鏃舵病鏈夌敤澶�-->
+ <div class="layui-row" style="display:none;">
+ <div class="layui-inline">
+ <label class="layui-form-label">閿�鍞富绠�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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 class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="background-color: #efefef4d;" autocomplete="off" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 501px;">
+ </div>
+ </div>
+ </div>
<div class="layui-row" style="display:none;">
<div class="layui-inline">
<label class="layui-form-label">缁撶畻鏃ユ湡</label>
@@ -365,7 +397,13 @@
<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
-
+ <!--琛屼笅鎷夐�夋嫨(鏄惁鍙栧簱瀛�)-->
+ <script type="text/html" id="HisStockGoods">
+ <select name="HisStockGoods" lay-filter="HisStockGoods" id="HisStockGoods{{d.LAY_TABLE_INDEX+1}}">
+ <option value="false">鍚�</option>
+ <option value="true">鏄�</option>
+ </select>
+ </script>
<script>
//#region 鎶樺彔娉ㄩ噴
//#endregion
@@ -393,6 +431,7 @@
//妯″潡鍚�
var HModName = "Xs_SeOrderBill";
var HBillType = "1401";
+ var HEarnestRateTemp = "50";
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -405,7 +444,14 @@
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
- //#endregion
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ //var HModuleType = "1401";
+ ////閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ //var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ //$("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+ //#endregion
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
@@ -417,6 +463,14 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -434,6 +488,14 @@
set_InitGrid();
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -449,7 +511,7 @@
//DisPlay_HideColumn();
//#endregion
//#endregion
-
+
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
//#region 閫夋嫨閿�鍞憳鎸夐挳
@@ -468,7 +530,7 @@
form.on('submit(HSellSList)', function () {
get_checkSellS();
});
- //#endregion
+ //#endregion
//#region 閫夋嫨缁撶畻鏂瑰紡鎸夐挳
form.on('submit(HSSList)', function () {
@@ -480,7 +542,7 @@
form.on('submit(HCurList)', function () {
get_checkCur();
});
- //#endregion
+ //#endregion
//#region 閫夋嫨閿�鍞儴闂ㄦ寜閽�
form.on('submit(HDeptList)', function () {
@@ -516,6 +578,12 @@
});
//#endregion
+ //#region 鍙嶅鏍告寜閽�
+ form.on('submit(set_AbandonCheck)', function (data) {
+ set_CheckBill(1);
+ });
+ //#endregion
+
//#region 鎵撳嵃鎸夐挳
form.on('submit(btn-print)', function (data) {
get_PrintReport();
@@ -544,6 +612,9 @@
"HMaterID": "0",
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
+ "HOrderLevID": "0",
+ "璁㈠崟绛夌骇浠ｇ爜": "",
+ "璁㈠崟绛夌骇鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
@@ -558,9 +629,19 @@
"HlineTotal": "0",
"HlineTotalBB": "0",
"HDate": Format(new Date(), 'yyyy-MM-dd'),
+ "HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
- "HRemark": ""
+ "HRemark": "",
+ "HCusMaterNumber": "",
+ "HCusModel": "",
+ "HCusMaterName": "",
+ "HRelationQty": "0",
+ "HRelationQty_SellOutCheck": "0",
+ "HRelationMoney_SellOutCheck": "0",
+ "HRelationQty_ICMO": "0",
+ "HRelationQty_SellBack": "0",
+ "HRelationQty_SellBackCheck": "0"
};
switch (obj.event) {
//鏂板涓�琛�
@@ -596,7 +677,7 @@
var field = $(this).data('field');
laydate.render({
elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
+ , show: true //鐩存帴鏄剧ず
, closeStop: this
, done: function (nowDate) {
//鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
@@ -632,6 +713,9 @@
});
table.render(option);
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -644,7 +728,7 @@
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
- //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
+ //鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
@@ -666,24 +750,60 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val()*1);
break;
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);
- layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
- return;
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ 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; //鏁伴噺
@@ -714,9 +834,13 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -727,6 +851,9 @@
HTaxRate: oldText
});
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
return;
@@ -762,31 +889,68 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
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);
- layer.msg("鍚◣鍗曟嵁璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
- return;
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ 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; //鏁伴噺
var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
var HTaxPrice = value * 1; //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
var HPrice = HTaxPrice / (1 + HTaxRate); //鍗曚环=鍚◣鍗曟嵁/(1+绋庣巼)
-
+
/*var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�*/
-
+
/*var HRelTaxPrice = HTaxPrice * HDiscountRate; //瀹為檯鍚◣鍗曚环=鍚◣鍗曚环*鎶樻墸鐜�*/
//鎶樻墸棰� = 鍚◣鍗曚环 * (1 - 鎶樻墸鐜�) * 鏁伴噺
var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
@@ -810,9 +974,13 @@
, HMoney: HMoney
, HlineTotal: HlineTotal
});
- table.render(option);
+ //table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
default:
}
@@ -831,17 +999,42 @@
//#region 鍙敤浣欓鎻愮ず淇℃伅
$("#tips-HAvailableBalance").on('click', function (data) {
- var tips_Message = "鍙敤棰濆害 = 瀹㈡埛浣欓 + 淇＄敤棰濆害 - 锛堟湰鏈熼攢鍞鍗曟�婚噾棰� * 0.5锛�";
+ var tips_Message = "鍙敤棰濆害 = 瀹㈡埛浣欓 + 淇＄敤棰濆害 - 锛堟湰鏈熼攢鍞鍗曟�婚噾棰� * 瀹氶噾姣斾緥%锛�";
layer.alert(tips_Message, { icon: 0, btn: ['閫�鍑�'], time: 100000, offset: 't' });
});
//#endregion
//#region 闇�姹傞噾棰�
$("#tips-HBillMoney").on('click', function (data) {
- var tips_Message = "闇�姹傞噾棰� = 浠风◣鍚堣 * 0.5";
+ var tips_Message = "闇�姹傞噾棰� = 浠风◣鍚堣 * 瀹氶噾姣斾緥%";
layer.alert(tips_Message, { icon: 0, btn: ['閫�鍑�'], time: 100000, offset: 't' });
});
//#endregion
+ });
+ //#endregion
+
+ //#region 璧犻�佹瘮渚嬩笅鎷夊垪琛ㄧ洃鍚�
+ form.on('select(HEarnestRate)', function (data) {
+ //杈撳叆鐨勯噾棰濆悎娉曪紝閲嶇畻鎶樻墸鍚庨噾棰�
+ var HEarnestRate = $("#HEarnestRate").val() * 1; //瀹氶噾姣斾緥%
+ set_HBillMoney(HEarnestRate);
+
+ if (HEarnestRate != 0) {
+ HEarnestRateTemp = HEarnestRate;
+ }
+ });
+ //#endregion
+
+ //#region 閿�鍞鍗曠被鍨嬩笅鎷夊垪琛ㄧ洃鍚�
+ form.on('select(HBillSubType)', function (data) {
+ //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+ setHisStockGoodsByHBillSubType();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
});
//#endregion
//#endregion
@@ -959,36 +1152,65 @@
, cols: [[ //瀛愯〃
{ type: 'checkbox', totalRowText: '鍚堣琛�', style: 'background-color:#efefef4d;' }
, { type: 'numbers', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'HOrderLevID', title: 'HOrderLevID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+ , { field: '璁㈠崟绛夌骇浠ｇ爜', title: '璁㈠崟绛夌骇浠ｇ爜', width: 150, hide: true, edit: 'text', event: "HOrderLevID" }//f7
+ , { field: '璁㈠崟绛夌骇鍚嶇О', title: '璁㈠崟绛夌骇鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150, edit: 'text', event: "HMaterID" }//f7
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+ , { 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: 'HDate', title: '浜よ揣鏃ユ湡', event: "HDate", width: 120 }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-
-
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text', hide: true }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, hide: true }
, { field: 'HTaxMoney', title: '绋庨', width: 100, hide: true }
, { 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) {
+ option.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.HisStockGoods);
+ }
+ });
+ });
+ }
}
var rowdata = [{
"HMaterID": "0",
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
+ "HOrderLevID": "0",
+ "璁㈠崟绛夌骇浠ｇ爜": "",
+ "璁㈠崟绛夌骇鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
"HUnitID": "0",
"璁￠噺鍗曚綅": "",
@@ -1003,16 +1225,29 @@
"HlineTotal": "0",
"HlineTotalBB": "0",
"HDate": Format(new Date(),'yyyy-MM-dd'),
+ "HisStockGoods": "false",
"HOutStockQty": "0",
"HInvoiceQty": "0",
- "HRemark": ""
+ "HRemark": "",
+ "HCusMaterNumber": "",
+ "HCusModel": "",
+ "HCusMaterName": "",
+ "HRelationQty": "0",
+ "HRelationQty_SellOutCheck": "0",
+ "HRelationMoney_SellOutCheck": "0",
+ "HRelationQty_ICMO": "0",
+ "HRelationQty_SellBack": "0",
+ "HRelationQty_SellBackCheck": "0"
}];
option.data = rowdata;
table.render(option);
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -1036,8 +1271,11 @@
//鍒濆鍖栧苟鍒楄缃細瀛愯〃1
set_InitGrid();
DisPlay_HideColumn();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
}
- //#endregion
+ //#endregion
//#region 缂栬緫椤甸潰鍒濆鍖�
function RoadBillMain(linterid) {
@@ -1068,6 +1306,8 @@
, "HCurID": data.HCurID
, "HCurName": data.甯佸埆
, "HExRate": data.姹囩巼
+ , "HEarnestRate": data.瀹氶噾姣斾緥
+ , "HBillSubType": data.HBillSubType
, "HManagerID": data.HManagerID
, "HManagerName": data.涓荤
, "HSellSID": data.HSellSID
@@ -1109,6 +1349,9 @@
"HMaterID": result.data[i]["HMaterID"],
"鐗╂枡浠ｇ爜": result.data[i]["鐗╂枡浠ｇ爜"],
"鐗╂枡鍚嶇О": result.data[i]["鐗╂枡鍚嶇О"],
+ "HOrderLevID": result.data[i]["HOrderLevID"],
+ "璁㈠崟绛夌骇浠ｇ爜": result.data[i]["璁㈠崟绛夌骇浠ｇ爜"],
+ "璁㈠崟绛夌骇鍚嶇О": result.data[i]["璁㈠崟绛夌骇鍚嶇О"],
"瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
"HUnitID": result.data[i]["HUnitID"],
"璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
@@ -1120,25 +1363,44 @@
"HRelTaxPrice": result.data[i]["瀹為檯鍚◣鍗曚环"],
"HTaxRate": result.data[i]["绋庣巼"],
"HTaxMoney": result.data[i]["绋庨"],
- "HlineTotal": dealDoubleToFixed(result.data[i]["浠风◣鍚堣"],2),
+ "HlineTotal": dealDoubleToFixed(result.data[i]["浠风◣鍚堣"], 2),
"HlineTotalBB": result.data[i]["鏈綅甯佷环绋庡悎璁�"],
+ "HisStockGoods": result.data[i]["鏄惁鍙栧簱瀛�"]=="Y"?"true":"false",
"HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
"HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
- "HRemark": result.data[i]["琛ㄤ綋澶囨敞"]
+ "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
+ "HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
+ "HCusModel": 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]["閿�鍞��搴撳鏍告暟閲�"],
}
);
}
option.data = rowdata;
//鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
- option.cols[0][19].edit = null;
- option.cols[0][20].edit = null;
+ option.cols[0][22].edit = null;
+ option.cols[0][23].edit = null;
table.render(option);
+ //鑾峰彇涓存椂瀹氶噾姣斾緥
+ HEarnestRateTemp = data.瀹氶噾姣斾緥 + "" == "0" ? "50" : data.瀹氶噾姣斾緥 + "";
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1152,6 +1414,7 @@
}
//#endregion
+ //#region 琛ㄥご閫夋嫨鏂规硶
//#region 閿�鍞憳閫夋嫨椤甸潰
function get_checkEmp() {
layer.open({
@@ -1170,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' //鍔犱笂杈规
@@ -1354,6 +1625,7 @@
})
}
//#endregion
+ //#endregion
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -1362,10 +1634,12 @@
if (OperationType == 1 || OperationType == 2) {
refSav = "Add";
data.field.HChangeDate = new Date();
+ data.field.HSTOCKORGID = data.field.HOrgID;
}
if (OperationType == 3) {
refSav = "Update";
data.field.HChangeDate = new Date();
+ data.field.HSTOCKORGID = data.field.HOrgID;
}
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -1458,6 +1732,11 @@
return false;
}
+ if ($("#HBillSubType").val() != "0" && $("#HBillSubType").val()!="1") {
+ layer.msg("璇烽�夋嫨閿�鍞鍗曠被鍨�!");
+ return false;
+ }
+
//if ($("#HSellSID").val() == "0") {
// layer.msg("閿�鍞柟寮忔湭閫夋嫨!");
// return false;
@@ -1468,7 +1747,7 @@
// return false;
//}
-
+
//if ($("#HPayCusID").val() == "0") {
// layer.msg("缁撶畻鏂规湭閫夋嫨!");
@@ -1480,7 +1759,7 @@
// return false;
//}
-
+
//#endregion
//#region 瀛愯〃 鏁版嵁妫�楠�
@@ -1507,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"] + "";
@@ -1524,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"] == "") {
@@ -1557,11 +1866,11 @@
return false;
}
-
-
-
+
+
+
////鎶樻墸鐜囨牸寮忔牎楠�
//temp = option.data[i]["HDiscountRate"] + "";
@@ -1583,7 +1892,7 @@
// return false;
//}
-
+
//绋庨鏍煎紡鏍￠獙
//temp = option.data[i]["HTaxMoney"] + "";
@@ -1595,7 +1904,7 @@
// return false;
//}
-
+
////鏈綅甯佷环绋庡悎璁℃牸寮忔牎楠�
//temp = option.data[i]["HlineTotalBB"] + "";
@@ -1640,11 +1949,25 @@
//#region 鍦ㄦ湯灏惧鍔犱竴琛�
function btnAddLine(NewRow) {
+ if (option.data.length > 0) {
+ NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
+ } else {
+ NewRow.HisStockGoods = "false";
+ }
+
+
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
//rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
}
@@ -1652,6 +1975,12 @@
//#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
function btnInsertLine(NewRow) {
+ if (option.data.length > 0) {
+ NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
+ } else {
+ NewRow.HisStockGoods = "false";
+ }
+
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
@@ -1666,8 +1995,15 @@
}
option.data = tables;
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -1692,8 +2028,15 @@
option.data[option.data.length - 1].HWeight = "0";
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
}
//#endregion
@@ -1718,8 +2061,15 @@
option.data[i - 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1751,8 +2101,15 @@
option.data[i + 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1778,13 +2135,39 @@
oldData.splice(obj.tr.data('index'), 1);
option.data = oldData;
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);
}
});
}
}
+ //#endregion
+
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堟槸鍚﹀彇搴撳瓨锛�
+ form.on('select(HisStockGoods)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ value.HisStockGoods = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
+ });
+ });
//#endregion
//#region 琛屽唴蹇嵎閿瓫閫�
@@ -1820,7 +2203,8 @@
var NewRow = {
"HMaterID": "0", "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": "0", "璁￠噺鍗曚綅": "", "HQty": "0", "HPrice": "0", "HTaxPrice": "0"
, "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
- , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": ""
+ , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
+ "HCusModel": "","HCusMaterName": ""
}
btnAddLine(NewRow);
}
@@ -1872,8 +2256,12 @@
}
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1908,6 +2296,37 @@
}
})
}
+ //璁㈠崟绛夌骇
+ if (obj.event == "HOrderLevID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "璁㈠崟绛夌骇鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璁㈠崟绛夌骇鍚嶇О": checkStatus.data[0].璁㈠崟绛夌骇
+ , "璁㈠崟绛夌骇浠ｇ爜": checkStatus.data[0].璁㈠崟绛夌骇浠ｇ爜
+ , "HOrderLevID": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
obj.event = "";
return false;
}
@@ -1960,7 +2379,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨","鏈綅甯佷环绋庡悎璁�","鍑哄簱鏁伴噺","寮�绁ㄦ暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID","璁㈠崟绛夌骇浠ｇ爜","閿�鍞嚭搴撴暟閲�","閿�鍞嚭搴撳鏍告暟閲�","閿�鍞嚭搴撳鏍搁噾棰�","鐢熶骇鏁伴噺","閿�鍞��搴撴暟閲�","閿�鍞��搴撳鏍告暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//titleData = [];
dataCol = data1.data[0].HGridString.split(',');
@@ -2024,8 +2443,15 @@
}
}
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
} else {
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -2118,12 +2544,80 @@
//#endregion
//#region 璁剧疆琛ㄥご鎵�闇�閲戦
- function set_HBillMoney() {
+ function set_HBillMoney(HEarnestRate) {
var HBillMoney = 0;
for (var i = 0; i < option.data.length; i++) {
- HBillMoney += option.data[i]["HlineTotal"] * 1;
+ if (option.data[i]["HisStockGoods"] == "false") {
+ HBillMoney += option.data[i]["HlineTotal"] * 1;
+ }
}
- $("#HBillMoney").val(HBillMoney * 0.5);
+
+
+ HEarnestRate = HEarnestRate * 0.01;
+ $("#HBillMoney").val(dealDoubleToFixed(HBillMoney * HEarnestRate, 2));
+ }
+ //#endregion
+
+ //#region 鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ function setHEarnestRateByHisStockGoods() {
+ if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "true") {
+ var HEarnestRateList = '<option value="0" selected="selected" >0%</option>';
+
+ $("#HEarnestRate").empty();
+ $("#HEarnestRate").append(HEarnestRateList);
+ form.render('select');
+ } else if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "false") {
+ var HEarnestRateList = '<option value="50" selected="selected" >50%</option>';
+ HEarnestRateList += '<option value="100" >100%</option>';
+
+ $("#HEarnestRate").empty();
+ $("#HEarnestRate").append(HEarnestRateList);
+ /*form.render('select');*/
+ $("#HEarnestRate").val(HEarnestRateTemp);
+ form.render('select');
+ } else {
+ var HEarnestRateList = '<option value="50" selected="selected" >50%</option>';
+ HEarnestRateList += '<option value="100" >100%</option>';
+
+ $("#HEarnestRate").empty();
+ $("#HEarnestRate").append(HEarnestRateList);
+ //form.render('select');
+ $("#HEarnestRate").val(HEarnestRateTemp);
+ form.render('select');
+ }
+ }
+ //#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
@@ -2149,6 +2643,15 @@
return HSourceBillData;
}
//#endregion
+
+ //#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ function setSelectHisStockGoodsByTableRender() {
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
+ }
+ form.render('select');
+ }
+ //#endregion
//#endregion
@@ -2162,6 +2665,8 @@
{
$("#HEmpName").val(obj[0].HName);
$("#HEmpID").val(obj[0].HItemID);
+
+ getEmpInfoByHEmpID(obj[0].HItemID)
}
function GetHSupValue(obj) //杩斿洖瀹㈡埛
@@ -2266,6 +2771,7 @@
type: "GET",
data: {
"HCusID": HCusID
+ , "CurUserName": sessionStorage["HUserName"]
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -2275,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 });
@@ -2318,7 +2855,7 @@
}
}
}
- //#endregion
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1