From 190d8a5621ed23969515a303c7691c8be6d32ef1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 10 七月 2023 20:16:28 +0800
Subject: [PATCH] 1
---
WebTM/views/项目管理/业绩指标/PM_YearEmployeeMoneyBill.html | 21 +++++++++-
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 4 +-
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 90 +++++++++++++++++++++++++++++++++++---------
3 files changed, 91 insertions(+), 24 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index c65ac5d..8c650cc 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4266,7 +4266,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/涓氱哗鎸囨爣/PM_YearEmployeeMoneyBill.html">
- <publishTime>07/10/2023 09:38:43</publishTime>
+ <publishTime>07/10/2023 18:52:03</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/涓氱哗鎸囨爣/PM_YearEmployeeMoneyBillList.html">
<publishTime>07/10/2023 09:34:06</publishTime>
@@ -4284,7 +4284,7 @@
<publishTime>07/10/2023 16:01:26</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
- <publishTime>07/10/2023 15:32:04</publishTime>
+ <publishTime>07/10/2023 19:38:50</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html">
<publishTime>07/09/2023 13:47:48</publishTime>
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 c027e31..0f53d3f 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"
@@ -171,7 +171,7 @@
<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" name="HUpDater" id="hupdater" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpdater" id="HUpdater" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -192,7 +192,7 @@
<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" name="HUpDaterDate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HUpdaterDate" id="HUpdaterDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -276,6 +276,8 @@
//妯″潡鍚�
var HModName = "PM_YearEmployeeMoneyBill";
+ //璁板綍缁勭粐鐨勫��
+ var HOrgIDBar = 0;
//鑾峰彇鍙傛暟
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
@@ -435,7 +437,10 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- $("#HOrgID").val(sessionStorage["OrganizationID"])
+ if (OperationType == 1) {
+ HOrgIDBar = sessionStorage["OrganizationID"];
+ }
+ $("#HOrgID").val(HOrgIDBar);
form.render('select');
}
layer.closeAll("loading");
@@ -506,6 +511,13 @@
function set_AddNew(data) {
//鑾峰彇缁勭粐鏁版嵁
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+ if (OperationType == 3) {
+ data.field.HUpdater = sessionStorage["HUserName"];
+ data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+ $("#HUpdater").val(sessionStorage["HUserName"]);
+ $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
@@ -578,6 +590,9 @@
, "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
, "HBackRemark": tableMain[0]["HBackRemark"]
});
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = tableMain[0]["HOrgID"];
}
})
}
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 77c10aa..7678dc8 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"
@@ -399,7 +399,18 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
</script>
-
+ <!--閲岀▼纰�-->
+ <script type="text/html" id="HIsKey">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HIsKey" lay-filter="HIsKey" id="HIsKey{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+ <!--椤圭洰缁忕悊-->
+ <script type="text/html" id="HIsPM">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HIsPM" lay-filter="HIsPM" id="HIsPM{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
<script>
layui.config({
@@ -420,6 +431,8 @@
//琛ㄦ牸娓叉煋鍙傛暟
var option = {}; //椤圭洰闃舵琛ㄦ覆鏌撳弬鏁�
var option1 = {}; //椤圭洰鎴愬憳琛ㄦ覆鏌撳弬鏁�
+ //璁板綍缁勭粐鐨勫��
+ var HOrgIDBar = 0;
//鑾峰彇鍙傛暟
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
@@ -533,6 +546,32 @@
//#endregion
+ //#region 澶嶉�夋 閫変腑/鍙栨秷 瑙﹀彂浜嬩欢
+ //#region 閲岀▼纰�
+ form.on('checkbox(HIsKey)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HIsKey = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+
+ //#region 椤圭洰缁忕悊
+ form.on('checkbox(HIsPM)', function (data) {
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option1.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HIsPM = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //#endregion
+ //#endregion
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎻愪氦
@@ -594,7 +633,7 @@
, 'HStageNote': ''
, 'HPMGoodsID': '0'
, 'HPMGoodsName': ''
- , 'HIsKey': '0'
+ , 'HIsKey': false
, 'HRate': '0'
, 'HEmpID': '0'
, 'HEmpName': ''
@@ -653,7 +692,7 @@
"RowID": (table.cache["mainTable1"].length + 1) * 10
, 'HEmployeeID': '0'
, 'HEmployeeName': ''
- , 'HIsPM': '0'
+ , 'HIsPM': false
, 'HRate': '0'
, 'HPlanAvgMoney': '0'
, 'HPlanCountMoney': '0'
@@ -747,7 +786,7 @@
})
//#endregion
-
+
//
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
@@ -791,7 +830,10 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- $("#HOrgID").val(sessionStorage["OrganizationID"])
+ if (OperationType == 1) {
+ HOrgIDBar = sessionStorage["OrganizationID"];
+ }
+ $("#HOrgID").val(HOrgIDBar);
form.render('select');
}
layer.closeAll("loading");
@@ -845,10 +887,10 @@
, { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
, { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true }
, { field: 'HProjectStageName', title: '椤圭洰闃舵', edit: 'text', event: "HProjectStageName" } //f7
- , { field: 'HStageNote', title: '椤圭洰璇︾粏鍐呭', edit: 'text' }
+ , { field: 'HStageNote', title: '椤圭洰璇︾粏鍐呭' }
, { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true }
, { field: 'HPMGoodsName', title: '鐩稿叧浜や粯鐗�', edit: 'text', event: "HPMGoodsName" } //f7
- , { field: 'HIsKey', title: '閲岀▼纰�', edit: 'text' }
+ , { field: 'HIsKey', title: '閲岀▼纰�', templet: "#HIsKey" }
, { field: 'HRate', title: '涓氱哗鍗犳瘮', edit: 'text' }
, { field: 'HEmpID', title: '闃舵璐熻矗浜篒D', hide: true }
, { field: 'HEmpName', title: '闃舵璐熻矗浜�', edit: 'text', event: "HEmpName" } //f7
@@ -869,7 +911,7 @@
, 'HStageNote': ''
, 'HPMGoodsID': '0'
, 'HPMGoodsName': ''
- , 'HIsKey': '0'
+ , 'HIsKey': false
, 'HRate': '0'
, 'HEmpID': '0'
, 'HEmpName': ''
@@ -898,7 +940,7 @@
, { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
, { field: 'HEmployeeID', title: '椤圭洰鎴愬憳ID', hide: true }
, { field: 'HEmployeeName', title: '椤圭洰鎴愬憳', edit: 'text', event: "HEmployeeName" } //f7
- , { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', edit: 'text' }
+ , { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', templet: "#HIsPM" }
, { field: 'HRate', title: '椤圭洰鍗犳瘮', edit: 'text' }
, { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', edit: 'text' }
, { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', edit: 'text' }
@@ -911,7 +953,7 @@
"RowID": 10
, 'HEmployeeID': '0'
, 'HEmployeeName': ''
- , 'HIsPM': '0'
+ , 'HIsPM': false
, 'HRate': '0'
, 'HPlanAvgMoney': '0'
, 'HPlanCountMoney': '0'
@@ -1122,7 +1164,7 @@
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
//椤圭洰闃舵琛ㄣ�侀」鐩垚鍛樿〃鏁版嵁搴忓垪鍖�
- var sSubStr = JSON.stringify(num);
+ var sSubStr = JSON.stringify(num);
var sSubStr1 = JSON.stringify(num1);
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
@@ -1213,18 +1255,27 @@
, "HDepDays": tableMain[0]["HDepDays"]
, "HLastMoney": tableMain[0]["HLastMoney"]
});
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = tableMain[0]["HOrgID"];
- //瀛愯〃 璧嬪��
- for (var i = 0; i < tableSub.length; i++) {
- tableSub[i].HIsKey = (tableSub[i].HIsKey) ? 1 : 0;
- }
- for (var i = 0; i < tableSub_Emp.length; i++) {
- tableSub_Emp[i].HIsPM = (tableSub_Emp[i].HIsPM) ? 1 : 0;
- }
option.data = tableSub;
table.render(option);
+ //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
+ for (var i = 0; i < tableSub.length; i++) {
+ if (tableSub[i].HIsKey) {
+ $('#HIsKey' + (i + 1)).attr("checked", true);
+ }
+ }
+ form.render('checkbox');
option1.data = tableSub_Emp;
table.render(option1);
+ //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
+ for (var i = 0; i < tableSub_Emp.length; i++) {
+ if (tableSub_Emp[i].HIsPM) {
+ $('#HIsPM' + (i + 1)).attr("checked", true);
+ }
+ }
+ form.render('checkbox');
}
})
}
@@ -1663,6 +1714,7 @@
obj.update({
"HProjectStageID": checkStatus.data[0].HItemID
, "HProjectStageName": checkStatus.data[0].HName
+ , "HStageNote": checkStatus.data[0].HStageNote
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1775,7 +1827,7 @@
}
})
}
-
+
obj.event = "";
return false;
--
Gitblit v1.9.1