| WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/仓存管理/组托单/Sc_PackUnionBillMain_Setto.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/仓存管理/装箱单/Sc_PackUnionBillMain_Packing.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/项目管理/报表分析/PM_WorkTaskReportMonthSumReport.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj
@@ -421,6 +421,8 @@ <Content Include="views\人äºç®¡ç\èåå¼å¨å\HR_EmpChangeBillList.html" /> <Content Include="views\ä»å管ç\æ¡ç æ¥è¡¨\Kf_ICInvBalList.html" /> <Content Include="views\ä»å管ç\çäº§å ¥åºå\Kf_ProductInBillList.html" /> <Content Include="views\ä»å管ç\ç»æå\Sc_PackUnionBillMain_Setto.html" /> <Content Include="views\ä»å管ç\è£ ç®±å\Sc_PackUnionBillMain_Packing.html" /> <Content Include="views\å ¬å ±é¡µé¢\Kf_ChaoBaoEditDlg.html" /> <Content Include="views\å ¬å ±é¡µé¢\Kf_SourceBillEditDlg_PDA.html" /> <Content Include="views\å质管ç\客è¯å¤ç\QC_CustomerAppealReport_BadClass.html" /> WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@ <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ShowAllFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@ /*var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°é ç½®*/ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® //var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® @@ -31,7 +31,7 @@ //var WEBURL = "http://192.168.60.12/API"; //ä¸æ§ //var WEBURL = "http://192.168.6.5:8082/API/"; //èæ /*var WEBURL = "http://121.36.199.126:8181/API/"; //ä¸å*/ /* var WEBURL = "http://localhost:81/API";*/ var WEBURL = "http://localhost:81/API"; return WEBURL }
New file @@ -0,0 +1,10 @@ <!DOCTYPE html> <html> <head> <meta charset="utf-8" /> <title></title> </head> <body> </body> </html> WebTM/views/²Ö´æ¹ÜÀí/×°Ïäµ¥/Sc_PackUnionBillMain_Packing.html
New file @@ -0,0 +1,10 @@ <!DOCTYPE html> <html> <head> <meta charset="utf-8" /> <title></title> </head> <body> </body> </html> WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillList.html
@@ -1560,7 +1560,7 @@ if (openType == 2) { sWhere += " and HBillStatus=2 "; $("#HOrgID").val(HOrgID); form.render("select"); form.render("select");zz return true; } return false; WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskReportBillList.html
@@ -21,6 +21,7 @@ <script src="../../../layuiadmin/PubCustom.js"></script> <script src="../../../layuiadmin/soulTable.slim.js"></script> <script src="../../../layuiadmin/PageTitle.js"></script> <script src="../../../layuiadmin/common.js"></script> </head> @@ -410,11 +411,6 @@ //åå§åç»ç» Organ(); //æ¥è¯¢ if (addSWhereByOpenType()) { //addSWhereByOpenType()æ¹æ³å¤ææ¯å¦å ¶å®é¡µé¢æå¼æ¬é¡µé¢ï¼è¥æ¯åå¤çè¿æ»¤æ¡ä»¶ï¼å¹¶è¿åtrue get_FastQuery(2); } else { get_FastQuery(1); } //æ¥è¯¢å½åç»å½ç¨æ·æ没æå¨å½å模å设置é»è®¤è¿æ»¤æ¹æ¡ get_DefaultModule(); } @@ -620,11 +616,14 @@ //#region å¿«éè¿æ»¤ function get_FastQuery(number) { ////è·åç»å½è´¦æ·å¯¹åºèåå称 let openType = addSWhereByOpenType() var HUserName = getHEmpByHUserName(); if (HUserName != "" && HUserName != null) { sWhere = " and æ±æ¥äºº = N'" + HUserName + "' OR æ¥æ¶äºº = N'" + HUserName + "' OR æé人 like N'%" sWhere += " and æ±æ¥äºº = N'" + HUserName + "' OR æ¥æ¶äºº = N'" + HUserName + "' OR æé人 like N'%" + HUserName + "%'"; } var HOrgID = ""; var HBillNo = $("#HBillNo").val(); //åæ®å· @@ -707,7 +706,7 @@ } sWhere += " and " + ColName2 + " " + com2; } if (number == 1) { if (openType == false) { HOrgID = sessionStorage["OrganizationID"]; } else { @@ -1245,6 +1244,18 @@ var params = getUrlVars(); var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å ¶å®é¡µé¢éè¿éæ©æé®æå¼ var HOrgID = params[params[1]]; var Employee = params[params[2]]; // èå var DateInfo = params[params[3]]; // æ¥æä¿¡æ¯ if (isEmpty(Employee) === false && isEmpty(DateInfo) === false) { let EmployeeDecode = decodeURIComponent(Employee) debugger $('#HReportEmp').val(EmployeeDecode) if (DateInfo.length == 7) { //å¹´æ sWhere += " and æ¥æ >= CAST(N'" + DateInfo + "' + '-01' AS DATE) and æ¥æ < DATEADD(MONTH, 1, CAST(N'" + DateInfo + "' + '-01' AS DATE))" } else if (DateInfo.length == 10) { //å¹´ææ¥ sWhere += " and æ¥æ >= CAST(N'" + DateInfo + "' AS DATE) and æ¥æ < DATEADD(DAY, 1, CAST(N'" + DateInfo + "' AS DATE))" } } if (openType == 2) { sWhere += " and ISNULL(å ³é人,'') = '' and ISNULL(ä½åºäºº,'') = '' "; $("#HOrgID").val(HOrgID); WebTM/views/ÏîÄ¿¹ÜÀí/±¨±í·ÖÎö/PM_WorkTaskReportMonthSumReport.html
@@ -1,5 +1,6 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>æ度æ±æ¥ç»è®¡æ¥è¡¨</title> @@ -22,6 +23,7 @@ } </style> </head> <body> <div class="layui-fluid"> <div class="layui-col-md12"> @@ -39,7 +41,8 @@ <div class="layui-inline"> <label class="layui-form-label">èå</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;"> <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;"> </div> </div> <div class="layui-inline"> @@ -50,7 +53,8 @@ </select> </div> </div> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button> </div> </div> <table class="" id="mainTable" lay-filter="mainTable"></table> @@ -69,6 +73,8 @@ </div> </div> </div> </script> <script> //#region æå 注é //#endregion @@ -76,9 +82,9 @@ base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾ }).extend({ index: 'lib/index', //ä¸»å ¥å£æ¨¡å }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () { //#region å ¬å ±åé }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { //#region å ¬å ±åé var $ = layui.$ , admin = layui.admin , layer = layui.layer @@ -87,6 +93,7 @@ , element = layui.element , laypage = layui.laypage , laydate = layui.laydate , util = layui.util var sDate = Format(new Date(), "yyyy-MM-dd") var sWhere = ""; var option = []; @@ -94,9 +101,9 @@ var columns = ""; var HModName = "PM_ProjectWorkDaysSumReport"; var titleData = []; //ä¸éè¦æ¾ç¤ºçå段 //#endregion //#endregion //#region è¿å ¥é¡µé¢å³å è½½ //#region è¿å ¥é¡µé¢å³å è½½ //åå§åçé¢ set_ClearBill(); @@ -106,7 +113,7 @@ //è·åç»ç» Organ(); //åå§å表åæ¶é´ set_InitDate(); set_InitDate(); //åå§åè¡¨æ ¼ set_InitGrid(); //æ¥è¯¢ @@ -129,7 +136,7 @@ }); } //éæ©æ份å³éä¸å ³é 年份æå¯ä»¥å·¦å³ç¹å»éæ© ,change: function (value, date, endDate) { //çå¬æ¥æ被åæ¢ , change: function (value, date, endDate) { //çå¬æ¥æ被åæ¢ lay('#HDate').val(value); sDate = Format($("#HDate").val() + "-01", "yyyy-MM-dd"); $('.laydate-month-list').on('click', 'li', function () {//å©ç¨çäºä»¶å§æ @@ -285,9 +292,9 @@ } //#endregion //#endregion //#endregion //#region æ¬é¡µé¢ææ被è°ç¨çæ¹æ³ //#region æ¬é¡µé¢ææ被è°ç¨çæ¹æ³ //#region å·¥å ·æ äºä»¶ table.on('toolbar(mainTable)', function (obj) { @@ -314,11 +321,45 @@ }); //#endregion //#region åå æ ¼åå»äºä»¶ table.on('tool(mainTable)', function (obj) { let index = obj.index let $elem = $(this) // è·åç¹å»çå ç´ if (obj.event === "workTimeClickHandler") { debugger let dateInfo = $elem.data('value') get_WorkTaskList(obj.data['èå'], dateInfo) } }) //#endregion //#region 导åºExecel function get_Export() { table.exportFile(ins.config.id, option.data, "xls"); } //#endregion function get_WorkTaskList(Employee, DateInfo) { let EmployeeEncode = encodeURIComponent(Employee) layer.open({ type: 2 , skin: "layui-layer-rim" //å ä¸è¾¹æ¡ , title: "å·¥ä½ä»»å¡" //æ é¢ , closeBtn: 1 //çªä½å³ä¸è§å ³é ç æ ·å¼ , shift: 2 //å¼¹åºå¨ç» , area: ["90%", "90%"] //çªä½å¤§å° , maxmin: true //设置æ大æå°æé®æ¯å¦æ¾ç¤º , content: ['../../项ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskReportBillList.html?openType=&HOrgID=' + sessionStorage["OrganizationID"] + '&Employee=' + EmployeeEncode + '&DateInfo=' + DateInfo, "yes"] , btn: ["ç¡®å®", "åæ¶"] , btn1: function (index, laero) { //å·æ°è¡¨æ ¼æ°æ® get_Display(); //æ´æ°è¡¨æ ¼ç¼åçæ°æ® layer.close(index);//å ³éå¼¹çª } }) } //#region æ¥è¯¢ function get_Display() { @@ -326,7 +367,6 @@ var HEmpName = $("#HEmpName").val(); //èå sWhere = "'" + HDate + "','" + HEmpName + "'"; var ajaxLoad = layer.load(); $.ajax({ type: "GET", @@ -358,8 +398,38 @@ switch (data[i].Type) { //int case 'DateTime': col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div'>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 }); break; //æ¯æ¥å·¥ä½æ¶é¿ case 'Decimal': let date = util.toDateString(HDate, "yyyy-MM") let prefix = data[i].name.split("_").reverse()[1] console.log(typeof prefix) if (typeof prefix == "undefined") { } else if (prefix.length < 2) { prefix = '-0' + prefix } else { prefix = '-' + prefix } prefix = prefix || '' col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: ((d) => { let node = document.createElement("div") let node_sub = document.createElement("div") node_sub.setAttribute("data-value", date + prefix) node_sub.setAttribute("lay-event", "workTimeClickHandler") node_sub.style.color = "blue"; node_sub.innerHTML = "{{= d['" + data[i].name + "']==0? '0' : d['" + data[i].name + "'] }}" node.appendChild(node_sub) return node.outerHTML })() , width: 200 }); break default: if (data[i].name == 'æ¬æå计') { col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true }); @@ -533,8 +603,7 @@ } //#endregion //#endregion //#endregion }); @@ -544,4 +613,5 @@ </script> </body> </html> </html>
