| WebTM/WebTM.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/layuiadmin/layui/css/ReportPlatform.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/IpadIndex.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@ <PropertyGroup> <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -228,3 +228,71 @@ float: left; top: 6px; } /* èµæºç»å®åºåç容卿 ·å¼ */ .cnt1 { border: 1px solid #5FB878; height: 60px; border-radius: 5px; position: relative; /* æ·»å ç¸å¯¹å®ä½ */ } /* æ·»å æé®ï¼+ï¼æ ·å¼ */ .imgicon0 { height: 100px; display: block; text-align: center; margin: 0.2em auto; width: 100px; cursor: pointer; /* é¼ æ åææææ ·å¼ */ } /* é对åèç»ç»çç¹æ®æ ·å¼ */ .cnt1 .imgicon0 { /* è°æ´ä½ç½®å大å°ä»¥éåº60pxé«åº¦çå®¹å¨ */ font-size: 40px; /* åå°å¾æ å¤§å° */ height: 60px; /* è°æ´é«åº¦ */ width: 60px; /* è°æ´å®½åº¦ */ line-height: 60px; /* åç´å± ä¸ */ margin: 0 auto; /* æ°´å¹³å± ä¸ */ } /* å ¶ä»ç»ç»çæ ·å¼ */ .cnt .imgicon0 { /* 150pxé«åº¦å®¹å¨çæ ·å¼ */ font-size: 60px; height: 150px; width: 150px; line-height: 150px; margin: 0 auto; } .imgicon0:hover { cursor: pointer; /*é¼ æ åææææ ·å¼*/ -webkit-transition: border linear .1s, -webkit-box-shadow linear .5s; border-color: rgba(141, 39, 142, .75); -webkit-box-shadow: 0 0 18px rgba(111, 1, 32, 3); color: #5FB878; /* æ¬åæ¶æ¹åé¢è² */ transform: scale(1.1); /* æ¬åæ¶è½»å¾®æ¾å¤§ */ transition: all 0.3s ease; /* å¹³æ»è¿æ¸¡ææ */ } /* å¯ä»¥æ·»å ä¸ä¸ªä¸é¨çå 巿鮿 ·å¼ç±» */ .add-icon-container { display: flex; align-items: center; justify-content: center; width: 100%; height: 100%; } .add-icon-container .layui-icon-addition { font-size: 40px; color: #5FB878; } .add-icon-container:hover .layui-icon-addition { color: #13ad4c; transform: rotate(90deg); /* æ¬åæ¶æè½¬ææ */ transition: all 0.3s ease; } WebTM/views/IpadIndex.html
@@ -20,6 +20,7 @@ <script src="../layuiadmin/Scripts/webConfig.js"></script> <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script> <script> var wktag = 0; var workcode = ""; //å·¥åå· @@ -89,6 +90,67 @@ { HSBName = LoadData[0].HSourceName; for (var i = 1; i <= LoadData.length + 1; i++) { if (sessionStorage["Organization"] == "宿³¢å¸åèå è£ æéå ¬å¸") { if (i <= LoadData.length) { var html1 = ''; html1 += '<div class="layui-col-sm12 layui-col-md2">'; html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">'; html1 += '<dl>'; html1 += '<dd>'; html1 += '<h1 style="display:none;"><span>èµæºIDï¼</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>'; html1 += '<h1><span>设å¤ç¼å·ï¼</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>'; html1 += '<h1><span>设å¤ä»£ç ï¼</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>'; switch (LoadData[i - 1].HStatus) { case "空é²": html1 += '<h1><span>å½åç¶æï¼</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>'; break; case "弿º": html1 += '<h1><span>å½åç¶æï¼</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>'; break; case "åæº": html1 += '<h1><span>å½åç¶æï¼</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>'; break; case "ç产": html1 += '<h1><span>å½åç¶æï¼</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>'; break; case "ç»´ä¿®è¿è¡ä¸": html1 += '<h1><span>å½åç¶æï¼</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>'; break; case "ç»´ä¿®ç»æ": html1 += '<h1><span>å½åç¶æï¼</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>'; break; case "ç»´ä¿®ç»æ¢": html1 += '<h1><span>å½åç¶æï¼</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>'; break; default: } html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>'; html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>'; html1 += '</dd>'; html1 += '</dl>'; html1 += '</div>'; html1 += '</div>'; $("#topleft").append(html1); $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete" onclick="Delete(event,this,' + i + ')"></span>'); //å¨å½ådivå追å å ä¸ä¸ªspanå é¤ //æ ¹æ®è¿åç é䏿 å¿HNowFlag设置éä¸çèµæº if (LoadData[i - 1].HNowFlag) { $('.ctop').removeClass('check'); //å é¤ä¸åç¶çº§clssæ ·å¼ç¸åçææå ç´ $("#ts" + i + "").addClass('check'); // æ·»å å½åå ç´ çæ ·å¼ Check(this, i); } } else { var html1 = ''; html1 += '<div class="layui-col-sm12 layui-col-md2">'; html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">'; html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>'; html1 += '</div>'; html1 += '</div>'; $("#topleft").append(html1); } } else { if (i <= LoadData.length) { var html1 = ''; html1 += '<div class="layui-col-sm12 layui-col-md3">'; @@ -100,9 +162,6 @@ html1 += '<h1><span>设å¤ä»£ç ï¼</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>'; html1 += '<h1><span>æä½åï¼</span><span id="HEmpName' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>'; html1 += '<h1><span>ç产çç»ï¼</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>'; //html1 += '<h1><span>å½åå·¥åï¼</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>'; //html1 += '<h1><span>产ååç§°ï¼</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>'; //html1 += '<h1><span>产åè§æ ¼ï¼</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>'; html1 += '<h1><span>è´è´£äººï¼</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>'; switch (LoadData[i - 1].HStatus) { case "空é²": @@ -155,6 +214,8 @@ } } } } else { var html1 = ''; WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html
@@ -71,6 +71,12 @@ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" value=""> </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" lay-verify="HLocation" name="HLocation" id="HLocation" value=""> </div> </div> </div> <div class="layui-row" style="margin-top:10px"> @@ -168,6 +174,16 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">è´è´£äºº</label> <div class="layui-input-block" style="margin-left: 80px;"> <input type="text" class="layui-input" name="HManagerName" id="HManagerName" style="width: 60%;display: inline-block;" readonly> <input type="hidden" class="layui-input" name="HManagerID" id="HManagerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;"> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManagerList" id="btnHManagerList" 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: 85px;">åç</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input" lay-verify="HBrand" name="HBrand" id="HBrand" value=""> @@ -181,12 +197,6 @@ <option value="夿 ¡">夿 ¡</option> <option value="å æ ¡">å æ ¡</option> </select> </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" lay-verify="HLocation" name="HLocation" id="HLocation" value=""> </div> </div> </div> @@ -1451,6 +1461,45 @@ }); //表头信æ¯éæ©æ£éªåå¼¹çª form.on('submit(btnHManagerList)', function () { //页é¢å±-èªå®ä¹ layer.open({ type: 2, skin: 'layui-layer-rim', //å ä¸è¾¹æ¡ title: '使ç¨äººå表', closeBtn: 1, shift: 2, area: ['90%', '90%'], maxmin: true, content: ['../../åºç¡èµæ/å ¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager', '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('è¯·éæ©æ°æ®'); } $("#HManagerName").val(checkStatus.data[0].èååç§°); $("#HManagerID").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(HNowSupList)', function () { var typeid = $("#HNowSupTypeID").val();//è·åèæä»ç±»å @@ -2020,6 +2069,8 @@ $("#HNextMainDate").val(d.data[0].æ ¡æ£æ¥æ); $("#HUserID").val(d.data[0].HUserID); $("#HUserName").val(d.data[0].使ç¨äºº); $("#HManagerID").val(d.data[0].HManagerID); $("#HManagerName").val(d.data[0].è´è´£äºº); $("#HBrand").val(d.data[0].åç); $("#HCalibrationType").val(d.data[0].æ ¡åç±»å); $("#HLocation").val(d.data[0].ä½ç½®); @@ -2870,6 +2921,10 @@ $("#HUserName").val(obj[0].èååç§°); $("#HUserID").val(obj[0].HItemID); } function GetHManagerValue(obj) { //è´¨æ£å $("#HManagerName").val(obj[0].èååç§°); $("#HManagerID").val(obj[0].HItemID); } function GetGyMaterial(obj) { //ç©æ $("#HName").val(obj.ç©æåç§°); $("#HMaterNumber").val(obj.ç©æä»£ç ); WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html
@@ -208,7 +208,7 @@ </div> </div> </div> <div class="layui-row" style="margin-bottom: 15px;"> <div class="layui-row" style="margin-bottom: 15px; display:none"> <div class="layui-inline"> <label class="layui-form-label" style="width: 65px;">ç©´å·</label> <div class="layui-input-block" style="margin-left: 95px; width: 150px"> @@ -234,7 +234,7 @@ </div> </div> </div> <div class="layui-row" style="margin-bottom: 15px;"> <div class="layui-row" style="margin-bottom: 15px; display: none"> <div class="layui-inline"> <label class="layui-form-label" style="width: 65px;">é失æ°é</label> <div class="layui-input-block" style="margin-left: 95px;"> @@ -248,7 +248,7 @@ </div> </div> </div> <div class="layui-row" style="margin-bottom: 15px;"> <div class="layui-row" style="margin-bottom: 15px; display: none"> <div class="layui-inline"> <label class="layui-form-label" style="width: 65px;">æ¥åºæ°é</label> <div class="layui-input-block" style="margin-left: 95px;"> @@ -262,7 +262,7 @@ </div> </div> </div> <div class="layui-row" style="margin-bottom: 15px;"> <div class="layui-row" style="margin-bottom: 15px; display: none"> <div class="layui-inline"> <label class="layui-form-label" style="width: 65px;">å·¥åºæ°é</label> <div class="layui-input-block" style="margin-left: 95px;"> @@ -323,7 +323,15 @@ </div> </div> </div> <div class="layui-row" style="margin-bottom: 15px; text-align: center;"> <div style="margin-top: 20px;"> <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Add">æ°å¢</button> <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Saver">ä¿å</button> <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius" id="Exit">éåº</button> </div> </div> </div> </div> <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;"> <div id="center-left" style="width: 30%; height: calc(40vh); float: left;"> @@ -345,7 +353,7 @@ <div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div> </div> </div> <div id="bottom" style="width: 100%; height: calc(20vh);"> <!--<div id="bottom" style="width: 100%; height: calc(20vh);"> <div id="bottom-left" style="width: 100%; height: calc(10vh);"> <div style="text-align: left; width: 100%; height: calc(20vh); margin-left:410px "> <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius " style="margin-left: 20%;" id="Add">æ°å¢</button> @@ -353,7 +361,7 @@ <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius " style="margin-left: 5%; " id="Exit">éåº</button> </div> </div> </div> </div>--> </div> <div id="center-right-maintable" style="width: 34%; height: calc(135vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) "> <div class="layui-tab" lay-filter="tab-POStockInBill"> @@ -445,6 +453,29 @@ //åå§åçé¢ set_ClearBill(); //è·å页é¢è·³è½¬åæ° //åæ®ç¼è¾ç¶æï¼ 1.æ æºåæ°å¢ 2.ææºåæ°å¢ 3.ç¼è¾ 4.æµè§ 5.åæ´ var params = get_UrlVars(); if (typeof (params[params[0]]) == "undefined") { var OperationType = 1;//æä½ç±»å } else { var OperationType = params[params[0]];//æä½ç±»å var HInterID = params[params[1]];//åæ®å ç var HEntry = params[params[2]];//åæ®åå ç } var edit = function (data) { HSourceInterID = data[0].HSourceInterID; HSourceEntryID = data[0].HSourceEntryID; HSourceBillNo = data[0].HSourceBillNo; HSourceBillType = data[0].HSourceBillType; } if (OperationType==2) { txtHBarCode_KeyDown(HSourceBillNo); } $("#HEquipName").text(HEquipName);//设å¤åç§° $("#HEquipCode").text(HEquipCode);//设å¤ç¼å· $("#HEmpName").text(HEmpName);//æä½å WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeArrangement_PG.html
@@ -68,11 +68,17 @@ 产线æ¥è¯¢ </button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_cx" id="btnReSearch_cx" style="padding:0 5px">产线éç½®</button> <div class="layui-row" style="margin-top:10px;"> <div class="layui-row" style="margin-top:10px;margin-left:100px"> <div class="layui-inline"> <label class="layui-form-label">ç©æä»£ç </label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HNumber" id="HNumber"> </div> </div> <div class="layui-inline"> <label class="layui-form-label">ç©æåç§°</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HName" id="HName"> </div> </div> <div class="layui-inline"> @@ -733,16 +739,29 @@ , data = checkStatus.data; if (checkStatus.data.length == 1) { var linterid = data[0].hmainid.toString(); if (sessionStorage["Organization"] == "宿³¢å¸åèå è£ æéå ¬å¸") { layer.open({ type: 2 , area: ['80%', '80%'] , area: ['40%', '80%'] , title: 'æå°æ¨¡çéæ©' , shade: 0.6 //é®ç½©éæåº¦ , maxmin: false //å è®¸å ¨å±æå°å , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=Sc_ProcessExchangeArrangement', 'yes'] , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 3 + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes'] , resize: false }) } else { layer.open({ type: 2 , area: ['40%', '80%'] , title: 'æå°æ¨¡çéæ©' , shade: 0.6 //é®ç½©éæåº¦ , maxmin: false //å è®¸å ¨å±æå°å , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + QJQD + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes'] , resize: false }) } } else { layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼'); @@ -1100,7 +1119,6 @@ var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ® /* var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºå主å ç ", "æºååå ç "];//ä¸éè¦æ¾ç¤ºçåæ®µ 坿©å±*/ dataCol = data1.data[0].HGridString.split(','); @@ -1122,12 +1140,6 @@ } else { option.cols[0][i + 1]["style"] = "font-size:100%"; } //设置å宽 //if (data1.data[0].HColumnWidth != 0) { // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;"; //} else { // option.cols[0][i + 1]["width"] = ""; //} //æ¾ç¤ºå if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) { option.cols[0][i + 1]["hide"] = false; @@ -1186,7 +1198,6 @@ var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ® /* var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºå主å ç ", "æºååå ç "];//ä¸éè¦æ¾ç¤ºçåæ®µ 坿©å±*/ dataCol = data1.data[0].HGridString.split(','); @@ -1208,12 +1219,6 @@ } else { option2.cols[0][i + 1]["style"] = "font-size:100%"; } //设置å宽 //if (data1.data[0].HColumnWidth != 0) { // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;"; //} else { // option.cols[0][i + 1]["width"] = ""; //} //æ¾ç¤ºå if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) { option2.cols[0][i + 1]["hide"] = false;