From f0d9b2e63b6c53fc502c22420cf6b91a5b016796 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 20 九月 2023 13:44:38 +0800
Subject: [PATCH] 工作任务单列表，任务汇报单列表 增加 合计行； 包括项目管理 其他单据列表，有数量 金额的 都增加 合计行； 任务汇报单列表， 把 子表内容也 显示出来。 增加 快速过滤 汇报人，项目名称，任务描述，单据状态 ； 工作任务单列表，增加可以选择单行或多行进行 下推 任务汇报 功能 。 并增加 快速过滤 “接单人”，“单据状态” 快速过滤 。
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 133 +++++++++++++++++++++++++++++---------------
1 files changed, 87 insertions(+), 46 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_WorkTaskReportBill.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_WorkTaskReportBill.html"
index 31766c8..7cb1354 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_WorkTaskReportBill.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_WorkTaskReportBill.html"
@@ -121,8 +121,8 @@
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
- <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="0">
- <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
</div>
</div>
</div>
@@ -351,24 +351,24 @@
get_InitGrid();
DisPlay_HideColumn();
RoadBillMain(linterid);
- } else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
- ////绂佺敤缁勭粐閫夐」
- //$("#HOrgID").attr("disabled", true);
+ } else if (OperationType == 4) { //涓嬫帹
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
- //createBillNo();
- ////姹囨姤浜哄垵濮嬪寲
- //getHEmpByHUserName();
+ createBillNo();
+ //姹囨姤浜哄垵濮嬪寲
+ getHEmpByHUserName();
- ////鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
- //$("#HMaker").val(sessionStorage["HUserName"]);
- //$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
- ////鍒濆鍖栨棩鏈�
- //$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- ////鍒濆鍖栭」鐩樁娈佃〃
- //get_InitGrid();
- ////涓嬫帹-椤甸潰璁剧疆
- //set_WorkTaskReport();
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+ //涓嬫帹-椤甸潰璁剧疆
+ set_WorkTaskReport();
}
//#endregion
@@ -377,7 +377,7 @@
//#endregion
//#region 鍒濆鍖栬〃鏍�
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
//#endregion
//#endregion
@@ -590,7 +590,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1) {
+ if (OperationType == 1 || OperationType == 4) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -612,6 +612,16 @@
vars[hash[0]] = hash[1];
}
return vars;
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ function getUrlVars_JSON() {
+ var datajson;
+ var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.indexOf("=") + 7);
+ datajson = $.parseJSON(decodeURI(arr));
+ return datajson;
}
//#endregion
@@ -693,7 +703,7 @@
}
//#endregion
- //瀹屾垚鏍囪
+ //#region 瀹屾垚鏍囪
form.on('checkbox(HFinishFlag)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
var elem = data.othis.parents('tr');
@@ -704,6 +714,7 @@
}
});
});
+ //#endregion
//#region 姹囨姤浜洪�夋嫨椤甸潰
function get_checkSearchHReportEmp() {
@@ -849,35 +860,65 @@
//#region 涓嬫帹-椤甸潰璧嬪��
function set_WorkTaskReport() {
- $.ajax({
- url: GetWEBURL() + "/PM_ProjectBill/set_WorkTaskReport",
- type: "GET",
- async: false,
- data: { "HInterID": linterid, "HProjectStageID": HProjectStageID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- var tableMain = result.data[0];
- var tableSub = result.data[1];
+ var data = getUrlVars_JSON().data;
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ var NewRow =
+ {
+ "RowID": (i + 1) * 10
+ , "HProjectID": data[i].HProjectID
+ , "HProNumber": data[i].HProNumber
+ , "HProjectStageID": data[i].HProjectStageID
+ , "HProjectStageName": data[i].HProjectStageName
+ , "HName": data[i].HName
+ , "HTaskNote": data[i].HTaskNote
+ , "HType": data[i].HType
+ , "HRelTimes": "0"
+ , "HReportNote": ""
+ , "HFinishFlag": false
+ , "HAdv": ""
+ , "HRemarkSub": ""
+ , "HSourceInterID": data[i].HSourceInterID
+ , "HSourceEntryID": data[i].HSourceEntryID
+ , "HSourceBillNo": data[i].HSourceBillNo
+ , "HSourceBillType": data[i].HSourceBillType
+ };
+ dataArray.push(NewRow);
+ }
- //涓昏〃 璧嬪��
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HOrgID": tableMain[0]["HOrgID"]
- , "HProID": tableMain[0]["HInterID"]
- , "HProjectStageID": tableMain[0]["HProjectStageID"]
- , "HMainSourceBillNo": tableMain[0]["鍗曟嵁鍙�"]
- , "HMainSourceBillType": tableMain[0]["鍗曟嵁绫诲瀷"]
- });
+ option.data = dataArray;
+ table.render(option);
- //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
- HOrgIDBar = tableMain[0]["HOrgID"];
- //瀛愯〃 璧嬪��
- for (var i = 0; i < tableSub.length; i++) {
- tableSub[i].RowID = (i + 1) * 10;
- }
- option.data = tableSub;
- table.render(option);
- }
- })
+ //$.ajax({
+ // url: GetWEBURL() + "/PM_ProjectBill/set_WorkTaskReport",
+ // type: "GET",
+ // async: false,
+ // data: { "HInterID": linterid, "HProjectStageID": HProjectStageID, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // var tableMain = result.data[0];
+ // var tableSub = result.data[1];
+
+ // //涓昏〃 璧嬪��
+ // form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ // "HOrgID": tableMain[0]["HOrgID"]
+ // , "HProID": tableMain[0]["HInterID"]
+ // , "HProjectStageID": tableMain[0]["HProjectStageID"]
+ // , "HMainSourceBillNo": tableMain[0]["鍗曟嵁鍙�"]
+ // , "HMainSourceBillType": tableMain[0]["鍗曟嵁绫诲瀷"]
+ // });
+
+ // //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ // HOrgIDBar = tableMain[0]["HOrgID"];
+
+ // //瀛愯〃 璧嬪��
+ // for (var i = 0; i < tableSub.length; i++) {
+ // tableSub[i].RowID = (i + 1) * 10;
+ // }
+ // option.data = tableSub;
+ // table.render(option);
+ // }
+ //})
}
//#endregion
--
Gitblit v1.9.1