WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj
@@ -581,13 +581,13 @@ <Content Include="views\ç产管ç\ä¸åæäº§\JIT_DayPlanPlatFormImport_SS.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\Cg_PODemandPlanConfigBillReportForLack.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\Gy_RoutingBillReportForLack.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_NeedMaterPlanConfigBillReportForLack.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_PickUpCalculate_BaoGong.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_UnLockRequestBillList.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_UnLockRequestBill.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_LockRequestBill.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_DayPlanPlatForm.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_LockRequestBillList.html" /> <Content Include="views\ç产管ç\å®å·¥æäº§\JIT_NeedMaterPlanConfigBillReportForLack.html" /> <Content Include="views\ç产管ç\å¼å¸¸åé¦å\OA_ErrMsgBackSignBill_BrushCard.html" /> <Content Include="views\ç产管ç\å¼å¸¸åé¦å\Sc_MESExecptFeedBackBillResumeList.html" /> <Content Include="views\ç产管ç\å¼å¸¸åé¦å\Sc_MESExecptFeedBackBillType.html" /> @@ -603,7 +603,6 @@ <Content Include="views\ç产管ç\æ¥å·¥å¹³å°_PDA\è´¨éæ±æ¥\Sc_QualityReportBill_PDA.html" /> <Content Include="views\ç产管ç\æ¥å·¥å¹³å°åè½é¡µ\Gy_ButtonList.html" /> <Content Include="views\ç产管ç\æ¥å·¥å¹³å°åè½é¡µ\LineBind_Button.html" /> <Content Include="views\ç产管ç\æ¥è®¡ååºç¡èµæ\JIT_NeedMaterPlanConfigBill_Excel.html" /> <Content Include="views\ç产管ç\æ¬ æè¿ç®\JIT_MaterialLevelShorAnalysis.html" /> <Content Include="views\ç产管ç\æ¬ æè¿ç®\JIT_MaterialLevelShorAnalysisDetailReport.html" /> <Content Include="views\ç产管ç\æ¬ æè¿ç®\JIT_MaterialLevelShorAnalysisReport.html" /> @@ -622,7 +621,6 @@ <Content Include="views\ç产管ç\çäº§ç©ææ¸ å\sc_Gy_ICBomBillEdit.html" /> <Content Include="views\ç产管ç\ç产计åå¹³å°\JIT_DayPlanPlatForm_TK.html" /> <Content Include="views\ç产管ç\ç产计åå¹³å°\JIT_DayPlanPlatForm_BCP.html" /> <Content Include="views\ç产管ç\ç产计åå¹³å°\Sc_ShopCalendar_Excel.html" /> <Content Include="views\ç产管ç\订åç¶æåå¸\Sc_EquipmentProcessList.html" /> <Content Include="views\ç产管ç\订åç¶æåå¸\Sc_OEEStatusReport.html" /> <Content Include="views\ç产管ç\ç产计åå¹³å°\Sc_BulkEditWorkTime.html" /> @@ -643,7 +641,6 @@ <Content Include="views\计å管ç\å·¥èºè·¯çº¿\Gy_RoutingBillCloseList.html" /> <Content Include="views\计å管ç\å·¥èºè·¯çº¿\Gy_RoutingBillToInvalidatedList.html" /> <Content Include="views\计å管ç\å·¥èºè·¯çº¿\Gy_RoutingBillWorkQty.html" /> <Content Include="views\计å管ç\å·¥èºè·¯çº¿\Gy_RoutingBillimport_WorkQty.html" /> <Content Include="views\计å管ç\å·¥èºè·¯çº¿\Pay_ProcPriceTypeChangeReport.html" /> <Content Include="views\计å管ç\å·¥èºè·¯çº¿\Gy_MaterialTechParamBill_Excel.html" /> <Content Include="views\计å管ç\å·¥èºè·¯çº¿å¤§ç±»\Gy_RoutingGroupEdit.html" /> 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/"; //å¼ ç广æ¬å°é ç½® WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -107,7 +107,7 @@ <button class="layui-btn layuiadmin-btn-order" style="" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">éç½®</button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">éç½®</button> </div> <!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡--> <div class="layui-inline" style="margin-left:5px;"> @@ -205,6 +205,7 @@ <script type="text/html" id="toolbarDemo"> <div class="layui-btn-container" id="toolbarDemo_ButtonSet"> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导åº</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excelå¯¼å ¥</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>æ°å¢å路线</button> @@ -389,6 +390,9 @@ //导åºexcel case 'get_export': get_Export(); break; //å¯¼å ¥ case 'set_Excel': set_Excel(); break; //å设置 case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery); @@ -1637,6 +1641,22 @@ } //#endregion //å¯¼å ¥ function set_Excel() { layer.open({ type: 2 , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡ , area: ['100%', '100%'] , title: 'å·¥èºè·¯çº¿å表-å¯¼å ¥' , shift: 0//å¼¹åºå¨ç» , content: '../å·¥èºè·¯çº¿/Gy_RoutingBillimport.html' , end: function () { //å·æ°é¡µé¢, get_FastQuery(); } }) } //#region è·åå¯¼åºæ°æ® function getExportData() { var data;//导åºçæ°æ®