From ebc5cb37642bc43d7d98366c2e28e50a5fd84dc5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 二月 2024 09:16:32 +0800
Subject: [PATCH] 工作任务 增加 字段 任务状态 ，需求及问题清单内码，需求及问题清单号,工作任务里 增加 字段： 订单等级（紧急、普通、优化项目）、增加 催促次数 的字段；单据列表里 也把 这2个字段 显示出来
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 132 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 111 insertions(+), 21 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 4237953..951d968 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"
@@ -291,7 +291,8 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
+ var HEntryID = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
//#endregion
@@ -326,23 +327,27 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
+
}
- //else if (OperationType == 2) { //澶嶅埗
- // //绂佺敤缁勭粐閫夐」
- // //$("#HOrgID").attr("disabled", true);
- // RoadBillMain(linterid);
- // $.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // async: false,
- // data: { "HBillType": '4750' },
- // success: function (d) {
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- // }
- // });
- //}
+ else if (OperationType == 2) { //鎴戠殑浠诲姟妯″潡涓嬫帹
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+ //姹囨姤浜哄垵濮嬪寲
+ getHEmpByHUserName();
+
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+
+ get_Display();
+ }
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
@@ -367,6 +372,7 @@
get_InitGrid();
//涓嬫帹-椤甸潰璁剧疆
set_WorkTaskReport();
+
}
//#endregion
@@ -590,7 +596,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -757,6 +763,7 @@
num.push(table.cache["mainTable"][i])
}
}
+
//鑾峰彇缁勭粐鏁版嵁
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -786,6 +793,8 @@
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ var datas = num;
+ UpdateState(datas);
}
else {
layer.close(index);
@@ -800,6 +809,40 @@
}
//#endregion
+
+ //寰幆瀛愯〃鏁版嵁,鏌ョ湅鏄惁瀹屾垚,瀹屾垚灏辨洿鏂扮姸鎬佷负宸茬粨鏉�
+ function UpdateState(datas) {
+ var data = datas;
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].HFinishFlag == true) {
+ var InterID = data[i].HSourceInterID;
+ var nums = 2;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/PM_WorkTaskBill/BeginPM_WorkTaskBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ }
+ }
+
//#region 缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
@@ -1065,7 +1108,11 @@
if (HRelTimes.substring(HRelTimes.length - 1, HRelTimes.length) == ".") {
layer.msg("绗�" + (i + 1) + "琛岋細鑰楃敤宸ユ椂鏈熬涓嶈兘涓�.锛�");
return;
- } else {
+ } else if (HRelTimes == "0") {
+ layer.msg("绗�" + (i + 1) + "琛岋細鑰楃敤宸ユ椂涓嶈兘涓�0锛�");
+ return;
+ }
+ else {
var ref = /^[0-9]+\.?[0-9]*$/;
if (!ref.test(HRelTimes)) {
layer.msg("绗�" + (i + 1) + "琛岋細鑰楃敤宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
@@ -1079,9 +1126,9 @@
//#region 瀛愯〃鍏抽敭瀛楁閲嶅妫�楠�
var num = [];
for (var i = 0; i < option.data.length; i++) {
- temp = option.data[i]["HProjectID"] + "|" + option.data[i]["HProjectStageID"] + "|" + option.data[i]["HName"];
+ temp = option.data[i]["HProjectID"] + "|" + option.data[i]["HProjectStageID"] + "|" + option.data[i]["HName"] + "|" + option.data[i]["HSourceInterID"] + "|" + option.data[i]["HSourceEntryID"];
if ($.inArray(temp, num) != -1) {
- layer.msg("绗�" + (i + 1) + "琛岋細椤圭洰浠ｇ爜銆侀」鐩樁娈点�佷换鍔″悕绉伴噸澶嶏紝璇烽噸鏂伴�夋嫨锛�");
+ layer.msg("绗�" + (i + 1) + "琛岋細浠诲姟閲嶅锛岃閲嶆柊閫夋嫨锛�");
return false;
}
num.push(temp);
@@ -1276,6 +1323,49 @@
}
//#endregion
+ //#region 鏌ヨ 鎴戠殑浠诲姟涓嬫帹鏌ヨ鏁版嵁
+ function get_Display() {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskBill/XTList',
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var rowdata = [];
+ for (var i = 0; i < data1.data.length; i++) {
+ rowdata.push(
+ {
+ "HName": data1.data[i].浠诲姟鍚嶇О
+ , "HTaskNote": data1.data[i].浠诲姟鎻忚堪
+ , "HType": data1.data[i].浠诲姟绫诲瀷
+ , "HProjectID": data1.data[i].HProjectID
+ , "HProNumber": data1.data[i].椤圭洰浠ｇ爜
+ , "HProjectStageID": data1.data[i].HProjectStageID
+ , "HProjectStageName": data1.data[i].椤圭洰闃舵
+ , "HSourceInterID": data1.data[i].HInterID
+ , "HSourceEntryID": data1.data[i].HEntryID
+ , "HSourceBillNo": data1.data[i].鍗曟嵁鍙�
+ , "HSourceBillType": data1.data[i].鍗曟嵁绫诲瀷
+ , "HRelTimes": data1.data[i].宸茶�楃敤宸ユ椂
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ CheckedSet_tableSub();
+ form.render('select');
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1