From 5831cd59fcd0eb209790ac867038b5707fc3613c Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期四, 26 六月 2025 14:32:54 +0800 Subject: [PATCH] 齐套报表导出日期格式设置,工程项目工程类添加新字段,销售出库修改 --- WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 9 WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillTotalList.html | 6 WebTM/layuiadmin/Scripts/webConfig.js | 2 WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 649 ++++++++++++++++++++++++++++++++--------------------- 4 files changed, 405 insertions(+), 261 deletions(-) diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js index 7562261..58e2b61 100644 --- a/WebTM/layuiadmin/Scripts/webConfig.js +++ b/WebTM/layuiadmin/Scripts/webConfig.js @@ -7,7 +7,7 @@ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆 var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆 //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃� - //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃� + var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃� //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆 //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆 //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃� 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/ReportMOMaterReadysBillTotalList.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/ReportMOMaterReadysBillTotalList.html" index d7a574a..c6583a9 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/ReportMOMaterReadysBillTotalList.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/ReportMOMaterReadysBillTotalList.html" @@ -633,6 +633,12 @@ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓� item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓� + if (itemobj == "璁㈠崟浜ゆ湡") { + item[itemobj] = item[itemobj].toString().split('T')[0]; + } + if (itemobj == "鏃ヨ鍒掓棩鏈�") { + item[itemobj] = item[itemobj].toString().split('T')[0]; + } } } }); 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_ProjectBill.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_ProjectBill.html" index e8bca31..823e879 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_ProjectBill.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_ProjectBill.html" @@ -261,246 +261,284 @@ <!--宸ョ▼淇℃伅--> <div class="layui-tab-item" id="project_tab"> <div class="layui-form-item"> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰绫诲埆</label> - <div class="layui-input-block" style="margin-left: 77px;"> - <input type="text" class="layui-input" lay-verify="HProjectClassName" name="HProjectClassName" id="HProjectClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" name="HProjectClassID" id="HProjectClassID" lay-verify="HProjectClassID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProjectClass" id="btnSearchHProjectClass" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> + <div class="layui-card layui-bg-gray"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰绫诲埆</label> + <div class="layui-input-block" style="margin-left: 77px;"> + <input type="text" class="layui-input" lay-verify="HProjectClassName" name="HProjectClassName" id="HProjectClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HProjectClassID" id="HProjectClassID" lay-verify="HProjectClassID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProjectClass" id="btnSearchHProjectClass" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </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="text" class="layui-input" lay-verify="HBuildAddress" name="HBuildAddress" id="HBuildAddress" style="width:500px"> + </div> </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="text" class="layui-input" lay-verify="HBuildAddress" name="HBuildAddress" id="HBuildAddress"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">浠诲姟缂栧彿</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HWorkNo" name="HWorkNo" id="HWorkNo"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鍙楃悊鏃ユ湡</label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HReDate" name="HReDate" id="HReDate" style="padding-left: 80px;"> + </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="text" class="layui-input" lay-verify="HPicNo" name="HPicNo" id="HPicNo"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">浠诲姟涓嬭揪</label> + <div class="layui-input-block" style="margin-left: 77px; "> + <input type="text" class="layui-input" lay-verify="HWorkTask" name="HWorkTask" id="HWorkTask" style="width: 60%; display: inline-block; "> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkTask" id="btnSearchHWorkTask" style="padding: 0 10px; float: right; margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">椤圭洰鍐呭</label> + <div class="layui-input-block" style="margin-left: 120px; width:815px;"> + <textarea class="layui-textarea" name="HProjectNote" id="HProjectNote" lay-verify="HProjectNote" style="height:100px"></textarea> + </div> </div> </div> </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">浠诲姟缂栧彿</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HWorkNo" name="HWorkNo" id="HWorkNo"> + <div class="layui-card layui-bg-gray"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍒嗗寘鍗曚綅<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 77px;"> + <input type="text" class="layui-input" lay-verify="HSupplierName" name="HSupplierName" id="HSupplierName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HSupplierID" id="HSupplierID" lay-verify="HSupplierID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSupplier" id="btnSearchHSupplier" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰缁忕悊<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 77px;"> + <input type="text" class="layui-input" lay-verify="HProPMEmpName" name="HProPMEmpName" id="HProPMEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HProPMEmpID" id="HProPMEmpID" lay-verify="HProPMEmpID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProPMEmp" id="btnSearchHProPMEmp" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">绠$悊鍛�<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 77px;"> + <input type="text" class="layui-input" lay-verify="HMangerEmpName" name="HMangerEmpName" id="HMangerEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HMangerEmpID" id="HMangerEmpID" lay-verify="HMangerEmpID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMangerEmp" id="btnSearchHMangerEmp" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鏉愭枡璁″垝<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HMaterPlanDate" name="HMaterPlanDate" id="HMaterPlanDate" style="padding-left: 80px;"> + </div> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鍙楃悊鏃ユ湡</label> - <div class="layui-input-block" style="margin-left: 120px; width:180px;"> - <input type="date" class="layui-input" lay-verify="HReDate" name="HReDate" id="HReDate" style="padding-left: 80px;"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鏂藉伐鍛�<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 77px;"> + <input type="text" class="layui-input" lay-verify="HWorkerName" name="HWorkerName" id="HWorkerName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HWorkerID" id="HWorkerID" lay-verify="HWorkerID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorker" id="btnSearchHWorker" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">宸ョ▼寮�宸ユ棩鏈�</label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HProBeginDate" name="HProBeginDate" id="HProBeginDate" style="padding-left: 80px;"> + </div> + + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">宸ョ▼瀹屽伐鏃ユ湡</label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HProEndDate" name="HProEndDate" id="HProEndDate" style="padding-left: 80px;"> + </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="text" class="layui-input" lay-verify="HPlanWorkTimes" name="HPlanWorkTimes" id="HPlanWorkTimes" value="0"> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">瀹為檯宸ユ湡</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HRelWorkTimes" name="HRelWorkTimes" id="HRelWorkTimes" value="0"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">璇曞帇鏃ユ湡<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HTestDate" name="HTestDate" id="HTestDate" style="padding-left: 80px;"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璇曞帇楠屾敹浜�<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 77px;"> + <input type="text" class="layui-input" lay-verify="HTestCheckerName" name="HTestCheckerName" id="HTestCheckerName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> + <input type="hidden" name="HTestCheckerID" id="HTestCheckerID" lay-verify="HTestCheckerID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTestChecker" id="btnSearchHTestChecker" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">璇曞帇璁板綍</label> + <div class="layui-input-block" style="margin-left: 120px; width:815px;"> + <textarea class="layui-textarea" name="HTestNote" id="HTestNote" lay-verify="HTestNote" style="height:100px"></textarea> + </div> + </div> + </div> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鎺掓薄鏃ユ湡<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HSewageDate" name="HSewageDate" id="HSewageDate" style="padding-left: 80px;"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">閫氭按鏃ユ湡<!--<label style="color:red"> * </label>--></label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="date" class="layui-input" lay-verify="HWaterSupplyDate" name="HWaterSupplyDate" id="HWaterSupplyDate" style="padding-left: 80px;"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">绔e伐鍥剧紪鍙�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HWorkPicNumber" name="HWorkPicNumber" id="HWorkPicNumber"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">绔e伐璧勬枡</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" name="HWorkNote" id="HWorkNote" lay-verify="HWorkNote" > + </div> </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="text" class="layui-input" lay-verify="HPicNo" name="HPicNo" id="HPicNo"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鏂藉伐瀹屾垚鎯呭喌</label> + <div class="layui-input-block" style="margin-left: 120px; width:815px;"> + <textarea class="layui-textarea" name="HWorkProcNote" id="HWorkProcNote" lay-verify="HWorkProcNote" style="height:100px"></textarea> + </div> </div> </div> </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鑱旂郴浜�</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HContacts" name="HContacts" id="HContacts"> + <div class="layui-card layui-bg-gray"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">棰勭畻閫犱环</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HYuSuanMoney" name="HYuSuanMoney" id="HYuSuanMoney" value="0"> + </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="text" class="layui-input" lay-verify="HHeTongMoney" name="HHeTongMoney" id="HHeTongMoney" value="0"> + </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="text" class="layui-input" lay-verify="HJieSuanMoney" name="HJieSuanMoney" id="HJieSuanMoney" value="0"> + </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="text" class="layui-input" lay-verify="HShenJiMoney" name="HShenJiMoney" id="HShenJiMoney" value="0"> + </div> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鑱旂郴浜虹數璇�</label> - <div class="layui-input-block" style="margin-left: 120px; width:180px;"> - <input type="text" class="layui-input" lay-verify="HContactNumber" name="HContactNumber" id="HContactNumber"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鏉愭枡璐�</label> + <div class="layui-input-block" style="margin-left: 120px;"> + <input type="text" class="layui-input" lay-verify="HCaiLiaoMoney" name="HCaiLiaoMoney" id="HCaiLiaoMoney" value="0"> + </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="text" class="layui-input" lay-verify="HAnZhuangMoney" name="HAnZhuangMoney" id="HAnZhuangMoney" value="0"> + </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="text" class="layui-input" lay-verify="HBanZuMoney" name="HBanZuMoney" id="HBanZuMoney" value="0"> + </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="text" class="layui-input" lay-verify="HYuShouKuanMoney" name="HYuShouKuanMoney" id="HYuShouKuanMoney" value="0"> + </div> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">浠诲姟涓嬭揪</label> - <div class="layui-input-block" style="margin-left: 120px; width:180px;"> - <input type="text" class="layui-input" lay-verify="HWorkTask" name="HWorkTask" id="HWorkTask"> + <div class="layui-row"> + <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="HGongFeiMoney" name="HGongFeiMoney" id="HGongFeiMoney"> + </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="HJieZhangMoney" name="HJieZhangMoney" id="HJieZhangMoney"> + </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="text" class="layui-input" lay-verify="HContacts" name="HContacts" id="HContacts"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鑱旂郴浜虹數璇�</label> + <div class="layui-input-block" style="margin-left: 120px; width:180px;"> + <input type="text" class="layui-input" lay-verify="HContactNumber" name="HContactNumber" id="HContactNumber"> + </div> </div> </div> </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">椤圭洰鍐呭</label> - <div class="layui-input-block" style="margin-left: 120px; width:815px;"> - <textarea class="layui-textarea" name="HProjectNote" id="HProjectNote" lay-verify="HProjectNote" style="height:100px"></textarea> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍒嗗寘鍗曚綅<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 77px;"> - <input type="text" class="layui-input" lay-verify="HSupplierName" name="HSupplierName" id="HSupplierName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" name="HSupplierID" id="HSupplierID" lay-verify="HSupplierID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSupplier" id="btnSearchHSupplier" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">绠$悊鍛�<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 77px;"> - <input type="text" class="layui-input" lay-verify="HMangerEmpName" name="HMangerEmpName" id="HMangerEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" name="HMangerEmpID" id="HMangerEmpID" lay-verify="HMangerEmpID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMangerEmp" id="btnSearchHMangerEmp" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鏂藉伐鍛�<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 77px;"> - <input type="text" class="layui-input" lay-verify="HWorkerName" name="HWorkerName" id="HWorkerName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" name="HWorkerID" id="HWorkerID" lay-verify="HWorkerID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorker" id="btnSearchHWorker" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璇曞帇楠屾敹浜�<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 77px;"> - <input type="text" class="layui-input" lay-verify="HTestCheckerName" name="HTestCheckerName" id="HTestCheckerName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> - <input type="hidden" name="HTestCheckerID" id="HTestCheckerID" lay-verify="HTestCheckerID" value="0"> - <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTestChecker" id="btnSearchHTestChecker" style="padding: 0 10px;float: right;margin-right: 3px;"> - <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> - </button> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鏉愭枡璁″垝<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 120px; width:180px;"> - <input type="date" class="layui-input" lay-verify="HMaterPlanDate" name="HMaterPlanDate" id="HMaterPlanDate" style="padding-left: 80px;"> - </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="text" class="layui-input" lay-verify="HPlanWorkTimes" name="HPlanWorkTimes" id="HPlanWorkTimes" value="0"> - </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="text" class="layui-input" lay-verify="HRelWorkTimes" name="HRelWorkTimes" id="HRelWorkTimes" value="0"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">璇曞帇鏃ユ湡<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 120px; width:180px;"> - <input type="date" class="layui-input" lay-verify="HTestDate" name="HTestDate" id="HTestDate" style="padding-left: 80px;"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">璇曞帇璁板綍</label> - <div class="layui-input-block" style="margin-left: 120px; width:815px;"> - <textarea class="layui-textarea" name="HTestNote" id="HTestNote" lay-verify="HTestNote" style="height:100px"></textarea> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鎺掓薄鏃ユ湡<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 120px; width:180px;"> - <input type="date" class="layui-input" lay-verify="HSewageDate" name="HSewageDate" id="HSewageDate" style="padding-left: 80px;"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">閫氭按鏃ユ湡<!--<label style="color:red"> * </label>--></label> - <div class="layui-input-block" style="margin-left: 120px; width:180px;"> - <input type="date" class="layui-input" lay-verify="HWaterSupplyDate" name="HWaterSupplyDate" id="HWaterSupplyDate" style="padding-left: 80px;"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">绔e伐璧勬枡</label> - <div class="layui-input-block" style="margin-left: 120px; width:815px;"> - <textarea class="layui-textarea" name="HWorkNote" id="HWorkNote" lay-verify="HWorkNote" style="height:100px"></textarea> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鏂藉伐瀹屾垚鎯呭喌</label> - <div class="layui-input-block" style="margin-left: 120px; width:815px;"> - <textarea class="layui-textarea" name="HWorkProcNote" id="HWorkProcNote" lay-verify="HWorkProcNote" style="height:100px"></textarea> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">棰勭畻閫犱环</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HYuSuanMoney" name="HYuSuanMoney" id="HYuSuanMoney" value="0"> - </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="text" class="layui-input" lay-verify="HHeTongMoney" name="HHeTongMoney" id="HHeTongMoney" value="0"> - </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="text" class="layui-input" lay-verify="HJieSuanMoney" name="HJieSuanMoney" id="HJieSuanMoney" value="0"> - </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="text" class="layui-input" lay-verify="HShenJiMoney" name="HShenJiMoney" id="HShenJiMoney" value="0"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">鏉愭枡璐�</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HCaiLiaoMoney" name="HCaiLiaoMoney" id="HCaiLiaoMoney" value="0"> - </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="text" class="layui-input" lay-verify="HAnZhuangMoney" name="HAnZhuangMoney" id="HAnZhuangMoney" value="0"> - </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="text" class="layui-input" lay-verify="HBanZuMoney" name="HBanZuMoney" id="HBanZuMoney" value="0"> - </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="text" class="layui-input" lay-verify="HYuShouKuanMoney" name="HYuShouKuanMoney" id="HYuShouKuanMoney" value="0"> - </div> - </div> - </div> - <div class="layui-row"> - <div class="layui-inline"> - <label class="layui-form-label" style="width: 85px;">宸ヨ垂缁撹处</label> - <div class="layui-input-block" style="margin-left: 120px;"> - <input type="text" class="layui-input" lay-verify="HGongFeiMoney" name="HGongFeiMoney" id="HGongFeiMoney" value="0"> - </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="text" class="layui-input" lay-verify="HJieZhangMoney" name="HJieZhangMoney" id="HJieZhangMoney" value="0"> - </div> - </div> - </div> + </div> </div> <!--椤圭洰淇℃伅--> @@ -968,25 +1006,8 @@ </div> </div> <div class="layui-card layui-bg-gray"> - - </div> - <div class="layui-row"> - - - - - </div> - <div class="layui-row"> - - </div> - <div class="layui-row"> - - </div> - <div class="layui-row"> - - - </div> + </div> </div> </div> @@ -1195,10 +1216,10 @@ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); $("#HReDate").val(Format(new Date(), "yyyy-MM-dd")); - $("#HMaterPlanDate").val(Format(new Date(), "yyyy-MM-dd")); - $("#HTestDate").val(Format(new Date(), "yyyy-MM-dd")); - $("#HSewageDate").val(Format(new Date(), "yyyy-MM-dd")); - $("#HWaterSupplyDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HMaterPlanDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HTestDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HSewageDate").val(Format(new Date(), "yyyy-MM-dd")); + //$("#HWaterSupplyDate").val(Format(new Date(), "yyyy-MM-dd")); //$('input[type="datetime-local"]').val(new Date().toDateString()); //$('input[type="datetime-local"]').each(function () { @@ -1329,6 +1350,18 @@ //#region 閫夋嫨绠$悊鍛樻寜閽� form.on('submit(btnSearchHMangerEmp)', function () { get_checkSearchHMangerEmp(); + }); + //#endregion + + //#region 閫夋嫨椤圭洰缁忕悊鎸夐挳 + form.on('submit(btnSearchHProPMEmp)', function () { + get_checkSearchHProPMEmp(); + }); + //#endregion + + //#region 閫夋嫨浠诲姟涓嬭揪鎸夐挳 + form.on('submit(btnSearchHWorkTask)', function () { + get_checkSearchHWorkTask(); }); //#endregion @@ -2322,7 +2355,9 @@ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� } , btn2: function (index, layero) { } - , end: function () { } + , end: function () { + GetHProjectNumber(0); + } }) } //#endregion @@ -2448,6 +2483,65 @@ $("#HMangerEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍛樺伐鍚嶇О if ($("#HMangerEmpName").val() == "") { $("#HMangerEmpName").val(checkStatus.data[0].鑱屽憳浠g爜); + } + layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { } + }) + } + //#endregion + + //#region 椤圭洰缁忕悊閫夋嫨椤甸潰 + function get_checkSearchHProPMEmp() { + var HOrgID = $("#HOrgID").val(); + layer.open({ + type: 2//寮圭獥绫诲瀷 + , skin: 'layui-layer-rim' //鍔犱笂杈规 + , area: ['90%', '90%']//澶у皬 + , title: '鍛樺伐琛�'//鏍囬 + , shift: 2//寮瑰嚭鍔ㄧ敾 + , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=HPM&HOrgID=' + HOrgID, 'yes'] + , btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + //鑾峰彇鏁版嵁 + $("#HProPMEmpID").val(checkStatus.data[0].HItemID);//鍛樺伐id + $("#HProPMEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍛樺伐鍚嶇О + if ($("#HProPMEmpName").val() == "") { + $("#HProPMEmpName").val(checkStatus.data[0].鑱屽憳浠g爜); + } + layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { } + }) + } + //#endregion + + //#region 浠诲姟涓嬭揪閫夋嫨椤甸潰 + function get_checkSearchHWorkTask() { + var HOrgID = $("#HOrgID").val(); + layer.open({ + type: 2//寮圭獥绫诲瀷 + , skin: 'layui-layer-rim' //鍔犱笂杈规 + , area: ['90%', '90%']//澶у皬 + , title: '鍛樺伐琛�'//鏍囬 + , shift: 2//寮瑰嚭鍔ㄧ敾 + , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?openType=HEmpList&HOrgID=' + HOrgID, 'yes'] + , btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + //鑾峰彇鏁版嵁 + $("#HWorkTask").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍛樺伐鍚嶇О + if ($("#HWorkTask").val() == "") { + $("#HWorkTask").val(checkStatus.data[0].鑱屽憳浠g爜); } layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� } @@ -2965,7 +3059,10 @@ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true); layer.close(index); //鏂板缂栫爜娴佹按鍙� - GetHProjectNumber(1); + if (HBillSubType == "浠诲姟绫�" || HBillSubType == "宸ョ▼绫�") { + GetHProjectNumber(1); + } + layer.msg("鎻愪氦鎴愬姛"); } else { @@ -3169,7 +3266,15 @@ , "HBanZuMoney": tableMain[0]["HBanZuMoney"] , "HYuShouKuanMoney": tableMain[0]["HYuShouKuanMoney"] , "HGongFeiMoney": tableMain[0]["HGongFeiMoney"] - , "HJieZhangMoney": tableMain[0]["HJieZhangMoney"], + , "HJieZhangMoney": tableMain[0]["HJieZhangMoney"] + , "HProBeginDate": tableMain[0]["HProBeginDate"]//宸ョ▼寮�宸ユ椂闂� + , "HProEndDate": tableMain[0]["HProEndDate"]//宸ョ▼缁撴潫鏃堕棿 + , "HProPMEmpID": tableMain[0]["HProPMEmpID"]//椤圭洰缁忕悊 + , "HProPMEmpName": tableMain[0]["HProPMEmpName"] + , "HWorkPicNumber": tableMain[0]["HWorkPicNumber"],//绔e伐鍥剧紪鍙� + + + "HTaskClassID": tableMain[0]["HTaskClassID"], "HTaskClassName": tableMain[0]["HTaskClassName"], "HTaskClassEntryID": tableMain[0]["HTaskClassEntryID"], @@ -3455,20 +3560,45 @@ //浠诲姟澶х被 浠诲姟椤圭洰鍒嗙被 鏃ユ湡 鍙樺寲鏃讹紝鏇存柊 椤圭洰浠g爜锛圱ype涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級 function GetHProjectNumber(HType) { - $.ajax({ - url: GetWEBURL() + '/PM_ProjectBill/GetHProjectHNumber', - type: "GET", - async: false, - data: { "HDeptID": $("#HDeptID").val(), "HDate": $("#HDate").val(), "HTaskClassID": $("#HTaskClassID").val(), "HTaskClassEntryID": $("#HTaskClassEntryID").val(), "HType":HType }, - success: function (data1) { - if (data1.count == 1) { - var data = data1.data[0]; - $("#HProNumber").val(data.HBillNo) + if (HBillSubType == "浠诲姟绫�") { + var sql = "exec h_p_Xt_GetMaxBillNo_SubType '4750','" + $("#HDate").val() + "','" + $("#HTaskClassID").val() + "','" + $("#HTaskClassEntryID").val() + "','" + $("#HDeptID").val() + "'," + HType; + $.ajax({ + url: GetWEBURL() + '/CommonModel/searchMethod', + type: "GET", + async: false, + data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, + success: function (data1) { + if (data1.count == 1) { + $("#HProNumber").val(data1.data[0]["HBillNo"]); + } else { + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); } - }, error: function () { - layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); - } - }); + }); + } else if (HBillSubType == "宸ョ▼绫�") { + var sql = "exec h_p_Xt_GetMaxBillNo_SubType '4750','" + $("#HDate").val() + "','" + $("#HProjectClassID").val() + "','" + 0 + "','" + $("#HDeptID").val() + "'," + HType; + $.ajax({ + url: GetWEBURL() + '/CommonModel/searchMethod', + type: "GET", + async: false, + data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" }, + success: function (data1) { + if (data1.count == 1) { + $("#HProNumber").val(data1.data[0]["HBillNo"]); + } else { + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + + + + } //#endRegion @@ -4226,6 +4356,8 @@ function GetHPMValue(obj) { $("#HPMEmpID").val(obj[0].HItemID);//瀹㈡埛id $("#HPMEmpName").val(obj[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О + $("#HProPMEmpID").val(obj[0].HItemID);//瀹㈡埛id + $("#HProPMEmpName").val(obj[0].鑱屽憳鍚嶇О);//瀹㈡埛鍚嶇О } //椤圭洰绫诲埆 function GetProjectClassValue(obj) { @@ -4256,6 +4388,7 @@ //宸ヤ綔浜哄憳 function GetHEmpListValue(obj) { $("#HTaskWorkEmp").val(obj.鑱屽憳鍚嶇О); + $("#HWorkTask").val(obj.鑱屽憳鍚嶇О); } //鍙楃悊浜� diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" index c9f8596..16dc342 100644 --- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" +++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" @@ -618,7 +618,7 @@ //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠� getCzyglByUser(); - if (HBillSubType = "浠诲姟绫�") { + if (HBillSubType == "浠诲姟绫�") { getCzyglByUser2(); } //鐢熸垚鍗曟嵁鍙峰拰鍐呯爜 @@ -1516,7 +1516,7 @@ //$("#HBillNo").val(HBillNo); $("#HBillNo").val(d.data[0].HBillNo); $("#HInterID").val(d.data[0].HInterID); - if (HBillSubType = "浠诲姟绫�") { + if (HBillSubType == "浠诲姟绫�") { get_MAXNum_Task(0); } } @@ -1683,6 +1683,11 @@ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� } , btn2: function (index, layero) { } + , end:function(index, layero) { + if (HBillSubType == "浠诲姟绫�") { + get_MAXNum_Task(0); + } + } }) } //#endregion -- Gitblit v1.9.1