Bladeren bron

导出纱线规则时增加预期天数条件

liling 7 maanden geleden
bovenliggende
commit
f3f56be8c2
2 gewijzigde bestanden met toevoegingen van 74 en 7 verwijderingen
  1. 12 3
      css/main.css
  2. 62 4
      main.html

+ 12 - 3
css/main.css

@@ -422,7 +422,7 @@
         padding: 5px;
         border: 1px solid #314f85;
     }
-    #date_select .triangle{
+    #date_select .triangle,#day_select .triangle{
         width: 0;
         height: 0;
         position: absolute;
@@ -433,6 +433,15 @@
         border-color:transparent transparent transparent #396da9 ;
         border-radius: 4rpx;
     }
+    #day_select{
+        position: absolute;
+        display: none;
+        z-index: 1000;
+        color: #ffffff;
+        background: #396da9;
+        padding: 5px;
+        border: 1px solid #314f85;
+    }
     .ui-datepicker-trigger{
         color: #fff;
         background: #27486f;
@@ -453,10 +462,10 @@
         color: #3d3ad7;
         font-weight: bold;
     }
-    .dateSelected_ok{
+    .dateSelected_ok,.daySelected_ok{
         text-align: center;
     }
-    .dateSelected_ok button{
+    .dateSelected_ok button,.daySelected_ok button{
         color: #fff;
         background: #27486f;
         border: 1px solid #7d8aa3;

+ 62 - 4
main.html

@@ -6,7 +6,7 @@
     <link rel="stylesheet" type="text/css" href="css/main.css">
     <link rel="stylesheet" type="text/css" href="css/jquery-ui.css">
 </head>
-<body onclick="$('#imp_item,#date_select').hide();$('#search_result').html('').hide();$('#search input').val('')">
+<body onclick="$('#imp_item,#date_select,#day_select').hide();$('#search_result').html('').hide();$('#search input').val('')">
 <div id="loading_a1"></div>
 <div id="loading">正在加载模型中...</div>
 <div id="top" class="top">
@@ -66,6 +66,16 @@
         <button type=button>确定</button>
     </div>
 </div>
+<div id="day_select">
+    <div class="triangle"></div>
+    <div style="margin-top: 5px;">
+        <label for="datepicker1">产能预期天数:</label>
+        <input type="text" id="prev_day" style="width: 50%;" imeMode="disabled" value="7" maxlength="2" placeholder="请输入小于61的正整数">
+    </div>
+    <div class="daySelected_ok">
+        <button type=button>确定</button>
+    </div>
+</div>
 <div id="search"><input type="text" placeholder="请输入设备编号" maxlength="4"><img
         style="position: absolute;top: 20%;right: 5px;" src="image/search_icon.png" class="search_btn"></div>
 <div id="search_result"></div>
@@ -2302,8 +2312,47 @@
         });
         //日期不能超过当前日期
         $("#datepicker1,#datepicker2").datepicker("option", "maxDate", new Date().Format("yyyy-MM-dd"));
-        $("#date_select,#ui-datepicker-div").on("click", function (e) {
+        $("#date_select,#ui-datepicker-div,#day_select").on("click", function (e) {
             e.stopPropagation();
+        });
+        var ua = navigator.userAgent;
+        var isIE=false;
+        if (ua.indexOf('MSIE') != -1 || ua.indexOf('Trident') != -1) {
+            isIE=true;
+        }
+        //纱线规格导出生产预期天数输入控制处理
+        $("#prev_day").on("keydown",function(event){
+            var v = $(this).val();
+                if (isIE) {
+                    if ( ((event.keyCode > 47) && (event.keyCode < 58)) || (event.keyCode == 8) ) {  // 判断键值
+                        if(event.keyCode != 8 && (v+String.fromCharCode(event.keyCode))*1>60){
+                            return false;
+                        }
+                        return true; 
+                    } else { 
+                        return false; 
+                    }
+                } else { 
+                    if ( ((event.which > 47) && (event.which < 58)) || (event.which == 8) || (event.keyCode == 17) ) { 
+                        if(event.keyCode != 17 && event.which != 8 && (v+String.fromCharCode(event.which))*1>60){
+                            return false;
+                        }
+                        return true; 
+                    } else { 
+                        return false; 
+                    } 
+                }
+        }).focus(function() {
+                this.style.imeMode='disabled';   // 禁用输入法,禁止输入中文字符
+        });
+        //纱线规格导出确定按钮事件处理
+        $("#day_select .daySelected_ok").on('click',function(){
+            var v=$("#prev_day").val();
+            if(isNaN(v)){
+                $("#prev_day").val('');
+                return;
+            }
+            window.open(SERVER_URL + "/export/yarn-specifications?day="+(v*1));
         })
         $("#dev_stop").css("top", ($("#dev_alarm").offset().top * 1 + $("#dev_alarm").height() + 15) + "px");
         $("#search input:eq(0)").off().on('keypress', function (e) {
@@ -2325,7 +2374,8 @@
             $(this).parent().find(".active").removeClass("active");
             //导出数据
             var code = $(this).addClass("active").attr("itemcode");
-            var $date_select = $("#date_select").attr("itemcode",code)
+            var $date_select = $("#date_select").attr("itemcode",code);
+            var $day_select=$("#day_select").hide();
             var day = new Date();
             if(day.getHours()<7){
                 day=day.setDate(day.getDate()-2);
@@ -2414,8 +2464,16 @@
                     window.open(SERVER_URL + "/export/warp-run-in");
                     break;
 				case 9:
+                    e.stopPropagation();
+                    $("#prev_day").val('7');
                     // alert("纱线规格");
-                    window.open(SERVER_URL + "/export/yarn-specifications");
+                    $date_select.hide();
+                    //打开预期天数窗口
+                    $day_select.show().css({
+                        "top": $(this).offset().top-10  + "px",
+                        "left": $("#imp_item").offset().left- $("#day_select").width()-20 + "px"
+                    });
+                    //window.open(SERVER_URL + "/export/yarn-specifications");
                     break;
             }
         })