| WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/领料发货/领料出库/Kf_MateOutRequestBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj.user
@@ -16,9 +16,8 @@ <VisualStudio> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <WebProjectProperties> <StartPageUrl> </StartPageUrl> <StartAction>CurrentPage</StartAction> <StartPageUrl>views/user/login.html</StartPageUrl> <StartAction>SpecificPage</StartAction> <AspNetDebugging>True</AspNetDebugging> <SilverlightDebugging>False</SilverlightDebugging> <NativeDebugging>False</NativeDebugging> WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@ //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:81/API/"; //ç彬æ¬å°é ç½® /*var WEBURL = "http://localhost:8083/API/"; //éé¯éæ¬å°é ç½®*/ var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½®*/ //var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½®*/ // var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°é ç½® //var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°é ç½®(å®ç) //var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMain.html
@@ -177,11 +177,35 @@ </div> <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="HMouldNumber" name="HMouldNumber" id="HMouldNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> <input type="hidden" name="HMouldID" id="HMouldID" lay-verify="HMouldID" value="0"> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMould" id="btnSearchHMould" 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: 75px;">æ¨¡å ·å称</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HMouldName" lay-verify="HMouldName" id="HMouldName" style="background-color:#efefef4d;" readonly> </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" name="HMouldModel" lay-verify="HMouldModel" id="HMouldModel" style="background-color:#efefef4d;" readonly> </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" name="HRemark" id="HRemark" lay-verify="HRemark" style=" width: 500px;"> </div> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> @@ -459,6 +483,12 @@ //#region éæ©å·¥åºæé® form.on('submit(btnSearchHProc)', function () { get_checkSearchHProc(); }); //#endregion //#region éæ©æ¨¡å ·æé® form.on('submit(btnSearchHMould)', function () { get_checkSearchHMould(); }); //#endregion @@ -847,6 +877,34 @@ } //#endregion //#region æ¨¡å ·éæ©é¡µé¢ function get_checkSearchHMould() { layer.open({ type: 2//å¼¹çªç±»å , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡ , area: ['90%', '90%']//å¤§å° , title: 'å·¥åºè¡¨'//æ é¢ , shift: 2//å¼¹åºå¨ç» , content: ['../../æ¨¡æ²»å ·ç®¡ç/æ¨¡æ²»å ·ç®¡ç/Gy_MouldFileList.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('请éæ©æ°æ®'); } //è·åæ°æ® $("#HMouldID").val(checkStatus.data[0].hmainid); $("#HMouldNumber").val(checkStatus.data[0].æ¨¡å ·ç¼å·); $("#HMouldName").val(checkStatus.data[0].æ¨¡å ·å称); $("#HMouldModel").val(checkStatus.data[0].æ¨¡å ·åå·); layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæ个å±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç } , btn2: function (index, layero) { } }) } //#endregion //#region å表ï¼å¿«æ·é®(F7)æå¼å¼¹çª function set_GridCellCheck(obj) { $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) { @@ -1115,6 +1173,10 @@ , "HEquipNumber": tableMain[0]["设å¤ä»£ç "] , "HEquipName": tableMain[0]["设å¤å称"] , "HEquipModel": tableMain[0]["设å¤åå·"] , "HMouldID": tableMain[0]["HMouldID"] , "HMouldNumber": tableMain[0]["æ¨¡å ·ä»£ç "] , "HMouldName": tableMain[0]["æ¨¡å ·å称"] , "HMouldModel": tableMain[0]["æ¨¡å ·åå·"] , "HDeptID": tableMain[0]["HDeptID"] , "HDeptName": tableMain[0]["é¨é¨"] , "HWorkCenterID": tableMain[0]["HWorkCenterID"] WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html
@@ -208,7 +208,7 @@ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i> </button> </div> </div> </div> </div> <div class="layui-row"> <div class="layui-inline"> @@ -403,15 +403,23 @@ //åå§åæ¥æãå建人ãå建æ¶é´ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); $("#HMaker").val(HMaker); $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); //å·¥åºæµè½¬å¡é¡µé¢ä¸æ¨ set_ProcessBill(HInterID, HEntry); $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); } else if (OperationType == 2) { //ç¼è¾ $("#HInterID").val(HInterID);//ä¿®æ¹æ¶ä¸»è¡¨ID //ç¼è¾ç¶ææ¶ï¼æ ¹æ®å ç ï¼è·åä¿¡æ¯å¹¶åå ¥çé¢ RoadBillMain(HInterID); } else if (OperationType == 4) { //ä¸æ¨ //è·åæ大åæ®å· get_MAXNum(); //åå§åæ¥æãå建人ãå建æ¶é´ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); $("#HMaker").val(HMaker); $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); //å·¥åºæµè½¬å¡é¡µé¢ä¸æ¨ set_ProcessBill(HInterID, HEntry); } else { layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 }); } @@ -1360,7 +1368,7 @@ "HTechParamUnitID": result.data[i]["HTechParamUnitID"], "HTechParamUnitNumber": result.data[i]["å·¥èºåæ°åä½ä»£ç "], "HTechParamUnitName": result.data[i]["å·¥èºåæ°åä½å称"], "HVaule": result.data[i]["æ åå¼"], "HVaule": "", "HStd": result.data[i]["æ åå¼"], "HMax": result.data[i]["ä¸éå¼"], "HMin": result.data[i]["ä¸éå¼"], WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -2883,7 +2883,7 @@ , shade: 0.6 , maxmin: false , anim: 0 , content: ['../../设å¤ç®¡ç/设å¤å·¥èºåæ°è®¢åç¹æ£è¡¨/SB_EquipICMOTechParamBillEdit.html?OperationType=1&linterid=' + linterid + '&HEntryID=' + HEntryID + '', 'yes'] , content: ['../../设å¤ç®¡ç/设å¤å·¥èºåæ°è®¢åç¹æ£è¡¨/SB_EquipICMOTechParamBillEdit.html?OperationType=4&linterid=' + linterid + '&HEntryID=' + HEntryID + '', 'yes'] , resize: false , cancel: function () { btnIs(); WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutRequestBillList.html
@@ -61,6 +61,15 @@ <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">éç½®</button> <div class="layui-inline"> <label class="layui-form-label">åæ®å·</label> <div class="layui-input-block"> <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;"> </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" style="margin-left:5px;"> <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div> @@ -287,6 +296,44 @@ }; }); //#region éæ°åæ¥æé® form.on('submit(btnResCnz)', function (data) { set_ResCnz(); }); //éæ°åæ¥æé® function set_ResCnz() { var HBillno2 = $('#HBillno2').val(); if (HBillno2 == "") { layer.msg('请è¾å ¥éè¦åæ¥çåæ®å·ï¼'); return; } $.ajax({ url: GetWEBURL() + '/Kf_MateOutRequestBillController/GetKf_MateOutRequestBill_Sync_Json', type: "GET", data: { "HBillNo": HBillno2, "HBillType": 1214 }, success: function (result) { if (result.count == 1) { layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // å¾å°frameç´¢å¼ var index = layer.getFrameIndex(window.name); //å ³éå½åframe layer.close(index); //ä¿®æ¹ä¸ºååå·æ°çé¢ window.location.reload(); }); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function () { layer.close(wait); layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 }); } }); } //#endregion //éç½®æé® form.on('submit(btnReSearch)', function (data) { set_ClearQuery();
