From 0c57fb6193cf47fd9a918147edeb3bd626e07b59 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 26 七月 2024 16:03:45 +0800
Subject: [PATCH] 付款单按钮选择源单应付单功能实现
---
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 72 +++++++++++++++++++++++
WebTM/Vlog/webapi20240726.txt | 5 +
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 64 ++++++++++++++++-----
3 files changed, 123 insertions(+), 18 deletions(-)
diff --git a/WebTM/Vlog/webapi20240726.txt b/WebTM/Vlog/webapi20240726.txt
new file mode 100644
index 0000000..d520030
--- /dev/null
+++ b/WebTM/Vlog/webapi20240726.txt
@@ -0,0 +1,5 @@
+2024/7/26 11:11:52 鎵撳嵃sql:select * from h_v_YF_PayMentBillList where hmainid = 449 order by hmainid desc
+
+2024/7/26 11:11:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/7/26 11:11:53 ReportDataSet:1
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 1a27f49..badff8d 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"
@@ -151,6 +151,18 @@
<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color: #efefef4d;" readonly>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -390,7 +402,11 @@
get_checkCur();
});
//#endregion
-
+ //#region 閫夋嫨婧愬崟鎸夐挳
+ form.on('submit(HMainSource)', function () {
+ get_checkMainSource();
+ });
+ //#endregion
//#region 閫夋嫨涓氬姟鍗曚綅鎸夐挳
form.on('submit(HSupList)', function () {
get_checkSup();
@@ -810,7 +826,55 @@
})
}
//#endregion
+ //#region 閫夋嫨婧愬崟
+ function get_checkMainSource() {
+ var url = "";
+ var HOrgID = $("#HOrgID").val();
+ url = "../../閲囪喘绠＄悊/搴斾粯鍗�/Cg_PayableBillList.html?openType=2&HOrgID=" + HOrgID;
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '婧愬崟-搴斾粯鍗�' + + '鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: [url, '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 != 1) {
+ return layer.msg('璇烽�夋嫨涓�琛屾暟鎹�');
+ }
+ checkStatus = checkStatus.data;
+ console.log(checkStatus);
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": checkStatus[0].hmainid
+ , "HMainSourceEntryID": checkStatus[0].hsubid
+ , "HMainSourceBillNo": checkStatus[0].鍗曟嵁鍙�
+ , "HMainSourceBillType": '1114'
+ , "HDeptID": checkStatus[0].HDeptID
+ , "HDeptName": checkStatus[0].閮ㄩ棬
+ , "HEmpID": checkStatus[0].HEmpID
+ , "HEmpName": checkStatus[0].涓氬姟鍛�
+ , "HCurID": checkStatus[0].HCurID
+ , "HCurName": checkStatus[0].甯佸埆
+ , "HExRate": checkStatus[0].绋庣巼
+ , "HSSID": checkStatus[0].HSSID
+ , "HSupID": checkStatus[0].HSupID
+ , "HSupName": checkStatus[0].渚涘簲鍟�
+ , "HSSName": checkStatus[0].缁撶畻鏂瑰紡
+ /*, "HSSNum": checkStatus[0].缁撶畻鍙�*/
+ , "HAccSupID": checkStatus[0].HSupID
+ , "HAccSupName": checkStatus[0].渚涘簲鍟�
+ , "HSumMoney": checkStatus[0].閲戦
+ });
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
//#region 缁撶畻鏂瑰紡閫夋嫨椤甸潰
function get_checkSS() {
@@ -988,7 +1052,11 @@
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HMainSourceInterID": data.HMainSourceInterID
+ , "HMainSourceEntryID": data.HMainSourceEntryID
+ , "HMainSourceBillNo": data.HMainSourceBillNo
+ , "HMainSourceBillType": data.HMainSourceBillType
+ , "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HDeptID": data.HDeptID
, "HDeptName": data.閮ㄩ棬
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index facd719..164d56e 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -155,17 +155,21 @@
<table class="" 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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ {{# if(openType!=2){ }}
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b" id="set_AddNew"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ {{# } }}
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ {{# if(openType!=2){ }}
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm " lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ {{# } }}
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -178,6 +182,8 @@
</div>
</div>
<script>
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -224,7 +230,6 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
-
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -318,7 +323,9 @@
l.LAY_CHECKED = true;
}
});
-
+ if (openType == 2) {
+ return
+ }
var linterid = obj.data["hmainid"];
layer.open({
type: 2
@@ -599,7 +606,6 @@
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
-
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -856,7 +862,10 @@
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
-
+
+ if (openType == 2) {
+ return
+ }
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
@@ -1244,6 +1253,19 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ var addSWhere = "";
+ if (openType == 2) {
+
+ }
+ return addSWhere;
+ }
+ //#endregion
});
//#endregion
@@ -1286,8 +1308,18 @@
}
//#endregion
-
- //浠ヤ笂鏄痩ayui妯″潡
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
</script>
</body>
--
Gitblit v1.9.1