From 3c39d419f2bb7b3c9912a211a07c1365a88eb1c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 04 九月 2023 13:19:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
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
--
Gitblit v1.9.1