From e87958d76f1e13f445b9d6829a3fdd1921b5f44e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 22 九月 2023 17:31:30 +0800
Subject: [PATCH] 1
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 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 c1d45f8..d7a4680 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"
@@ -40,6 +40,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">姹囨姤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HReportEmp" id="HReportEmp">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillStatus" id="HBillStatus">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
@@ -53,6 +65,18 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProjectName" id="HProjectName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鎻忚堪</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HTaskNote" id="HTaskNote">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -259,6 +283,7 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , totalRow: true
//, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 50000]
@@ -299,6 +324,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["璇勪及宸ユ椂","鑷瘎宸ユ椂","鑰楃敤宸ユ椂"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -312,7 +338,9 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
- else {
+ 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 {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -353,7 +381,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
- //鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
+ ////鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
var HUserName = getHEmpByHUserName();
if (HUserName != "" && HUserName != null) {
sWhere = " and 姹囨姤浜� = '" + HUserName + "' ";
@@ -361,10 +389,17 @@
var HOrgID = "";
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HReportEmp = $("#HReportEmp").val();//姹囨姤浜�
+ var HBillStatus = $("#HBillStatus").val();//鍗曟嵁鐘舵��
+ var HProjectName = $("#HProjectName").val();//椤圭洰鍚嶇О
+ var HTaskNote = $("#HTaskNote").val();//浠诲姟鎻忚堪
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+
+
+
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -400,6 +435,19 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+ if (HBillStatus) {
+ sWhere += " and 鍗曟嵁鐘舵�� like '%" + HBillStatus + "%'";
+ }
+ if (HProjectName) {
+ sWhere += " and 椤圭洰鍚嶇О like '%" + HProjectName + "%'";
+ }
+ if (HTaskNote) {
+ sWhere += " and 浠诲姟鎻忚堪 like '%" + HTaskNote + "%'";
+ }
+ if (HReportEmp) {
+ sWhere += " and 姹囨姤浜� like '%" + HReportEmp + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -408,6 +456,10 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HBillNo").val("");
+ $("#HReportEmp").val("");
+ $("#HBillStatus").val("");
+ $("#HProjectName").val("");
+ $("#HTaskNote").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
$("#ColContent").val("");
$("#ColName").val("0");
@@ -429,9 +481,9 @@
, content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=1&linterid=0&HSouceBillType='
,btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
}
@@ -452,9 +504,9 @@
, content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
} else {
@@ -478,9 +530,9 @@
, content: '../../椤圭洰绠＄悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- btn1: function (index, layero, that) {
+ end: function (index, layero, that) {
//鍒锋柊椤甸潰
- //window.location.reload();
+ $("#btnSearch").trigger('click');
}
})
} else {
@@ -511,7 +563,7 @@
//鍏抽棴褰撳墠frame
layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -533,8 +585,7 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_FastQuery(1);
+ $("#btnSearch").trigger('click');
}
//#endregion
--
Gitblit v1.9.1