WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/质量管理/质量报表/QC_BadProductsReport.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@ <PropertyGroup> <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.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
@@ -8,7 +8,7 @@ //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® /*var WEBURL = "http://localhost/API/";*/ //æ½æµæ¸¸æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //å¼ ç广æ¬å°é ç½® var WEBURL = "http://localhost:81/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:8088/ARAPI/"; //ä½ææ°æ¬å°é ç½®(å®ç) WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadReason.html
@@ -38,6 +38,15 @@ <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">å·¥åºåç§°</label> <div class="layui-input-block"> <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> </button> </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> @@ -173,6 +182,7 @@ , laydate = layui.laydate //æ¥è¯¢æ¡ä»¶ var sWhere = ""; var HProcName = ""; var option = []; var HModName = "Gy_BadReason"; //ä¸éè¦æ¾ç¤ºçåæ®µ 坿©å± @@ -192,10 +202,11 @@ window.HInterID_Choose = 0; //#endregion //#region è¿å ¥é¡µé¢æ¢å è½½ //#region è¿å ¥é¡µé¢æ¢å è½½ var params = getUrlVars(); var Type = params[params[0]]; HProcName = params[params[1]] == undefined? "": params[params[1]]; HProcName = decodeURI(HProcName); //åå§åçé¢ set_ClearBill(); @@ -276,7 +287,7 @@ //åå§åè¡¨æ ¼ set_InitGrid(); //æ¥è¯¢ get_Display(sWhere); get_FastQuery(); get_DefaultModule(); } @@ -386,6 +397,7 @@ function get_FastQuery() { var HNumber = $("#HNumber").val(); var HName = $("#HName").val(); HProcName = $("#HProcName").val() == "" ? HProcName : $("#HProcName").val(); var ColName = $("#ColName").val();//å¤éæ¡ var Comparator = $("#Comparator").val() var ColContent = $("#ColContent").val(); @@ -466,6 +478,9 @@ if (HName) { sWhere += " and ä¸è¯åå åç§° like '%" + HName + "%'"; } if (HProcName) { sWhere += " and é»è®¤å·¥åº like '%" + HProcName + "%'"; } get_Display(sWhere); sWhere = "";//è°ç¨æ¥å£åæ¸ ç©ºsWhereç¼å } @@ -473,6 +488,7 @@ function set_ClearQuery() { $("#HNumber").val(""); $("#HName").val(""); $("#HProcName").val(""); $("#btnSearch").click(); $("#ColContent").val(""); $("#ColName").val("0"); @@ -610,6 +626,43 @@ } //#endregion //å·¥åº form.on('submit(btnHProc)', function () { //页é¢å±-èªå®ä¹ layer.open({ type: 2, skin: 'layui-layer-rim', //å ä¸è¾¹æ¡ title: 'å·¥åºå表', closeBtn: 1, shift: 2, area: ['90%', '90%'], maxmin: true, content: ['../../åºç¡èµæ/ç产åºç¡èµæ/Gy_Process.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('è¯·éæ©æ°æ®'); } $("#HProcName").val(checkStatus.data[0].å·¥åºåç§°); layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç } , btn2: function (index, layero) { //æé®ãæé®äºãçåè° //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å ³é }, end: function () { }, success: function (layero, index) { } }); }); //#region åå®¡æ ¸/å®¡æ ¸æ°æ® function set_CheckBill(num) { var checkStatus = table.checkStatus('mainTable') WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html
Diff too large WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html
@@ -691,6 +691,8 @@ $("#HICMOEntryID").val(data.HICMOEntryID); $("#HDeptID").val(data.HDeptID); $("#HDeptName").val(data.HDeptName); $("#HSourceID").val(data.HSourceID); $("#HSourceName").val(data.HSourceName); $("#HUnitID").val(data.HUnitID); $("#HUnitName").val(data.HUnitName); if (HSouceBillType == "3772") { WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html
@@ -700,6 +700,7 @@ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) { if (event.key == "F7") { if (obj.event == "HBadReasonNumber") { var HProcName = obj.data.HProcName; layer.open({ type: 2 , skin: "layui-layer-rim" //å ä¸è¾¹æ¡ @@ -708,7 +709,7 @@ , shift: 2 //å¼¹åºå¨ç» , area: ["90%", "90%"] //çªä½å¤§å° , maxmin: true //设置æå¤§æå°æé®æ¯å¦æ¾ç¤º , content: ['../../åºç¡èµæ/ç产åºç¡èµæ/Gy_BadReason.html', "yes"] , content: ['../../åºç¡èµæ/ç产åºç¡èµæ/Gy_BadReason.html?Type=BadReason&HProcName=' + HProcName, "yes"] , btn: ["ç¡®å®", "åæ¶"] , btn1: function (index, laero) { //æé®ä¸ çåè° WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_BadProductsReport.html
@@ -49,8 +49,37 @@ <div class="layui-input-block"> <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;"> </div> </div> </div> <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æç¼ç </label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; 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: 85px;">ç©æåç§°</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName"> </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="HBatchNo" id="HBatchNo" 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="HProjectNum" id="HProjectNum" readonly> </div> </div> </div> <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">æ¯å¦é产</label> <div class="layui-input-block" style="margin-left: 120px; width: 185px;"> @@ -81,7 +110,7 @@ <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> </div> </div> </div> <div class="layui-tab layui-tab-card"> @@ -156,6 +185,12 @@ form.on('submit(btnReSearch)', function (data) { set_ClearQuery(); }); //#region 产åç¼ç form.on('submit(btnHMaterID)', function (data) { btnHMaterID(); }); //#endregion //æ¥æé´é䏿å表çå¬ form.on('select(HInitTimeCycle)', function (data) { @@ -308,14 +343,21 @@ var HProject = $("#HProject").val();//项ç®å· var HBatchWork = $("#HBatchWork").val();//æ¯å¦é产 var HDivisionName = $("#HDivisionName").val();//äºä¸é¨ var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç var HMaterName = $("#HMaterName").val();//ç©æåç§° var HBatchNo = $("#HBatchNo").val();//æ¹æ¬¡å· var HProjectNum = $("#HProjectNum").val();//项ç®å· sWhere = { HBeginDate: HBeginDate , HEndDate: HEndDate , HProject: HProject , HBatchWork: HBatchWork , HDivisionName: HDivisionName , HMaterNumber: HMaterNumber , HMaterName: HMaterName , HBatchNo: HBatchNo , HProjectNum: HProjectNum } set_InitGrid(); get_Display(JSON.stringify(sWhere)); @@ -328,7 +370,11 @@ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ $("#HProject").val(""); $("#HBatchWork").val(""); $("#HDivisionName").val(""); $("#HDivisionName").val(""); $("#HMaterNumber").val("");//ç©æä»£ç $("#HMaterName").val("");//ç©æåç§° $("#HBatchNo").val("");//æ¹æ¬¡å· $("#HProjectNum").val("");//项ç®å· form.render('select'); sWhere = ""; @@ -384,6 +430,32 @@ } //#endregion //ç©æå表 function btnHMaterID() { layer.open({ type: 2 //ç±»å , skin: 'layui-layer-rim'//å ä¸è¾¹æ¡ , area: ['90%', '90%']//å¤§å° , title: 'ç©æå表'//æ é¢ , shift: 2//å¼¹åºå¨ç» , content: ['../../åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_Material.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('è¯·éæ©æ°æ®'); } //è·åæ°æ® $("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç ); $("#HMaterName").val(checkStatus.data[0].ç©æåç§°); layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layerå é¨å¨æéå¢è®¡ç®ç } , btn2: function (index, layero) { } }) } //éèå设置 function get_HideColumn() { WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Gy_WorkBeginDotCheckListBill.html
@@ -822,6 +822,7 @@ for (var i = 0; i < table.cache["mainTable"].length; i++) { if (table.cache["mainTable"][i] != "") { table.cache["mainTable"][i].LAY_TABLE_INDEX = i; table.cache["mainTable"][i].HRelationID == null ? 0 : table.cache["mainTable"][i].HRelationID; num.push(table.cache["mainTable"][i]) } } @@ -932,7 +933,7 @@ "HCheckPostID": tableSub[i]["HCheckPostID"], "HCheckPostName": tableSub[i]["确认è è§è²"], "HDotCheckType": tableSub[i]["ç¹æ£ç±»å"] == null ? "设å¤" : tableSub[i]["ç¹æ£ç±»å"], "HRelationID": tableSub[i]["HRelationID"], "HRelationID": tableSub[i]["HRelationID"] == null ? "0" : tableSub[i]["HRelationID"], "HRelationName": relationName, "HRemark": tableSub[i]["表ä½å¤æ³¨"] }