From 8f3c8c4490e1e862b1b19f59bc0920c18f658d40 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 二月 2024 16:03:11 +0800
Subject: [PATCH] 修复月度阶段计划的选着源单回显数据
---
WebTM/views/项目管理/工程项目/PM_WorkPlanMonthBillMain.html | 2 +-
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 16 +++++++++++-----
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 922b73b..f9bb972 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
//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:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
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 bc2fc86..4741101 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"
@@ -166,7 +166,7 @@
//#endregion
var params = getUrlVars();
- var UserName = params[params[0]];
+ var UserName = params[params[2]];
UserName = decodeURI(UserName);//瀵筓RI 杩涜瑙ｇ爜
@@ -466,8 +466,10 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
- if (UserName!="") {
- sWhere += " and 椤圭洰缁忕悊 = '" + UserName + "' and 鍗曟嵁鐘舵�� != '宸插叧闂�' ";
+ if (number == 2) {
+ if (HOrgID==null) {
+ sWhere += " and 椤圭洰缁忕悊 = '" + UserName + "' and 鍗曟嵁鐘舵�� != '宸插叧闂�' ";
+ }
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -958,7 +960,7 @@
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
var params = getUrlVars();
- var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (openType == 2) {
sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
@@ -1008,7 +1010,11 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
form.render("select");
}
}, error: function () {
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_WorkPlanMonthBillMain.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_WorkPlanMonthBillMain.html"
index 5d9d0dc..dc7b25b 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_WorkPlanMonthBillMain.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_WorkPlanMonthBillMain.html"
@@ -789,7 +789,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ョ▼椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?UserName=' + UserName, 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=&UserName=' + UserName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
--
Gitblit v1.9.1