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_WorkTaskReportBillList.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 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_WorkTaskReportBillList.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_WorkTaskReportBillList.html"
index 2bf778f..8e2c1ec 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_WorkTaskReportBillList.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_WorkTaskReportBillList.html"
@@ -21,6 +21,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
</head>
@@ -344,6 +345,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -390,11 +411,6 @@
//鍒濆鍖栫粍缁�
Organ();
//鏌ヨ
- if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
- get_FastQuery(2);
- } else {
- get_FastQuery(1);
- }
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -553,6 +569,13 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
+ else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
else if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
@@ -593,10 +616,14 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
////鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
+
+ let openType = addSWhereByOpenType()
var HUserName = getHEmpByHUserName();
if (HUserName != "" && HUserName != null) {
- sWhere = " and 姹囨姤浜� = '" + HUserName + "' ";
+ sWhere += " and 姹囨姤浜� = N'" + HUserName + "' OR 鎺ユ敹浜� = N'" + HUserName + "' OR 鎶勯�佷汉 like N'%"
+ + HUserName + "%'";
}
+
var HOrgID = "";
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -679,7 +706,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (number == 1) {
+ if (openType == false) {
HOrgID = sessionStorage["OrganizationID"];
}
else {
@@ -1217,6 +1244,18 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
+ var Employee = params[params[2]]; // 鑱屽憳
+ var DateInfo = params[params[3]]; // 鏃ユ湡淇℃伅
+ if (isEmpty(Employee) === false && isEmpty(DateInfo) === false) {
+ let EmployeeDecode = decodeURIComponent(Employee)
+ debugger
+ $('#HReportEmp').val(EmployeeDecode)
+ if (DateInfo.length == 7) { //骞存湀
+ sWhere += " and 鏃ユ湡 >= CAST(N'" + DateInfo + "' + '-01' AS DATE) and 鏃ユ湡 < DATEADD(MONTH, 1, CAST(N'" + DateInfo + "' + '-01' AS DATE))"
+ } else if (DateInfo.length == 10) { //骞存湀鏃�
+ sWhere += " and 鏃ユ湡 >= CAST(N'" + DateInfo + "' AS DATE) and 鏃ユ湡 < DATEADD(DAY, 1, CAST(N'" + DateInfo + "' AS DATE))"
+ }
+ }
if (openType == 2) {
sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
$("#HOrgID").val(HOrgID);
--
Gitblit v1.9.1