From 6e54db0de1b41ca840e42e11b39a300dba7ceaba Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 17 十一月 2023 12:51:47 +0800
Subject: [PATCH] ../../销售管理/收款单/YS_ReceiveBill.html：增加 结算方式返回方法
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 266 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 206 insertions(+), 60 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 c382e32..1e879d6 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"
@@ -121,8 +121,8 @@
<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">
+ <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>
@@ -254,6 +254,18 @@
<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>
layui.config({
@@ -337,11 +349,15 @@
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
RoadBillMain(linterid);
- } else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
- ////绂佺敤缁勭粐閫夐」
- //$("#HOrgID").attr("disabled", true);
+ } else if (OperationType == 4) { //涓嬫帹
+ //绂佺敤缁勭粐閫夐」
+ $("#HOrgID").attr("disabled", true);
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
+ //姹囨姤浜哄垵濮嬪寲
+ getHEmpByHUserName();
+
+
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -429,22 +445,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);
@@ -460,6 +492,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;
//鍒楄缃�
@@ -504,7 +546,7 @@
//#endregion
-
+
//
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
@@ -548,7 +590,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) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -570,6 +612,16 @@
vars[hash[0]] = hash[1];
}
return vars;
+ }
+ //#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
@@ -604,16 +656,23 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HProNumber', title: '椤圭洰浠ｇ爜', 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: '浠诲姟鎻忚堪', style: 'background-color: #f9f9f9;' }
- , { field: 'HType', 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' }
]]
}
@@ -621,21 +680,41 @@
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 姹囨姤浜洪�夋嫨椤甸潰
@@ -690,7 +769,7 @@
//鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
var sMainStr = JSON.stringify(data.field); //涓昏〃鏁版嵁
//瀛愯〃鏁版嵁搴忓垪鍖�
- var sSubStr = JSON.stringify(num);
+ var sSubStr = JSON.stringify(num);
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
@@ -767,6 +846,8 @@
}
option.data = tableSub;
table.render(option);
+ CheckedSet_tableSub();
+ form.render('select');
}
})
}
@@ -774,35 +855,66 @@
//#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];
+ 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);
+ }
- //涓昏〃 璧嬪��
- 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]["鍗曟嵁绫诲瀷"]
- });
+ option.data = dataArray;
+ table.render(option);
+ CheckedSet_tableSub();
- //缁勭粐鐨勫�糎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);
- }
- })
+ //$.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
@@ -929,6 +1041,13 @@
var num = [];
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
+ //椤圭洰闈炵┖妫�楠�
+ if (option.data[i]["HProjectID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:椤圭洰涓嶈兘涓虹┖!");
+ return false;
+ }
+
+
//椤圭洰闃舵闈炵┖妫�楠�
if (option.data[i]["HProjectStageID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:椤圭洰闃舵涓嶈兘涓虹┖!");
@@ -946,7 +1065,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) + "琛岋細鑰楃敤宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
@@ -960,9 +1083,9 @@
//#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"];
+ 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);
@@ -987,6 +1110,7 @@
option.data[i - 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+ CheckedSet_tableSub();
break;
}
}
@@ -1009,6 +1133,7 @@
option.data[i + 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+ CheckedSet_tableSub();
break;
}
}
@@ -1030,6 +1155,7 @@
oldData.splice(obj.tr.data('index'), 1)
option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);
+ CheckedSet_tableSub();
layer.close(index);
}
});
@@ -1130,9 +1256,14 @@
"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("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
@@ -1194,7 +1325,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["琛屽彿","椤圭洰闃舵ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["琛屽彿", "椤圭洰闃舵ID", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -1257,8 +1388,10 @@
}
}
table.render(option);
+ CheckedSet_tableSub();
} else {
table.render(option);
+ CheckedSet_tableSub();
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1267,6 +1400,19 @@
}
//#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"];
--
Gitblit v1.9.1