From aa1ea8554ac0ce28b766cb714db31c8bbe697cbb Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 03 四月 2025 14:30:28 +0800
Subject: [PATCH] 生产工单排产：Excel，导入时，查询是否已经存在时，增加对是否作废的过滤
---
WebTM/views/项目管理/周计划/PM_WorkTaskWeekBill.html | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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_WorkTaskWeekBill.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_WorkTaskWeekBill.html"
index 883a53e..1433ee3 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_WorkTaskWeekBill.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_WorkTaskWeekBill.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>
<!--<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -65,6 +66,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:300px;">
+ <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>
@@ -368,6 +370,14 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "4756";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤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("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -816,12 +826,16 @@
// 濡傛灉鍒氬ソ鏄涓�鍛�
if (weekNo == 1) {
// 鍦ㄥ師鏂囨。杩涜浜嗕慨鏀�
- fistday = addDate(one_fistday, 7);
- lastday = addDate(one_lastday, 7);
+ //fistday = addDate(one_fistday, 7);
+ //lastday = addDate(one_lastday, 7);
+ fistday = one_fistday;
+ lastday = one_lastday;
} else {
// 鍦ㄥ師鏂囨。杩涜浜嗕慨鏀�
- fistday = addDate(one_lastday, (weekNo - 1) * 7 + 1);
- lastday = addDate(one_lastday, weekNo * 7);
+ //fistday = addDate(one_lastday, (weekNo - 1) * 7 + 1);
+ //lastday = addDate(one_lastday, weekNo * 7);
+ fistday = addDate(one_fistday, (weekNo - 1) * 7);
+ lastday = addDate(one_lastday, (weekNo - 1) * 7);
}
console.log(fistday, lastday);
return [fistday, lastday];
@@ -999,7 +1013,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] //鑾峰彇寮规椤甸潰
@@ -1016,6 +1030,7 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function () { }
})
}
//#endregion
@@ -1911,7 +1926,11 @@
//#endregion
});
-
+ //璁″垝浜�
+ function GetHEmpValue(obj) {
+ $("#HPlanEmpID").val(obj[0].HItemID);//瀹㈡埛id
+ $("#HPlanEmpName").val(obj[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1