From b4a59b1d60048bbea005573506c150e4cf9e4b54 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 31 八月 2023 13:43:47 +0800
Subject: [PATCH] 完善项目管理模块
---
WebTM/views/项目管理/项目阶段/Add_Edit_Gy_ProjectStage.html | 10
WebTM/views/项目管理/项目阶段/PM_ProjectStageBill.html | 9
WebTM/views/项目管理/项目阶段/PM_ProjectReportBillList.html | 37 +
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 51 ++
WebTM/views/项目管理/项目阶段/Gy_ProjectStage.html | 41 +
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 50 ++
WebTM/views/项目管理/项目阶段/PM_ProjectReportBill.html | 204 ++++++---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 61 ++
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 49 ++
WebTM/views/项目管理/业绩指标/PM_YearEmployeeMoneyBill.html | 23
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 38 +
WebTM/views/项目管理/项目阶段/PM_ProjectStageBillList.html | 24 +
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 38 +
WebTM/views/项目管理/业绩指标/PM_YearEmployeeMoneyBillList.html | 39 +
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 317 +++++++++++----
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 148 +++++-
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html | 38 +
17 files changed, 947 insertions(+), 230 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 6edff81..4954e6d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -134,6 +134,8 @@
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
+ //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
+ addSWhereByOpenType();
get_Display(sWhere);
//#endregion
@@ -242,6 +244,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
+ sWhere = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var ColName = $("#ColName").val();//澶嶉�夋
@@ -763,6 +766,54 @@
}
//#endregion
+ //#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
+ //#region 鏍规嵁缁勭粐ID鑾峰彇缁勭粐Name
+ function Organ(HOrgID) {
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ if (data[i].ID == HOrgID) {
+ Organization = data[i].Name;
+ break;
+ }
+ }
+ }
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and 绂佺敤鏍囪 = '' ";
+ Organ(HOrgID);
+ }
+
+ }
+ //#endregion
+
+
//浠ヤ笂鏄痩ayui妯″潡
});
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index d88f778..20b4ca6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -263,6 +263,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
+ //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠秙Where鏄惁闇�瑕佽繘琛岄澶栫殑娣诲姞
+ addSWhereByOpenType();
get_Display(sWhere);
get_Display_Tree();
@@ -402,6 +404,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
+ sWhere = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var HModel = $("#HModel").val();
@@ -903,6 +906,53 @@
form.render('select');
}
//#endregion
+
+ //#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
+ //#region 鏍规嵁缁勭粐ID鑾峰彇缁勭粐Name
+ function Organ(HOrgID) {
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ if (data[i].ID == HOrgID) {
+ Organization = data[i].Name;
+ break;
+ }
+ }
+ }
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and 绂佺敤鏍囪 = '' ";
+ Organ(HOrgID);
+ }
+
+ }
+ //#endregion
});
//#endregion
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 7628f21..72911ab 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -196,6 +196,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
+ //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
+ addSWhereByOpenType();
get_Display(sWhere);
}
//鍒濆鍖栬〃鏍�
@@ -296,6 +298,7 @@
}
//蹇�熸煡璇㈡寜閽�
function get_FastQuery() {
+ sWhere = "";
var ajaxLoad = layer.load();
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
@@ -680,6 +683,52 @@
}
//#endregion
+ //#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
+ //#region 鏍规嵁缁勭粐ID鑾峰彇缁勭粐Name
+ function Organ(HOrgID) {
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ if (data[i].ID == HOrgID) {
+ Organization = data[i].Name;
+ break;
+ }
+ }
+ }
+ }
+ })
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and 绂佺敤鏍囪 = '' ";
+ Organ(HOrgID);
+ }
+
+ }
+ //#endregion
//#endregion
});
</script>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBill.html"
index dbc9cae..9bb2a7c 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBill.html"
@@ -294,15 +294,10 @@
}
//#endregion
-
- //#region 鍒濆鍖栫粍缁�
- Organ();
- //#endregion
-
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -330,13 +325,16 @@
// });
//}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
RoadBillMain(linterid);
}
//#endregion
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
+ //#endregion
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -458,13 +456,14 @@
//#region 璐熻矗浜洪�夋嫨椤甸潰
function get_checkSearchHEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -474,9 +473,9 @@
}
//鑾峰彇鏁版嵁
$("#HEmpID").val(checkStatus.data[0].HItemID);//璐熻矗浜篿d
- $("#HEmpName").val(checkStatus.data[0].HName);//璐熻矗浜哄悕绉�
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//璐熻矗浜哄悕绉�
if ($("#HEmpName").val() == "") {
- $("#HEmpName").val(checkStatus.data[0].HNumber);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html"
index 9273832..28fbb7c 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html"
@@ -259,9 +259,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
}
//#endregion
@@ -284,6 +289,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -438,6 +444,7 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -854,6 +861,34 @@
}
//#endregion
+ //#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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
});
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index e1d02f5..5b6e124 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -353,22 +353,19 @@
}
//#endregion
-
- //#region 鍒濆鍖栫粍缁�
- Organ();
- //#endregion
-
//#region 浠诲姟绫诲瀷绫诲瀷涓嬫媺妗嗘樉绀�
ColFilter();
//#endregion
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
+ //鍒濆鍖栨淳鍗曚汉
+ getHEmpByHUserName();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -395,11 +392,15 @@
// });
//}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
RoadBillMain(linterid);
}
+ //#endregion
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
//#endregion
//#endregion
@@ -571,6 +572,7 @@
//#region 椤圭洰浠ｇ爜閫夋嫨椤甸潰
function get_checkSearchHProNumber() {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
layer.open({
type: 2
@@ -580,7 +582,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html", "yes"]
+ , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -600,9 +602,6 @@
} else {
layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
}
-
-
-
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -643,13 +642,14 @@
//#region 娲惧崟浜洪�夋嫨椤甸潰
function get_checkSearchHSendEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -658,9 +658,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HSendEmp").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HSendEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HSendEmp").val() == "") {
- $("#HSendEmp").val(checkStatus.data[0].HNumber);
+ $("#HSendEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -671,13 +671,14 @@
//#region 鎺ユ敹浜洪�夋嫨椤甸潰
function get_checkSearchHReceiveEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -686,9 +687,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HReceiveEmp").val(checkStatus.data[0].HName);//鎺ユ敹浜哄悕绉�
+ $("#HReceiveEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鎺ユ敹浜哄悕绉�
if ($("#HReceiveEmp").val() == "") {
- $("#HReceiveEmp").val(checkStatus.data[0].HNumber);
+ $("#HReceiveEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -699,29 +700,77 @@
//#region 鎶勯�佷汉閫夋嫨椤甸潰
function get_checkSearchHCopyEmp() {
+ //var HOrgID = $("#HOrgID").val();
+ //layer.open({
+ // type: 2//寮圭獥绫诲瀷
+ // , skin: 'layui-layer-rim' //鍔犱笂杈规
+ // , area: ['90%', '90%']//澶у皬
+ // , title: '鍛樺伐琛�'//鏍囬
+ // , shift: 2//寮瑰嚭鍔ㄧ敾
+ // , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, '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 === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // //鑾峰彇鏁版嵁
+ // $("#HCopyEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鎶勯�佷汉鍚嶇О
+ // if ($("#HCopyEmp").val() == "") {
+ // $("#HCopyEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
+ // }
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) { }
+ //})
+
+
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鍛樺伐琛�'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶勯�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/transfer.html', '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 === 0) {
+ var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+ if (checkStatus.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- //鑾峰彇鏁版嵁
- $("#HCopyEmp").val(checkStatus.data[0].HName);//鎶勯�佷汉鍚嶇О
- if ($("#HCopyEmp").val() == "") {
- $("#HCopyEmp").val(checkStatus.data[0].HNumber);
+ var value = "";
+ var title = "";
+ for (var i = 0; i < checkStatus.length; i++) {
+ value += checkStatus[i].value + ",";
+ title += checkStatus[i].title + ",";
}
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+ if (value.length > 0) {
+ value = value.substr(0, value.length - 1);
+ title = title.substr(0, title.length - 1);
+ }
+ $("#HCopyEmp").val(title);
+ console.log(checkStatus, value, title);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- , btn2: function (index, layero) { }
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
}
//#endregion
@@ -1093,6 +1142,33 @@
form.render('select');
}
//#endregion
+
+
+ //#region 鏍规嵁鐧诲綍璐︽埛鑾峰彇鐩稿簲鑱屽憳
+ function getHEmpByHUserName() {
+ var Czybm = sessionStorage["Czybm"];
+
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskReportBill/getHEmpByHUserName',
+ type: "GET",
+ data: { "Czybm": Czybm , "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var HSendEmp = result.data[0]["HEmpName"];
+ $("#HSendEmp").val(HSendEmp);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
index d145dc2..146d02c 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
@@ -253,9 +253,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
}
//#endregion
@@ -278,6 +283,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -787,6 +793,34 @@
}
//#endregion
+ //#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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
});
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
index df973f5..c382e32 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
@@ -296,17 +296,15 @@
//DisPlay_HideColumn();
//#endregion
- //#region 鍒濆鍖栫粍缁�
- Organ();
- //#endregion
-
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
+ //姹囨姤浜哄垵濮嬪寲
+ getHEmpByHUserName();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -334,14 +332,14 @@
// });
//}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
RoadBillMain(linterid);
- } else if (OperationType == 4 && HProjectStageID != null) {
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ } else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
@@ -354,6 +352,10 @@
//涓嬫帹-椤甸潰璁剧疆
set_WorkTaskReport();
}
+ //#endregion
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
//#endregion
//#region 鍒濆鍖栬〃鏍�
@@ -638,13 +640,14 @@
//#region 姹囨姤浜洪�夋嫨椤甸潰
function get_checkSearchHReportEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -654,9 +657,9 @@
}
//鑾峰彇鏁版嵁
$("#HReportEmpID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
- $("#HReportEmpName").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HReportEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HReportEmpName").val() == "") {
- $("#HReportEmpName").val(checkStatus.data[0].HNumber);
+ $("#HReportEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1099,6 +1102,7 @@
})
}
if (obj.event == "HName") {
+ var HOrgID = $("#HOrgID").val();
//宸ヤ綔浠诲姟浠ｇ爜
//鎵撳紑宸ヤ綔浠诲姟灏忕獥浣�
layer.open({
@@ -1109,7 +1113,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html", "yes"]
+ , content: ['../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html?openType=2&HOrgID=' + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1263,6 +1267,33 @@
}
//#endregion
+ //#region 鏍规嵁鐧诲綍璐︽埛鑾峰彇鐩稿簲鑱屽憳
+ function getHEmpByHUserName() {
+ var Czybm = sessionStorage["Czybm"];
+
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskReportBill/getHEmpByHUserName',
+ type: "GET",
+ data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var HReportEmpID = result.data[0]["HEmpID"];
+ var HReportEmpName = result.data[0]["HEmpName"];
+ $("#HReportEmpID").val(HReportEmpID);
+ $("#HReportEmpName").val(HReportEmpName);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
index 3d313ec..dfa3e23 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
@@ -241,9 +241,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
}
//#endregion
@@ -266,6 +271,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -802,6 +808,34 @@
}
//#endregion
+ //#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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
});
//#endregion
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 0f0f9a2..3c73ca8 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"
@@ -200,8 +200,52 @@
</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">
+ </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="HProMoney" name="HProMoney" id="HProMoney" 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;">
+ <input type="text" class="layui-input" lay-verify="HWorkMoney" name="HWorkMoney" id="HWorkMoney" 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;">
+ <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;">
+ <input type="text" class="layui-input" lay-verify="HConWorkDays" name="HConWorkDays" id="HConWorkDays" 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;">
+ <input type="text" class="layui-input" lay-verify="HDepDays" name="HDepDays" id="HDepDays" 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;">
@@ -312,52 +356,6 @@
<input type="text" class="layui-input" name="HBackRemark" id="HBackRemark" style="background-color:#efefef4d;" readonly>
</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="HConWorkDays" name="HConWorkDays" id="HConWorkDays" 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;">
- <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;">
- <input type="text" class="layui-input" lay-verify="HSumMoney" name="HSumMoney" id="HSumMoney" 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;">
- <input type="text" class="layui-input" lay-verify="HProMoney" name="HProMoney" id="HProMoney" 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;">
- <input type="text" class="layui-input" lay-verify="HWorkMoney" name="HWorkMoney" id="HWorkMoney" 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="HOtherMoney" name="HOtherMoney" id="HOtherMoney" 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;">
- <input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
- </div>
- </div>
</div>
</div>
</div>
@@ -462,18 +460,14 @@
}
//#endregion
- //#region 鍒濆鍖栫粍缁�
- Organ();
- //#endregion
-
//#region 椤圭洰闅炬槗绫诲瀷涓嬫媺妗嗘樉绀�
ColFilter();
//#endregion
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -506,12 +500,16 @@
// });
//}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid1();
RoadBillMain(linterid);
}
+ //#endregion
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
//#endregion
//#region 鍒濆鍖栬〃鏍�
@@ -615,6 +613,64 @@
//#endregion
//#endregion
+ //#region 琛ㄥご鏂囨湰妗嗗�煎彉鍖栫洃鍚�
+ $(document).ready(function () {
+ //#region 瀹屾垚鏁伴噺鏂囨湰妗嗙洃鍚�
+ $("#HSumMoney").on('change', function (data) {
+ var ref = /^\d+(\.\d+)?$/; //鍒ゆ柇鏄惁鏄潪璐熸诞鐐规暟
+ var currHSumMoney = data.currentTarget.value;
+ var HRate = 0;
+ for (var i = 0; i < option1.data.length; i++) {
+ HRate = option1.data[i]["HRate"];
+ if (ref.test(currHSumMoney) && ref.test(HRate)) {
+ option1.data[i]["HPlanAvgMoney"] = ((currHSumMoney * HRate) / 100).toFixed(8);
+ option1.data[i]["HPlanCountMoney"] = (((currHSumMoney * HRate) / 100) * 0.07).toFixed(8);
+ table.render(option1);
+ CheckedSet_tableSub_Emp();
+ }
+ }
+ });
+ //#endregion
+ });
+ //#endregion
+
+ //#region 瀛愯〃锛氬崟鍏冩牸缂栬緫鐩戝惉
+ //table.on('edit(mainTable1)', function (obj) {
+ // // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ // var oldText = $(this).prev().text();
+ // var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ // , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ // , field = obj.field; //寰楀埌瀛楁
+ // //姝ｅ垯琛ㄨ揪寮�-鏍￠獙闈炶礋娴偣鏁�
+ // var ref = /^\d+(\.\d+)?$/;
+
+ // switch (field) {
+ // case "HRate": //鏁伴噺
+ // if (!ref.test(value)) { //鑻ヨ緭鍏ュ�兼牸寮忎笉姝ｇ‘锛屽垯鍙樺洖鍘熸潵鐨勫��
+ // obj.update({
+ // HRate: oldText
+ // });
+ // layer.msg("椤圭洰鍗犳瘮锛氭暟鎹敊璇紝璇疯緭鍏ラ潪璐熷皬鏁�")
+ // } else {
+ // var HSumMoney = $("#HSumMoney").val();
+ // if (!(ref.test(value) && ref.test(HSumMoney))) {
+ // obj.update({
+ // HPlanAvgMoney: ((HSumMoney * value) / 100).toFixed(8) //棰勮鍒嗛厤涓氱哗=鍚堝悓鎬婚噾棰�*椤圭洰鍗犳瘮
+ // , HPlanCountMoney: (((HSumMoney * value) / 100) * 0.07).toFixed(8) //(椤圭洰鎻愭垚)棰勮鎻愭垚=棰勮鍒嗛厤涓氱哗*0.07
+ // });
+ // } else {
+ // layer.msg("鍚堝悓鎬婚噾棰濇牸寮忓瓨鍦ㄩ棶棰橈紝鏃犳硶璁＄畻鈥滈璁″垎閰嶄笟缁┾�濅笌鈥滈璁℃彁鎴愨��");
+ // obj.update({
+ // HPlanAvgMoney: 0
+ // , HPlanCountMoney: 0
+ // });
+ // }
+ // }
+ // break;
+ // default:
+ // }
+ //});
+ //#endregion
//#endregion
//#region 椤圭洰闃舵琛細澶村伐鍏锋爮浜嬩欢
@@ -964,8 +1020,8 @@
, { field: 'HEmployeeName', title: '椤圭洰鎴愬憳', edit: 'text', event: "HEmployeeName" } //f7
, { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', templet: "#HIsPM" }
, { field: 'HRate', title: '椤圭洰鍗犳瘮', edit: 'text' }
- , { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', style: 'background-color: #f9f9f9;' }
- , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', style: 'background-color: #f9f9f9;' }
+ , { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', edit: 'text' }
+ , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', edit: 'text' }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
]]
@@ -990,13 +1046,14 @@
//#region 瀹㈡埛閫夋嫨椤甸潰
function get_checkSearchHCus() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '瀹㈡埛琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1006,9 +1063,9 @@
}
//鑾峰彇鏁版嵁
$("#HCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
- $("#HCusName").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HCusName").val() == "") {
- $("#HCusName").val(checkStatus.data[0].HNumber);
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1019,13 +1076,14 @@
//#region 椤圭洰缁忕悊閫夋嫨椤甸潰
function get_checkSearchHPMEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1035,9 +1093,9 @@
}
//鑾峰彇鏁版嵁
$("#HPMEmpID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
- $("#HPMEmpName").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HPMEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HPMEmpName").val() == "") {
- $("#HPMEmpName").val(checkStatus.data[0].HNumber);
+ $("#HPMEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1048,13 +1106,14 @@
//#region 瀹炴柦鎷呭綋閫夋嫨椤甸潰
function get_checkSearchHWorkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1064,9 +1123,9 @@
}
//鑾峰彇鏁版嵁
$("#HWorkEmpID").val(checkStatus.data[0].HItemID);//鍛樺伐id
- $("#HWorkEmpName").val(checkStatus.data[0].HName);//鍛樺伐鍚嶇О
+ $("#HWorkEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍛樺伐鍚嶇О
if ($("#HWorkEmpName").val() == "") {
- $("#HWorkEmpName").val(checkStatus.data[0].HNumber);
+ $("#HWorkEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1077,13 +1136,14 @@
//#region 寮�鍙戞媴褰撻�夋嫨椤甸潰
function get_checkSearchHDepEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1093,9 +1153,9 @@
}
//鑾峰彇鏁版嵁
$("#HDepEmpID").val(checkStatus.data[0].HItemID);//鍛樺伐id
- $("#HDepEmpName").val(checkStatus.data[0].HName);//鍛樺伐鍚嶇О
+ $("#HDepEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍛樺伐鍚嶇О
if ($("#HDepEmpName").val() == "") {
- $("#HDepEmpName").val(checkStatus.data[0].HNumber);
+ $("#HDepEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1106,13 +1166,14 @@
//#region 瀵瑰簲浜у搧閫夋嫨椤甸潰
function get_checkSearchHMater() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '浜у搧琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1122,10 +1183,10 @@
}
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);//浜у搧鍐呯爜
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);//浜у搧浠ｇ爜
- $("#HMaterName").val(checkStatus.data[0].HName);//浜у搧鍚嶇О
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//浜у搧浠ｇ爜
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//浜у搧鍚嶇О
if ($("#HMaterName").val() == "") {
- $("#HMaterName").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1136,13 +1197,14 @@
//#region 缁撶畻鏂归�夋嫨椤甸潰
function get_checkSearchHPayCus() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '瀹㈡埛琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1152,9 +1214,9 @@
}
//鑾峰彇鏁版嵁
$("#HPayCusID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
- $("#HPayCusName").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HPayCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HPayCusName").val() == "") {
- $("#HPayCusName").val(checkStatus.data[0].HNumber);
+ $("#HPayCusName").val(checkStatus.data[0].瀹㈡埛浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1171,7 +1233,7 @@
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰闃舵娓呭崟鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectStageBillList.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectStageBillList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1748,6 +1810,7 @@
if (event.key == "F7") {
//椤圭洰闃舵
if (obj.event == "HProjectStageName") {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑椤圭洰闃舵灏忕獥浣�
layer.open({
type: 2
@@ -1757,7 +1820,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html", "yes"]
+ , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html?openType=2&HOrgID=" + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1772,13 +1835,20 @@
"HProjectStageID": checkStatus.data[0].HItemID
, "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
, "HStageNote": checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭
+ , "HPMGoodsID": checkStatus.data[0].HPMGoodsID == null ? 0 : checkStatus.data[0].HPMGoodsID
+ , "HPMGoodsName": checkStatus.data[0].鐩稿叧浜や粯鐗�
+ , "HIsKey": checkStatus.data[0].閲岀▼纰� == "Y" ? true : false
+ , "HRate": checkStatus.data[0].鐞嗚涓氱哗鍗犳瘮
})
+
+ CheckedSet_tableSub();
layer.close(index);//鍏抽棴寮圭獥
}
})
}
//闃舵璐熻矗浜�
if (obj.event == "HEmpName") {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑鍛樺伐鍒楄〃灏忕獥浣�
layer.open({
type: 2
@@ -1788,7 +1858,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1801,7 +1871,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmpID": checkStatus.data[0].HItemID
- , "HEmpName": checkStatus.data[0].HName
+ , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1809,6 +1879,7 @@
}
//闃舵瀹℃牳浜�
if (obj.event == "HCheckEmpName") {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑鍛樺伐鍒楄〃灏忕獥浣�
layer.open({
type: 2
@@ -1818,7 +1889,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1831,7 +1902,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HCheckEmpID": checkStatus.data[0].HItemID
- , "HCheckEmpName": checkStatus.data[0].HName
+ , "HCheckEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1844,8 +1915,85 @@
obj.event = "";
return false;
- }
+ }else if (event.key == "F6") {
+ //闃舵璐熻矗浜�
+ if (obj.event == "HEmpName") {
+ var HOrgID = $("#HOrgID").val();
+ //鎵撳紑鍛樺伐鍒楄〃灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鍛樺伐鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊瀛愯〃1鏁版嵁
+ var rowIndex = $(obj.tr).attr("data-index");
+ for (var i = 0; i < option.data.length; i++) {
+ if (i >= rowIndex) {
+ option.data[i]["HEmpID"] = checkStatus.data[0].HItemID;
+ option.data[i]["HEmpName"] = checkStatus.data[0].鑱屽憳鍚嶇О;
+ }
+ }
+ table.render(option);
+ CheckedSet_tableSub();
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //闃舵瀹℃牳浜�
+ if (obj.event == "HCheckEmpName") {
+ var HOrgID = $("#HOrgID").val();
+ //鎵撳紑鍛樺伐鍒楄〃灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鍛樺伐鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊瀛愯〃1鏁版嵁
+ var rowIndex = $(obj.tr).attr("data-index");
+ for (var i = 0; i < option.data.length; i++) {
+ if (i >= rowIndex) {
+ option.data[i]["HCheckEmpID"] = checkStatus.data[0].HItemID;
+ option.data[i]["HCheckEmpName"] = checkStatus.data[0].鑱屽憳鍚嶇О;
+ }
+ }
+ table.render(option);
+ CheckedSet_tableSub();
+
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ }
})
}
//#endregion
@@ -1856,6 +2004,7 @@
if (event.key == "F7") {
//椤圭洰鎴愬憳
if (obj.event == "HEmployeeName") {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑鍛樺伐鍒楄〃灏忕獥浣�
layer.open({
type: 2
@@ -1865,7 +2014,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1878,7 +2027,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmployeeID": checkStatus.data[0].HItemID
- , "HEmployeeName": checkStatus.data[0].HName
+ , "HEmployeeName": checkStatus.data[0].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
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 72deb83..195806c 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"
@@ -263,9 +263,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
}
//#endregion
@@ -288,6 +293,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -893,6 +899,34 @@
}
//#endregion
+ //#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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
+
});
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Add_Edit_Gy_ProjectStage.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Add_Edit_Gy_ProjectStage.html"
index 6085aeb..6c33ba9 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Add_Edit_Gy_ProjectStage.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Add_Edit_Gy_ProjectStage.html"
@@ -184,13 +184,15 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
- //绂佺敤缁勭粐閫夐」
- $("#HUSEORGID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HUSEORGID").attr("disabled", true);
+ $("#checkboxHStopflag").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HUSEORGID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ $("#checkboxHStopflag").attr("disabled", true);
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
} else if (OperationType == 4) {//娴忚
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStage.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStage.html"
index d4a67b9..e6bba83 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStage.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/Gy_ProjectStage.html"
@@ -227,9 +227,15 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
+
}
//#endregion
@@ -253,6 +259,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -726,8 +733,38 @@
}
//#endregion
+
+ //#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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(绂佺敤浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
});
+
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
index 33c0ac1..4268bd0 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
@@ -54,15 +54,15 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
<!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >棰勮</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -301,26 +301,16 @@
</div>
</div>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this"></li>
- </ul>
- <div class="layui-tab-content">
- <!--瀛愯〃-->
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" 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="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></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="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
- </div>
- </script>
- </div>
+ <table class="layui-hide" 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="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></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="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
</div>
- </div>
+ </script>
</form>
</div>
</div>
@@ -374,17 +364,15 @@
}
//#endregion
- //#region 鍒濆鍖栫粍缁�
- Organ();
- //#endregion
-
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
+ //鍒濆鍖栨眹鎶ヤ汉
+ getHEmpByHUserName();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -412,14 +400,14 @@
// });
//}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid1();
RoadBillMain(linterid);
} else if (OperationType == 4 && HProjectStageID != null) {
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 4;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -436,6 +424,10 @@
set_ProjectReport_Display();
}
+ //#endregion
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
//#endregion
//#region 鍒濆鍖栬〃鏍�
@@ -692,9 +684,9 @@
, { field: 'HEmpID', title: '鎴愬憳ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HEmpName', title: '鎴愬憳', edit: 'text', event: "HEmpName" } //f7
, { field: 'HIsPM', title: '椤圭洰缁忕悊', templet: "#HIsPM" }
- , { field: 'HRate', title: '椤圭洰鍗犳瘮', totalRow: true, style: 'background-color: #f9f9f9;'}
- , { field: 'HAvgMoney', title: '鍒嗛厤涓氱哗', totalRow: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HCountMoney', title: '鎻愭垚', totalRow: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HRate', title: '椤圭洰鍗犳瘮', totalRow: true, edit: 'text'}
+ , { field: 'HAvgMoney', title: '鍒嗛厤涓氱哗', totalRow: true, edit: 'text' }
+ , { field: 'HCountMoney', title: '鎻愭垚', totalRow: true, edit: 'text' }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -719,6 +711,7 @@
//#region 椤圭洰浠ｇ爜閫夋嫨椤甸潰
function get_checkSearchHProNumber() {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
layer.open({
type: 2
@@ -728,7 +721,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html", "yes"]
+ , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -803,6 +796,7 @@
//#region 椤圭洰闃舵閫夋嫨椤甸潰
function get_checkSearchHProjectStage() {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑椤圭洰闃舵灏忕獥浣�
layer.open({
type: 2
@@ -812,7 +806,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html", "yes"]
+ , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html?openType=2&HOrgID=" + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -835,13 +829,14 @@
//#region 姹囨姤浜洪�夋嫨椤甸潰
function get_checkSearchHReportEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -851,9 +846,9 @@
}
//鑾峰彇鏁版嵁
$("#HReportEmpID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
- $("#HReportEmpName").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HReportEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HReportEmpName").val() == "") {
- $("#HReportEmpName").val(checkStatus.data[0].HNumber);
+ $("#HReportEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -864,41 +859,91 @@
//#region 鎶勯�佷汉閫夋嫨椤甸潰
function get_checkSearchHCopyEmp() {
+ //var HOrgID = $("#HOrgID").val();
+ //layer.open({
+ // type: 2//寮圭獥绫诲瀷
+ // , skin: 'layui-layer-rim' //鍔犱笂杈规
+ // , area: ['90%', '90%']//澶у皬
+ // , title: '鍛樺伐琛�'//鏍囬
+ // , shift: 2//寮瑰嚭鍔ㄧ敾
+ // , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, '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 === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // //鑾峰彇鏁版嵁
+ // $("#HCopyEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鎶勯�佷汉鍚嶇О
+ // if ($("#HCopyEmp").val() == "") {
+ // $("#HCopyEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
+ // }
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) { }
+ //})
+
+
+
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鍛樺伐琛�'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶勯�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/transfer.html', '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 === 0) {
+ var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+ if (checkStatus.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- //鑾峰彇鏁版嵁
- $("#HCopyEmp").val(checkStatus.data[0].HName);//鎶勯�佷汉鍚嶇О
- if ($("#HCopyEmp").val() == "") {
- $("#HCopyEmp").val(checkStatus.data[0].HNumber);
+ var value = "";
+ var title = "";
+ for (var i = 0; i < checkStatus.length; i++) {
+ value += checkStatus[i].value + ",";
+ title += checkStatus[i].title + ",";
}
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+ if (value.length > 0) {
+ value = value.substr(0, value.length - 1);
+ title = title.substr(0, title.length - 1);
+ }
+ $("#HCopyEmp").val(title);
+ console.log(checkStatus, value, title);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- , btn2: function (index, layero) { }
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
}
//#endregion
//#region 鎺ユ敹浜洪�夋嫨椤甸潰
function get_checkSearchHReceiveEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -907,9 +952,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HReceiveEmp").val(checkStatus.data[0].HName);//鎺ユ敹浜哄悕绉�
+ $("#HReceiveEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鎺ユ敹浜哄悕绉�
if ($("#HReceiveEmp").val() == "") {
- $("#HReceiveEmp").val(checkStatus.data[0].HNumber);
+ $("#HReceiveEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1110,7 +1155,7 @@
return false;
}
- if ($("#HProID").val() == "0") {
+ if ($("#HProNumber").val() == "0") {
layer.msg("椤圭洰浠ｇ爜鏈�夋嫨!");
return false;
}
@@ -1278,6 +1323,7 @@
if (event.key == "F7") {
//鎴愬憳
if (obj.event == "HEmpName") {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑鍛樺伐鍒楄〃灏忕獥浣�
layer.open({
type: 2
@@ -1287,7 +1333,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1300,7 +1346,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HEmpID": checkStatus.data[0].HItemID
- , "HEmpName": checkStatus.data[0].HName
+ , "HEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1445,6 +1491,34 @@
})
}
//#endregion
+
+ //#region 鏍规嵁鐧诲綍璐︽埛鑾峰彇鐩稿簲鑱屽憳
+ function getHEmpByHUserName() {
+ var Czybm = sessionStorage["Czybm"];
+
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskReportBill/getHEmpByHUserName',
+ type: "GET",
+ data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var HReportEmpID = result.data[0]["HEmpID"];
+ var HReportEmpName = result.data[0]["HEmpName"];
+ $("#HReportEmpID").val(HReportEmpID);
+ $("#HReportEmpName").val(HReportEmpName);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ }
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
index a14fe7c..8d74886 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
@@ -263,9 +263,14 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_FastQuery(1);
+ //鍒濆鍖栫粍缁�
Organ();
+ //鏌ヨ
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
}
//#endregion
@@ -288,6 +293,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -833,6 +839,33 @@
}
//#endregion
+ //#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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ $("#HOrgID").val(HOrgID);
+ form.render("select");
+ return true;
+ }
+ return false;
+ }
+ //#endregion
});
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
index 759d238..2498178 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBill.html"
@@ -546,7 +546,7 @@
, { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
, { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProjectStageName', title: '椤圭洰闃舵', edit: 'text', event: "HProjectStageName" } //f7
- , { field: 'HStageNote', title: '椤圭洰闃舵璇︾粏鍐呭', style: 'background-color: #f9f9f9;' }
+ , { field: 'HStageNote', title: '椤圭洰闃舵璇︾粏鍐呭', edit: 'text' }
, { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HPMGoodsName', title: '鐩稿叧浜や粯鐗�', edit: 'text', event: "HPMGoodsName" } //f7
, { field: 'HIsKey', title: '閲岀▼纰�', templet: "#HIsKey" }
@@ -836,7 +836,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html", "yes"]
+ , content: ["../../椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html?openType=2", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -851,7 +851,12 @@
"HProjectStageID": checkStatus.data[0].HItemID
, "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
, "HStageNote": checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭
+ , "HPMGoodsID": checkStatus.data[0].HPMGoodsID == null ? 0 : checkStatus.data[0].HPMGoodsID
+ , "HPMGoodsName": checkStatus.data[0].鐩稿叧浜や粯鐗�
+ , "HRate": checkStatus.data[0].鐞嗚涓氱哗鍗犳瘮
+ , "HIsKey": checkStatus.data[0].閲岀▼纰� == "Y" ? true : false
})
+ CheckedSet_tableSub();
layer.close(index);//鍏抽棴寮圭獥
}
})
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBillList.html"
index d79c38b..d004f2e 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectStageBillList.html"
@@ -224,6 +224,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
+ //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
+ addSWhereByOpenType();
get_FastQuery(1);
//Organ();
}
@@ -737,6 +739,28 @@
}
//#endregion
+ //#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
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ if (openType == 2) {
+ sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ }
+ }
+ //#endregion
});
//#endregion
--
Gitblit v1.9.1