From 370e2aa3aa67f99b2ccfe495d2cd1450f79c8a0d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 24 九月 2024 11:41:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/Baseset/基础资料/Gy_RoutingBillList.html | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
index ee43c5f..e73213a 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RoutingBillList.html"
@@ -67,9 +67,11 @@
}
var HMaterID = "";
+ var HProID = 0;
var params = getUrlVars();
if (params[params[0]] != "undefined") {
HMaterID = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇
+ HProID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇
}
RoadQuery($('#Value').val());
@@ -83,20 +85,23 @@
{ type: 'radio' }
, { field: 'hmainid', title: '宸ヨ壓璺嚎ID', hide: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓璺嚎鍚嶇О' }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
, { field: '缁勭粐', title: '缁勭粐' }
]]
, page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
});
///鍔犺浇鏄剧ず鏁版嵁
function RoadQuery(Where) {
var Value = Where;
if (Value == null) {
- Value = " and HMaterID=" + HMaterID + " and HOrgID = " + sessionStorage["OrganizationID"];
+ Value = " and HMaterID=" + HMaterID + " and HMainProcID=" + HProID+" and HOrgID = " + sessionStorage["OrganizationID"];
} else {
- Value = " and HMaterID=" + HMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] + " and ( 鍗曟嵁鍙� like '%" + Where + "%' or 鍗曟嵁鍙� like '%" + Where + "%' ) "
+ Value = " and HMaterID=" + HMaterID + " and HMainProcID=" + HProID +" and HOrgID = " + sessionStorage["OrganizationID"] + " and ( 鍗曟嵁鍙� like '%" + Where + "%' or 鍗曟嵁鍙� like '%" + Where + "%' ) "
}
var index = layer.load();
$.ajax({
--
Gitblit v1.9.1