From be7d738131c8cf9c8e00c6abfde469f2d82cbfb0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 15 三月 2024 16:48:45 +0800
Subject: [PATCH] 1
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 559 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 462 insertions(+), 97 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 0855be1..e3ecdb0 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,8 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <style>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <!--<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
height: 30px;
@@ -44,7 +45,7 @@
.layui-form-label {
width: 25%;
}
- </style>
+ </style>-->
</head>
<body>
@@ -65,6 +66,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>浠诲姟姹囨姤</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -75,20 +77,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 +102,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 +110,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="">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
</div>
</div>
</div>
@@ -215,6 +227,7 @@
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
</ul>
@@ -227,8 +240,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>
@@ -243,6 +256,18 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
+
+ <!--澶嶉�夋 瀹屾垚鏍囪-->
+ <script type="text/html" id="HFinishFlag">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HFinishFlag" lay-filter="HFinishFlag" id="HFinishFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
+ <!--<script type="text/html" id="switchTpl">
+ 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀�
+ <input type="checkbox" name="checkbox" value="{{d.HFinishFlag}}" lay-skin="primary" lay-filter="HFinishFlag" {{ d.HFinishFlag == 1 ? 'checked' : '' }}>
+ </script>-->
<script>
@@ -269,10 +294,20 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HEntryID = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "4754";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
if (sessionStorage.login != "login") {
layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -285,17 +320,15 @@
//DisPlay_HideColumn();
//#endregion
- //#region 鍒濆鍖栫粍缁�
- Organ();
- //#endregion
-
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
+ //姹囨姤浜哄垵濮嬪寲
+ getHEmpByHUserName();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -305,30 +338,61 @@
$("#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);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
RoadBillMain(linterid);
+ } else if (OperationType == 4) { //涓嬫帹
+ //绂佺敤缁勭粐閫夐」
+ $("#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();
+ //涓嬫帹-椤甸潰璁剧疆
+ set_WorkTaskReport();
+
}
+ //#endregion
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
//#endregion
//#endregion
@@ -398,22 +462,38 @@
var NewRow =
{
"RowID": (table.cache["mainTable"].length + 1) * 10
- , 'HProNumber': ''
- , 'HProjectStageID': '0'
- , 'HProjectStageName': ''
- , 'HName': ''
- , 'HTaskNote': ''
- , 'HType': ''
- , 'HRelTimes': '0'
- , 'HReportNote': ''
- , 'HAdv': ''
- , 'HRemarkSub': ''
+ , "HProjectID": "0"
+ , "HProNumber": ""
+ , "HProjectStageID": "0"
+ , "HProjectStageName": ""
+ , "HName": ""
+ , "HTaskNote": ""
+ , "HType": ""
+ , "HRelTimes": "0"
+ , "HReportNote": ""
+ , "HFinishFlag": false
+ , "HAdv": ""
+ , "HRemarkSub": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
};
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+ CheckedSet_tableSub();
+
+ for (var i = 1; i <= option.data.length; i++) {
+ //瀹屾垚鏍囪
+ if (option.data[i - 1].HFinishFlag) {
+ $('#HFinishFlag' + i + '').attr("checked", true);
+ }
+ }
+ form.render('select');
+ form.render('checkbox');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -429,6 +509,16 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ CheckedSet_tableSub();
+
+ for (var i = 1; i <= option.data.length; i++) {
+ //瀹屾垚鏍囪
+ if (option.data[i - 1].HFinishFlag) {
+ $('#HFinishFlag' + i + '').attr("checked", true);
+ }
+ }
+ form.render('checkbox');
+ form.render('select');
}
break;
//鍒楄缃�
@@ -473,7 +563,7 @@
//#endregion
-
+
//
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
@@ -517,7 +607,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 || OperationType == 2) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -542,6 +632,16 @@
}
//#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
+
//#region 鐢熸垚鍗曟嵁鍙�
function createBillNo() {
$.ajax({
@@ -563,25 +663,33 @@
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: 'HProjectID', title: '椤圭洰ID', 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: 'HFinishFlag', title: '瀹屾垚鏍囪', templet: "#HFinishFlag" }//checkbox
+ //, { field: 'HFinishFlag', title: '瀹屾垚鏍囪', width: 100, templet: '#switchTpl', unresize: false }
, { field: 'HAdv', title: '浼樺寲寤鸿', edit: 'text' }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
+ , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' } //f7
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' } //f7
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -589,32 +697,53 @@
var rowdata = [
{
"RowID": 10
- , 'HProNumber': ''
- , 'HProjectStageID': '0'
- , 'HProjectStageName': ''
- , 'HName': ''
- , 'HTaskNote': ''
- , 'HType': ''
- , 'HRelTimes': '0'
- , 'HReportNote': ''
- , 'HAdv': ''
- , 'HRemarkSub': ''
+ , "HProjectID": "0"
+ , "HProNumber": ""
+ , "HProjectStageID": "0"
+ , "HProjectStageName": ""
+ , "HName": ""
+ , "HTaskNote": ""
+ , "HType": ""
+ , "HRelTimes": "0"
+ , "HReportNote": ""
+ , "HFinishFlag": false
+ , "HAdv": ""
+ , "HRemarkSub": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": ""
}
];
option.data = rowdata;
table.render(option);
+ CheckedSet_tableSub();
}
+ //#endregion
+
+ //#region 瀹屾垚鏍囪
+ form.on('checkbox(HFinishFlag)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HFinishFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
//#endregion
//#region 姹囨姤浜洪�夋嫨椤甸潰
function get_checkSearchHReportEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -624,9 +753,9 @@
}
//鑾峰彇鏁版嵁
$("#HReportEmpID").val(checkStatus.data[0].HItemID);//瀹㈡埛id
- $("#HReportEmpName").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HReportEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HReportEmpName").val() == "") {
- $("#HReportEmpName").val(checkStatus.data[0].HNumber);
+ $("#HReportEmpName").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -645,6 +774,7 @@
num.push(table.cache["mainTable"][i])
}
}
+
//鑾峰彇缁勭粐鏁版嵁
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -657,7 +787,7 @@
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
//瀛愯〃鏁版嵁搴忓垪鍖�
- var sSubStr = JSON.stringify(num);
+ var sSubStr = JSON.stringify(num);
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
@@ -674,6 +804,8 @@
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ var datas = num;
+ UpdateState(datas);
}
else {
layer.close(index);
@@ -688,6 +820,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)//鍔犺浇琛ㄥご
{
@@ -711,14 +877,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"]
@@ -729,10 +895,80 @@
HOrgIDBar = tableMain[0]["HOrgID"];
//瀛愯〃 璧嬪��
+ for (var i = 0; i < tableSub.length; i++) {
+ tableSub[i].RowID = (i + 1) * 10;
+ }
option.data = tableSub;
table.render(option);
+ CheckedSet_tableSub();
+ form.render('select');
}
})
+ }
+ //#endregion
+
+ //#region 涓嬫帹-椤甸潰璧嬪��
+ function set_WorkTaskReport() {
+ 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);
+ }
+
+ option.data = dataArray;
+ table.render(option);
+ CheckedSet_tableSub();
+
+
+ //$.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
@@ -844,7 +1080,12 @@
return false;
}
- if ($("#HReportEmpName").val() == "") {
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ if ($("#HReportEmpID").val() == "0") {
layer.msg("姹囨姤浜烘湭閫夋嫨!");
return false;
}
@@ -854,16 +1095,22 @@
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]["HProjectID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:椤圭洰涓嶈兘涓虹┖!");
+ 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;
}
@@ -872,7 +1119,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) + "琛岋細鑰楃敤宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
@@ -880,6 +1131,18 @@
}
}
}
+ }
+ //#endregion
+
+ //#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"] + "|" + option.data[i]["HSourceInterID"] + "|" + option.data[i]["HSourceEntryID"];
+ if ($.inArray(temp, num) != -1) {
+ layer.msg("绗�" + (i + 1) + "琛岋細浠诲姟閲嶅锛岃閲嶆柊閫夋嫨锛�");
+ return false;
+ }
+ num.push(temp);
}
//#endregion
return true;
@@ -901,6 +1164,7 @@
option.data[i - 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+ CheckedSet_tableSub();
break;
}
}
@@ -923,6 +1187,7 @@
option.data[i + 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+ CheckedSet_tableSub();
break;
}
}
@@ -944,6 +1209,7 @@
oldData.splice(obj.tr.data('index'), 1)
option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);
+ CheckedSet_tableSub();
layer.close(index);
}
});
@@ -979,7 +1245,7 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HProjectStageID": checkStatus.data[0].HItemID
- , "HProjectStageName": checkStatus.data[0].HName
+ , "HProjectStageName": checkStatus.data[0].闃舵鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1008,7 +1274,7 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HProNumber": checkStatus.data[0].HProNumber
+ "HProNumber": checkStatus.data[0].椤圭洰浠ｇ爜
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -1016,6 +1282,7 @@
})
}
if (obj.event == "HName") {
+ var HOrgID = $("#HOrgID").val();
//宸ヤ綔浠诲姟浠ｇ爜
//鎵撳紑宸ヤ綔浠诲姟灏忕獥浣�
layer.open({
@@ -1026,7 +1293,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html", "yes"]
+ , content: ['../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html?openType=2&HOrgID=' + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1036,12 +1303,25 @@
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].浠诲姟绫诲瀷
+ , "HProjectID": checkStatus.data[0].HProjectID
+ , "HProNumber": checkStatus.data[0].椤圭洰浠ｇ爜
+ , "HProjectStageID": checkStatus.data[0].HProjectStageID
+ , "HProjectStageName": checkStatus.data[0].椤圭洰闃舵
+ , "HSourceInterID": checkStatus.data[0].HInterID
+ , "HSourceEntryID": checkStatus.data[0].HEntryID
+ , "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ , "HSourceBillType": checkStatus.data[0].鍗曟嵁绫诲瀷
+ })
+ } else {
+ layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+ }
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1051,6 +1331,49 @@
return false;
}
})
+ }
+ //#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
@@ -1099,7 +1422,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["琛屽彿", "椤圭洰闃舵ID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -1115,9 +1438,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) {
@@ -1162,8 +1485,10 @@
}
}
table.render(option);
+ CheckedSet_tableSub();
} else {
table.render(option);
+ CheckedSet_tableSub();
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1172,6 +1497,46 @@
}
//#endregion
+ //#region 鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ function CheckedSet_tableSub() {
+ var tableSub = option.data;
+ //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
+ for (var i = 0; i < tableSub.length; i++) {
+ if (tableSub[i].HFinishFlag) {
+ $('#HFinishFlag' + (i + 1)).attr("checked", true);
+ }
+ }
+ form.render('checkbox');
+ }
+ //#endregion
+
+ //#region 鏍规嵁鐧诲綍璐︽埛鑾峰彇鐩稿簲鑱屽憳
+ function getHEmpByHUserName() {
+ var Czybm = sessionStorage["Czybm"];
+
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskReportBill/getHEmpByHUserName',
+ type: "GET",
+ data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var HReportEmpID = result.data[0]["HEmpID"];
+ var HReportEmpName = result.data[0]["HEmpName"];
+ $("#HReportEmpID").val(HReportEmpID);
+ $("#HReportEmpName").val(HReportEmpName);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ }
+ //#endregion
//#endregion
--
Gitblit v1.9.1