From 22870b2ceda5ea1dc4e83c8b8d6a11973b834be3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 八月 2023 15:37:56 +0800
Subject: [PATCH] 指引卡开工单列表 指引卡完工单列表
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 177 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 132 insertions(+), 45 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 dd42fa9..df973f5 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"
@@ -14,7 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <style>
+ <!--<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
height: 30px;
@@ -44,7 +44,7 @@
.layui-form-label {
width: 25%;
}
- </style>
+ </style>-->
</head>
<body>
@@ -75,20 +75,20 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�*</label>
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width:180px;">
<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">姹囨姤浜�*</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">姹囨姤浜�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HReportEmpName" name="HReportEmpName" id="HReportEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" value="0">
@@ -100,7 +100,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
</div>
@@ -108,11 +108,21 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <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">
</div>
</div>
</div>
@@ -227,8 +237,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
<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="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
</div>
</script>
</div>
@@ -269,6 +279,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
//#endregion
@@ -328,6 +339,20 @@
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
RoadBillMain(linterid);
+ } else if (OperationType == 4 && HProjectStageID != null) {
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#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
@@ -567,22 +592,23 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , page: true
- , limit: 500
- , limits: [50, 500, 5000, 50000]
+ //, page: true
+ //, limit: 500
+ //, limits: [50, 500, 5000, 50000]
+ , totalRow: true
, cellMinWidth: 120
, height: 400
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HProNumber', title: '椤圭洰浠ｇ爜', edit: 'text', event: "HProNumber" }
- , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true }
- , { field: 'HProjectStageName', title: '椤圭洰闃舵', edit: 'text', event: "HProjectStageName" } //f7
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+ , { field: 'HProNumber', title: '椤圭洰浠ｇ爜', style: 'background-color: #f9f9f9;'}
+ , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HProjectStageName', title: '椤圭洰闃舵', style: 'background-color: #f9f9f9;' } //f7
, { field: 'HName', title: '浠诲姟鍚嶇О', edit: 'text', event: "HName" }
- , { field: 'HTaskNote', title: '浠诲姟鎻忚堪' }
- , { field: 'HType', title: '浠诲姟绫诲瀷'}
- , { field: 'HRelTimes', title: '鑰楃敤宸ユ椂', edit: 'text' }
+ , { field: 'HTaskNote', title: '浠诲姟鎻忚堪', style: 'background-color: #f9f9f9;' }
+ , { field: 'HType', title: '浠诲姟绫诲瀷', style: 'background-color: #f9f9f9;'}
+ , { field: 'HRelTimes', title: '鑰楃敤宸ユ椂', edit: 'text', totalRow: true }
, { field: 'HReportNote', title: '姹囨姤鍐呭', edit: 'text' }
, { field: 'HAdv', title: '浼樺寲寤鸿', edit: 'text' }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
@@ -715,14 +741,14 @@
, "HMaker": tableMain[0]["HMaker"]
, "HUpdater": tableMain[0]["HUpdater"]
, "HChecker": tableMain[0]["HChecker"]
- , "HMakerDate": tableMain[0]["HMakerDate"] == null ? "" : Format(new Date(tableMain[0]["HMakerDate"]), "yy-MM-dd")
- , "HUpdaterDate": tableMain[0]["HUpdaterDate"] == null ? "" : Format(new Date(tableMain[0]["HUpdaterDate"]), "yy-MM-dd")
- , "HCheckerDate": tableMain[0]["HCheckerDate"] == null ? "" : Format(new Date(tableMain[0]["HCheckerDate"]), "yy-MM-dd")
+ , "HMakerDate": tableMain[0]["HMakerDate"] == null ? "" : Format(new Date(tableMain[0]["HMakerDate"]), "yyyy-MM-dd")
+ , "HUpdaterDate": tableMain[0]["HUpdaterDate"] == null ? "" : Format(new Date(tableMain[0]["HUpdaterDate"]), "yyyy-MM-dd")
+ , "HCheckerDate": tableMain[0]["HCheckerDate"] == null ? "" : Format(new Date(tableMain[0]["HCheckerDate"]), "yyyy-MM-dd")
, "HCloseMan": tableMain[0]["HCloseMan"]
, "HDeleteMan": tableMain[0]["HDeleteMan"]
, "HBacker": tableMain[0]["HBacker"]
- , "HCloseManDate": tableMain[0]["HCloseManDate"] == null ? "" : Format(new Date(tableMain[0]["HCloseManDate"]), "yyyy-MM-dd")
- , "HDeleteManDate": tableMain[0]["HDeleteManDate"] == null ? "" : tFormat(new Date(tableMain[0]["HDeleteManDate"]), "yyyy-MM-dd")
+ , "HCloseManDate": tableMain[0]["HCloseDate"] == null ? "" : Format(new Date(tableMain[0]["HCloseDate"]), "yyyy-MM-dd")
+ , "HDeleteManDate": tableMain[0]["HDeleteDate"] == null ? "" : Format(new Date(tableMain[0]["HDeleteDate"]), "yyyy-MM-dd")
, "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
, "HBackRemark": tableMain[0]["HBackRemark"]
, "HReportEmpID": tableMain[0]["HReportEmpID"]
@@ -733,6 +759,43 @@
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
+
+ //#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];
+
+ //涓昏〃 璧嬪��
+ 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);
}
@@ -848,7 +911,12 @@
return false;
}
- if ($("#HReportEmpName").val() == "") {
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HReportEmpID").val() == "0") {
layer.msg("姹囨姤浜烘湭閫夋嫨!");
return false;
}
@@ -858,16 +926,15 @@
var num = [];
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
- ////椤圭洰闃舵閲嶅妫�楠�
- //if ($.inArray(option.data[i]["HProjectStageID"], num) == -1) {
- // num.push(option.data[i]["HProjectStageID"]);
- //} else {
- // layer.msg("绗�" + (i + 1) + "琛�,椤圭洰闃舵:" + option.data[i]["HProjectStageName"] + "閲嶅!");
- // return false;
- //}
//椤圭洰闃舵闈炵┖妫�楠�
- if (option.data[i]["HProjectStageName"] == "") {
+ if (option.data[i]["HProjectStageID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:椤圭洰闃舵涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ //浠诲姟鍚嶇О闈炵┖妫�楠�
+ if (option.data[i]["HName"] == "") {
+ layer.msg("绗�" + (i + 1) + "琛�:浠诲姟鍚嶇О涓嶈兘涓虹┖!");
return false;
}
@@ -884,6 +951,18 @@
}
}
}
+ }
+ //#endregion
+
+ //#region 瀛愯〃鍏抽敭瀛楁閲嶅妫�楠�
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ temp = option.data[i]["HProNumber"] + "|" + option.data[i]["HProjectStageID"] + "|" + option.data[i]["HName"];
+ if ($.inArray(temp, num) != -1) {
+ layer.msg("绗�" + (i + 1) + "琛岋細椤圭洰浠ｇ爜銆侀」鐩樁娈点�佷换鍔″悕绉伴噸澶嶏紝璇烽噸鏂伴�夋嫨锛�");
+ return false;
+ }
+ num.push(temp);
}
//#endregion
return true;
@@ -983,7 +1062,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HProjectStageID": checkStatus.data[0].HItemID
- , "HProjectStageName": checkStatus.data[0].HName
+ , "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1012,7 +1091,7 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HProNumber": checkStatus.data[0].HProNumber
+ "HProNumber": checkStatus.data[0].椤圭洰浠ｇ爜
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1040,12 +1119,20 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HName": checkStatus.data[0].HName
- , "HTaskNote": checkStatus.data[0].HTaskNote
- , "HType": checkStatus.data[0].HType
- })
+
+ if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HName": checkStatus.data[0].浠诲姟鍚嶇О
+ , "HTaskNote": checkStatus.data[0].浠诲姟鎻忚堪
+ , "HType": checkStatus.data[0].浠诲姟绫诲瀷
+ , "HProNumber": checkStatus.data[0].椤圭洰浠ｇ爜
+ , "HProjectStageID": checkStatus.data[0].HProjectStageID
+ , "HProjectStageName": checkStatus.data[0].椤圭洰闃舵
+ })
+ } else {
+ layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+ }
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1103,7 +1190,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["琛屽彿","椤圭洰闃舵ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -1119,9 +1206,9 @@
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] += "font-size:100%";
}
//璁剧疆鍒楀
//if (data1.data[0].HColumnWidth != 0) {
--
Gitblit v1.9.1