From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml | 123 +++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 29 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
index 69abc8f..f066608 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
@@ -9,6 +9,8 @@
var tiaoxiuri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "tiaoxiuri").ToList();
+ var jiabanri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiabanri").ToList();
+
}
<!DOCTYPE html>
@@ -109,9 +111,9 @@
<h5 style="color:cornflowerblue;">宸ヤ綔鏃�:</h5>
<div class="clearfix layer-area" style="padding-bottom:15px;">
<div class="col-sm-6 col-md-6">
- 鍛� <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})?/)" > -
- 鍛� <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})?/)" >
- <input type="hidden" value="@Model.Id" id="Id" name="Id" >
+ 鍛� <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})?/)"> -
+ 鍛� <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})?/)">
+ <input type="hidden" value="@Model.Id" id="Id" name="Id">
</div>
</div>
@@ -119,8 +121,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="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})?/)">
</div>
</div>
@@ -128,18 +130,18 @@
<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="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})?/)">
</div>
</div>
@*<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})?/)">鍏�
- </div>
- </div>*@
+ <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})?/)">鍏�
+ </div>
+ </div>*@
<h5 style="color:cornflowerblue;">杩熷埌鎵ｆ:</h5>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -156,7 +158,7 @@
<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>鏃峰伐鎵ｆ</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>鏃峰伐鎵ｆ</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})?/)">鍏�*@
</div>
</div>
@@ -206,11 +208,11 @@
}
else
{
- <div class="setSelect">
- <input type="text" value="@jiejiari[i].ValueStart.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control holiday_s" id="@("holiday_s"+(i+1))" name="holiday_s" style="width:150px;" onfocus='laydate({elem:"#holiday_s1",format:"YYYY-MM-DD",theme:"#fdd5004"})' /> -
- <input type="text" value="@jiejiari[i].ValueEnd.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control holiday_e" id="@("holiday_e"+(i+1))" name="holiday_e" style="width:150px;" onfocus='laydate({elem:"#holiday_e1",format:"YYYY-MM-DD",theme:"#fdd5004"})' />
- <button type="button" class="addBtn" onclick="delBtn(this,0,'holiday')" data-type="1">-</button>
- </div>
+ <div class="setSelect">
+ <input type="text" value="@jiejiari[i].ValueStart.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control holiday_s" id="@("holiday_s"+(i+1))" name="holiday_s" style="width:150px;" onfocus='laydate({elem:"#holiday_s1",format:"YYYY-MM-DD",theme:"#fdd5004"})' /> -
+ <input type="text" value="@jiejiari[i].ValueEnd.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control holiday_e" id="@("holiday_e"+(i+1))" name="holiday_e" style="width:150px;" onfocus='laydate({elem:"#holiday_e1",format:"YYYY-MM-DD",theme:"#fdd5004"})' />
+ <button type="button" class="addBtn" onclick="delBtn(this,0,'holiday')" data-type="1">-</button>
+ </div>
}
@@ -246,11 +248,11 @@
}
else
{
- <div class="setSelect">
- <input type="text" value="@tiaoxiuri[i].ValueStart.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control rest_s" id="@("rest_s"+(i+1))" name="rest_s" style="width:150px;" onfocus='laydate({elem:"#rest_s1",format:"YYYY-MM-DD",theme:"#fdd5004"})' /> -
- <input type="text" value="@tiaoxiuri[i].ValueEnd.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control rest_e" id="@("rest_e"+(i+1))" name="rest_e" style="width:150px;" onfocus='laydate({elem:"#rest_e1",format:"YYYY-MM-DD",theme:"#fdd5004"})' />
- <button type="button" class="addBtn" onclick="delBtn(this,0,'rest')" data-type="1">-</button>
- </div>
+ <div class="setSelect">
+ <input type="text" value="@tiaoxiuri[i].ValueStart.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control rest_s" id="@("rest_s"+(i+1))" name="rest_s" style="width:150px;" onfocus='laydate({elem:"#rest_s1",format:"YYYY-MM-DD",theme:"#fdd5004"})' /> -
+ <input type="text" value="@tiaoxiuri[i].ValueEnd.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control rest_e" id="@("rest_e"+(i+1))" name="rest_e" style="width:150px;" onfocus='laydate({elem:"#rest_e1",format:"YYYY-MM-DD",theme:"#fdd5004"})' />
+ <button type="button" class="addBtn" onclick="delBtn(this,0,'rest')" data-type="1">-</button>
+ </div>
}
}
@@ -258,6 +260,46 @@
</div>
</div>
+
+ <h5 style="color:red;">鍔犵彮鏃�:</h5>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <div class="col-sm-3 col-md-3">
+ @if (jiabanri == null || jiabanri.Count == 0)
+ {
+ <div class="setSelect">
+ <input type="text" value="" class="layui-input layer-date ldate form-control jiaban_s" id="jiaban_s1" name="jiaban_s" style="width:150px;" onfocus='laydate({elem:"#jiaban_s1",format:"YYYY-MM-DD",theme:"#fdd5004"})' /> -
+ <input type="text" value="" class="layui-input layer-date ldate form-control jiaban_e" id="jiaban_e1" name="jiaban_e" style="width:150px;" onfocus='laydate({elem:"#jiaban_e1",format:"YYYY-MM-DD",theme:"#fdd5004"})' />
+ <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="addjiabanBtn(this)" data-type="1">+</button>
+ </div>
+ }
+ else
+ {
+ for (int i = 0; i < jiabanri.Count; i++)
+ {
+ if (i == 0)
+ {
+ <div class="setSelect">
+ <input type="text" value="@jiabanri[i].ValueStart.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control jiaban_s" id="@("jiaban_s"+(i+1))" name="jiaban_s" style="width:150px;" onfocus='laydate({elem:"#jiaban_s1",format:"YYYY-MM-DD",theme:"#fdd5004"})' /> -
+ <input type="text" value="@jiabanri[i].ValueEnd.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control jiaban_e" id="@("jiaban_e"+(i+1))" name="jiaban_e" style="width:150px;" onfocus='laydate({elem:"#jiaban_e1",format:"YYYY-MM-DD",theme:"#fdd5004"})' />
+ <button type="button" class="addBtn" style="padding-bottom:10px;" onclick="addjiabanBtn(this)" data-type="1">+</button>
+ </div>
+ }
+ else
+ {
+ <div class="setSelect">
+ <input type="text" value="@jiabanri[i].ValueStart.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control jiaban_s" id="@("jiaban_s"+(i+1))" name="jiaban_s" style="width:150px;" onfocus='laydate({elem:"#jiaban_s1",format:"YYYY-MM-DD",theme:"#fdd5004"})' /> -
+ <input type="text" value="@jiabanri[i].ValueEnd.ToString("yyyy-MM-dd")" class="layui-input layer-date ldate form-control jiaban_e" id="@("jiaban_e"+(i+1))" name="jiaban_e" style="width:150px;" onfocus='laydate({elem:"#jiaban_e1",format:"YYYY-MM-DD",theme:"#fdd5004"})' />
+ <button type="button" class="addBtn" onclick="delBtn(this,0,'jiaban')" data-type="1">-</button>
+ </div>
+ }
+
+ }
+ }
+
+ </div>
+ </div>
+
+
<h5 style="color:cornflowerblue;">鍔犵彮琛ュ姪:</h5>
<div class="clearfix layer-area" style="padding-bottom:15px;height:45px;">
@@ -267,11 +309,11 @@
1鍊�
@if (Model.Gala == 1)
{
- <input name="Gala" type="radio" value="1" class="type_b" checked="checked">
+ <input name="Gala" type="radio" value="1" class="type_b" checked="checked">
}
else
- {
- <input name="Gala" type="radio" value="1" class="type_b" >
+ {
+ <input name="Gala" type="radio" value="1" class="type_b">
}
@@ -328,11 +370,11 @@
2鍊�
@if (Model.Weekend1 == 2)
{
- <input name="Weekend1" type="radio" checked="checked" value="2" class="type_b">
+ <input name="Weekend1" type="radio" checked="checked" value="2" class="type_b">
}
else
{
- <input name="Weekend1" type="radio" value="2" class="type_b">
+ <input name="Weekend1" type="radio" value="2" class="type_b">
}
</label>
@@ -374,7 +416,7 @@
<div class="col-sm-6 col-md-6">
<span></span>
@*<input name="holiday" value="" type="hidden" id="holiday">
- <input name="rest" value="" type="hidden" id="rest">*@
+ <input name="rest" value="" type="hidden" id="rest">*@
</div>
</div>
</div>
@@ -584,6 +626,29 @@
};
+
+
+ function addjiabanBtn(obj) {
+ var int = $('.jiaban_s').length - 1;
+ var id = $('.jiaban_s').eq(int).attr('id');
+ var jiaban_ss = parseInt(id.replace("jiaban_s", "")) + 1;
+
+ var int1 = $('.jiaban_e').length - 1
+ var id1 = $('.jiaban_e').eq(int1).attr('id');
+ var jiaban_ee = parseInt(id1.replace("jiaban_e", "")) + 1;
+
+ var html = ' <div class="setSelect">\n' +
+ ' <span></span>\n' +
+ ' <input type="text" value="" class="layui-input layer-date ldate form-control jiaban_s" id="jiaban_s' + jiaban_ss + '" name="jiaban_s" style="width:150px;" onfocus=\'laydate({elem:"#jiaban_s' + jiaban_ss + '",format:"YYYY-MM-DD",theme:"#fdd5004"})\' /> -\n' +
+ ' <input type="text" value="" class="layui-input layer-date ldate form-control jiaban_e" id="jiaban_e' + jiaban_ee + '" name="jiaban_e" style="width:150px;" onfocus=\'laydate({elem:"#jiaban_e' + jiaban_ee + '",format:"YYYY-MM-DD",theme:"#fdd5004"})\' />\n' +
+ ' <button type="button" class="addBtn" onclick="delBtn(this,0,\'jiaban\')" data-type="1">-</button>\n' +
+ ' </div>'
+
+ $(obj).parent('div').parent('div').append(html);
+
+
+ };
+
function delBtn(obj, id, tb) {
//if (id > 0) {
// var url = "/index.php/home/white/del.html"
--
Gitblit v1.9.1