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 | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 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 c4e7b93..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>
@@ -59,7 +61,7 @@
<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="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" 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;">
+ <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,11 +332,19 @@
}
- else if (OperationType == 3) { //缂栬緫
+ else if (OperationType == 3) {
+
+ //缂栬緫
//绂佺敤鎸夐挳
var num = 1;
HfBtn(num);
+ //鍒濆鍖栫粍缁�
+ Organ();
+ //鍒濆鍖栧勾鍜屽懆銆佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ Init_selectYearAndWeek();
set_EditForm(linterid);
+
+
}
//#endregion
@@ -645,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] //鑾峰彇寮规椤甸潰
@@ -664,6 +684,7 @@
getHUserNameHours();
}
, btn2: function (index, layero) { }
+ , end: function () { }
})
}
//#endregion
@@ -783,22 +804,22 @@
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]["鍗曟嵁鍙�"]
, "HYear": data[0]["骞�"]
- , "HPeriod": 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]["HBeginDate"]), "yyyy-MM-dd")
- , "HEndDate": Format(new Date(data[0]["HEndDate"]), "yyyy-MM-dd")
+ , "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]["澶囨敞"]
@@ -827,7 +848,7 @@
}
//#endregion
-
+
//#region 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂�
@@ -838,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);
@@ -864,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);
@@ -957,7 +978,11 @@
//#endregion
});
-
+ //鎬荤粨浜�
+ function GetHEmpValue(obj) {
+ $("#HReportEmpID").val(obj[0].HItemID);//瀹㈡埛id
+ $("#HPlanEmpName").val(obj[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
+ }
</script>
</body>
--
Gitblit v1.9.1