From 3ab5d223a8f8e4c569ae2df7934e29648566ea2f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 31 五月 2024 16:53:54 +0800
Subject: [PATCH] 全部PDA相关扫码模块优化，点击选中行时高亮显示
---
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 214 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 180 insertions(+), 34 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 7cb1354..73988d2 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,6 +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>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<!--<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -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>
@@ -225,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>
@@ -238,7 +241,7 @@
<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_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
</div>
</script>
</div>
@@ -291,11 +294,23 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
+ var HEntryID = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
+
+ //鍏ㄥ眬鍙橀噺
+ window.OptionData = [];
//#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("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -326,30 +341,32 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
- DisPlay_HideColumn();
+
}
- //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);
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
- DisPlay_HideColumn();
RoadBillMain(linterid);
} else if (OperationType == 4) { //涓嬫帹
//绂佺敤缁勭粐閫夐」
@@ -369,6 +386,7 @@
get_InitGrid();
//涓嬫帹-椤甸潰璁剧疆
set_WorkTaskReport();
+
}
//#endregion
@@ -469,6 +487,7 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+ CheckedSet_tableSub();
for (var i = 1; i <= option.data.length; i++) {
//瀹屾垚鏍囪
@@ -493,6 +512,7 @@
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++) {
//瀹屾垚鏍囪
@@ -590,7 +610,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -700,6 +720,7 @@
];
option.data = rowdata;
table.render(option);
+ CheckedSet_tableSub();
}
//#endregion
@@ -725,7 +746,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=HReport&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -742,6 +763,7 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function () {}
})
}
//#endregion
@@ -756,6 +778,7 @@
num.push(table.cache["mainTable"][i])
}
}
+
//鑾峰彇缁勭粐鏁版嵁
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -785,6 +808,8 @@
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ var datas = num;
+ UpdateState(datas);
}
else {
layer.close(index);
@@ -799,6 +824,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)//鍔犺浇琛ㄥご
{
@@ -845,13 +904,7 @@
}
option.data = tableSub;
table.render(option);
-
- for (var i = 0; i < tableSub.length; i++) {
- if (tableSub[i].HFinishFlag) {
- $('#HFinishFlag' + (i + 1)).attr("checked", true);
- }
- }
- form.render('checkbox');
+ CheckedSet_tableSub();
form.render('select');
}
})
@@ -888,6 +941,7 @@
option.data = dataArray;
table.render(option);
+ CheckedSet_tableSub();
//$.ajax({
@@ -1069,7 +1123,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) + "琛岋細鑰楃敤宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
@@ -1083,9 +1141,9 @@
//#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"];
+ 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);
@@ -1110,6 +1168,7 @@
option.data[i - 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+ CheckedSet_tableSub();
break;
}
}
@@ -1132,6 +1191,7 @@
option.data[i + 1] = data[0];
option.data[i] = tables[0];
table.render(option);
+ CheckedSet_tableSub();
break;
}
}
@@ -1153,6 +1213,7 @@
oldData.splice(obj.tr.data('index'), 1)
option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);
+ CheckedSet_tableSub();
layer.close(index);
}
});
@@ -1268,12 +1329,75 @@
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
+ , end: function () {
+ if (OptionData[0].鍏抽棴浜� == null || OptionData[0].鍏抽棴浜� == "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HName": OptionData[0].浠诲姟鍚嶇О
+ , "HTaskNote": OptionData[0].浠诲姟鎻忚堪
+ , "HType": OptionData[0].浠诲姟绫诲瀷
+ , "HProjectID": OptionData[0].HProjectID
+ , "HProNumber": OptionData[0].椤圭洰浠ｇ爜
+ , "HProjectStageID": OptionData[0].HProjectStageID
+ , "HProjectStageName": OptionData[0].椤圭洰闃舵
+ , "HSourceInterID": OptionData[0].HInterID
+ , "HSourceEntryID": OptionData[0].HEntryID
+ , "HSourceBillNo": OptionData[0].鍗曟嵁鍙�
+ , "HSourceBillType": OptionData[0].鍗曟嵁绫诲瀷
+ })
+ } else {
+ layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+ }
+ }
})
}
obj.event = "";
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
@@ -1385,13 +1509,28 @@
}
}
table.render(option);
+ CheckedSet_tableSub();
} else {
table.render(option);
+ CheckedSet_tableSub();
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
+ }
+ //#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
@@ -1428,8 +1567,15 @@
});
-
-
+ //瀛愯〃f7 宸ヤ綔浠诲姟
+ function GetWorkTaskValue(obj) {
+ OptionData = obj;
+ }
+ //姹囨姤浜�
+ function GetHReportValue(obj) {
+ $("#HReportEmpID").val(obj[0].HItemID);//瀹㈡埛id
+ $("#HReportEmpName").val(obj[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1