From c92da7cfc9423d9f39b9968f2638bb2f206af57d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 17 十二月 2024 15:58:28 +0800
Subject: [PATCH] 销售出库单,发货通知单,工程项目添加子类型
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 19 ++++
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 27 ++++++
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 31 ++++---
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 73 ++++++++++++-----
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 15 +++
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 41 +++++++++
6 files changed, 162 insertions(+), 44 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index b3264b9..e4ec414 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -84,6 +84,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
</div>
</div>
<div class="layui-inline">
@@ -140,6 +141,22 @@
</div>
</div>
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻鏂�<!--<label style="color:red"> * </label>--></label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
@@ -455,24 +472,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻鏂�<!--<label style="color:red"> * </label>--></label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPayCus" id="btnSearchHPayCus" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁撶畻閲戦</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍚堝悓鎬婚噾棰�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HSumMoney" name="HSumMoney" id="HSumMoney" value="0">
@@ -484,6 +483,9 @@
<input type="text" class="layui-input" lay-verify="HProMoney" name="HProMoney" id="HProMoney" value="0">
</div>
</div>
+ </div>
+ <div class="layui-row">
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瀹炴柦璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -496,8 +498,6 @@
<input type="text" class="layui-input" lay-verify="HOtherMoney" name="HOtherMoney" id="HOtherMoney" value="0">
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍚堝悓瀹炴柦浜哄ぉ</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -510,6 +510,9 @@
<input type="text" class="layui-input" lay-verify="HDepDays" name="HDepDays" id="HDepDays" value="0">
</div>
</div>
+ </div>
+ <div class="layui-row">
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">寤鸿鍗曚綅</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -970,11 +973,23 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+ var HBillSubType = (decodeURI(params[params[3]]) != "宸ョ▼绫�" && decodeURI(params[params[3]]) != "浠诲姟绫�") ? "椤圭洰绫�" : decodeURI(params[params[3]]);
+ $("#HBillSubType").val(HBillSubType);
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+ //鏍规嵁瀛愮被鍨嬮殣钘忛〉绛�
+ $('li').show();
+ if (HBillSubType == "宸ョ▼绫�") {
+ $('li[lay-id="3"]').hide();
+ $('li[lay-id="4"]').hide();
+ } else if (HBillSubType == "浠诲姟绫�") {
+ $('li[lay-id="2"]').hide();
+ $('li[lay-id="3"]').hide();
+ } else {
+ $('li[lay-id="2"]').hide();
+ $('li[lay-id="4"]').hide();
+ }
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "4750";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -2209,7 +2224,19 @@
var tableMain = result.data[0];
var tableSub = result.data[1];
var tableSub_Emp = result.data[2];
-
+ HBillSubType = tableMain[0]["HBillSubType"];
+ //鏍规嵁瀛愮被鍨嬮殣钘忛〉绛�
+ $('li').show();
+ if (HBillSubType == "宸ョ▼绫�") {
+ $('li[lay-id="3"]').hide();
+ $('li[lay-id="4"]').hide();
+ } else if (HBillSubType == "浠诲姟绫�") {
+ $('li[lay-id="2"]').hide();
+ $('li[lay-id="3"]').hide();
+ } else {
+ $('li[lay-id="2"]').hide();
+ $('li[lay-id="4"]').hide();
+ }
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HInterID": tableMain[0]["HInterID"]
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index 7489ede..add7db4 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -175,7 +175,7 @@
var params = getUrlVars();
var UserName = params[params[2]];
UserName = decodeURI(UserName);//瀵筓RI 杩涜瑙ｇ爜
-
+ var HBillSubType="椤圭洰绫�";
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -316,11 +316,7 @@
//鍒濆鍖栫粍缁�
Organ();
//鏌ヨ
- if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
- get_FastQuery(2);
- } else {
- get_FastQuery(1);
- }
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -475,7 +471,7 @@
}
sWhere += " and " + ColName + " " + com;
}
- if (number == 1) {
+ if (addSWhereByOpenType()) {
HOrgID = sessionStorage["OrganizationID"];
}
else {
@@ -499,6 +495,7 @@
sWhere += " and 椤圭洰缁忕悊 = '" + UserName + "' and 鍗曟嵁鐘舵�� != '宸插叧闂�' ";
}
}
+ addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -527,7 +524,7 @@
, area: ['100%', '100%']
, title: '鏂板' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=1&linterid=0&HSouceBillType='
+ , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillSubType=' + HBillSubType
,btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
btn1: function (index, layero, that) {
@@ -550,7 +547,7 @@
, area: ['100%', '100%']
, title: '缂栬緫' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillSubType=' + HBillSubType
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
btn1: function (index, layero, that) {
@@ -890,7 +887,11 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
var dataCols = dataCol[i].split('|');
+
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -990,8 +991,14 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
+ HBillSubType = (decodeURI(params[params[2]]) != "宸ョ▼绫�" && decodeURI(params[params[2]]) != "浠诲姟绫�") ? "椤圭洰绫�" : decodeURI(params[params[2]]);//鑻ヨВ鐮佸悗type涓嶄负宸ョ▼鎴栦换鍔″己鍒跺彉涓洪」鐩�
if (openType == 2) {
sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ if (HBillSubType == "宸ョ▼绫�") {
+ sWhere += " and 鍗曟嵁瀛愮被鍨�='宸ョ▼绫�' "
+ } else if (HBillSubType == "浠诲姟绫�") {
+ sWhere += " and 鍗曟嵁瀛愮被鍨�='浠诲姟绫�' "
+ }
$("#HOrgID").val(HOrgID);
form.render("select");
return true;
@@ -1038,11 +1045,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
- get_FastQuery(2);
- } else {
- get_FastQuery(1);
- }
+ get_FastQuery();
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 8dedde5..2d61c26 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -69,6 +69,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
+ <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
</div>
</div>
<div class="layui-inline">
@@ -601,6 +602,8 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var closeType = params[params[3]];//瀹㈡埛搴旀敹璐︽鏄庣粏 鍙屽嚮寮圭獥寮瑰嚭鍙兘鏌ョ湅涓嶈兘缂栬緫 绂佺敤鎸夐挳
}
+ var HBillSubType = getParams("HBillSubType") == "" ? "1205" : getParams("HBillSubType");//鍗曟嵁瀛愮被鍨�
+ $("#HBillSubType").val(HBillSubType);
//#endregion
//鍒濆鍖栧瓙琛�
@@ -4222,6 +4225,19 @@
});
}
//#endregion
+
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return "";
+ };
+
//#endregion
@@ -4369,6 +4385,9 @@
$("#HCreditRating_Now").val(data.HCreditRating_Now);
$("#HLinkMan").val(data.HLinkMan);
$("#HLinkPhone").val(data.HLinkPhone);
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
//璁剧疆榛樿璐у竵淇℃伅
if (data.HCurID == 0) {
$("#HCurID").val(1);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 6e452af..52be366 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -96,6 +96,17 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
</div>
</div>
+
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀛愮被鍨�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="" disabled>
+ <option value="0" selected="selected"></option>
+ <option value="宸ョ▼绫�">宸ョ▼绫�</option>
+ <option value="浠诲姟绫�">浠诲姟绫�</option>
+ </select>
+ </div>
+ </div>-->
</div>
<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
@@ -252,7 +263,7 @@
var HModName = "Kf_SellOutBillList";
var HBillType = "1205";
-
+ var HBillSubType = "";
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -985,7 +996,13 @@
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HProjectNumber) {
+
sWhere += " and 椤圭洰缂栫爜 like '%" + HProjectNumber + "%'";
+ if (HBillSubType == "宸ョ▼绫�") {
+ sWhere += "and 椤圭洰瀛愮被鍨�='宸ョ▼绫�'"
+ } else if (HBillSubType == "浠诲姟绫�") {
+ sWhere += "and 椤圭洰瀛愮被鍨�='浠诲姟绫�'"
+ }
}
if (HCusID) {
sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
@@ -1080,7 +1097,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1&HBillSubType=' + HBillSubType,
end: function () {
//鍒锋柊椤甸潰,
$("#btnSearch").trigger('click');
@@ -1107,7 +1124,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , content: '../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1&HBillSubType=' + HBillSubType
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
@@ -1972,14 +1989,32 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
+ HBillSubType = getParams("HBillSubType");
var addSWhere = "";
if (openType == 2) {
addSWhere = " and 鐘舵�� = '宸插鏍�' and HOrgID = " + HOrgID;
+ if (HBillSubType == "宸ョ▼绫�") {
+ addSWhere += "and HBillSubType='宸ョ▼绫�'"
+ } else if (HBillSubType == "浠诲姟绫�") {
+ addSWhere += "and HBillSubType='浠诲姟绫�'"
+ }
+
}
return addSWhere;
}
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return "";
+ };
//#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
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/Add_Edit_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/Add_Edit_Kf_POStockInBillList.html"
index ea53893..3c4cacd 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/Add_Edit_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/Add_Edit_Kf_POStockInBillList.html"
@@ -74,6 +74,7 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
<input type="hidden" name="HInterID" id="HInterID" value="0">
<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value=0>
+ <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -406,7 +407,8 @@
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
-
+ var HBillSubType = getParams("HBillSubType") == "" ? "1201" : getParams("HBillSubType");//鍗曟嵁瀛愮被鍨�
+ $("#HBillSubType").val(HBillSubType);
//#region 鑾峰彇鏈�澶у崟鎹彿
@@ -3163,6 +3165,17 @@
//#endregion
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return "";
+ };
//浠ヤ笂鏄痩ayui妯″潡
});
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 d4dc4e3..63eda01 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"
@@ -258,7 +258,7 @@
var sWhere = "";
var option = [];
var HModName = "Kf_POStockInBillList";
-
+ var HBillSubType = "";
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1201";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -681,7 +681,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1&HBillSubType=' + HBillSubType,
end: function () {
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
$("#btnSearch").trigger('click');
@@ -927,6 +927,11 @@
}
if (HProjectNumber) {
sWhere += " and 椤圭洰浠ｇ爜 like '%" + HProjectNumber + "%'";
+ if (HBillSubType == "宸ョ▼绫�") {
+ sWhere += "and 椤圭洰瀛愮被鍨�='宸ョ▼绫�'"
+ } else if (HBillSubType == "浠诲姟绫�") {
+ sWhere += "and 椤圭洰瀛愮被鍨�='浠诲姟绫�'"
+ }
}
if (HSupID) {
sWhere += " and 渚涘簲鍟� like '%" + HSupID + "%'";
@@ -1636,14 +1641,30 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
-
+ HBillSubType = getParams("HBillSubType");
var addSWhere = "";
if (openType == 2) {
addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ if (HBillSubType == "宸ョ▼绫�") {
+ addSWhere += "and HBillSubType='宸ョ▼绫�'"
+ } else if (HBillSubType == "浠诲姟绫�") {
+ addSWhere += "and HBillSubType='浠诲姟绫�'"
+ }
}
return addSWhere;
}
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return "";
+ };
//#endregion
--
Gitblit v1.9.1