From df3ada3a122bb0de3fc02d18cf5199541bb95b00 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 04 十二月 2024 09:59:54 +0800
Subject: [PATCH] 付款单添加项目编号字段
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 5 +
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 20 +++++
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 19 ++++
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 20 +++++
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 32 +++++++
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 23 +++++
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 20 ++++
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 20 +++++
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 22 +++++
9 files changed, 177 insertions(+), 4 deletions(-)
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 a1c5fee..0216901 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"
@@ -76,14 +76,28 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline" style="width:900px;">
+ <div class="layui-inline" style="width:670px;">
<label class="layui-form-label">涓氬姟鍗曚綅<label style="color:red"> * </label></label>
- <div class="layui-input-inline" style="width:750px;">
+ <div class="layui-input-inline" style="width:525px;">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float: left; width: 475px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+
</div>
</div>
</div>
@@ -1071,6 +1085,9 @@
, "HAccSupID": dataArray[0].HSupID
, "HAccSupName": dataArray[0].渚涘簲鍟�
, "HSumMoney": dataArray[0].閲戦
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
@@ -1203,6 +1220,9 @@
, "HAccSupID": dataArray[0].HSupID
, "HAccSupName": dataArray[0].渚涘簲鍟�
, "HSumMoney": dataArray[0].閲戦
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
@@ -1519,6 +1539,9 @@
, "HAccDate": formatDate(data.璐㈠姟鏃ユ湡)
, "HCreditRating_Now": data.HCreditRating_Now
, "HInvoiceBillNo": data.鍙戠エ缂栧彿 ? "" : data.鍙戠エ缂栧彿
+ , "HProjectID": data.HProjectID
+ , "HProjectName": data.椤圭洰鍚嶇О
+ , "HProjectNumber": data.椤圭洰浠ｇ爜
, "HBigMoney": data.澶у啓閲戦
, "HReason": data.浠樻浜嬬敱
, "HMaker": data.鍒跺崟浜�
@@ -1647,6 +1670,9 @@
, "HAccSupID": dataArray[0].HSupID
, "HAccSupName": dataArray[0].渚涘簲鍟�
, "HSumMoney": dataArray[0].閲戦
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
});
//瀛愯〃 璧嬪��
var rowdata = [];
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_PayMentBillList.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_PayMentBillList.html"
index 16b35d1..d2712dd 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_PayMentBillList.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_PayMentBillList.html"
@@ -38,6 +38,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -333,6 +339,14 @@
}
});
})
+ //#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
//#endregion
//#region 鎺掑簭鍚庨�夋嫨
@@ -680,6 +694,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
@@ -763,6 +778,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -775,6 +793,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0"); $("#ColContent1").val("");
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 7eb63e4..8247ac4 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"
@@ -43,6 +43,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -334,6 +340,15 @@
});
})
//#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
//#region 鎺掑簭鍚庨�夋嫨
table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
table.reload('mainTable', {
@@ -656,6 +671,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
@@ -742,6 +758,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
@@ -756,6 +775,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 504b181..50cd70a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -64,6 +64,12 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -325,6 +331,16 @@
$('#HDate1').prop('disabled', false);
}
});
+
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
//#region 鎺掑簭鍚庨�夋嫨
table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
table.reload('mainTable', {
@@ -1268,6 +1284,7 @@
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HSupID = $("#HSupID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
@@ -1360,6 +1377,10 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
if (HSupID) {
sWhere += " and 渚涘簲鍟� like '%" + HSupID + "%'";
}
@@ -1382,6 +1403,7 @@
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HSupID").val("");
$("#HDeptID").val("");
$("#HMangerID").val("");
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index a9f4030..99215e7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -2308,6 +2308,7 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HEmpName = $("#HEmpName").val();
var HMaterNumber = $("#HMaterNumber").val();
var HMaterShortNumber = $("#HMaterShortNumber").val();
@@ -2422,6 +2423,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
if (HMaterShortNumber) {
sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterShortNumber + "%'";
}
@@ -2470,6 +2474,7 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$('#HStatus').find("option[value='-1']").attr("selected", true);
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#HEmpName").val("");
$("#HMaterNumber").val("");
$("#HOldMaterNumber").val("");
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index e15bdea..003cb32 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -72,6 +72,13 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -300,6 +307,16 @@
optionPage.curr = 1;
get_FastQuery(table, option);
+ });
+ //#endregion
+
+
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
});
//#endregion
@@ -853,6 +870,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HCusID = $("#HCusID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
@@ -941,6 +959,10 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰缂栫爜 like '%" + HProjectNumber + "%'";
+ }
+
if (HCusID) {
sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
}
@@ -962,6 +984,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HCusID").val("");
$("#HDeptID").val("");
$("#HMangerID").val("");
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index 5b7bc46..ab5dc15 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -43,6 +43,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -341,6 +347,14 @@
}
});
})
+ //#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
//#endregion
//#region 鎺掑簭鍚庨�夋嫨
@@ -710,6 +724,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
//浠绘剰瀛楁杩囨护
@@ -795,7 +810,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
-
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
sWhere += addSWhereByOpenType();
@@ -812,6 +829,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
+ $("#HProjectNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
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/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/Xs_SeOrderBillList.html"
index 0b56957..d5f35ff 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/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/Xs_SeOrderBillList.html"
@@ -63,6 +63,13 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -311,6 +318,14 @@
optionPage.curr = 1;
get_FastQuery(table, option);
+ });
+ //#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
});
//#endregion
@@ -1019,6 +1034,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HCusID = $("#HCusID").val();
var HMaterNumber = $("#HMaterNumber").val();
var HMaterName = $("#HMaterName").val();
@@ -1110,6 +1126,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰缂栫爜 like ''%" + HProjectNumber + "%''";
+ }
if (HCusID) {
sWhere += " and 瀹㈡埛 like ''%" + HCusID + "%''";
}
@@ -1147,6 +1166,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HCusID").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index b160501..cd0797c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -72,6 +72,12 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -316,6 +322,15 @@
$('#HEndDate').prop('disabled', false);
}
});
+
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
//#region 鎺掑簭鍚庨�夋嫨
table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
@@ -815,6 +830,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HSupID = $("#HSupID").val();
var HDeptID = $("#HDeptID").val();
var HMangerID = $("#HMangerID").val();
@@ -909,6 +925,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ }
if (HSupID) {
sWhere += " and 渚涘簲鍟� like '%" + HSupID + "%'";
}
@@ -934,6 +953,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
+ $("#HProjectNumber").val("");
$("#HSupID").val("");
$("#HDeptID").val("");
$("#HMangerID").val("");
--
Gitblit v1.9.1