From 7df042662e1929abdd667cfd7b037f4e10e8c2ad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 三月 2024 11:27:56 +0800
Subject: [PATCH] 其他应付单 增加子表保存,目录放到采购管理,其他入库单编辑模块 并完善 其他出库单 列表功能；（ 常规 功能， 新增，修改，删除，审核，作废，关闭，自定义过滤，源单类型列表（源单 手工录入）， 合计行，保存控制，审核控制，删除控制，关联数回填 等等 ） （注： 基础资料选择， 均用 基础资料列表 的方式）
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 432 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 350 insertions(+), 82 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 b4c62b5..907dbe1 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,24 @@
<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 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>
<div class="layui-row">
<div class="layui-inline">
@@ -413,6 +431,7 @@
//妯″潡鍚�
var HModName = "Xs_SeOrderBill";
var HBillType = "1401";
+ var HEarnestRateTemp = "50";
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -427,10 +446,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 +562,7 @@
});
//#endregion
- //#region 瀹℃牳鎸夐挳
+ //#region 鍙嶅鏍告寜閽�
form.on('submit(set_AbandonCheck)', function (data) {
set_CheckBill(1);
});
@@ -577,7 +596,7 @@
"HMaterID": "0",
"鐗╂枡浠ｇ爜": "",
"鐗╂枡鍚嶇О": "",
- "HItemID": "0",
+ "HOrderLevID": "0",
"璁㈠崟绛夌骇浠ｇ爜": "",
"璁㈠崟绛夌骇鍚嶇О": "",
"瑙勬牸鍨嬪彿": "",
@@ -600,7 +619,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) {
//鏂板涓�琛�
@@ -715,25 +740,54 @@
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);
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁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; //鏁伴噺
@@ -770,7 +824,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -825,23 +879,53 @@
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);
- //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁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; //鏁伴噺
@@ -880,7 +964,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
default:
}
@@ -899,17 +983,62 @@
//#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) {
+ 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
//#endregion
@@ -1036,17 +1165,17 @@
, { 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: '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 }
@@ -1054,6 +1183,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) {
@@ -1100,7 +1235,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;
@@ -1110,7 +1251,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -1134,6 +1275,9 @@
//鍒濆鍖栧苟鍒楄缃細瀛愯〃1
set_InitGrid();
DisPlay_HideColumn();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
}
//#endregion
@@ -1166,6 +1310,8 @@
, "HCurID": data.HCurID
, "HCurName": data.甯佸埆
, "HExRate": data.姹囩巼
+ , "HEarnestRate": data.瀹氶噾姣斾緥
+ , "HBillSubType": data.HBillSubType
, "HManagerID": data.HManagerID
, "HManagerName": data.涓荤
, "HSellSID": data.HSellSID
@@ -1223,14 +1369,20 @@
"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]["寮�绁ㄦ暟閲�"],
"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]["閿�鍞��搴撳鏍告暟閲�"],
}
);
}
@@ -1242,11 +1394,17 @@
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);
@@ -1281,7 +1439,10 @@
$("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- , btn2: function (index, layero) { }
+ , btn2: function (index, layero) {
+ $("#HEmpName").val("");
+ $("#HEmpID").val("0");
+ }
})
}
//#endregion
@@ -1570,6 +1731,11 @@
return false;
}
+ if ($("#HBillSubType").val() != "0" && $("#HBillSubType").val()!="1") {
+ layer.msg("璇烽�夋嫨閿�鍞鍗曠被鍨�!");
+ return false;
+ }
+
//if ($("#HSellSID").val() == "0") {
// layer.msg("閿�鍞柟寮忔湭閫夋嫨!");
// return false;
@@ -1619,13 +1785,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"] + "";
@@ -1636,32 +1810,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"] == "") {
@@ -1752,6 +1948,13 @@
//#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);
@@ -1759,8 +1962,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
//rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
}
@@ -1768,6 +1974,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) {
@@ -1786,8 +1998,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -1816,8 +2031,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
}
//#endregion
@@ -1846,8 +2064,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1883,8 +2104,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1914,8 +2138,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);
}
});
@@ -1929,9 +2156,15 @@
var elem = data.othis.parents('tr');
var dataindex = elem.attr("data-index");
$.each(option.data, function (index, value) {
- if (value.LAY_TABLE_INDEX == dataindex) {
- value.HisStockGoods = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
- }
+ value.HisStockGoods = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
});
});
//#endregion
@@ -2027,7 +2260,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);//鍏抽棴寮圭獥
}
@@ -2145,7 +2378,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(',');
@@ -2310,12 +2543,47 @@
//#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
@@ -2345,7 +2613,7 @@
//#region 鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
function setSelectHisStockGoodsByTableRender() {
for (var i = 1; i <= option.data.length; i++) {
- $('#HisStockGoods' + i + '').find("option[value='" + option.data[i - 1].HisStockGoods + "']").attr("selected", true);
+ $('#HisStockGoods' + i + '').val(option.data[i - 1].HisStockGoods);
}
form.render('select');
}
--
Gitblit v1.9.1