From 3ce0b2d1f99b157b8946ef8906bfcc90c957eff5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 11 三月 2024 09:36:25 +0800
Subject: [PATCH] 1.基础资料的自动生成编码 示例在基础资料/公用基础资料 地区 2.给其他应收单增加网格进行子表数据保存
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_AreaSet.html | 24 ++
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html | 559 +++++++++++++++++++++++++++++++++++++++++++++++--------
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.htmlList.html | 2
3 files changed, 501 insertions(+), 84 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_AreaSet.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_AreaSet.html"
index 396e7c6..84c97c2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_AreaSet.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_AreaSet.html"
@@ -35,7 +35,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off" readonly>
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
@@ -138,6 +138,9 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
+
+ //鑷姩鐢熸垚娴佹按鍙�
+ CreateNumber();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
@@ -214,7 +217,7 @@
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
$("#HItemID").val("0");
- $("#HNumber").val("");
+
}
//缂栬緫
function set_EditFromGrid() {
@@ -278,6 +281,23 @@
}
})
}
+
+ //#region 鐢熸垚娴佹按鍙�
+ function CreateNumber() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumber",
+ async: false,
+ type: "GET",
+ //绗竴涓弬鏁�:褰撳墠鍒楄〃鍚嶇О鐨勬瘡涓瓧鐨勯瀛楁瘝 绗簩涓�:鎻掑叆鍔ㄦ�佸垪琛ㄧ殑鍒楄〃鍚嶇О,瑕佸瓨鍏ユ暟鎹簱 绗笁涓�:褰撳墠鍒楄〃鐨勮〃鍚�,瑕佸瓨鍏ユ暟鎹簱
+ data: { "HBillType": 'DQ', "HName": '鍦板尯', "TableName":'Gy_AreaSet'}, //鏍规嵁 HName 鐨勫�煎幓鏌ュ綋鍓嶆祦姘村彿
+ success: function (d) {
+ $("#HNumber").val(d.data[0].HNumber);
+
+ }
+ });
+ }
+ //#endregion
+
//#endregion
});
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 71cee57..9bd22f2 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -15,13 +15,25 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <style>
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
<div class="layui-card" style="padding: 2px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="formData" style="background-color:white;height :1500px">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;height :700px">
<div style="padding: 2px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
@@ -56,7 +68,7 @@
<div class="layui-inline">
<label class="layui-form-label">鍐呴儴鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" >
+ <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -102,7 +114,7 @@
<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>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -133,19 +145,19 @@
<div class="layui-inline">
<label class="layui-form-label">涓嶅惈绋庨噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off" >
+ <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">绋庣巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off" >
+ <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鎬婚噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
+ <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -268,10 +280,41 @@
</div>
</div>
</div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--瀛愯〃-->
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
</form>
</div>
</div>
</div>
+ <!--瀛愯〃琛細鍒犻櫎-->
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <!--琛屼笅鎷夐�夋嫨(鍙戠エ绫诲瀷)-->
+ <script type="text/html" id="HTypeSub">
+ <select name="HTypeSub" lay-filter="HTypeSub" id="HTypeSub{{d.LAY_TABLE_INDEX+1}}">
+ <option value="鏅�氬彂绁�">鏅�氬彂绁�</option>
+ <option value="澧炲�肩◣鍙戠エ">澧炲�肩◣鍙戠エ</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </script>
<script>
@@ -310,7 +353,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
$("h1").html('<b>' + HPageTitle + '</b>');
- //#endregion
+ //#endregion
ColFilter();//鍙戠エ绫诲瀷
@@ -327,26 +370,31 @@
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
-
+ //瀛愯〃椤甸潰鍒濆鍖�
+ get_InitGrid();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HAccDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+
}
else if (OperationType == 3) { //缂栬緫
+
+ //瀛愯〃椤甸潰鍒濆鍖�
+ get_InitGrid();
+
//鍔犺浇缂栬緫椤甸潰
RoadBillMain(linterid);
}
-
+
//#endregion
//#region 缁勭粐鍒濆鍖�
Organ();
//#endregion
-
+
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -391,13 +439,206 @@
form.on('submit(set_AbandonCheck)', function (data) {
set_CheckBill(1);
});
- //#endregion
+ //#endregion
+
+ //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ //鏂板琛岃〃鏍兼暟鎹�
+ var NewRow =
+ {
+ "HProjectMoneyID": "0"
+ , "HPMoneyName": ""
+ , "HTypeSub": ""
+ , "HMoney": "0"
+ , "HTaxRate": "0"
+ , "HSumMoney": "0"
+ };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTypeSub' + i + '').find("option[value='" + option.data[i - 1].HTypeSub + "']").attr("selected", true);
+
+ }
+ form.render('select');
+
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTypeSub' + i + '').find("option[value='" + option.data[i - 1].HTypeSub + "']").attr("selected", true);
+
+ }
+ form.render('select');
+ }
+ break;
+
+ }
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氳鍐呬簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ });
//#endregion
+ //#region 鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+
+ switch (field) {
+ case "HMoney": //涓嶅惈绋庨噾棰�
+ //鏁版嵁鏍煎紡鏍¢獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HMoney: oldText
+ });
+ table.render(option);
+
+ layer.msg("涓嶅惈绋庨噾棰濊杈撳叆澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+ var HMoney = value * 1; //涓嶅惈绋庨噾棰�
+ var HTaxRate = obj.data.HTaxRate * 1; //绋庣巼
+ var HSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //鎬婚噾棰�=涓嶅惈绋庨噾棰�*(1+(绋庣巼*0.01))
+
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HMoney = dealDoubleToFixed(HMoney, 2);
+
+ HTaxRate = HTaxRate;
+ HSumMoney = dealDoubleToFixed(HSumMoney, 2);
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HMoney
+ , HTaxRate: HTaxRate
+ , HSumMoney: HSumMoney
+ });
+ break;
+ case "HTaxRate": //鍗曚环
+ //鏁版嵁鏍煎紡鏍¢獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HTaxRate: oldText
+ });
+ table.render(option);
+
+ layer.msg("绋庣巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+ var HTaxRate = value * 1; //绋庣巼
+ var HMoney = obj.data.HMoney * 1; //涓嶅惈绋庨噾棰�
+ var HSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //鎬婚噾棰�=涓嶅惈绋庨噾棰�*(1+(绋庣巼*0.01))
+
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HMoney = dealDoubleToFixed(HMoney, 2);
+
+ HTaxRate = HTaxRate;
+ HSumMoney = dealDoubleToFixed(HSumMoney, 2);
+
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HMoney
+ , HTaxRate: HTaxRate
+ , HSumMoney: HSumMoney
+ });
+ break;
+ case "HSumMoney": //鏁伴噺
+ //鏁版嵁鏍煎紡鏍¢獙
+ temp = value + "";
+ if (!ref.test(temp)) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HSumMoney: oldText
+ });
+ layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+ return;
+ }
+
+
+ //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+ var HSumMoney = value * 1; //鎬婚噾棰�
+
+ var HTaxRate = obj.data.HTaxRate * 1; //绋庣巼
+ var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));
+
+
+
+
+ //璁剧疆鏁版嵁灏忔暟浣嶆暟
+ HMoney = dealDoubleToFixed(HMoney, 2);
+
+ HTaxRate = HTaxRate;
+ HSumMoney = dealDoubleToFixed(HSumMoney, 2);
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HMoney
+ , HTaxRate: HTaxRate
+ , HSumMoney: HSumMoney
+ });
+ default:
+ }
+ });
//#endregion
- //#region 澶嶉�夋瑙﹀彂浜嬩欢
+ //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堟槸鍚﹀彇搴撳瓨锛�
+ form.on('select(HTypeSub)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ 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.HTypeSub = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+
//#endregion
//#region 鏂囨湰妗嗙洃鍚�
@@ -421,10 +662,10 @@
//杈撳叆鐨勪笉鍚◣閲戦鍚堟硶锛岄噸
var HMoney = newHMoney * 1; //绠楁�婚噾棰� //涓嶅惈绋庨噾棰�
var HTaxRate = $("#HTaxRate").val() * 1; //绋庣巼
- var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01) ); //鎬婚噾棰�
+ var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01)); //鎬婚噾棰�
$("#HSumMoney").val(HRelSumMoney);
-
+
});
//#endregion
@@ -462,7 +703,7 @@
oldHSumMoney = $("#HSumMoney").val() * 1; //涓嶅惈绋庨噾棰濇枃鏈鑾峰彇鐒︾偣鏃惰幏鍙栦慨鏀瑰墠鐨勫��
}).on('blur', function (data) {
newHSumMoney = $("#HSumMoney").val(); //涓嶅惈绋庨噾棰濇枃鏈澶辩劍鏃惰幏鍙栦慨鏀瑰悗鐨勫��
- if (newHSumMoney!=0) {
+ if (newHSumMoney != 0) {
//鍒ゆ柇杈撳叆鐨勯噾棰濇槸鍚﹀悎娉�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
if (!ref.test(newHSumMoney)) {
@@ -478,14 +719,14 @@
$("#HMoney").val(HMoney);
}
-
+
});
//#endregion
//#endregion
});
//#endregion
-
+
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
@@ -499,23 +740,27 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- var starts = data1.data[0].鍗曟嵁鐘舵��
- if (starts == "鍒涘缓") {
+ if (data1.data.length<1) {
set_AddNew(data);
- }
- else {
- layer.msg('姝ゅ崟鎹笉鏄垱寤虹姸鎬侊紒鏃犳硶杩涜缂栬緫淇濆瓨!');
+ } else {
+ var starts = data1.data[0].鍗曟嵁鐘舵��
+ if (starts == "鍒涘缓") {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg('姝ゅ崟鎹笉鏄垱寤虹姸鎬侊紒鏃犳硶杩涜缂栬緫淇濆瓨!');
+ }
}
}
}
});
}
-
+
});
//#endregion
-
+
//#region 閫�鍑�
form.on('submit(btnEdit)', function (data) {
@@ -624,8 +869,102 @@
}
//#endregion
-
+ //#region 鍏朵粬搴旀敹鍗曞瓙琛ㄥ垵濮嬪寲
+ function get_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'HProjectMoneyID', title: '璐圭敤椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HPMoneyName', title: '璐圭敤椤圭洰鍚嶇О', edit: 'text', event: "HPMoneyName",style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HTypeSub', title: '鍙戠エ绫诲瀷', templet: '#HTypeSub' }
+ , { field: 'HMoney', title: '涓嶅惈绋庨噾棰�', edit: 'text', style: 'background-color: #f9f9f9;' }
+ , { field: 'HTaxRate', title: '绋庣巼', edit: 'text', style: 'background-color: #f9f9f9;' }
+ , { field: 'HSumMoney', title: '鎬婚噾棰�', edit: 'text', style: 'background-color: #f9f9f9;' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ }
+
+ var rowdata = [
+ {
+ "HProjectMoneyID": "0"
+ , "HPMoneyName": ""
+ , "HTypeSub": ""
+ , "HMoney": "0"
+ , "HTaxRate": "0"
+ , "HSumMoney": "0"
+ }
+ ];
+ option.data = rowdata;
+ table.render(option);
+
+ }
+ //#endregion
+
+ //#region 琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //#endregion
+
//#region 寮圭獥椤甸潰鏂规硶
+
+ //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鍣ㄥ叿绠$悊
+ if (obj.event == "HPMoneyName") {
+ //鎵撳紑鍣ㄥ叿绠$悊灏忕獥浣�
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '椤圭洰璐圭敤鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html?OperationType=2", "yes"]
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ obj.update({
+ "HProjectMoneyID": checkStatus.data[0].HItemID
+ , "HPMoneyName": checkStatus.data[0].椤圭洰璐圭敤鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //#endregion
+
//#region 閫夋嫨閮ㄩ棬
function get_checkDept() {
layer.open({
@@ -718,10 +1057,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+
$("#HCusName").val(checkStatus.data[0].HName);
$("#HCusID").val(checkStatus.data[0].HItemID);
- var HCusID=$("#HCusID").val();
+ var HCusID = $("#HCusID").val();
getHTaxRateByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
getCustomerByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜�,绋庣巼
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -747,7 +1086,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
+
$("#HProjectMoneyID").val(checkStatus.data[0].HItemID);
$("#HProjectMoneyName").val(checkStatus.data[0].椤圭洰璐圭敤鍚嶇О);
@@ -820,11 +1159,20 @@
}
return true;
}
- //#endregion
//#endregion
-
+ //#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
+
+ //鑾峰彇椤圭洰璐圭敤琛ㄦ暟鎹�
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
//鑾峰彇鎿嶄綔鏂瑰紡
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -845,9 +1193,10 @@
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
-
+ //鍏朵粬搴旀敹鍗曞瓙琛ㄥ簭鍒楀寲
+ var sSubStr = JSON.stringify(num);
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
- var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr+';'+ refSav + ';' + sessionStorage["HUserName"];
$.ajax({
type: "POST",
@@ -889,52 +1238,66 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
-
+ var data1 = result.data[1];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": data.hmainid
- ,"HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HAccDate": formatDate(data.鏀舵鏃ユ湡)
- , "HCusID": data.HCusID
- , "HCusName": data.瀹㈡埛
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HDeptID": data.HDeptID
- , "HDeptName": data.閮ㄩ棬
- , "HEmpID": data.HEmpID
- , "HEmpName": data.缁忔墜浜�
-
-
- , "HProjectMoneyID": data.HProjectMoneyID
- , "HProjectMoneyName": data.璐圭敤椤圭洰
- , "HType": data.鍙戠エ绫诲瀷
- , "HMoney": data.涓嶅惈绋庨噾棰�
- , "HTaxRate": data.绋庣巼
- , "HSumMoney": data.鎬婚噾棰�
- , "HExplanation": data.鎽樿
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HRemark": data.琛ㄥご澶囨敞
+ "HInterID": data[0]["hmainid"]
+ , "HBillNo": data[0]["鍗曟嵁鍙�"]
+ , "HDate": formatDate(data[0]["鏃ユ湡"])
+ , "HAccDate": formatDate(data[0]["鏀舵鏃ユ湡"])
+ , "HCusID": data[0]["HCusID"]
+ , "HCusName": data[0]["瀹㈡埛"]
+ , "HCurID": data[0]["HCurID"]
+ , "HCurName": data[0]["甯佸埆"]
+ , "HExRate": data[0]["姹囩巼"]
+ , "HDeptID": data[0]["HDeptID"]
+ , "HDeptName": data[0]["閮ㄩ棬"]
+ , "HEmpID": data[0]["HEmpID"]
+ , "HEmpName": data[0]["缁忔墜浜�"]
- , "HMainSourceInterID": data.HMainSourceInterID == null ? 0 : data.HMainSourceInterID
- , "HMainSourceEntryID": data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID
- , "HMainSourceBillNo": data.HMainSourceBillNo
- , "HMainSourceBillType": data.HMainSourceBillType
- , "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
- , "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
- , "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
- , "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
- , "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "HProjectMoneyID": data[0]["HProjectMoneyID"]
+ , "HProjectMoneyName": data[0]["璐圭敤椤圭洰"]
+ , "HType": data[0]["鍙戠エ绫诲瀷"]
+ , "HMoney": data[0]["涓嶅惈绋庨噾棰�"]
+ , "HTaxRate": data[0]["绋庣巼"]
+ , "HSumMoney": data[0]["鎬婚噾棰�"]
+ , "HExplanation": data[0]["鎽樿"]
+ , "HInnerBillNo": data[0]["鍐呴儴鍗曟嵁鍙�"]
+ , "HRemark": data[0]["琛ㄥご澶囨敞"]
+
+ , "HMainSourceInterID": data[0]["HMainSourceInterID"] == null ? 0 : data[0]["HMainSourceInterID"]
+ , "HMainSourceEntryID": data[0]["HMainSourceEntryID"] == null ? 0 : data[0]["HMainSourceEntryID"]
+ , "HMainSourceBillNo": data[0]["HMainSourceBillNo"]
+ , "HMainSourceBillType": data[0]["HMainSourceBillType"]
+
+ , "HMaker": data[0]["鍒跺崟浜�"]
+ , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+ , "HUpDater": data[0]["淇敼浜�"]
+ , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+ , "HChecker": data[0]["瀹℃牳浜�"]
+ , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCloseMan": data[0]["鍏抽棴浜�"]
+ , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+ , "HDeleteMan": data[0]["浣滃簾浜�"]
+ , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
});
- HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
+ HOrgIDBar = data[0]["HOrgID"] == null ? 0 : data[0]["HOrgID"];
+ //瀛愯〃鏁版嵁璧嬪��
+ option.data = data1;
+ table.render(option);
+ for (var i = 0; i <data1.length; i++) {
+
+
+ //寤惰繜鍘熷洜
+ $('#HTypeSub' + (i + 1)).find("option[value='" + data1[i].HTypeSub + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
+
+
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -977,7 +1340,7 @@
}
//#endregion
-
+
//#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
function getHTaxRateByCusID(HCusID) {
$.ajax({
@@ -1000,7 +1363,7 @@
}
});
}
- //#endregion
+ //#endregion
//#region 鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇閮ㄩ棬 缁忔墜浜�
function getCzyglByUser() {
@@ -1058,7 +1421,7 @@
}
});
}
- //#endregion
+ //#endregion
//#endregion
@@ -1076,12 +1439,46 @@
$("#HEmpID").val(obj[0].HItemID);
}
- //function GetHSupValue(obj) //杩斿洖瀹㈡埛
- //{
- // $("#HCusName").val(obj[0].HName);
- // $("#HCusID").val(obj[0].HItemID);
- //}
+ //function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ //{
+ // $("#HCusName").val(obj[0].HName);
+ // $("#HCusID").val(obj[0].HItemID);
+ //}
+ //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+ function dealDoubleToFixed(data, num) {
+ //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+ var dotLength = 0;
+ if (num == 1) { //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+ dotLength = 6;
+ } else if (num == 2) { //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+ dotLength = 2;
+ } else if (num == 3) { //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+ //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+ dotLength = 4;
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+ data = data + "";
+ var index = data.indexOf(".");
+
+ //澶勭悊鏁版嵁骞惰繑鍥�
+ if (index < 0) {
+ return data * 1;
+ } else {
+ //鑾峰彇灏忔暟浣嶆暟
+ var length = data.length - index - 1;
+ if (length <= dotLength) {
+ return data * 1;
+ } else {
+ data = data * 1;
+ return data.toFixed(dotLength);
+ }
+ }
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
index ccc3f62..01d3c2e 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.htmlList.html"
@@ -131,7 +131,7 @@
var HModName = "YS_ReceiveBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HDeptID", "HEmpID", "HCurID", "HCusID", "HProjectMoneyID",];
+ var titleData = ["hmainid", "HDeptID", "HEmpID", "HCurID", "HCusID", "HProjectMoneyID","瀛愯垂鐢ㄩ」鐩甀d"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2002";
--
Gitblit v1.9.1