From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +0800
Subject: [PATCH] 今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算
---
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml | 121 ++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 36 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
index 1b8c331..c01cbfd 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
@@ -138,9 +138,9 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5><i class="fa fa-list"></i> 椤圭洰褰曞叆</h5>
+ <h5><i class="fa fa-list"></i> 浜哄憳褰曞叆</h5>
</div>
- <div id="div_content" class="ibox-content" style="background-color:white;">
+ <div id="div_content" class="ibox-content" style="background-color:white;overflow-y:auto;">
<div class="row">
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">鐢ㄦ埛鍚�<i class="red">*</i></label>
@@ -365,7 +365,7 @@
<label class="text-right col-sm-1 col-md-1 control-label">钖祫寰呴亣 </label>
<div class="col-sm-2 col-md-2">
- <input id="BasicPrice" class="form-control" label="钖祫寰呴亣" name="BasicPrice" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.BasicPrice" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input id="BasicPrice" class="form-control" label="钖祫寰呴亣" name="BasicPrice" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.BasicPrice" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鏄惁璐拱绀句繚 </label>
@@ -406,7 +406,7 @@
</div>
<label class="text-right col-sm-1 col-md-1 control-label">璇曠敤鏈熷緟閬�</label>
<div class="col-sm-2 col-md-2">
- <input id="ShiyongPrice" class="form-control" label="璇曠敤鏈熷緟閬�" name="ShiyongPrice" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShiyongPrice" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input id="ShiyongPrice" class="form-control" label="璇曠敤鏈熷緟閬�" name="ShiyongPrice" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShiyongPrice" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鏄惁绛捐鍚堝悓 </label>
@@ -445,33 +445,48 @@
<div class="col-sm-2 col-md-2">
<input id="Shebaodate" class="form-control" label="璁¤柂鏃堕棿" name="Shebaodate" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShebaodateName" readonly="readonly">
</div>
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍦ㄨ亴鐘舵��<i class="red">*</i></label>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
- <select id="Zhiwustatus" class="form-control" name="Zhiwustatus" data-placeholder="閫夋嫨 搴忓垪 ...">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in zhiwustatus)
- {
- @if (!item.CodeSn.Equals(Model.Zhiwustatus))
- {
- <option value="@item.CodeSn" hassubinfo="true">
- @item.Comments
- </option>
- }
- else
- {
- <option value="@item.CodeSn" hassubinfo="true" selected="selected">
- @item.Comments
- </option>
- }
- }
- </select>
- </div>
+
- <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔鐢佃剳MAC<i class="red">*</i> </label>
+ <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔鐢佃剳MAC</label>
<div class="col-sm-2 col-md-2">
<input id="IpMac" class="form-control" label="宸ヤ綔鐢佃剳MAC" name="IpMac" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@Model.IpMac">
</div>
</div>
+
+ @*<div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">鍩烘湰宸ヨ祫 </label>
+ <div class="col-sm-2 col-md-2">
+ <div class="col-sm-9 col-md-9" style="padding:0">
+ <input class="form-control" label="鍩烘湰宸ヨ祫" name="jibensalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.jibensalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
+ <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
+ <label class="text-left control-label">鍏�/鏈�</label>
+ </div>
+ </div>
+
+ <label class="text-right col-sm-1 col-md-1 control-label">淇濆瘑璐�</label>
+ <div class="col-sm-2 col-md-2">
+
+ <div class="col-sm-9 col-md-9" style="padding:0">
+ <input class="form-control" label="淇濆瘑璐�" name="baomisalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.baomisalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
+ <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
+ <label class="text-left control-label">鍏�/鏈�</label>
+ </div>
+ </div>
+ <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔琛ヨ创</label>
+ <div class="col-sm-2 col-md-2">
+ <div class="col-sm-9 col-md-9" style="padding:0">
+ <input class="form-control" label="宸ヤ綔琛ヨ创" name="jintiesalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.jintiesalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
+ <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
+ <label class="text-left control-label">鍏�/骞�</label>
+ </div>
+
+ </div>
+
+
+ </div>*@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">棰勫彂宸ヨ祫 </label>
@@ -481,13 +496,13 @@
</div>
<div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
<label class="text-left control-label">鍏�/鏈�</label>
- </div>
- </div>
+ </div>
+ </div>
<label class="text-right col-sm-1 col-md-1 control-label">淇濆簳骞磋柂</label>
<div class="col-sm-2 col-md-2">
-
- <div class="col-sm-9 col-md-9" style="padding:0">
+
+ <div class="col-sm-9 col-md-9" style="padding:0">
<input class="form-control" label="淇濆簳骞磋柂" name="miniyearsalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.miniyearsalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
@@ -502,7 +517,7 @@
<div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
<label class="text-left control-label">鍏�/骞�</label>
</div>
-
+
</div>
<label class="text-right col-sm-1 col-md-1 control-label">鏄惁浜ら�氳ˉ璐�</label>
@@ -528,6 +543,7 @@
</div>
</div>
+
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鐢佃瘽<i class="red">*</i></label>
<div class="col-sm-2 col-md-2">
@@ -541,7 +557,10 @@
<div class="col-sm-2 col-md-2">
<input id="Email" class="form-control" label="鐢靛瓙閭" name="Email" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.Email">
</div>
-
+ <label class="text-right col-sm-1 col-md-1 control-label">涓撻」鎵ｉ櫎</label>
+ <div class="col-sm-2 col-md-2">
+ <input id="geshuiqizheng" class="form-control" label="涓撻」鎵ｉ櫎" name="geshuiqizheng" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.geshuiqizheng" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -553,6 +572,34 @@
<div class="col-sm-2 col-md-2">
<input id="JinjiPhone" class="form-control" label="鑱旂郴鐢佃瘽" name="JinjiPhone" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@Model.JinjiPhone">
</div>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍦ㄨ亴鐘舵��<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <select id="Zhiwustatus" class="form-control" name="Zhiwustatus" data-placeholder="閫夋嫨 搴忓垪 ...">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in zhiwustatus)
+ {
+ @if (!item.CodeSn.Equals(Model.Zhiwustatus))
+ {
+ <option value="@item.CodeSn" hassubinfo="true">
+ @item.Comments
+ </option>
+ }
+ else
+ {
+ <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+ @item.Comments
+ </option>
+ }
+ }
+ </select>
+ </div>
+
+ <label class="text-right col-sm-1 col-md-1 control-label">绂昏亴鏃ユ湡 </label>
+ <div class="col-sm-2 col-md-2">
+ <input id="Outdate" class="form-control" label="绂昏亴鏃ユ湡" name="Outdate" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value='@Model.OutdateName ' readonly="readonly">
+
+ </div>
+
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -805,6 +852,8 @@
laydate({ elem: "#ShiyongDateEnd", format: 'YYYY-MM-DD', istime: false, event: "focus" });
laydate({ elem: "#Indate", format: 'YYYY-MM-DD', istime: false, event: "focus" });
laydate({ elem: "#Shebaodate", format: 'YYYY-MM-DD', istime: false, event: "focus" });
+ laydate({ elem: "#Outdate", format: 'YYYY-MM-DD', istime: false, event: "focus" });
+
var delPosition = function () {
@@ -897,10 +946,10 @@
return;
}
- if ($.trim($("#IpMac").val()) == '') {
- toastr.warning("宸ヤ綔鐢佃剳MAC涓嶈兘涓虹┖");
- return;
- }
+ //if ($.trim($("#IpMac").val()) == '') {
+ // toastr.warning("宸ヤ綔鐢佃剳MAC涓嶈兘涓虹┖");
+ // return;
+ //}
$.ajax({
type: "POST",
--
Gitblit v1.9.1