From caab4eb531f16305f4986bc3877db55812adcc91 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 22 九月 2023 13:40:32 +0800
Subject: [PATCH] 工作任务列表维护、任务汇报列表维护：处理根据账号获取数据和接单人/汇报人过滤框的关系
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 5 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_WorkTaskBillList.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_WorkTaskBillList.html"
index 0e21f80..02bba11 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_WorkTaskBillList.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_WorkTaskBillList.html"
@@ -66,6 +66,18 @@
<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="HReceiveEmp" id="HReceiveEmp">
+ </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">杩囨护</label>
<div class="layui-input-block">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
@@ -108,6 +120,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-radio"></i>鎵归噺涓嬫帹</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -139,7 +152,7 @@
var HModName = "PM_WorkTaskBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID","HProjectStageID","HOrgID","HEntryID", "HProjectID"];
+ var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -193,6 +206,9 @@
//鍙嶄綔搴熸寜閽�
case 'btn-DeDrop':
set_DropBill(2);
+ break;
+ case 'set_ShowBill_dh':
+ set_ShowBill_dh();
break;
////绂佺敤鎸夐挳
//case 'btn-Stop':
@@ -271,6 +287,7 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , totalRow: true
//, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 50000]
@@ -311,6 +328,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["璇勪及宸ユ椂", "鑷瘎宸ユ椂", "宸茶�楃敤宸ユ椂"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -324,11 +342,13 @@
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':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
@@ -368,13 +388,15 @@
//鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
var HUserName = getHEmpByHUserName();
if (HUserName != "" && HUserName != null) {
- sWhere = " and (娲惧崟浜� = '" + HUserName + "' or 鎺ュ崟浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
+ sWhere += " and (娲惧崟浜� = '" + HUserName + "' or 鎺ュ崟浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
}
var HOrgID = "";
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProNumber = $("#HProNumber").val();//椤圭洰浠ｇ爜
var HName = $("#HName").val();//宸ヤ綔鍚嶇О
+ var HBillStatus = $("#HBillStatus").val();//鍗曟嵁鐘舵��
+ var HReceiveEmp = $("#HReceiveEmp").val();//鎺ュ崟浜�
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -419,6 +441,13 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
+ if (HBillStatus) {
+ sWhere += " and 鍗曟嵁鐘舵�� like '%" + HBillStatus + "%'";
+ }
+ if (HReceiveEmp) {
+ sWhere += " and 鎺ュ崟浜� like '%" + HReceiveEmp + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -667,6 +696,56 @@
}
//#endregion
+ //#region 澶氳涓嬫帹
+ function set_ShowBill_dh() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length != 0) {
+ //layer.confirm("纭瑕佷笅鎺ㄥ悧?", function (index) {
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ var temp = {
+ "HProjectID": data[i].HProjectID
+ , "HProNumber": data[i].椤圭洰浠ｇ爜
+ , "HProjectStageID": data[i].HProjectStageID
+ , "HProjectStageName": data[i].椤圭洰闃舵
+ , "HName": data[i].浠诲姟鍚嶇О
+ , "HTaskNote": data[i].浠诲姟鎻忚堪
+ , "HType": data[i].浠诲姟绫诲瀷
+ , "HSourceInterID": data[i].HInterID
+ , "HSourceEntryID": data[i].HEntryID
+ , "HSourceBillNo": data[i].鍗曟嵁鍙�
+ , "HSourceBillType": data[i].鍗曟嵁绫诲瀷
+ }
+ dataArray.push(temp);
+ }
+
+ var datajson = {
+ "data": dataArray
+ };
+
+ var url = encodeURI('../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=4&res=' + JSON.stringify(datajson));
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔浠诲姟鍒楄〃-澶氳涓嬫帹'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: url
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ window.location.reload();
+ }
+ })
+ //})
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁涓嬫帹锛�');
+ }
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -818,7 +897,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (openType == 2) {
- sWhere += " and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
+ sWhere += " and HBillStatus<3 and ISNULL(鍏抽棴浜�,'') = '' and ISNULL(浣滃簾浜�,'') = '' ";
$("#HOrgID").val(HOrgID);
form.render("select");
return true;
--
Gitblit v1.9.1