From 464342e83b017ccde754bdda0294fc8b11acd7ee Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 28 二月 2024 11:26:46 +0800
Subject: [PATCH] 销售订单：主表增加 定金比例 字段。 需求金额根据定金比例与是否取库存进行计算
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 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 a3f658e..09966fc 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"
@@ -136,6 +136,15 @@
<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
</div>
</div>
+ <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>
<div class="layui-row">
<div class="layui-inline">
@@ -427,10 +436,10 @@
get_LoginIs();
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
- var HModuleType = "1401";
- //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
- $("h1").html('<b>' + HPageTitle + '</b>');
+ //var HModuleType = "1401";
+ ////閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ //var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ //$("h1").html('<b>' + HPageTitle + '</b>');
//#endregion
//#endregion
@@ -543,7 +552,7 @@
});
//#endregion
- //#region 瀹℃牳鎸夐挳
+ //#region 鍙嶅鏍告寜閽�
form.on('submit(set_AbandonCheck)', function (data) {
set_CheckBill(1);
});
@@ -715,7 +724,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val()*1);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -770,7 +779,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -825,7 +834,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
case "HTaxPrice": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -880,7 +889,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
default:
}
@@ -899,17 +908,25 @@
//#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);
});
//#endregion
//#endregion
@@ -1036,6 +1053,7 @@
, { 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' }
@@ -1046,7 +1064,6 @@
, { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', width: 100, edit: 'text' }
, { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', width: 100, edit: 'text' }
, { field: 'HDate', title: '浜よ揣鏃ユ湡', event: "HDate", width: 120 }
- , { field: 'HisStockGoods', title: '鏄惁鍙栧簱瀛�', width: 120, templet: '#HisStockGoods' }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text', hide: true }
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, hide: true }
@@ -1110,7 +1127,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -1166,6 +1183,7 @@
, "HCurID": data.HCurID
, "HCurName": data.甯佸埆
, "HExRate": data.姹囩巼
+ , "HEarnestRate": data.瀹氶噾姣斾緥
, "HManagerID": data.HManagerID
, "HManagerName": data.涓荤
, "HSellSID": data.HSellSID
@@ -1223,7 +1241,7 @@
"HTaxMoney": result.data[i]["绋庨"],
"HlineTotal": dealDoubleToFixed(result.data[i]["浠风◣鍚堣"], 2),
"HlineTotalBB": result.data[i]["鏈綅甯佷环绋庡悎璁�"],
- "HisStockGoods": result.data[i]["鏄惁鍙栧簱瀛�"]=="Y"?true:false,
+ "HisStockGoods": result.data[i]["鏄惁鍙栧簱瀛�"]=="Y"?"true":"false",
"HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
"HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
"HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
@@ -1246,7 +1264,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1760,7 +1778,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
//rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
}
@@ -1787,7 +1805,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -1817,7 +1835,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
}
//#endregion
@@ -1847,7 +1865,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1884,7 +1902,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1915,7 +1933,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);
}
});
@@ -1931,6 +1949,8 @@
$.each(option.data, function (index, value) {
if (value.LAY_TABLE_INDEX == dataindex) {
value.HisStockGoods = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
});
});
@@ -2027,7 +2047,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);//鍏抽棴寮圭獥
}
@@ -2310,12 +2330,17 @@
//#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(dealDoubleToFixed(HBillMoney * 0.5, 2));
+
+
+ HEarnestRate = HEarnestRate * 0.01;
+ $("#HBillMoney").val(dealDoubleToFixed(HBillMoney * HEarnestRate, 2));
}
//#endregion
--
Gitblit v1.9.1