From cd7657e7386d98b03005caedc6086166de16d94e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期日, 04 二月 2024 16:57:00 +0800
Subject: [PATCH] 工作周总结隐藏一个字段,工作任务列表增加催促按钮与编辑回显订单等级,工作任务去掉催促
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 44 +++++++++++++-
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMainList.html | 19 ++++--
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMain.html | 27 ++++++---
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 41 ++++---------
4 files changed, 83 insertions(+), 48 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
index c4e7b93..9d0909c 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMain.html"
@@ -59,7 +59,7 @@
<div class="layui-input-block" style="margin-left: 77px; width:270px;">
<input type="text" class="layui-input" lay-verify="HPlanEmpName" name="HPlanEmpName" id="HPlanEmpName" style="background-color:#efefef4d; width:180px; display: inline-block;" readonly>
<input type="hidden" name="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPlanEmp" id="btnSearchHPlanEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="btnSearchHPlanEmp" lay-filter="btnSearchHPlanEmp" id="btnSearchHPlanEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -295,7 +295,6 @@
//鍒濆鍖栫粍缁�
Organ();
-
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
@@ -311,6 +310,8 @@
//鏍规嵁鐧诲綍璐︽埛鍒濆鍖栨煡璇㈡�荤粨浜哄伐鏃�
getHUserNameHours();
+
+
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
@@ -320,11 +321,19 @@
}
- else if (OperationType == 3) { //缂栬緫
+ else if (OperationType == 3) {
+
+ //缂栬緫
//绂佺敤鎸夐挳
var num = 1;
HfBtn(num);
+ //鍒濆鍖栫粍缁�
+ Organ();
+ //鍒濆鍖栧勾鍜屽懆銆佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ Init_selectYearAndWeek();
set_EditForm(linterid);
+
+
}
//#endregion
@@ -783,22 +792,22 @@
success: function (result) {
if (result.code == 1) {
data = result.data;
-
+ $('#btnSearchHPlanEmp').addClass("layui-btn-disabled").attr("disabled", true);
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HInterID": data[0]["HInterID"]
, "HBillNo": data[0]["鍗曟嵁鍙�"]
, "HYear": data[0]["骞�"]
- , "HPeriod": data[0]["鏈�"]
+ , "HWeek": data[0]["鍛�"]
, "HDate": Format(new Date(data[0]["鏃ユ湡"]), "yyyy-MM-dd")
, "HPlanTimes": data[0]["璁″垝宸ユ椂"]
, "HUseTimes": data[0]["娑堣�楀伐鏃�"]
, "HRelUseTimes": data[0]["鏈夋晥宸ユ椂"]
, "HDelayTasks": data[0]["寤舵湡浠诲姟"]
, "HFineTasks": data[0]["瓒呭墠浠诲姟"]
- , "HFinishRate": data[0]["杈炬垚鐜�"]
- , "HBeginDate": Format(new Date(data[0]["HBeginDate"]), "yyyy-MM-dd")
- , "HEndDate": Format(new Date(data[0]["HEndDate"]), "yyyy-MM-dd")
+ , "HFinishRate": data[0]["杈炬垚鐜�"]+'%'
+ , "HBeginDate": Format(new Date(data[0]["寮�濮嬫棩鏈�"]), "yyyy-MM-dd")
+ , "HEndDate": Format(new Date(data[0]["缁撴潫鏃ユ湡"]), "yyyy-MM-dd")
, "HReportEmpID": data[0]["HReportEmpID"] == null ? 0 : data[0]["HReportEmpID"]
, "HPlanEmpName": data[0]["鎬荤粨浜�"]
, "HRemark": data[0]["澶囨敞"]
@@ -827,7 +836,7 @@
}
//#endregion
-
+
//#region 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂�
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
index 4c6376b..21c50f5 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
@@ -136,7 +136,7 @@
var HModName = "h_v_PM_WorkReportWeekBillMainList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HReportEmpID"];
+ var titleData = ["HInterID", "HReportEmpID","HOrgID"];
//#endregion
@@ -286,7 +286,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainList',
+ url: GetWEBURL() + '/PM_WorkTaskWeekBill/PM_WorkReportWeekBillList',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
@@ -422,7 +422,7 @@
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
+ get_FastQuery();
}
})
}
@@ -445,7 +445,7 @@
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
+ get_FastQuery();
}
})
} else {
@@ -465,7 +465,7 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'PM_WorkTaskWeekBill/delete',
+ url: GetWEBURL() + 'PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainDelete',
type: "GET",
data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -477,8 +477,9 @@
//鍏抽棴褰撳墠frame
layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- w$("#btnSearch").trigger('click');
+
});
+ get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -499,7 +500,7 @@
//#region 鍒锋柊
function get_Refresh() {
- $("#btnSearch").trigger('click');
+ get_FastQuery();
}
//#endregion
@@ -520,6 +521,7 @@
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
+ get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -549,6 +551,7 @@
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
+ get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -579,6 +582,7 @@
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
+ get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
@@ -609,6 +613,7 @@
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
+ get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
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_WorkTaskBill.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_WorkTaskBill.html"
index 56940ac..402c146 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_WorkTaskBill.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_WorkTaskBill.html"
@@ -204,16 +204,6 @@
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍌績娆℃暟</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HHasten" name="HHasten" id="HHasten" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly >
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHHasten" id="btnSearchHHasten" style="padding: 0 10px;float: right;margin-right: 3px; " value="0">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -442,6 +432,8 @@
//#region 浠诲姟绫诲瀷绫诲瀷涓嬫媺妗嗘樉绀�
ColFilter();
//#endregion
+ //鍒濆鍖栬鍗曠瓑绾�
+ HOrderLev();
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
@@ -464,8 +456,7 @@
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
- //鍒濆鍖栬鍗曠瓑绾�
- HOrderLev();
+
}
//else if (OperationType == 2) { //澶嶅埗
@@ -489,6 +480,9 @@
//缂栬緫
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
+
+
+
//鍒濆鍖栭」鐩樁娈佃〃
RoadBillMain(linterid);
@@ -496,8 +490,7 @@
PicUpload();
//灞曠ず宸蹭笂浼犵殑鏂囦欢
getFileList_loaded();
- //鍒濆鍖栬鍗曠瓑绾�
- HOrderLev();
+
} else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
////绂佺敤缁勭粐閫夐」
@@ -521,8 +514,7 @@
set_WorkTaskReport();
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
- //鍒濆鍖栬鍗曠瓑绾�
- HOrderLev();
+
}
//#endregion
@@ -684,10 +676,7 @@
Order += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
}
$("#HOrderLevID ").append(Order);
- //if (OperationType == 1) {
- // HOrgIDBar = sessionStorage["OrganizationID"];
- //}
- //$("#HOrderLevID ").val(HOrgIDBar);
+
form.render('select');
}
layer.closeAll("loading");
@@ -697,12 +686,7 @@
//#endregion
- //#region 鑾峰彇鍌績娆℃暟
- document.getElementById('btnSearchHHasten').addEventListener('click', function () {
- var input = document.getElementById('HHasten');
- input.value = parseInt(input.value) + 1;
- });
-
+
//#endregion
//#region 鑾峰彇鍙傛暟
@@ -1057,8 +1041,8 @@
function set_AddNew(data) {
//鑾峰彇缁勭粐鏁版嵁
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
- if (data.field.HHasten == "") {
- data.field.HHasten = 0;
+ if (data.field.HOrderLevID == "") {
+ data.field.HOrderLevID = 0;
}
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
if (OperationType == 3) {
@@ -1132,7 +1116,6 @@
, "HRemark": tableMain[0]["HRemark"]
, "HOrgID": tableMain[0]["HOrgID"]
, "HOrderLevID": tableMain[0]["HOrderLevID"]
- , "HHasten": tableMain[0]["HHasten"]
, "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
, "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
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 2532bda..5d9e770 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"
@@ -135,6 +135,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HHasten"><i class="layui-icon layui-icon-logout"></i>鍌績娆℃暟鎸夐挳</button>
</div>
</script>
</form>
@@ -213,9 +214,9 @@
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
- ////娴忚
- //case 'get_view': get_view();
- // break;
+ //鍌績鎸夐挳
+ case 'get_HHasten': get_HHasten();
+ break;
//瀹℃牳鎸夐挳
case 'btn-Audit':
set_CheckBill(1);
@@ -856,6 +857,43 @@
}
//#endregion
+ //#region 鍌績娆℃暟
+ function get_HHasten() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ var HHasten = data[0].鍌績娆℃暟 == undefined ? 0 : data[0].鍌績娆℃暟 ;
+ var HHastens = HHasten + 1;
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/PM_WorkTaskBill/UpdateHHasten", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "HHasten": HHastens, "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);
+ });
+ get_FastQuery(1);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//#region 澶氳涓嬫帹
function set_ShowBill_dh() {
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1