From 2b18f7b02062bf8d883c72e46c2d265c9a8cb716 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 17 四月 2024 08:57:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 3
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 16 ++
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html | 154 ++++++++++++++++++++++++++++--
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 44 ++++++++
WebTM/views/系统管理/组织架构设置/Gy_DutyList.html | 2
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/系统管理/组织架构设置/Gy_DutyEdit.html | 46 +++++++++
7 files changed, 250 insertions(+), 19 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f07a5e2..fd98315 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
index 984e5a5..bd0ca99 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
@@ -175,17 +175,42 @@
<option value="璋冩嫧鐢宠鍗�" selected="selected">璋冩嫧鐢宠鍗�</option>
<option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
</select>
-
+
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
<input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
-
+
<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍙戠エ缂栧彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" value="" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+
+ <label class="layui-form-label">椤圭洰浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label" >椤圭洰鍚嶇О</label>
+ <div class="layui-input-block" >
+ <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
</div>
</div>
</div>
@@ -490,7 +515,11 @@
form.on('submit(HEMPList)', function () {
get_checkHemp();
});
-
+ //#region 閫夋嫨椤圭洰浠ｇ爜鎸夐挳
+ form.on('submit(btnSearchHProNumber)', function () {
+ get_checkSearchHProNumber();
+ });
+ //#endregion
@@ -775,6 +804,10 @@
, "HManagerID": data[0]["HManagerID"]
, "HMangerName": data[0]["涓荤"]
, "HExplanation": data[0]["HExplanation"]
+ , "HInvoiceBillNo": data[0]["鍙戠エ缂栧彿"]
+ , "HProjectID": data[0]["HProjectID"]
+ , "HProNumber": data[0]["椤圭洰缂栫爜"]
+ , "HProName": data[0]["椤圭洰鍚嶇О"]
, "HRemark": data[0]["琛ㄥご澶囨敞"]
, "HMaker": data[0]["鍒跺崟浜�"]
@@ -941,6 +974,16 @@
}
$("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
$("#HWHID").val(checkStatus.data[0].HItemID);
+
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0) {
+ option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
+ option.data[i]["璋冨叆浠撳簱"] = checkStatus.data[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ table.render(option);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -964,6 +1007,16 @@
}
$("#HSCWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
$("#HSCWHID").val(checkStatus.data[0].HItemID);
+
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0) {
+ option.data[i]["HSCWHID"] = checkStatus.data[0].HItemID;
+ option.data[i]["璋冨嚭浠撳簱"] = checkStatus.data[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ table.render(option);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1066,6 +1119,44 @@
})
}
+ //#region 椤圭洰浠ｇ爜閫夋嫨椤甸潰
+ function get_checkSearchHProNumber() {
+ var HOrgID = $("#HOrgID").val();
+ //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ョ▼椤圭洰鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+ if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(checkStatus.data[0].HInterID);
+ $("#HProNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
//#endregion
//琛屽唴蹇嵎閿瓫閫�
@@ -1201,7 +1292,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1238,7 +1329,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1256,12 +1347,12 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
- }
+ , end: function () {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ }
})
}
//浠撲綅
@@ -1584,12 +1675,30 @@
{
$("#HWHName").val(obj[0].浠撳簱鍚嶇О);
$("#HWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HWHID"] == 0 || option.data[i]["璋冨叆浠撳簱"] == undefined) {
+ option.data[i]["HWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨叆浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
function GetHSCWHValue(obj) //杩斿洖璋冨嚭浠撳簱
{
$("#HSCWHName").val(obj[0].浠撳簱鍚嶇О);
- $("#HSCWHID").val(obj[0].HItemID);
+ $("#HSCWHID").val(obj[0].HItemID);
+ if (option.data.length > 0) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HSCWHID"] == 0 || option.data[i]["璋冨嚭浠撳簱"] == undefined) {
+ option.data[i]["HSCWHID"] = obj[0].HItemID;
+ option.data[i]["璋冨嚭浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+ }
+ }
+ }
+ layui.table.render(option);
}
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
@@ -1626,7 +1735,26 @@
//鍙屽嚮杩斿洖浠撲綅
function GetGyStockPlace(data) {
OptionData = data
- }
+ }
+ //鍙屽嚮杩斿洖璋冨叆浠撳簱
+ function GetHWHSubValue(data) {
+ OptionData = data[0]
+ }
+ //鍙屽嚮杩斿洖璋冨嚭浠撳簱
+ function GetGyWarehouse(data) {
+ OptionData = data[0];
+ }
+ //椤圭洰浠ｇ爜
+ function GetProjectBillValue(obj) {
+ if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(obj[0].HInterID);
+ $("#HProNumber").val(obj[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+ }
</script>
</body>
</html>
\ No newline at end of file
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/Gy_Warehouse.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/Gy_Warehouse.html"
index de4b13d..19e04a1 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/Gy_Warehouse.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/Gy_Warehouse.html"
@@ -272,6 +272,9 @@
case "Warehouse":
parent.GetGyWarehouse(data);
break;
+ case "HWHSub": //璋冨叆瀛愯〃
+ parent.GetHWHSubValue(data);
+ break;
default:
parent.GetHWHValue(data);
break;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 10bb8de..13f9840 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -220,10 +220,19 @@
</div>
</div>
<div class="layui-row" style="margin-bottom:5px">
- <div class="layui-inline" style="width: 56%;">
+ <div class="layui-inline" style="width: 53%;">
<label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline" style="width: 56%;">
+ <div class="layui-input-inline" style="width: 53%;">
<input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉愭枡绫诲埆:</label>
+ <div class="layui-input-inline">
+ <select name="HMaterClass" lay-filter="HMaterClass" id="HMaterClass">
+ <option value="涓绘潗" selected="selected">涓绘潗</option>
+ <option value="杈呮潗">杈呮潗</option>
+ </select>
</div>
</div>
</div>
@@ -622,7 +631,10 @@
$("#HRemark").val(d.data[0].澶囨敞);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
$("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+ $('#HMaterClass').find("option[value='" + data[0].渚涜揣鏉愭枡绫诲埆 + "']").attr("selected", true);
+ form.render('select');
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
//table.reload(layTableId, {
// data: ajaxReturnData
//});
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
index bfecf4a..93f35b8 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyEdit.html"
@@ -92,7 +92,16 @@
<input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢ㄦ埛缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 67px;">
+ <input type="text" class="layui-input" name="HUserCodeName" lay-verify="HUserCodeName" id="HUserCodeName" style="background-color:#efefef4d;width: 55%;margin-left:7px;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HUserCode" lay-verify="HUserCode" id="HUserCode" value="">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUserCode" id="btnHUserCode" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -147,6 +156,10 @@
form.on('submit(btnHUserGroup)', function () {
get_btnHUserGroup();
});
+ //鐢ㄦ埛缂栫爜
+ form.on('submit(btnHUserCode)', function () {
+ get_btnHUserCode();
+ });
//淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
@@ -190,6 +203,35 @@
$("#HUserGroupID").val(checkStatus.data[0].HGroupID);
$("#HUserGroupName").val(checkStatus.data[0].瑙掕壊);
$("#HName").val(checkStatus.data[0].瑙掕壊);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鐢ㄦ埛缂栫爜
+ function get_btnHUserCode() {
+ //鎵撳紑閮ㄩ棬灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢ㄦ埛鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../鐢ㄦ埛绠＄悊/Xt_UserList.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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ $("#HUserCode").val(checkStatus.data[0].鐢ㄦ埛缂栫爜);
+ $("#HUserCodeName").val(checkStatus.data[0].鐢ㄦ埛鍚嶇О);
layer.close(index);//鍏抽棴寮圭獥
}
})
@@ -249,6 +291,8 @@
, "HUserGroupID": data.HUserGroupID
, "HRemark": data.澶囨敞
, "HStopFlag": data.绂佺敤鏍囪
+ , "HUserCode": data.鐢ㄦ埛缂栫爜
+ , "HUserCodeName": data.鐢ㄦ埛鍚嶇О
});
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
index caed4d4..ebcbe57 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\273\204\347\273\207\346\236\266\346\236\204\350\256\276\347\275\256/Gy_DutyList.html"
@@ -103,6 +103,8 @@
{ field: "hitemid", title: "hitemid", width: 100, hide: true },
{ field: "缁勭粐鏋舵瀯浠ｇ爜", title: "缁勭粐鏋舵瀯浠ｇ爜", width: 110 },
{ field: "鑱屽姟", title: "鑱屽姟", width: 110 },
+ { field: "鐢ㄦ埛缂栫爜", title: "鐢ㄦ埛缂栫爜", width: 110 },
+ { field: "鐢ㄦ埛鍚嶇О", title: "鐢ㄦ埛鍚嶇О", width: 110 },
{ field: "鍔╄鐮�", title: "鍔╄鐮�", width: 110 },
{ field: "鐭唬鐮�", title: "鐭唬鐮�", width: 110 },
{ field: "鏈骇鏍囧織", title: "鏈骇鏍囧織", width: 110 },
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index 660734b..54e3912 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -179,6 +179,27 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label">鍙戠エ缂栧彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" value="" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶у啓閲戦</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBigMoney" id="HBigMoney" value="" autocomplete="off" >
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠樻浜嬬敱</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HReason" value="" id="HReason" autocomplete="off" >
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1160px;">
@@ -447,6 +468,25 @@
$("#HRelSumMoney").val(HRelSumMoney);
});
//#endregion
+ });
+
+ $(document).ready(function () {
+ $("#HBigMoney").blur(function () {
+ var num = $(this).val();
+ var strOutput = "";
+ var strUnit = '浠熶桨鎷句嚎浠熶桨鎷句竾浠熶桨鎷惧厓瑙掑垎';
+ num += "00";
+ var intPos = num.indexOf('.');
+ if (intPos >= 0) {
+ num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
+ }
+ strUnit = strUnit.substr(strUnit.length - num.length);
+ for (var i = 0; i < num.length; i++) {
+ strOutput += '闆跺９璐板弫鑲嗕紞闄嗘煉鎹岀帠'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
+ }
+ // 灏嗚浆鎹㈠悗鐨勫ぇ鍐欓噾棰濇浛鎹㈡枃鏈涓殑鍐呭
+ $(this).val(strOutput.replace(/闆惰闆跺垎$/, '鏁�').replace(/闆禰浠熶桨鎷綸/g, '闆�').replace(/闆秢2,}/g, '闆�').replace(/闆�([浜縷涓嘳)/g, '$1').replace(/闆�+鍏�/, '鍏�').replace(/浜块浂{0,3}涓�/, '浜�').replace(/^鍏�/, "闆跺厓"));
+ });
});
//#endregion
@@ -893,7 +933,9 @@
, "HRelSumMoney": data.鎶樻墸鍚庨噾棰�
, "HAccDate": formatDate(data.璐㈠姟鏃ユ湡)
, "HCreditRating_Now": data.HCreditRating_Now
- , "HRemark": data.琛ㄥご澶囨敞
+ , "HInvoiceBillNo": data.鍙戠エ缂栧彿
+ , "HBigMoney": data.澶у啓閲戦
+ , "HReason": data.浠樻浜嬬敱
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
--
Gitblit v1.9.1