| 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/生产管理/日计划报表/ReportPODemandPlanBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj
@@ -326,7 +326,6 @@ <Content Include="views\WMSæ«ç 模å\客æ·æ¡ç æ«æ\Gy_getCusBarCodeBillList_BarCodeList_Batch.html" /> <Content Include="views\WMSæ«ç 模å\客æ·æ¡ç æ«æ\Gy_getCusBarCodeBill_PDA.html" /> <Content Include="views\WMSæ«ç 模å\客æ·æ¡ç æ«æ\Gy_getCusBarCodeBillList_PDA.html" /> <Content Include="views\WMSæ«ç 模å\å°è½¦éå®\Kf_TrolleyPositionBill_PDA.html" /> <Content Include="views\WMSæ«ç 模å\åºåæ¥è¯¢\KF_ICInventoryByWorkShop_PDA.html" /> <Content Include="views\WMSæ«ç 模å\åºåæ¥è¯¢\KF_ICInventoryByCLD_PDA.html" /> <Content Include="views\WMSæ«ç 模å\æ«ç éªè¯\Gy_BarCodeConfirmBill_PDA.html" /> @@ -650,7 +649,6 @@ <Content Include="views\ç产管ç\å®å·¥æ产\JIT_LockRequestBillList.html" /> <Content Include="views\ç产管ç\å®å·¥æ产\ReportPODemandPlanBillList.html" /> <Content Include="views\ç产管ç\å®å·¥æ产\ReportPODemandPlanBillList_S.html" /> <Content Include="views\ç产管ç\客æ·æ ç¾\Sc_CustomerTagBarCodeList.html" /> <Content Include="views\ç产管ç\客æ·æ ç¾\Sc_CustomerTagInfoExcel.html" /> <Content Include="views\ç产管ç\客æ·æ ç¾\Sc_CustomerTagInfoEdit.html" /> <Content Include="views\ç产管ç\客æ·æ ç¾\Sc_CustomerTagInfoList.html" /> WebTM/WebTM.csproj.user
@@ -2,8 +2,8 @@ <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> <ProjectView>ShowAllFiles</ProjectView> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,7 +3,7 @@ //var WEBURL = "http://192.168.16.80:8011/"; //åå ¬å®¤æå¡å¨ //var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°*/ //var WEBURL = "http://61.164.86.218:8099/ABAPI/"; /*var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°é ç½®*/ //var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® @@ -31,7 +31,8 @@ //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://36.134.2.30:200/WEBS-API/"; //éå¸ //var WEBURL = "http://localhost:81/API"; return WEBURL }
@@ -98,11 +98,11 @@ <option value=">=">>=</option> <option value=">">></option> <option value="<="> <=< /option> <= </option> <option value="<"> << /option> < </option> <option value="<>"> <> <> </option> <option value="7">å å«</option> <option value="8">å·¦å å«</option> @@ -132,11 +132,11 @@ <option value=">=">>=</option> <option value=">">></option> <option value="<="> <=< /option> <= </option> <option value="<"> << /option> < </option> <option value="<>"> <> <> </option> <option value="7">å å«</option> <option value="8">å·¦å å«</option> @@ -166,11 +166,11 @@ <option value=">=">>=</option> <option value=">">></option> <option value="<="> <= </option> <= </option> <option value="<"> << /option> < </option> <option value="<>"> <> <> </option> <option value="7">å å«</option> <option value="8">å·¦å å«</option> @@ -736,13 +736,15 @@ //#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³ function set_ClearQuery() { debugger $("#HBillNo").val(""); $('#HStatus').find("option[value='-1']").attr("selected", true); $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd")); $("#ColContent").val(""); $("#ColName").val("0"); $("#Comparator").val("0"); $("#ColContent2").val(""); $("#Comparator").val("0"); $("#ColContent2").val(""); $("#ColName2").val("0"); $("#Comparator2").val("0"); $("#ColContent1").val(""); WebTM/views/²Ö´æ¹ÜÀí/×°Ïäµ¥/Sc_PackUnionBillMain_Packing.html
@@ -96,11 +96,11 @@ <option value=">=">>=</option> <option value=">">></option> <option value="<="> <=< /option> <= </option> <option value="<"> << /option> < </option> <option value="<>"> <> <> </option> <option value="7">å å«</option> <option value="8">å·¦å å«</option> @@ -130,11 +130,11 @@ <option value=">=">>=</option> <option value=">">></option> <option value="<="> <=< /option> <= </option> <option value="<"> << /option> < </option> <option value="<>"> <> <> </option> <option value="7">å å«</option> <option value="8">å·¦å å«</option> @@ -164,11 +164,11 @@ <option value=">=">>=</option> <option value=">">></option> <option value="<="> <= </option> <= </option> <option value="<"> << /option> < </option> <option value="<>"> <> <> </option> <option value="7">å å«</option> <option value="8">å·¦å å«</option> @@ -735,12 +735,13 @@ function set_ClearQuery() { $("#HBillNo").val(""); $('#HStatus').find("option[value='-1']").attr("selected", true); $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd")); $("#HOrgID").val(sessionStorage["OrganizationID"]); $("#ColContent").val(""); $("#ColName").val("0"); $("#Comparator").val("0"); $("#ColContent2").val(""); $("#Comparator").val("0"); $("#ColContent2").val(""); $("#ColName2").val("0"); $("#Comparator2").val("0"); $("#ColContent1").val(""); WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList.html
@@ -259,7 +259,7 @@ } columns.push({ field: 'ææ计åå计', title: 'ææ计åå计', filter: true }); field: 'PLANSUM', title: 'ææ计åå计', filter: true }); option = { elem: '#mainTable' @@ -322,7 +322,7 @@ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, success: function (result) { if (result.count == 1) { option.data = addTotalField(result.data); option.data = result.data; //å设置 DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option); ins = table.render(option); WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillList.html
@@ -22,6 +22,7 @@ <script src="../../../layuiadmin/soulTable.slim.js"></script> <script src="../../../layuiadmin/PageTitle.js"></script> <script src="../../../layuiadmin/SetColumn.js"></script> <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> </head> <body> <div class="layui-fluid"> @@ -34,6 +35,25 @@ <div class="layui-colla-title layui-inline"> <div class="layui-inline"> <span>æ´å¤</span> </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">å¼å§æ¥æ</label> <div class="layui-input-block"> <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ç»ææ¥æ</label> <div class="layui-input-block"> <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;"> </div> </div> <div class="layui-inline"> @@ -54,14 +74,7 @@ <input type="text" class="layui-input ForFilteringSchemes" name="HProName" id="HProName"> </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: 185px;"> <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes"> <!--å¨æ渲æç»ç»--> </select> </div> </div> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> @@ -80,6 +93,14 @@ </div> </div> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnResCnz" style="padding:0 5px">éæ°åæ¥</button> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">ç»ç»</label> <div class="layui-input-block" style="margin-left: 120px; width: 185px;"> <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes"> <!--å¨æ渲æç»ç»--> </select> </div> </div> <div class="layui-row" style="margin-top:5px"> <div class="layui-inline"> <label class="layui-form-label">è¿æ»¤</label> @@ -391,6 +412,25 @@ } }); //æ¥æé´éä¸æå表çå¬ form.on('select(HInitTimeCycle)', function (data) { var HInitTimeCycle = $("#HInitTimeCycle").val() * 1; //è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ© if (HInitTimeCycle != -1) { $('#HBeginDate').prop('disabled', true); $('#HEndDate').prop('disabled', true); $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //æ§è¡æ¥è¯¢æ¹æ³ get_FastQuery(); } else { $('#HBeginDate').prop('disabled', false); $('#HEndDate').prop('disabled', false); } }); //éæ°åæ¥æé® form.on('submit(btnResCnz)', function (data) { var HBillno2 = $('#HBillno2').val(); @@ -439,6 +479,14 @@ //#region åå§åçé¢ function set_ClearBill() { //åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ setSelect_HInitTimeCycle(); //è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ© var HInitTimeCycle = $("#HInitTimeCycle").val() * 1; //æ ¹æ®æ¥æé´é设置å¼å§æ¶é´ä¸ç»ææ¶é´ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //åå§åè¡¨æ ¼ set_InitGrid(); //åå§åç»ç» @@ -660,6 +708,8 @@ //#region å¿«éè¿æ»¤ function get_FastQuery(number) { var HOrgID = ""; var HDate = $("#HBeginDate").val();//å¼å§æ¥æ var HDate1 = $("#HEndDate").val();//ç»ææ¥æ var HBillNo = $("#HBillNo").val(); //åæ®å· var HProNumber = $("#HProNumber").val();//项ç®ä»£ç var HProName = $("#HProName").val();//项ç®å称 @@ -761,6 +811,12 @@ } if (HOrgID) { sWhere += " and HOrgID = '" + HOrgID + "'"; } if (HDate) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'"; } if (HDate1) { sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'"; } if (number == 2) { if (HOrgID==null) { @@ -1362,6 +1418,24 @@ } //#endregion //#region åå§æ¥æé´é ä¸æå表 function setSelect_HInitTimeCycle() { var valueList = [0, 6, 29, 90]; var titleList = ["ä»å¤©", "è¿ä¸å¤©", "è¿30天", "è¿ä¸ä¸ªæ"]; 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("90"); } //#endregion //#region ãè¿æ»¤æ¹æ¡ã //è·åå½åç¨æ·çé»è®¤è¿æ»¤æ¹æ¡
