| WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@ <PropertyGroup> <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\å端代ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,18 +5,13 @@ //var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® /* var WEBURL = "http://localhost:8082/API/"; */ //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost/API/"; //æ½æµæ¸¸æ¬å°é ç½® */ //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® /*var WEBURL = "http://localhost/API/";*/ //æ½æµæ¸¸æ¬å°é ç½® /*var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½®*/ //var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® /* var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½®*/ //var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //ä½ææ°æ¬å°é ç½® /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°é ç½®*/ //var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°é ç½®(å®ç) //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost/API/"; //æ½æµæ¸¸æ¬å°é ç½® //var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //å¥¥é¦ //var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainPlanBillList.html
@@ -81,6 +81,7 @@ <label class="layui-form-label">å¨æåä½</label> <div class="layui-input-inline"> <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit"> <option value="次">次</option> <option value="天">天</option> <option value="æ">æ</option> <option value="å¹´">å¹´</option> @@ -94,6 +95,24 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label">ä¿å »é¢è¦æ¬¡æ°</label> <div class="layui-input-inline"> <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">产åå¨å ·<label style="color:red"> * </label></label> <div class="layui-input-inline"> <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;"> <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> </div> </div> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">计åå¼å§æ¥æ<label style="color:red"> * </label></label> <div class="layui-input-inline"> <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd"> @@ -105,35 +124,9 @@ <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd"> </div> </div> </div> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">æè¦</label> <div class="layui-input-inline"> <textarea placeholder="请è¾å ¥æè¦" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea> </div> </div> <div class="layui-inline" style="margin-left:340px;"> <label class="layui-form-label">å¤æ³¨</label> <div class="layui-input-inline"> <textarea placeholder="请è¾å ¥å¤æ³¨" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea> </div> </div> </div> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">产åå¨å ·<label style="color:red"> * </label></label> <div class="layui-input-inline"> <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;"> <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;"> <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> </div> <div class="layui-inline"> <label class="layui-form-label">é¨é¨</label> <div class="layui-input-inline" > <div class="layui-input-inline"> <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;float:left;width:150px;" readonly> <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0"> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="width: 40px;"> @@ -148,6 +141,20 @@ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID"> <!--å¨æ渲æç»ç»--> </select> </div> </div> </div> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label">æè¦</label> <div class="layui-input-inline"> <textarea placeholder="请è¾å ¥æè¦" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea> </div> </div> <div class="layui-inline" style="margin-left:340px;"> <label class="layui-form-label">å¤æ³¨</label> <div class="layui-input-inline"> <textarea placeholder="请è¾å ¥å¤æ³¨" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea> </div> </div> </div> @@ -358,6 +365,7 @@ $("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID); $("#HCycleUnit").val(checkStatus.data[0].å¨æåä½); $("#HCheckCycle").val(checkStatus.data[0].ä¿å »å¨æ); $("#HErrWarQtys").val(checkStatus.data[0].ä¿å »é¢è¦æ¬¡æ°); form.render('select'); get_DocCheckItem2(checkStatus.data[0].hmainid); @@ -637,6 +645,10 @@ , { field: 'HErrBeginTime', title: 'é¢è¦å¼å§æ¶é´ç¹' } , { field: 'HRelationFlag', title: 'å ³èæ è®°' } , { field: 'DiffDate', title: 'ç¸å·®é´é' } , { field: 'HSendFlag', title: 'åéæ è®°' } , { field: 'HErrBeginQty', title: 'é¢è¦å¼å§æ¬¡æ°' } , { field: 'HUseNowQty', title: 'å½å使ç¨æ¬¡æ°' } , { field: 'HUseEndQty', title: 'ç»æ使ç¨æ¬¡æ°' } ]; option_plan = { id: 'mainTable_plan' @@ -675,7 +687,7 @@ table.render(option1); set_EditGrid_Plan(linterid); //ç¼è¾è·å表ä½--ç¹æ£è®¡å option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "æªç¹æ£", "DiffDate": 0 }]; option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "æªç¹æ£", "DiffDate": 0, "HSendFlag": "0", "HErrBeginQty": "", "HUseNowQty": "", "HUseEndQty": "" }]; table.render(option_plan); } @@ -754,6 +766,7 @@ , "HUSEORGID": data.HUSEORGID , "HDeptID": data.HDeptID , "HDeptName": data.é¨é¨å称 , "HErrWarQtys": data.ä¿å »é¢è¦æ¬¡æ° }); if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) { $("#HUSEORGID").val(sessionStorage["OrganizationID"]) @@ -821,7 +834,7 @@ rowdata.push( { "HPlanDate": Pub_Format(data[i].计åæ¥æ, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].计åå¼å§æ¶é´ç¹, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].计åç»ææ¶é´ç¹, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].å®å ¨ç»ææ¶é´ç¹, "yyyy-MM-dd hh:mm:ss") ,"HErrBeginTime": Pub_Format(data[i].é¢è¦å¼å§æ¶é´ç¹, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].å ³èæ è®°, "DiffDate": data[i].ç¸å·®é´é , "HErrBeginTime": Pub_Format(data[i].é¢è¦å¼å§æ¶é´ç¹, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].å ³èæ è®°, "DiffDate": data[i].ç¸å·®é´é, "HSendFlag": data[i].ä¿¡æ¯æ è®°, "HErrBeginQty": data[i].é¢è¦å¼å§æ¬¡æ°, "HUseNowQty": data[i].å½å使ç¨æ¬¡æ°, "HUseEndQty": data[i].ç»æ使ç¨æ¬¡æ° } ) } WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainRuleBillEdit.html
@@ -78,6 +78,7 @@ <label class="layui-form-label">å¨æåä½<label style="color:red"> * </label></label> <div class="layui-input-inline"> <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit"> <option value="次">次</option> <option value="天">天</option> <option value="æ">æ</option> <option value="å¹´">å¹´</option> @@ -108,6 +109,12 @@ <label class="layui-form-label">ä¿å »é¢è¦å¤©æ°</label> <div class="layui-input-inline"> <input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="0"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ä¿å »é¢è¦æ¬¡æ°</label> <div class="layui-input-inline"> <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0"> </div> </div> </div> @@ -546,6 +553,7 @@ , "HUseQtys": data.ä¿å »å²åºæ° , "HSafeDays": data.ä¿å »å®å ¨å¤©æ° , "HErrWarDays": data.ä¿å »é¢è¦å¤©æ° , "HErrWarQtys": data.ä¿å »é¢è¦æ¬¡æ° }); } else { WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html
@@ -344,6 +344,16 @@ <input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">车é´:</label> <div class="layui-input-inline"> <input type="text" name="HCenterName" id="HCenterName" class="layui-input" value="" style="float:left;width:150px;" disabled> <input type="hidden" name="HCenterID" id="HCenterID" class="layui-input" value="0" style="float:left;width:150px;"> <button type="button" lay-submit="" class="layui-btn" lay-filter="HCenterList" id="HCenterList" style="width:40px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> </div> </div> </div> <!--å ¶ä»ä¿¡æ¯--> @@ -559,8 +569,7 @@ set_EditFromGrid(); } else if (OperationType == 4) { set_AddFNew(); $("#HSendMan").val(sessionStorage["HUserName"]); //åé人 set_AddFNew(); var EquipNumber = "";//设å¤ä»£ç var HSourceName1 = "";//ç产èµæºå称 var HTypes = "";//å¼å¸¸ç±»å @@ -760,6 +769,9 @@ $("#HMaker").val(sessionStorage["HUserName"]); //å¶å人 $("#HDeptID").val(sessionStorage["HDeptID"]); //é¨é¨ID $("#HDeptName").val(sessionStorage["HDept"]); //é¨é¨ $("#HSendMan").val(sessionStorage["HUserName"]); //åé人 $("#HCenterName").val(sessionStorage["HWorkCenter"]); //å·¥ä½ä¸å¿ $("#HCenterID").val(sessionStorage["HWorkCenterID"]); //å·¥ä½ä¸å¿ } //ææºåæ°å¢ @@ -833,6 +845,8 @@ , "HSendMan": data.HSendMan , "HDeptID": data.HDeptID , "HDeptName": data.HDeptName , "HCenterID": data.HCenterID , "HCenterName": data.HCenterName , "HReceiveMan": data.HReceiveMan , "HCopyMan": data.HCopyMan , "HMainSourceInterID": data.HSourceInterID //æºåID @@ -1109,6 +1123,44 @@ }); }); //车é´(å·¥ä½ä¸å¿) form.on('submit(HCenterList)', function () { //页é¢å±-èªå®ä¹ layer.open({ type: 2, skin: 'layui-layer-rim', //å ä¸è¾¹æ¡ title: 'å·¥ä½ä¸å¿å表', closeBtn: 1, shift: 2, area: ['80%', '80%'], maxmin: true, content: ['../../åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_WorkCenter.html', 'yes'], btn: ['ç¡®å®', 'åæ¶'] , btn1: function (index, layero) { //æé®ãæé®ä¸ãçåè° var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test" if (checkStatus.data.length === 0) { return layer.msg('请éæ©æ°æ®'); } $("#HCenterName").val(checkStatus.data[0].å·¥ä½ä¸å¿å称); $("#HCenterID").val(checkStatus.data[0].HItemID); layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæ个å±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç } , btn2: function (index, layero) { //æé®ãæé®äºãçåè° //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å ³é }, end: function () { }, success: function (layero, index) { } }); }); //æ¥æ¶äºº(ä½åº) form.on('submit(HReceiveManList0)', function () { //页é¢å±-èªå®ä¹ WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMain.html
@@ -413,27 +413,27 @@ $("#HMaker").val(sessionStorage["HUserName"]); $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd")); } //else if (OperationType == 2) { // RoadBillMain(linterid); // $.ajax({ // url: GetWEBURL() + "/Web/GetMAXNum", // type: "GET", // async: false, // data: { "HBillType": '3301' }, // success: function (d) { // $("#HInterID").val(d.data[0].HInterID); // $("#HBillNo").val(d.data[0].HBillNo); // $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); // } // }); //} else if (OperationType == 2) { //åå§åè¡¨æ ¼ get_InitGrid(); RoadBillMain(linterid); $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", async: false, data: { "HBillType": '3334' }, success: function (d) { $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); } }); } else if (OperationType == 3) { //ç¦ç¨æé® var num = 1; HfBtn(num); debugger; //åå§åè¡¨æ ¼ get_InitGrid(); @@ -1313,8 +1313,8 @@ var tableSub = result.data[1]; //主表 form.val("formData", { //formTest å³ class="layui-form" æå¨å ç´ å±æ§ lay-filter="" 对åºçå¼ "HInterID": tableMain[0]["HInterID"] , "HBillNo": tableMain[0]["åæ®å·"] "HInterID": OperationType == 2 ? "" : tableMain[0]["HInterID"] , "HBillNo": OperationType == 2 ? "" : tableMain[0]["åæ®å·"] , "HDate": Format(new Date(tableMain[0]["æ¥æ"]), "yyyy-MM-dd") , "HMaterID": tableMain[0]["HMaterID"] , "HMaterNumber": tableMain[0]["ç©æ代ç "] WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMainList.html
@@ -162,7 +162,7 @@ <div class="layui-btn-container"> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</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_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button> @@ -238,6 +238,9 @@ //ç¼è¾ case 'set_ShowBill': set_ShowBill(); break; //å¤å¶ case 'set_Copy': set_Copy(); break; //å é¤ case 'set_DeleteBill': set_DeleteBill(); break; @@ -602,7 +605,7 @@ sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'"; } if (number==2) { if (HProject) { if (HProject!='0') { sWhere += " and 项ç®å· like '%" + HProject + "%'"; } } @@ -719,6 +722,29 @@ } //#endregion //å¤å¶ function set_Copy() { var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data; if (checkStatus.data.length === 1) { var linterid = data[0].HInterID.toString(); layer.open({ type: 2 , area: ['100%', '100%'] , title: '产åå·¥èºåæ°æ¸ å-ç¼è¾' , shift: 0//å¼¹åºå¨ç» , content: '../../计å管ç/å·¥èºè·¯çº¿/Gy_MaterialTechParamBillMain.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=' , end: function () { //å·æ°é¡µé¢, location.reload(); } }) } else { layer.msg('请éæ©ä¸è¡æ°æ®ç¼è¾ï¼'); } } //#region å é¤ function set_DeleteBill() { WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -830,7 +830,7 @@ sWhere += " and HOrgID = '" + HOrgID + "'"; } if (number==2) { if (HProject) { if (HProject!='0') { sWhere += " and 项ç®å· like '%" + HProject + "%'"; } } WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Gy_WorkBeginDotCheckListBill.html
@@ -931,7 +931,7 @@ "HCheckNoteItemName": tableSub[i]["æ£æ¥é¡¹ç®"], "HCheckPostID": tableSub[i]["HCheckPostID"], "HCheckPostName": tableSub[i]["确认è è§è²"], "HDotCheckType": tableSub[i]["ç¹æ£ç±»å"], "HDotCheckType": tableSub[i]["ç¹æ£ç±»å"] == null ? "设å¤" : tableSub[i]["ç¹æ£ç±»å"], "HRelationID": tableSub[i]["HRelationID"], "HRelationName": relationName, "HRemark": tableSub[i]["表ä½å¤æ³¨"]
