From d60dca8d721279c66d70d27b5f03231a237eaaa9 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 15 九月 2023 15:54:14 +0800
Subject: [PATCH] 任务汇报新增模块列表增加完成标记列
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 284 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 221 insertions(+), 63 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_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 f9b4b71..b6b562a 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"
@@ -59,10 +59,10 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>
+ <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">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -75,7 +75,7 @@
<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">
@@ -88,10 +88,10 @@
</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="HProNumber" name="HProNumber" id="HProNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <!--<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">-->
+ <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjecID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -106,7 +106,7 @@
</div>
<div class="layui-row">
<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="HProjectStageName" name="HProjectStageName" id="HProjectStageName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
@@ -122,7 +122,7 @@
</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>
@@ -132,7 +132,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠诲姟鎻忚堪</label>
<div class="layui-input-block" style="margin-left: 120px; width:500px;">
- <input type="text" class="layui-input" lay-verify="HTaskNote" name="HTaskNote" id="HTaskNote">
+ <textarea class="layui-textarea" name="HTaskNote" id="HTaskNote" lay-verify="HTaskNote"></textarea>
</div>
</div>
</div>
@@ -158,7 +158,7 @@
</div>
<div class="layui-row">
<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="HSendEmp" name="HSendEmp" id="HSendEmp" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<!--<input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">-->
@@ -199,7 +199,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>
@@ -207,11 +207,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="HMainSourceInterID" id="HMainSourceInterID" lay-verify="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" lay-verify="HMainSourceEntryID" 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>
@@ -341,6 +351,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HEntryID = params[params[3]]; //宸ョ▼椤圭洰瀛愬唴鐮�
//#endregion
@@ -353,22 +364,19 @@
}
//#endregion
-
- //#region 鍒濆鍖栫粍缁�
- Organ();
- //#endregion
-
//#region 浠诲姟绫诲瀷绫诲瀷涓嬫媺妗嗘樉绀�
ColFilter();
//#endregion
//#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
if (OperationType == null || OperationType == 1) { //鏂板
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
OperationType = 1;
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
+ //鍒濆鍖栨淳鍗曚汉
+ getHEmpByHUserName();
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -395,11 +403,35 @@
// });
//}
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
- //绂佺敤缁勭粐閫夐」
- $("#HOrgID").attr("disabled", true);
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
RoadBillMain(linterid);
+ } else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
+
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+ //鍒濆鍖栨淳鍗曚汉
+ getHEmpByHUserName();
+
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨渶缁堝畬鎴愭椂闂�
+ $("#HLastDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+ //涓嬫帹-椤甸潰璁剧疆
+ set_WorkTaskReport();
}
+ //#endregion
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
//#endregion
//#endregion
@@ -571,6 +603,7 @@
//#region 椤圭洰浠ｇ爜閫夋嫨椤甸潰
function get_checkSearchHProNumber() {
+ var HOrgID = $("#HOrgID").val();
//鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
layer.open({
type: 2
@@ -580,7 +613,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html", "yes"]
+ , content: ["../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -591,8 +624,22 @@
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- $("#HProNumber").val(checkStatus.data[0].HProNumber);//宸ョ▼椤圭洰浠ｇ爜
- $("#HProName").val(checkStatus.data[0].HProName);//宸ョ▼椤圭洰浠ｇ爜
+ //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+ if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(checkStatus.data[0].HInterID);
+ $("#HProNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProjectStageID").val(checkStatus.data[0].HProjectStageID);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProjectStageName").val(checkStatus.data[0].椤圭洰闃舵);//宸ョ▼椤圭洰浠ｇ爜
+
+ $("#HMainSourceInterID").val(checkStatus.data[0].HInterID);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].HEntryID);
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(checkStatus.data[0].鍗曟嵁绫诲瀷);
+
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -623,10 +670,7 @@
}
$("#HProjectStageID").val(checkStatus.data[0].HItemID);//椤圭洰闃舵id
- $("#HProjectStageName").val(checkStatus.data[0].HName);//椤圭洰闃舵鍚嶇О
- if ($("#HProjectStageName").val() == "") {
- $("#HProjectStageName").val(checkStatus.data[0].HNumber);
- }
+ $("#HProjectStageName").val(checkStatus.data[0].闃舵鍚嶇О);//椤圭洰闃舵鍚嶇О
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -636,13 +680,14 @@
//#region 娲惧崟浜洪�夋嫨椤甸潰
function get_checkSearchHSendEmp() {
+ 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] //鑾峰彇寮规椤甸潰
@@ -651,9 +696,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HSendEmp").val(checkStatus.data[0].HName);//瀹㈡埛鍚嶇О
+ $("#HSendEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
if ($("#HSendEmp").val() == "") {
- $("#HSendEmp").val(checkStatus.data[0].HNumber);
+ $("#HSendEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -664,13 +709,14 @@
//#region 鎺ユ敹浜洪�夋嫨椤甸潰
function get_checkSearchHReceiveEmp() {
+ 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] //鑾峰彇寮规椤甸潰
@@ -679,9 +725,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HReceiveEmp").val(checkStatus.data[0].HName);//鎺ユ敹浜哄悕绉�
+ $("#HReceiveEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鎺ユ敹浜哄悕绉�
if ($("#HReceiveEmp").val() == "") {
- $("#HReceiveEmp").val(checkStatus.data[0].HNumber);
+ $("#HReceiveEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
}
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -692,29 +738,77 @@
//#region 鎶勯�佷汉閫夋嫨椤甸潰
function get_checkSearchHCopyEmp() {
+ //var HOrgID = $("#HOrgID").val();
+ //layer.open({
+ // type: 2//寮圭獥绫诲瀷
+ // , skin: 'layui-layer-rim' //鍔犱笂杈规
+ // , area: ['90%', '90%']//澶у皬
+ // , title: '鍛樺伐琛�'//鏍囬
+ // , shift: 2//寮瑰嚭鍔ㄧ敾
+ // , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ // , btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // //鑾峰彇鏁版嵁
+ // $("#HCopyEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鎶勯�佷汉鍚嶇О
+ // if ($("#HCopyEmp").val() == "") {
+ // $("#HCopyEmp").val(checkStatus.data[0].鑱屽憳浠ｇ爜);
+ // }
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) { }
+ //})
+
+
+ //椤甸潰灞�-鑷畾涔�
layer.open({
- type: 2//寮圭獥绫诲瀷
- , skin: 'layui-layer-rim' //鍔犱笂杈规
- , area: ['90%', '90%']//澶у皬
- , title: '鍛樺伐琛�'//鏍囬
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶勯�佷汉鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/transfer.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
+ var checkStatus = iframeWindow.layui.transfer.getData('key123'); //鑾峰彇宸插垎閰嶆暟閲�
+ if (checkStatus.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- //鑾峰彇鏁版嵁
- $("#HCopyEmp").val(checkStatus.data[0].HName);//鎶勯�佷汉鍚嶇О
- if ($("#HCopyEmp").val() == "") {
- $("#HCopyEmp").val(checkStatus.data[0].HNumber);
+ var value = "";
+ var title = "";
+ for (var i = 0; i < checkStatus.length; i++) {
+ value += checkStatus[i].value + ",";
+ title += checkStatus[i].title + ",";
}
- layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+ if (value.length > 0) {
+ value = value.substr(0, value.length - 1);
+ title = title.substr(0, title.length - 1);
+ }
+ $("#HCopyEmp").val(title);
+ console.log(checkStatus, value, title);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- , btn2: function (index, layero) { }
- })
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
}
//#endregion
@@ -776,6 +870,7 @@
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HInterID": tableMain[0]["HInterID"]
, "HBillNo": tableMain[0]["HBillNo"]
+ , "HProjectID": tableMain[0]["HProjectID"]
, "HProNumber": tableMain[0]["HProNumber"]
, "HProName": tableMain[0]["HProName"]
, "HProjectStageID": tableMain[0]["HProjectStageID"]
@@ -792,19 +887,56 @@
, "HCopyEmp": tableMain[0]["HCopyEmp"]
, "HRemark": tableMain[0]["HRemark"]
, "HOrgID": tableMain[0]["HOrgID"]
+
+ , "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
+ , "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
+ , "HMainSourceBillNo": tableMain[0]["HMainSourceBillNo"]
+ , "HMainSourceBillType": tableMain[0]["HMainSourceBillType"]
+
, "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"]
+ });
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = tableMain[0]["HOrgID"];
+ }
+ })
+ }
+ //#endregion
+
+ //#region 涓嬫帹-椤甸潰璧嬪��
+ function set_WorkTaskReport() {
+ $.ajax({
+ url: GetWEBURL() + "/PM_ProjectBill/set_WorkTask",
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var tableMain = result.data;
+
+ //涓昏〃 璧嬪��
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HOrgID": tableMain[0]["HOrgID"]
+ , "HProjectID": tableMain[0]["HInterID"]
+ , "HProNumber": tableMain[0]["HProNumber"]
+ , "HProName": tableMain[0]["HProName"]
+ , "HProjectStageID": tableMain[0]["HProjectStageID"]
+ , "HProjectStageName": tableMain[0]["HProjectStageName"]
+ , "HMainSourceInterID": tableMain[0]["HInterID"]
+ , "HMainSourceEntryID": tableMain[0]["HEntryID"]
+ , "HMainSourceBillNo": tableMain[0]["HBillNo"]
+ , "HMainSourceBillType": tableMain[0]["HBillType"]
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
@@ -921,21 +1053,20 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
-
- if ($("#HProNumber").val() == "") {
- layer.msg("椤圭洰浠ｇ爜涓嶈兘涓虹┖!");
+ if ($("#HProID").val() == "0") {
+ layer.msg("椤圭洰浠ｇ爜娌℃湁閫夋嫨!");
return false;
}
- if ($("#HProName").val() == "") {
- layer.msg("椤圭洰鍚嶇О涓嶈兘涓虹┖!");
- return false;
- }
- if ($("#HProjectStageName").val() == "") {
+ if ($("#HProjectStageID").val() == "0") {
layer.msg("椤圭洰闃舵娌℃湁閫夋嫨!");
return false;
}
if ($("#HName").val() == "") {
layer.msg("浠诲姟鍚嶇О涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
if ($("#HSendEmp").val() == "") {
@@ -1087,6 +1218,33 @@
form.render('select');
}
//#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 HSendEmp = result.data[0]["HEmpName"];
+ $("#HSendEmp").val(HSendEmp);
+ 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