From ebef191888d9d2c2a2e7a7f677189164e4eef0b3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 八月 2025 19:04:33 +0800
Subject: [PATCH] 车间委外接收单列表bug处理
---
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMain.html | 220 +++++++++++++++++++------------------------------------
1 files changed, 76 insertions(+), 144 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
index fddeeef..53beb9c 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
</head>
<body>
@@ -33,6 +34,7 @@
<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" style="height:800px;">
+ <h1 style="text-align: center; padding: 10px 0;"><b>宸ヤ綔鍛ㄦ�荤粨</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -58,8 +60,8 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎬荤粨浜�:</label>
<div class="layui-input-block" style="margin-left: 77px; width:270px;">
<input type="text" class="layui-input" lay-verify="HPlanEmpName" name="HPlanEmpName" id="HPlanEmpName" style="background-color:#efefef4d; width:180px; display: inline-block;" readonly>
- <input type="hidden" name="HPlanEmpID" id="HPlanEmpID" lay-verify="HPlanEmpID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPlanEmp" id="btnSearchHPlanEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="hidden" name="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="btnSearchHPlanEmp" lay-filter="btnSearchHPlanEmp" id="btnSearchHPlanEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -239,7 +241,7 @@
</div>
</div>
</div>
- </div>
+ </div>
</div>
</form>
</div>
@@ -273,6 +275,15 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "4757";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
+
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -295,7 +306,6 @@
//鍒濆鍖栫粍缁�
Organ();
-
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -311,6 +321,8 @@
//鏍规嵁鐧诲綍璐︽埛鍒濆鍖栨煡璇㈡�荤粨浜哄伐鏃�
getHUserNameHours();
+
+
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
@@ -320,8 +332,19 @@
}
- else if (OperationType == 3) { //缂栬緫
-
+ else if (OperationType == 3) {
+
+ //缂栬緫
+ //绂佺敤鎸夐挳
+ var num = 1;
+ HfBtn(num);
+ //鍒濆鍖栫粍缁�
+ Organ();
+ //鍒濆鍖栧勾鍜屽懆銆佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ Init_selectYearAndWeek();
+ set_EditForm(linterid);
+
+
}
//#endregion
@@ -547,9 +570,9 @@
data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- var HPlanEmpID = result.data[0]["HEmpID"];
+ var HReportEmpID = result.data[0]["HEmpID"];
var HPlanEmpName = result.data[0]["HEmpName"];
- $("#HPlanEmpID").val(HPlanEmpID);
+ $("#HReportEmpID").val(HReportEmpID);
$("#HPlanEmpName").val(HPlanEmpName);
layer.close(wait);
} else {
@@ -642,7 +665,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -651,7 +674,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HPlanEmpID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
+ $("#HReportEmpID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
$("#HPlanEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HPlanEmpName").val() == "") {
$("#HPlanEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
@@ -661,6 +684,7 @@
getHUserNameHours();
}
, btn2: function (index, layero) { }
+ , end: function () { }
})
}
//#endregion
@@ -678,7 +702,7 @@
return false;
}
- if ($("#HPlanEmpID").val() == "0") {
+ if ($("#HReportEmpID").val() == "0") {
layer.msg("璁″垝浜烘湭閫夋嫨!");
return false;
}
@@ -768,10 +792,10 @@
}
//#endregion
- //#region 缂栬緫鑾峰彇琛ㄥご
+ //#region 缂栬緫鑾峰彇琛ㄥご 椤甸潰璧嬪��
function set_EditForm(linterid) {
$.ajax({
- url: GetWEBURL() + "PM_WorkTaskWeekBill/PM_WorkTaskWeekBillgetEditMainData",
+ url: GetWEBURL() + "PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainEditList",
async: false,
type: "GET",
data: {
@@ -780,39 +804,40 @@
success: function (result) {
if (result.code == 1) {
data = result.data;
-
+ $('#btnSearchHPlanEmp').addClass("layui-btn-disabled").attr("disabled", true);
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HInterID": data[0]["HInterID"]
- , "HBillNo": data[0]["HBillNo"]
- , "HYear": data[0]["HYear"]
- , "HWeek": data[0]["HWeek"]
- , "HDate": Format(new Date(data[0]["HDate"]), "yyyy-MM-dd")
- , "HBeginDate": Format(new Date(data[0]["HBeginDate"]), "yyyy-MM-dd")
- , "HEndDate": Format(new Date(data[0]["HEndDate"]), "yyyy-MM-dd")
- , "HPlanEmpID": data[0]["HPlanEmpID"] == null ? 0 : data[0]["HPlanEmpID"]
- , "HPlanEmpName": data[0]["HPlanEmpName"]
- , "HRemark": data[0]["HRemark"]
+ , "HBillNo": data[0]["鍗曟嵁鍙�"]
+ , "HYear": data[0]["骞�"]
+ , "HWeek": data[0]["鍛�"]
+ , "HDate": Format(new Date(data[0]["鏃ユ湡"]), "yyyy-MM-dd")
+ , "HPlanTimes": data[0]["璁″垝宸ユ椂"]
+ , "HUseTimes": data[0]["娑堣�楀伐鏃�"]
+ , "HRelUseTimes": data[0]["鏈夋晥宸ユ椂"]
+ , "HDelayTasks": data[0]["寤舵湡浠诲姟"]
+ , "HFineTasks": data[0]["瓒呭墠浠诲姟"]
+ , "HFinishRate": data[0]["杈炬垚鐜�"]+'%'
+ , "HBeginDate": Format(new Date(data[0]["寮�濮嬫棩鏈�"]), "yyyy-MM-dd")
+ , "HEndDate": Format(new Date(data[0]["缁撴潫鏃ユ湡"]), "yyyy-MM-dd")
+ , "HReportEmpID": data[0]["HReportEmpID"] == null ? 0 : data[0]["HReportEmpID"]
+ , "HPlanEmpName": data[0]["鎬荤粨浜�"]
+ , "HRemark": data[0]["澶囨敞"]
+ , "HWorkReport": data[0]["宸ヤ綔鎬荤粨"]
, "HOrgID": data[0]["HOrgID"]
- , "HMaker": data[0]["HMaker"]
- , "HUpDater": data[0]["HUpDater"]
- , "HChecker": data[0]["HChecker"]
- , "HMakeDate": data[0]["HMakeDate"] == null ? "" : Format(new Date(data[0]["HMakeDate"]), "yyyy-MM-dd")
- , "HUpDateDate": data[0]["HUpDateDate"] == null ? "" : Format(new Date(data[0]["HUpDateDate"]), "yyyy-MM-dd")
- , "HCheckDate": data[0]["HCheckDate"] == null ? "" : Format(new Date(data[0]["HCheckDate"]), "yyyy-MM-dd")
- , "HCloseMan": data[0]["HCloseMan"]
- , "HDeleteMan": data[0]["HDeleteMan"]
- , "HBacker": data[0]["HBacker"]
- , "HCloseDate": data[0]["HCloseDate"] == null ? "" : Format(new Date(data[0]["HCloseDate"]), "yyyy-MM-dd")
- , "HDeleteDate": data[0]["HDeleteDate"] == null ? "" : Format(new Date(data[0]["HDeleteDate"]), "yyyy-MM-dd")
- , "HBackDate": data["HBackDate"] == null ? "" : Format(new Date(data[0]["HBackDate"]), "yyyy-MM-dd")
+ , "HNextPlan": data[0]["涓诲椤圭洰鐨勪笅涓�姝ヨ鍒�"]
+ , "HWorkGain": data[0]["宸ヤ綔蹇冨緱"]
+ , "HMaker": data[0]["鍒跺崟浜�"]
+ , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+ , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HUpDater": data[0]["淇敼浜�"]
+ , "HChecker": data[0]["瀹℃牳浜�"]
+ , "HCloseMan": data[0]["鍏抽棴浜�"]
+ , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+
});
-
- //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
- HOrgIDBar = data[0]["HOrgID"];
-
-
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -823,104 +848,7 @@
}
//#endregion
- //#region 缂栬緫鑾峰彇琛ㄤ綋
- function set_EditGrid(linterid) {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'PM_WorkTaskWeekBill/PM_WorkTaskWeekBillgetEditSubData',
- async: false,
- type: "GET",
- data: { "HInterID": linterid },
- success: function (result) {
- if (result.count == 1) {
- option.data = dealEditData(result.data);
- table.render(option);
- CheckedSet_tableSub();
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- //#endregion
-
- //#region 澶勭悊缂栬緫鏁版嵁
- function dealEditData(data) {
- var tables = [];
- var HSno = 0; //鏍囪鍚屼竴浠诲姟锛屽悓涓�浠诲姟鐨勪笉鍚岃褰曠殑HSno涓�鑷�
- for (var i = 0; i < data.length; i++) {
- if (data[i]["HSno"] != HSno) {
- HSno = data[i]["HSno"];
- var NewRow =
- {
- "HProjectID": data[i]["HProjectID"]
- , "HProNumber": data[i]["HProNumber"]
- , "HProName": data[i]["HProName"]
- , "HProjectStageID": data[i]["HProjectStageID"]
- , "HProjectStageName": data[i]["HProjectStageName"]
- , "HName": data[i]["HName"]
- , "HTaskNote": data[i]["HTaskNote"]
- , "HPlanTimes": data[i]["HPlanTimes"]
- , "HReportTimes": data[i]["HReportTimes"]
-
- , "HMonday": false
- , "HTuesday": false
- , "HWednesday": false
- , "HThursday": false
- , "HFriday": false
- , "HSaturday": false
- , "HSunday": false
-
- , "HSourceInterID": data[i]["HSourceInterID"]
- , "HSourceEntryID": data[i]["HSourceEntryID"]
- , "HSourceBillNo": data[i]["HSourceBillNo"]
- , "HSourceBillType": data[i]["HSourceBillType"]
- };
- tables.push(NewRow);
- }
-
- switch (data[i]["HWeekDay"] + "") {
- case "1":
- tables[tables.length - 1]["HMonday"] = true;
- break;
- case "2":
- tables[tables.length - 1]["HTuesday"] = true;
- break;
- case "3":
- tables[tables.length - 1]["HWednesday"] = true;
- break;
- case "4":
- tables[tables.length - 1]["HThursday"] = true;
- break;
- case "5":
- tables[tables.length - 1]["HFriday"] = true;
- break;
- case "6":
- tables[tables.length - 1]["HSaturday"] = true;
- break;
- case "7":
- tables[tables.length - 1]["HSunday"] = true;
- break;
- }
- }
- return tables;
- }
- //#endregion
-
- //#region 缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
- {
- var wait = layer.load();
- Init_selectYearAndWeek();
- set_EditForm(linterid);
- set_EditGrid(linterid)
- getOption1Date();
- layer.close(wait);
- }
- //#endregion
+
//#region 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂�
@@ -931,7 +859,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: {"HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -957,7 +885,7 @@
$.ajax({
url: GetWEBURL() + '/PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);
@@ -1034,14 +962,14 @@
function get_Export(data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- var formData = data.field;
+ var formDatas = data.field;
var formcols = ["鍗曟嵁鍙�", "鍗曟嵁鍐呯爜", "鏃ユ湡", "鎬荤粨浜�", "鎬荤粨浜篒D", "骞�", "鍛�", "寮�濮嬫棩鏈�", "缁撴潫鏃ユ湡",
"璁″垝宸ユ椂", "娑堣�楀伐鏃�", "鏈夋晥宸ユ椂", "寤舵湡浠诲姟", "瓒呭墠浠诲姟", "杈炬垚鐜�", "宸ヤ綔鎬荤粨",
"涓诲椤圭洰鐨勪笅涓�姝ヨ鍒�", "宸ヤ綔蹇冨緱", "澶囨敞", "缁勭粐ID", "鍒跺崟浜�", "淇敼浜�", "瀹℃牳浜�", "鍒跺崟鏃ユ湡", "淇敼鏃ユ湡", "瀹℃牳鏃ユ湡", "鍏抽棴浜�", "鍏抽棴鏃ユ湡"]
// 灏咼SON鏁版嵁瀛樺偍鍒颁竴涓彉閲忎腑锛岀敤浜庡鍑�
var jsonData = [];
- jsonData.push(Object.keys(formData));
- jsonData.push(Object.values(formData));
+ jsonData.push(Object.keys(formDatas));
+ jsonData.push(Object.values(formDatas));
table.exportFile(formcols, [jsonData[1]], 'xls');
/*table.exportFile(ins.config.id, form, "xls");*/
@@ -1050,7 +978,11 @@
//#endregion
});
-
+ //鎬荤粨浜�
+ function GetHEmpValue(obj) {
+ $("#HReportEmpID").val(obj[0].HItemID);//瀹㈡埛id
+ $("#HPlanEmpName").val(obj[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
+ }
</script>
</body>
--
Gitblit v1.9.1