From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:45 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/zhengcaioa/Views/Project/Add.cshtml | 78 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
index 467da1e..e740abf 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
@@ -15,7 +15,7 @@
List<Projectyouxiao> Projectyouxiaos = Model.Projectyouxiaos;
- List<Projectzhongbiao> Projectzhongbiaos = Model.Projectzhongbiaos;
+ List<ProjectzhongbiaoDTO> Projectzhongbiaos = Model.Projectzhongbiaos;
//string[] arrJobLevel = (Model.Zhuanjia ?? "").Split(',');
@@ -236,7 +236,7 @@
<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-6 col-md-6">
+ <div class="col-sm-4 col-md-4">
<input class="form-control" label="涓爣锛堟垚浜わ級渚涘簲鍟�" name="Names" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Projectzhongbiaos[i].Names">
</div>
<label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鎶ヤ环</label>
@@ -244,10 +244,14 @@
<input class="form-control" label="鎶ヤ环" name="Price" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Projectzhongbiaos[i].Price">
<input type="hidden" name="ZhongbiaoId" value="@Projectzhongbiaos[i].ZhongbiaoId" />
</div>
+ <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label>
+ <div class="col-sm-2 col-md-2" style="width:10%;">
+ <input class="form-control" label="璇勫寰楀垎" name="Defen" id="Defen" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Projectzhongbiaos[i].DefenName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
<div class="col-sm-1 col-md-1" style="width:100px;">
@if (Projectzhongbiaos[i].ProjectId != null && Projectzhongbiaos[i].ProjectId == "yes")
{
- <button type="button" data-type="1" >娣诲姞渚涘簲鍟�</button>
+ <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button>
}
else
{
@@ -271,12 +275,16 @@
<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-6 col-md-6">
+ <div class="col-sm-4 col-md-4">
<input class="form-control" label="鍏憡鏃堕棿" name="Drhx" id="Drhx" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Drhx">
</div>
<label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鎶ヤ环</label>
- <div class="col-sm-2 col-md-2" style="width:10%;">
+ <div class="col-sm-2 col-md-2" style="width:10%;">
<input class="form-control" label="鍏憡鏃堕棿" name="DrhxPrice" id="DrhxPrice" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.DrhxPrice">
+ </div>
+ <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label>
+ <div class="col-sm-2 col-md-2" style="width:10%;">
+ <input class="form-control" label="璇勫寰楀垎" name="DrhxDefen" id="DrhxDefen" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.DrhxDefenName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<div class="col-sm-1 col-md-1" style="width:100px;">
@if (Model.Drcunzai != null && Model.Drcunzai == "yes")
@@ -285,7 +293,7 @@
}
else
{
- <button type="button" onclick="_pageAdd('@Model.Drhx')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button>
+ <button type="button" onclick="_pageAdd('@Model.Drhx')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button>
}
@@ -294,17 +302,21 @@
</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-6 col-md-6">
+ <div class="col-sm-4 col-md-4">
<input class="form-control" label="鍏憡鏃堕棿" name="Dshx" id="Dshx" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Dshx">
</div>
<label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鎶ヤ环</label>
- <div class="col-sm-2 col-md-2" style="width:10%;">
+ <div class="col-sm-2 col-md-2" style="width:10%;">
<input class="form-control" label="鍏憡鏃堕棿" name="DshxPrice" id="DshxPrice" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.DshxPrice">
+ </div>
+ <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label>
+ <div class="col-sm-2 col-md-2" style="width:10%;">
+ <input class="form-control" label="璇勫寰楀垎" name="DshxDefen" id="DshxDefen" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.DshxDefenName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<div class="col-sm-1 col-md-1" style="width:100px;">
@if (Model.Dscunzai != null && Model.Dscunzai == "yes")
{
- <button type="button" data-type="1" >娣诲姞渚涘簲鍟�</button>
+ <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button>
}
else
{
@@ -464,12 +476,24 @@
<div class="col-sm-3 col-md-3">
<input id="Caigourenname" class="form-control" label="閲囪喘浜哄悕绉�" name="Caigourenname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourenname">
</div>
+ <div class="col-sm-1 col-md-1" style="width:100px;">
+ @if (Model.Caigourennamecunzai != null && Model.Caigourennamecunzai == "yes")
+ {
+ <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button>
+ }
+ else
+ {
+ <button type="button" onclick="_pageAdd('@Model.Caigourenname')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button>
+ }
+
+
+ </div>
<label class="text-right col-sm-1 col-md-1 control-label">鍦板潃</label>
<div class="col-sm-3 col-md-3">
<input id="Caigourenaddress" class="form-control" label="鍦板潃" name="Caigourenaddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourenaddress">
</div>
<label class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鏂瑰紡</label>
- <div class="col-sm-3 col-md-3">
+ <div class="col-sm-2 col-md-2">
<input id="Caigourencontact" class="form-control" label="鑱旂郴鏂瑰紡" name="Caigourencontact" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourencontact">
</div>
</div>
@@ -479,12 +503,24 @@
<div class="col-sm-3 col-md-3">
<input id="Dailiname" class="form-control" label="閲囪喘浜哄悕绉�" name="Dailiname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailiname">
</div>
+ <div class="col-sm-1 col-md-1" style="width:100px;">
+ @if (Model.Dailinamecunzai != null && Model.Dailinamecunzai == "yes")
+ {
+ <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button>
+ }
+ else
+ {
+ <button type="button" onclick="_pageAdd('@Model.Dailiname')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button>
+ }
+
+
+ </div>
<label class="text-right col-sm-1 col-md-1 control-label">鍦板潃</label>
<div class="col-sm-3 col-md-3">
<input id="Dailiaddress" class="form-control" label="鍦板潃" name="Dailiaddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailiaddress">
</div>
<label class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鏂瑰紡</label>
- <div class="col-sm-3 col-md-3">
+ <div class="col-sm-2 col-md-2">
<input id="Dailicontact" class="form-control" label="鑱旂郴鏂瑰紡" name="Dailicontact" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailicontact">
</div>
</div>
@@ -574,7 +610,7 @@
if (num == 1) {
$('#addlist_1').append(oTr);
$(oTr).html(` <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-6 col-md-6">
+ <div class="col-sm-4 col-md-4">
<input class="form-control" label="鍏憡鏃堕棿" name="Names" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="">
</div>
<label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鎶ヤ环</label>
@@ -582,6 +618,10 @@
<input class="form-control" label="鍏憡鏃堕棿" name="Price" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="">
<input type="hidden" name="ZhongbiaoId" value="" />
</div>
+ <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label>
+ <div class="col-sm-2 col-md-2" style="width:10%;">
+ <input class="form-control" label="璇勫寰楀垎" name="Defen" id="Defen" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)" >
+ </div>
</div>`);
} else if (num == 2) {
@@ -608,7 +648,7 @@
</div>
<label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鍘熷洜</label>
<div class="col-sm-2 col-md-2" style="width:10%;">
-
+
<input class="form-control" label="鍘熷洜" name="reasonremark" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="flase" type="text" value="">
<input type="hidden" name="ReasonId" value="" />
</div>
@@ -695,7 +735,7 @@
return;
}
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -704,7 +744,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -746,7 +786,7 @@
global: false,
data: "",
success: function (data) {
-
+
var city = $("#City");
city.find('option').remove();
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -778,7 +818,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#AreaId");
quxian.find('option').remove();
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -814,7 +854,7 @@
global: false,
data: "",
success: function (data) {
-
+
var starttime = $("#StartTime");
starttime.val(data.StartTimestr);
var Number = $("#Number");
@@ -841,7 +881,7 @@
var Names = $("input[name='Names']");
var Price = $("input[name='Price']")
-
+
if (Names != null && Names.length > 0) {
if (data.Projectzhongbiaos != null && data.Projectzhongbiaos.length > 0) {
Names[0].value=data.Projectzhongbiaos[0].Names;
--
Gitblit v1.9.1