From 69e9ce6ae24fce670fb8d7af0e1f132e2e009dbc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 12 七月 2023 13:44:21 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml |   86 ++++++++++++++++++++++++------------------
 1 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
index f066608..f403573 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
@@ -5,12 +5,15 @@
     Layout = null;
     List< AdmAttendanceRulesDtlDTO >  admAttendanceRulesDtlDTOs =  Model.admAttendanceRulesDtlDTOs;
 
-    var jiejiari =  admAttendanceRulesDtlDTOs.Where(x=>x.Name=="jiejiari").ToList();
+    var jiejiari =  admAttendanceRulesDtlDTOs.Where(x=>x.Name=="jiejiari").OrderBy(x=>x.ValueStart).ToList();
 
-    var tiaoxiuri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "tiaoxiuri").ToList();
+    var tiaoxiuri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "tiaoxiuri").OrderBy(x => x.ValueStart).ToList();
 
-    var jiabanri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiabanri").ToList();
+    var jiabanri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiabanri").OrderBy(x => x.ValueStart).ToList();
 
+    List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
+    string Creater = ViewData["Creater"] as string;
 
 }
 <!DOCTYPE html>
@@ -111,8 +114,8 @@
                                 <h5 style="color:cornflowerblue;">宸ヤ綔鏃�:</h5>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-6 col-md-6">
-                                        鍛� &nbsp;<input type="number" value="@Model.WeekStart" name="WeekStart" id="WeekStart" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">&nbsp;-
-                                        鍛� &nbsp;<input type="number" value="@Model.WeekEnd" name="WeekEnd" id="WeekEnd" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+                                        鍛� &nbsp;<input type="text" value="@Model.WeekStart" name="WeekStart" id="WeekStart" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">&nbsp;-
+                                        鍛� &nbsp;<input type="text" value="@Model.WeekEnd" name="WeekEnd" id="WeekEnd" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                         <input type="hidden" value="@Model.Id" id="Id" name="Id">
                                     </div>
                                 </div>
@@ -121,8 +124,8 @@
                                 <h5 style="color:cornflowerblue;">涓婄彮鏃堕棿:</h5>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-6 col-md-6">
-                                        <span>涓婂崍锛�</span><input type="number" value="@Model.WorkingStart" name="WorkingStart" id="WorkingStart" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">-
-                                        <input type="number" value="@Model.WorkingEnd" name="WorkingEnd" id="WorkingEnd" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+                                        <span>涓婂崍锛�</span><input type="text" value="@Model.WorkingStart" name="WorkingStart" id="WorkingStart" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">-
+                                        <input type="text" value="@Model.WorkingEnd" name="WorkingEnd" id="WorkingEnd" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                     </div>
 
                                 </div>
@@ -130,8 +133,8 @@
 
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-6 col-md-6">
-                                        <span>涓嬪崍锛�</span><input type="number" value="@Model.OffworkStart" name="OffworkStart" id="OffworkStart" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">-
-                                        <input type="number" value="@Model.OffworkEnd" name="OffworkEnd" id="OffworkEnd" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+                                        <span>涓嬪崍锛�</span><input type="text" value="@Model.OffworkStart" name="OffworkStart" id="OffworkStart" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">-
+                                        <input type="text" value="@Model.OffworkEnd" name="OffworkEnd" id="OffworkEnd" style="width:100px;" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                     </div>
                                 </div>
 
@@ -139,17 +142,17 @@
                                 @*<div class="clearfix layer-area" style="padding-bottom:15px;">
             <div class="col-sm-6 col-md-6">
                 <span>鍏ㄥ嫟濂�</span>
-                <input type="number" value="@Model.FullAttendance" name="FullAttendance" id="FullAttendance" style="width:150px" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                <input type="text" value="@Model.FullAttendance" name="FullAttendance" id="FullAttendance" style="width:150px" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
             </div>
         </div>*@
 
                                 <h5 style="color:cornflowerblue;">杩熷埌鎵f:</h5>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-8 col-md-8">
-                                        <span>15鍒嗛挓</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.LatePayment1" name="LatePayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>30鍒嗛挓</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.LatePayment2" name="LatePayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>1灏忔椂</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.LatePayment3" name="LatePayment3" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>2灏忔椂</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.LatePayment4" name="LatePayment4" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>15鍒嗛挓</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.LatePayment1" name="LatePayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>30鍒嗛挓</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.LatePayment2" name="LatePayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>1灏忔椂</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.LatePayment3" name="LatePayment3" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>2灏忔椂</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.LatePayment4" name="LatePayment4" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
 
                                     </div>
                                 </div>
@@ -157,29 +160,29 @@
                                 <h5 style="color:cornflowerblue;">鏃峰伐鎵f:</h5>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-6 col-md-6">
-                                        <span>杩熷埌</span><input style="width:150px" type="number" min="0" step="1" max="999999" value="@Model.Absenteeism" name="Absenteeism" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍒嗛挓璁颁负鏃峰伐
-                                        <span>鏃峰伐鎵f</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.AbsenteeismPayment1" name="AbsenteeismPayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍊嶅伐璧�
-                                        @*<span>1澶�</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.AbsenteeismPayment2" name="AbsenteeismPayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�*@
+                                        <span>杩熷埌</span><input style="width:150px" type="text" min="0" step="1" max="999999" value="@Model.Absenteeism" name="Absenteeism" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍒嗛挓璁颁负鏃峰伐
+                                        <span>鏃峰伐鎵f</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.AbsenteeismPayment1" name="AbsenteeismPayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍊嶅伐璧�
+                                        @*<span>1澶�</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.AbsenteeismPayment2" name="AbsenteeismPayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�*@
                                     </div>
                                 </div>
 
                                 <h5 style="color:cornflowerblue;">浜嬪亣鎵f:</h5>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-8 col-md-8">
-                                        <span>1灏忔椂</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment1" name="PersonalPayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>2灏忔椂</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment2" name="PersonalPayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)"> 鍏�
-                                        <span>鍗婂ぉ</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment3" name="PersonalPayment3" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>1澶�</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment4" name="PersonalPayment4" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>1灏忔椂</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment1" name="PersonalPayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>2灏忔椂</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment2" name="PersonalPayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)"> 鍏�
+                                        <span>鍗婂ぉ</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment3" name="PersonalPayment3" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>1澶�</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.PersonalPayment4" name="PersonalPayment4" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
                                     </div>
                                 </div>
 
                                 <h5 style="color:cornflowerblue;">鐥呭亣鎵f:</h5>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <div class="col-sm-8 col-md-8">
-                                        <span>1灏忔椂</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.SickPayment1" name="SickPayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>2灏忔椂</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.SickPayment2" name="SickPayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>鍗婂ぉ</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.SickPayment3" name="SickPayment3" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
-                                        <span>1澶�</span><input style="width:150px" type="number" min="0.01" step="0.01" max="999999" value="@Model.SickPayment4" name="SickPayment4" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>1灏忔椂</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.SickPayment1" name="SickPayment1" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>2灏忔椂</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.SickPayment2" name="SickPayment2" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>鍗婂ぉ</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.SickPayment3" name="SickPayment3" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
+                                        <span>1澶�</span><input style="width:150px" type="text" min="0.01" step="0.01" max="999999" value="@Model.SickPayment4" name="SickPayment4" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">鍏�
                                     </div>
                                 </div>
 
@@ -299,7 +302,7 @@
                                     </div>
                                 </div>
 
-                                
+
 
                                 <h5 style="color:cornflowerblue;">鍔犵彮琛ュ姪:</h5>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;height:45px;">
@@ -429,7 +432,7 @@
         <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
             <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��">
 
-                <a class="btn btn-success" href="javascript:void(0)" onclick="SaveAttendanceRule();" style="margin-left:4px; border-radius:4px;">
+                <a class="btn btn-success Update"  href="javascript:void(0)" onclick="SaveAttendanceRule();" style="margin-left:4px; border-radius:4px;display:none;">
                     <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">鎻愪氦</span>
                 </a>
             </div>
@@ -539,7 +542,7 @@
 
         //鎻愪氦璇锋眰
         var SaveAttendanceRule =    function () {
-            
+
 
             $.ajax({
                 type: "POST",
@@ -580,7 +583,7 @@
         } ;
         //鏈湀鑺傚亣鏃ヨ缃�
         function addBtn(obj) {
-          
+
             var int = $('.holiday_s').length - 1;
             var id = $('.holiday_s').eq(int).attr('id');
             var holiday_ss = parseInt(id.replace("holiday_s", "")) + 1;
@@ -588,7 +591,7 @@
             var int1 = $('.holiday_e').length - 1
             var id1 = $('.holiday_e').eq(int1).attr('id');
             var holiday_es = parseInt(id1.replace("holiday_e", "")) + 1;
-            
+
             var html = ' <div class="setSelect">\n' +
                 '                <span></span>\n' +
                 '                <input type="text" value="" class="layui-input  layer-date  ldate form-control   holiday_s" id="holiday_s' + holiday_ss + '" name="holiday_s"  style="width:150px;"   onfocus=\'laydate({elem:"#holiday_s' + holiday_ss + '",format:"YYYY-MM-DD",theme:"#fdd5004"})\'  /> -\n' +
@@ -598,13 +601,13 @@
 
             $(obj).parent('div').parent('div').append(html);
 
-            
-           
 
-           
-             
 
-           
+
+
+
+
+
         };
         function addRestBtn(obj) {
             var int = $('.rest_s').length - 1;
@@ -624,7 +627,7 @@
 
             $(obj).parent('div').parent('div').append(html);
 
-           
+
         };
 
 
@@ -648,7 +651,7 @@
 
 
         };
-        
+
         function delBtn(obj, id, tb) {
             //if (id > 0) {
             //    var url = "/index.php/home/white/del.html"
@@ -662,8 +665,17 @@
             //}
             $(obj).parent().remove();
         }
+         var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
 
 
+
+        $(function () {
+            var data = JSON.parse(ActionInfo22);
+            for (var o in data) {
+                $("." + data[o].PageShortcut).show();
+
+            }
+        });
     </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1