From 8f8f0ad3286df6d848fa75cbeaa1b0bd47fd6525 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 27 四月 2025 08:54:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 33 --
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html | 85 ++++++-
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | 76 +++++-
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatFormImport_SS.html | 9
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 222 ++++++++++++-------
WebTM/views/生产管理/报工平台_PDA/IpadIndex_PDA.html | 223 ++++++++++++++++++++
7 files changed, 504 insertions(+), 146 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 444fdd2..980f848 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 6141465..459c54f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -23,7 +23,7 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="padding: 10px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">瀹屽伐鏃ユ湡瀵煎叆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">浜ゆ湡瀵煎叆</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
@@ -1659,11 +1659,12 @@
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, filter: true, sort: true});
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, filter: true, sort: true });
columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, edit: 'text', filter: true, sort: true });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });//0
+ //0
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
- columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+ columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+
columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true, sort: true});
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true, sort: true });
@@ -1677,7 +1678,7 @@
for (var i = 0; i < HArrangeProductDayQty; i++) {
columns.push(dateColumns[i]);//0
}
-
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
@@ -1692,7 +1693,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150 });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
- columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
@@ -1712,7 +1713,7 @@
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, filter: true });//0
- columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+ columns.push({ fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
elem: '#mainTable'
@@ -1831,11 +1832,7 @@
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
get_Display_1(HinterID_S);
- get_Display_2(HinterID_S)
- }
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
+ get_Display_2(HinterID_S);
}
} else {
@@ -4564,20 +4561,6 @@
})
}
- //鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 2; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization);$("#ColName1").empty();
- $("#ColName1").append(Organization);$("#ColName2").empty();
- $("#ColName2").append(Organization);
- form.render('select');
- }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
index cadd3c7..10a2573 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
@@ -230,16 +230,16 @@
}
var HDataSub = [];
-
+ var index = layer.load();
+ layer.msg("寮�濮嬪鍏�");
//JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
- for (var i = 0; i < option.data.length; i += 300) {
+ for (var i = 0; i < option.data.length; i += 100) {
HDataSub = option.data.slice(i, i + 100)
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(HDataSub);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
- var index = layer.load();
$.ajax({
type: "POST",
@@ -263,7 +263,8 @@
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- }
+ }
+ layer.close(index);
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
index 41b484b..999bf08 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
@@ -355,6 +355,7 @@
function fetchListData(HSourceID) {
if (HSourceID != "0" && HSourceID != null && HSourceID!="") {
$('.ctop').removeClass('check'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
+ HSourceID1 = HSourceID;
//鎵ц鑱斿姩浜嬩欢
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetWorkBillList",
@@ -655,6 +656,156 @@
//璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
iframe.edit(data);
},
+ });
+ }
+
+ //蹇嵎寮�宸�
+ function OpenFastWork(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (!WorkStaus(HSourceID1, workcode, HSourceInterID, "蹇嵎寮�宸�")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻寮�宸ユ潯浠�!", { icon: 5 });
+ return false;
+ }
+ var indexOpen = layer.open({
+ type: 1
+ , title: "纭寮�宸ュ悧?"
+ , closeBtn: false
+ , area: '300px;'
+ , shade: 0.8
+ , id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
+ , btn: ['纭畾', '鍙栨秷']
+ , btnAlign: 'c'
+ , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
+ , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
+ , btn1: function (index, layero, e) {
+
+ //鏂板寮�宸ュ崟
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/FastBeginWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillType": HBillType, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ layer.close(indexOpen);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+ }
+
+ //蹇嵎瀹屽伐
+ function OpenFastEnd(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (!WorkStaus(HSourceID1, workcode, HSourceInterID, "蹇嵎瀹屽伐")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!", { icon: 5 });
+ return false;
+ }
+ var indexOpen = layer.open({
+ type: 1
+ , title: "纭瀹屽伐鍚�?"
+ , closeBtn: false
+ , area: '300px;'
+ , shade: 0.8
+ , id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
+ , btn: ['纭畾', '鍙栨秷']
+ , btnAlign: 'c'
+ , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
+ , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
+ , btn1: function (index, layero, e) {
+
+ //鏂板寮�宸ュ崟
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESEndWorkBill/FastEndWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillType": HBillType, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ layer.close(indexOpen);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+ }
+
+ //蹇嵎鍋滃伐
+ function OpenFastStop(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (!WorkStaus(HSourceID1, workcode, HSourceInterID, "蹇嵎鍋滃伐")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻鍋滃伐鏉′欢!", { icon: 5 });
+ return false;
+ }
+ var indexOpen = layer.open({
+ type: 1
+ , title: "纭鍋滃伐鍚�?"
+ , closeBtn: false
+ , area: '300px;'
+ , shade: 0.8
+ , id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
+ , btn: ['纭畾', '鍙栨秷']
+ , btnAlign: 'c'
+ , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
+ , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
+ , btn1: function (index, layero, e) {
+
+ //鏂板寮�宸ュ崟
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESStopWorkBill/FastStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillType": HBillType, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ layer.close(indexOpen);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
});
}
@@ -1465,6 +1616,78 @@
});
return flag;
+ case "蹇嵎寮�宸�":
+ sWhere = { "HSourceID": HSourceID1, "HICMOBillNo": workcode, "HInterID": HSourceInterID,"type":"寮�宸�"}
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0) {
+ flag = true;
+
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
+
+ return flag;
+ case "蹇嵎鍋滃伐":
+ sWhere = { "HSourceID": HSourceID1, "HICMOBillNo": workcode, "HInterID": HSourceInterID, "type": "瀹屽伐" }
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0) {
+ flag = true;
+
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
+
+ return flag;
+ case "蹇嵎瀹屽伐":
+ sWhere = { "HSourceID": HSourceID1, "HICMOBillNo": workcode, "HInterID": HSourceInterID, "type": "鍋滃伐" }
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0) {
+ flag = true;
+
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
+
+ return flag;
}
}
</script>
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 d66cd14..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"
@@ -48,6 +48,13 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁″垝鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 58px;width:160px;">
@@ -102,88 +109,88 @@
</div>
</div>
<!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>-->
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>-->
</div>
</div>
@@ -242,6 +249,26 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ //$('#HDate').prop('disabled', true);
+ //$('#HDate1').prop('disabled', true);
+
+ $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ //$('#HDate').prop('disabled', false);
+ //$('#HDate1').prop('disabled', false);
+ }
+ });
+ //#endregion
//#region 浜у搧缂栫爜
form.on('submit(btnHMATERIALID)', function (data) {
@@ -416,9 +443,13 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
//鍒濆鍖栨棩鏈�
$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//鑷�
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
//鍒濆鍖栬〃鏍�
@@ -438,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' }
@@ -458,7 +489,10 @@
, { field: '鏃ヨ鍒掓暟閲�', title: '鏃ヨ鍒掓暟閲�', sort: true, totalRow: true, filter: true }
, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', sort: true, filter: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, filter: true }
- , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿', sort: true, filter: true }
+ , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿', sort: true, filter: true }
+ , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', sort: true, filter: true }
+ , { field: '渚涜揣杞﹂棿浠ｇ爜', title: '渚涜揣杞﹂棿浠ｇ爜', sort: true, filter: true }
+ , { field: '渚涜揣杞﹂棿', title: '渚涜揣杞﹂棿', sort: true, filter: true }
, { field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��', sort: true, filter: true }
, { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', sort: true, totalRow: true, filter: true }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true, totalRow: true, filter: true }
@@ -811,7 +845,7 @@
$("#ColName2").val("0");
$("#Comparator2").val("0");
$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//鑷�
+ $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
$("#HMaterAtt").val("");
form.render('select');
sWhere = "";
@@ -910,6 +944,24 @@
form.render('select');
}
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [7,30, 45, 60];
+ var titleList = ["杩�7澶�","杩戜竴鏈�", "杩�45澶�", "杩�60澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("30");
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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