From f025d969dcf4e664ef8f7f33ee2060e113c3adff Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 20:56:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | 128 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 15 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
index 7871d93..bfe1bed 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
@@ -45,6 +45,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-MoneyDeSave" id="MoneyDeSave"><i class="layui-icon layui-icon-circle"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -94,7 +95,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟瀹夎璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;display:none;">
瀹℃牳
</button>
</div>
@@ -103,7 +104,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟闄勫睘璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px; display: none;">
瀹℃牳
</button>
</div>
@@ -112,7 +113,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟鑰冩牳璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px; display: none;">
瀹℃牳
</button>
</div>
@@ -121,7 +122,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟宸ヨ垂</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px; display: none;">
瀹℃牳
</button>
</div>
@@ -141,6 +142,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+
</div>
</script>
</div>
@@ -173,8 +175,7 @@
var optionNeedCheck = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
- "HFeedback", "HPriority", "HUserID", "甯佸埆浠ｇ爜", "閲囪喘鏂瑰紡浠ｇ爜", "缁撶畻鏂瑰紡浠ｇ爜", "閮ㄩ棬浠ｇ爜", "涓荤浠ｇ爜", "涓氬姟鍛樹唬鐮�", "璁￠噺鍗曚綅浠ｇ爜", "HCheckFlowStatusID", "HCheckFlowID","HCheckItemID"];
+ var titleData = ["hmainid"];
//#endregion
//#endregion
var HModName = "PM_ProjectTaskNeedCheckQuery";
@@ -182,8 +183,8 @@
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_Display();
+
+ get_FastQuery();
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -194,7 +195,7 @@
//case 'btn-Edit': get_ShowBill('mainTableNeedCheck');
// break;
//鍒锋柊
- case 'get_Refresh': get_Display();
+ case 'get_Refresh': get_FastQuery();
break;
//瀵煎嚭excel
case 'get_export':
@@ -211,7 +212,11 @@
table.exportFile(ins.config.id, optionNeedCheck.data, "xls");
break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_Display);
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_FastQuery);
+ break;
+ //璐圭敤鍙嶄繚瀛樻寜閽�
+ case 'btn-MoneyDeSave':
+ set_SaveMoneyBill();
break;
};
});
@@ -236,6 +241,7 @@
//#region 瀹℃牳
form.on('submit(btnCheckSetupMoney)', function (data) {
set_CheckBill("SetupMoneyCheck");
+ set_CheckBill("OtherMoneyCheck");//瀹℃牳瀹夎闄勫睘璐�
$('#btnCheckSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
});
form.on('submit(btnCheckOtherMoney)', function (data) {
@@ -260,7 +266,12 @@
$('tr').attr({ "style": "background:" });
$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
//obj.tr.find('.layui-form-radio').addClass('layui-form-radioed');
-
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTableNeedCheck, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
//鏄剧ず椤圭洰淇℃伅
RoadBillMain(obj.data["HInterID"]);
@@ -311,6 +322,17 @@
//#endregion
//#region 璇ラ〉闈㈡墍鏈夋柟娉�
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ //鍒濆璇濇寜閽偣鍑�
+ sWhere = " '"+addSWhereByOpenType() + "'";
+ //鏌ヨ
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
//#region 鍒濆鍖栬〃鏍�
function set_InitGrid() {
//璁剧疆瀹℃牳鎸夐挳涓嶅彲鐐瑰嚮
@@ -318,7 +340,6 @@
$('#btnCheckOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
$('#btnCheckExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
$('#btnCheckWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
-
optionNeedCheck = {
elem: '#mainTableNeedCheck'
, toolbar: '#toolbarDemoNeedCheck'
@@ -346,13 +367,13 @@
//#endregion
//#region 鍔犺浇琛ㄦ牸
- function get_Display() {
+ function get_Display(sWhere) {
var ajaxLoad = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/NeedCheckQuery',
type: "GET",
async: false,
- data: {"user": sessionStorage["HUserName"] },
+ data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -538,7 +559,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_Display();
+ get_FastQuery();
});
} else {
@@ -555,6 +576,83 @@
}
//#endregion
+ //#region 璐圭敤鍙嶄繚瀛樻暟鎹�
+ function set_SaveMoneyBill() {
+ var checkStatus = table.checkStatus('mainTableNeedCheck')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
+ var sql = "exec h_p_PM_ProjectBillUnSaveMoney " + HInterID + ",'" + openType+"'"
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/CommonModel/searchMethod", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck":"Pm_ProjectBill_edit" },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.data[0].message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹┏鍥烇紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
+ var addSWhere = openType;
+ //鏍规嵁閫掑叆鍙傛暟闅愯棌瀵瑰簲鎸夐挳鍜屾樉绀哄垪
+ if (openType == "SetupMoney") {
+ $('#btnCheckSetupMoney').show();
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "OtherMoney") {
+ $('#btnCheckOtherMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ } else if (openType == "ExamMoney") {
+ $('#btnCheckExamMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "WorkMoney") {
+ $('#btnCheckWorkMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else {
+ addSWhere="other"
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ }
+ return addSWhere;
+ }
+ //#endregion\
+
//#endregion
--
Gitblit v1.9.1