From 3427c749f7f268fdaf17fcc2e4a2a3b1e7aa3cd0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 06 三月 2024 10:49:45 +0800
Subject: [PATCH] 销售订单：编辑页面子表税率表头增加百分比符号
---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 172 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 143 insertions(+), 29 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 70dd964..10bf7c8 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,10 +15,11 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style>
/*.main-btn {*/ /*澶撮儴涓绘寜閽�*/
- /*padding: 0 2px;*/ /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
- /*height: 30px;
+ /*padding: 0 2px;*/ /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ /*height: 30px;
line-height: 30px;
}*/
@@ -36,7 +37,7 @@
margin-right: -15px;
}
- /* .layui-form-item .layui-inline {
+ /* .layui-form-item .layui-inline {
margin-top: 0px;
margin-bottom: 5px;
margin-right: 0px;
@@ -133,6 +134,15 @@
<label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<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>
@@ -412,6 +422,7 @@
//妯″潡鍚�
var HModName = "Xs_SeOrderBill";
var HBillType = "1401";
+ var HEarnestRateTemp = "50";
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -424,6 +435,13 @@
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
+
+ //#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 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
@@ -535,7 +553,7 @@
});
//#endregion
- //#region 瀹℃牳鎸夐挳
+ //#region 鍙嶅鏍告寜閽�
form.on('submit(set_AbandonCheck)', function (data) {
set_CheckBill(1);
});
@@ -707,7 +725,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val()*1);
break;
case "HPrice": //鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
@@ -762,7 +780,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
case "HTaxRate": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -817,7 +835,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
case "HTaxPrice": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -872,7 +890,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
default:
}
@@ -891,17 +909,29 @@
//#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
//#endregion
@@ -1028,9 +1058,10 @@
, { 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;' }
@@ -1038,7 +1069,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 }
@@ -1102,7 +1132,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
//#endregion
@@ -1126,6 +1156,9 @@
//鍒濆鍖栧苟鍒楄缃細瀛愯〃1
set_InitGrid();
DisPlay_HideColumn();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
}
//#endregion
@@ -1158,6 +1191,7 @@
, "HCurID": data.HCurID
, "HCurName": data.甯佸埆
, "HExRate": data.姹囩巼
+ , "HEarnestRate": data.瀹氶噾姣斾緥
, "HManagerID": data.HManagerID
, "HManagerName": data.涓荤
, "HSellSID": data.HSellSID
@@ -1215,7 +1249,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]["寮�绁ㄦ暟閲�"],
@@ -1234,11 +1268,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);
@@ -1464,10 +1504,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;
}
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -1742,6 +1784,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);
@@ -1749,8 +1798,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
//rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
}
@@ -1758,6 +1810,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) {
@@ -1776,8 +1834,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -1806,8 +1867,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
}
}
//#endregion
@@ -1836,8 +1900,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1873,8 +1940,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
break;
}
}
@@ -1904,8 +1974,11 @@
//鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
setSelectHisStockGoodsByTableRender();
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ setHEarnestRateByHisStockGoods();
+
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);
}
});
@@ -1919,9 +1992,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
@@ -2017,7 +2096,7 @@
setSelectHisStockGoodsByTableRender();
//璁剧疆琛ㄥご鎵�闇�閲戦
- set_HBillMoney();
+ set_HBillMoney($("#HEarnestRate").val() * 1);
layer.close(index);//鍏抽棴寮圭獥
}
@@ -2300,12 +2379,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
@@ -2335,7 +2449,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