From 27ccbd987c7f7c3a40fde5eb3706bde10d3e7d64 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 24 四月 2025 09:07:00 +0800
Subject: [PATCH] 报表修改，工程项目费用待审核带保存列表更改
---
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html | 85 +++++++++++++++++++++++-----
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | 76 ++++++++++++++++++++-----
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 4
3 files changed, 132 insertions(+), 33 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index bddd509..5197a15 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -469,8 +469,8 @@
, page: true
, cellMinWidth: 90
, totalRow: true
- , limit: 1000
- , limits: [50, 500,1000, 5000, 20000]
+ , limit: 50
+ , limits: [50, 500,1000, 5000]
//, loading: false
, cols: [[
{ type: 'checkbox', fixed: 'left' }
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 96c5909..51202cd 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"
@@ -94,7 +94,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 +103,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 +112,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 +121,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>
@@ -155,7 +155,6 @@
</div>
</div>
<script>
- var params = get_UrlVars();
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -174,8 +173,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";
@@ -183,8 +181,8 @@
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_Display();
+
+ get_FastQuery();
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -195,7 +193,7 @@
//case 'btn-Edit': get_ShowBill('mainTableNeedCheck');
// break;
//鍒锋柊
- case 'get_Refresh': get_Display();
+ case 'get_Refresh': get_FastQuery();
break;
//瀵煎嚭excel
case 'get_export':
@@ -212,7 +210,7 @@
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;
};
});
@@ -312,6 +310,17 @@
//#endregion
//#region 璇ラ〉闈㈡墍鏈夋柟娉�
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ //鍒濆璇濇寜閽偣鍑�
+ sWhere = " '"+addSWhereByOpenType() + "'";
+ //鏌ヨ
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
//#region 鍒濆鍖栬〃鏍�
function set_InitGrid() {
//璁剧疆瀹℃牳鎸夐挳涓嶅彲鐐瑰嚮
@@ -319,7 +328,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'
@@ -347,13 +355,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 = [];//鍒楀瓧娈垫暟鎹�
@@ -539,7 +547,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_Display();
+ get_FastQuery();
});
} else {
@@ -556,6 +564,44 @@
}
//#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
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_ProjectTaskNeedSaveQuery.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_ProjectTaskNeedSaveQuery.html"
index 100082f..a638680 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_ProjectTaskNeedSaveQuery.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_ProjectTaskNeedSaveQuery.html"
@@ -94,10 +94,10 @@
<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" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveSetupMoney" id="btnSaveSetupMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveSetupMoney" id="btnSaveSetupMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -106,10 +106,10 @@
<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" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveOtherMoney" id="btnSaveOtherMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveOtherMoney" id="btnSaveOtherMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -118,10 +118,10 @@
<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" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveExamMoney" id="btnSaveExamMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveExamMoney" id="btnSaveExamMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -130,10 +130,10 @@
<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" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveWorkMoney" id="btnSaveWorkMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveWorkMoney" id="btnSaveWorkMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -193,8 +193,8 @@
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_Display();
+
+ get_FastQuery();
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -205,7 +205,7 @@
//case 'btn-Edit': get_ShowBill('mainTableNeedSave');
// break;
//鍒锋柊
- case 'get_Refresh': get_Display();
+ case 'get_Refresh': get_FastQuery();
break;
//瀵煎嚭excel
case 'get_export':
@@ -222,7 +222,7 @@
table.exportFile(ins.config.id, optionNeedSave.data, "xls");
break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedSave, get_Display);
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedSave, get_FastQuery);
break;
};
});
@@ -345,6 +345,17 @@
//#endregion
//#region 璇ラ〉闈㈡墍鏈夋柟娉�
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ //鍒濆璇濇寜閽偣鍑�
+ sWhere = " '" + addSWhereByOpenType() + "'";
+ //鏌ヨ
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
//#region 鍒濆鍖栬〃鏍�
function set_InitGrid() {
//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐐瑰嚮
@@ -380,13 +391,13 @@
//#endregion
//#region 鍔犺浇琛ㄦ牸
- function get_Display() {
+ function get_Display(sWhere) {
var ajaxLoad = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/NeedSaveQuery',
type: "GET",
async: false,
- data: {"user": sessionStorage["HUserName"] },
+ data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -572,7 +583,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_Display();
+ get_FastQuery();
});
} else {
@@ -715,7 +726,49 @@
})
}
//#endregion
-
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
+ var addSWhere = openType;
+ //鏍规嵁閫掑叆鍙傛暟闅愯棌瀵瑰簲鎸夐挳鍜屾樉绀哄垪
+ if (openType == "SetupMoney") {
+ $('#btnSaveSetupMoney').show();
+ $('#btnSearchHTaskSetupMoney').show();
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "OtherMoney") {
+ $('#btnSaveOtherMoney').show();
+ $('#btnSearchHTaskOtherMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ } else if (openType == "ExamMoney") {
+ $('#btnSaveExamMoney').show();
+ $('#btnSearchHTaskExamMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "WorkMoney") {
+ $('#btnSaveWorkMoney').show();
+ $('#btnSearchHTaskWorkMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else {
+ addSWhere = "other"
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ }
+ return addSWhere;
+ }
+ //#endregion\
+
+ //#endregion
//#endregion
--
Gitblit v1.9.1