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/AskLeave.cshtml | 196 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 149 insertions(+), 47 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml
index b2ccff1..a61072d 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml
@@ -3,6 +3,7 @@
@using zhengcaioa.Models;
@{
Layout = null;
+
ResultDataEntity<SysAttachmentDTO> attachment = ViewBag.attachment as ResultDataEntity<SysAttachmentDTO>; //闂绫诲瀷
List<SysAttachmentDTO> attachmentsssss = attachment.DataList;
@@ -10,8 +11,14 @@
{
attachmentsssss = new List<SysAttachmentDTO>();
}
-
List<SysCodeDtl> Lavetype = ViewData["Lavetype"] as List<SysCodeDtl>; //鎷滆鏂瑰紡
+
+ //娴佺▼鐩稿叧
+ string shifoubiaoji = ViewBag.shifoubiaoji as string;
+ string sifoudangqian = ViewBag.sifoudangqian as string;
+ string dangqianbuzhou = ViewBag.dangqianbuzhou as string;
+
+ List<WfHistoryDTO> lishiyijian = ViewData["lishiyijian"] as List<WfHistoryDTO>; //瀹℃壒杩涘害
}
<!DOCTYPE html>
<html>
@@ -78,21 +85,21 @@
<tbody>
<tr>
<td class="title">鍗曟嵁鍚嶇О</td>
- <td>
- <input type="text" class="form-control" value="@Model.Tittle" name="Tittle" id="Tittle" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off" readonly="readonly">
+ <td colspan="4">
+ <input type="text" class="form-control" value="@Model.Tittle" name="Tittle" id="Tittle" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off" readonly="readonly">
</td>
</tr>
<tr>
<td class="title">鐢宠浜�</td>
- <td>
+ <td colspan="4">
<input type="text" class="form-control" value="@Model.CreaterName" name="CreaterName" id="CreaterName" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off" readonly="readonly">
</td>
</tr>
<tr>
<td class="title">璇峰亣鏃堕棿</td>
- <td>
+ <td colspan="4">
<input type="text" class="layui-input layer-date ldate form-control" value="@Model.StratTimeName" name="StratTime" id="StratTime" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off" readonly="readonly">- <input type="text" class="layui-input layer-date ldate form-control" value="@Model.EndTimeName" name="EndTime" id="EndTime" style="width:150px;margin-right: 4px;" validate="RequiredField" autocomplete="off" readonly="readonly">
</td>
@@ -100,7 +107,7 @@
<tr>
<td class="title">璇峰亣绫诲瀷</td>
- <td>
+ <td colspan="4">
<select class="leaveType form-control data" name="Lavetype" id="Lavetype" style="margin-right: 4px;">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in Lavetype)
@@ -136,38 +143,88 @@
</tr>
<tr>
<td class="title">璇峰亣鏃堕暱</td>
- <td>
+ <td colspan="4">
<input class="layui-input data" style="width:100px !important;float: left;" type="number" value="@Model.LaveDay" name="LaveDay" id="LaveDay" min="0" step="1" readonly="readonly">澶�
<input class="layui-input data" style="width:100px !important;" type="number" value="@Model.LavehHour" name="LavehHour" id="LavehHour" min="0" step="1" readonly="readonly">灏忔椂
</td>
</tr>
<tr>
<td class="title">澶� 娉�</td>
- <td>
+ <td colspan="4">
<textarea class="form-control data" name="Remark" style="width:374px; vertical-align: top;height:100px" maxlength="500">@Model.Remark</textarea>
</td>
</tr>
<tr>
<td class="title">涓婁紶闄勪欢</td>
- <td>
+ <td colspan="4">
<input type="file" name="file" id="fileUp" multiple>
</td>
</tr>
- <tr>
- <td colspan="10" style="text-align: center">
- <a class="btn btn-success" href="javascript:void(0)" onclick="Save();" style="margin-left:4px; border-radius:4px;">
- <span class="bold">鎻愪氦</span>
- </a>
+ <tr id="shenpiyijian">
+ <td class="title">瀹℃壒鎰忚</td>
+ <td colspan="4">
+ <textarea class="form-control data" id="Content" name="Content" style="width:374px; vertical-align: top;height:100px" maxlength="500"></textarea>
</td>
</tr>
+ <tr>
+ <td class="title">瀹℃壒杩涘害</td>
+ <td colspan="4">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="10"> <table>
+ @if (lishiyijian.Count > 0)
+ {
+ <tr>
+ <td style="border:1px solid #ccc;width:150px;">姝ラ </td>
+ <td style="border:1px solid #ccc;width:150px;"> 鎵瑰鐘舵��</td>
+ <td style="border:1px solid #ccc;width:150px;">鎵瑰鏃堕棿</td>
+ <td style="border:1px solid #ccc;width:300px;"> 瀹℃壒鎰忚</td>
+ <td style="border:1px solid #ccc;width:100px;"> 鎵瑰浜�</td>
+ </tr>
+ }
+ @foreach (var wfHistory in lishiyijian)
+ {
+ <tr>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
+ <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
+ <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>
+ </tr>
+ }
+</table></td>
+
+
+ </tr>
- </tbody>
+ <tr>
+ <td colspan="10" style="text-align: center">
+ <a class="btn btn-success" id="tijiao" href="javascript:void(0)" onclick="Save('');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">鎻愪氦</span>
+ </a>
+
+ <a class="btn btn-success" id="tongyi" href="javascript:void(0)" onclick="Save('A');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">鍚屾剰</span>
+ </a>
+
+ <a class="btn btn-success" id="jujue" href="javascript:void(0)" onclick="Save('D');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">鎷掔粷</span>
+ </a>
+
+ <input type="hidden" id="Id" name="Id" value="@Model.Id" />
+ <input type="hidden" id="Tongguojujue" name="Tongguojujue" value="" />
+ <input type="hidden" id="Step" name="Step" value="@dangqianbuzhou" />
+ </td>
+ </tr>
+
+ </tbody>
</table>
<div id='file-list-display' style="width: 100%;text-align: left; background-color:white">
@{ for (int i = 0; i < attachmentsssss.Count; i++)
{
<div>
- <a download href='@attachmentsssss[i].Filepath'>@attachmentsssss[i].Filefullname </a> <a href='javascript: void (0);' onclick='js_method(this,"@attachmentsssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
+ <a download href='@attachmentsssss[i].Filepath'>@attachmentsssss[i].Filefullname </a> <a href='javascript: void (0);' class = 'fujianshanchu' onclick='js_method(this,"@attachmentsssss[i].Id")'><i class='glyphicon glyphicon-remove'></i> </a>
<input type="hidden" name="attachmentid" value="@attachmentsssss[i].Id" />
<input type="hidden" name="Filepath" value="@attachmentsssss[i].Filepath" />
<input type="hidden" name="Filefullname" value="@attachmentsssss[i].Filefullname" />
@@ -184,6 +241,8 @@
</form>
<script type="text/javascript">
+
+
var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95;
$("#div_content").height(hh);
@@ -207,33 +266,74 @@
$(function () {
- $(".ldate").each(function (el) {
- laydate({
- elem: "#" + $(this).attr('id'), //瀵瑰簲id
- format: 'YYYY-MM-DD hh:mm', //鏃ユ湡鏍煎紡 // 鍒嗛殧绗﹀彲浠ヤ换鎰忓畾涔夛紝璇ヤ緥瀛愯〃绀哄彧鏄剧ず骞存湀
- min: '2021-01-01', //璁惧畾鏈�灏忔棩鏈熶负褰撳墠鏃ユ湡
- max: '2099-06-16', //鏈�澶ф棩鏈�
- type: 'datetime',
- festival: false, //鏄剧ず鑺傛棩
- istime: true, 聽 //鏄惁鏄剧ず鏃跺垎绉�
- istoday: true, //鏄惁鏄粖澶�
- choose: function (datas) { //閫夋嫨鏃ユ湡瀹屾瘯鐨勫洖璋�
- // console.log("234234234234324");
- // end.min = datas; //寮�濮嬫棩閫夊ソ鍚庯紝閲嶇疆缁撴潫鏃ョ殑鏈�灏忔棩鏈�
- // end.start = datas //灏嗙粨鏉熸棩鐨勫垵濮嬪�艰瀹氫负寮�濮嬫棩
- checktime();
- }
- });
-
- });
+
$("#Lavetype").val("@Model.Lavetype");
-
+
+
+ if ("@shifoubiaoji" != "A") {
+ $("input").attr('readonly', true);
+ $("textarea").attr('readonly', true);
+ $(':radio').attr('disabled', true);
+ $(':checkbox').attr('disabled', true);
+ $(':button').attr('disabled', true);
+ //$('a').removeAttr('onclick');
+ $('select').attr('disabled', true);
+ $("#fileUp").attr('disabled', true);
+
+ $('.fujianshanchu').removeAttr('onclick');
+
+
+ if ("@sifoudangqian" == "A") {
+ $("#Content").attr('readonly', false);
+ $('#tijiao').hide();
+ } else {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ $('#tijiao').hide();
+ $('#shenpiyijian').hide();
+ }
+
+ } else {
+
+
+ //瀹℃壒鐩稿叧
+ $('#shenpiyijian').hide();
+ if ("@sifoudangqian" == "A") {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ } else {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ $('#tijiao').hide();
+ }
+
+
+ $(".ldate").each(function (el) {
+ laydate({
+ elem: "#" + $(this).attr('id'), //瀵瑰簲id
+ format: 'YYYY-MM-DD hh:mm', //鏃ユ湡鏍煎紡 // 鍒嗛殧绗﹀彲浠ヤ换鎰忓畾涔夛紝璇ヤ緥瀛愯〃绀哄彧鏄剧ず骞存湀
+ min: '2021-01-01', //璁惧畾鏈�灏忔棩鏈熶负褰撳墠鏃ユ湡
+ max: '2099-06-16', //鏈�澶ф棩鏈�
+ type: 'datetime',
+ festival: false, //鏄剧ず鑺傛棩
+ istime: true, 聽 //鏄惁鏄剧ず鏃跺垎绉�
+ istoday: true, //鏄惁鏄粖澶�
+ choose: function (datas) { //閫夋嫨鏃ユ湡瀹屾瘯鐨勫洖璋�
+ // console.log("234234234234324");
+ // end.min = datas; //寮�濮嬫棩閫夊ソ鍚庯紝閲嶇疆缁撴潫鏃ョ殑鏈�灏忔棩鏈�
+ // end.start = datas //灏嗙粨鏉熸棩鐨勫垵濮嬪�艰瀹氫负寮�濮嬫棩
+ checktime();
+ }
+ });
+
+ });
+ }
})
- function Save() {
+ function Save(tongyi) {
if ($("#StratTime").val() == '') {
toastr.warning("寮�濮嬫棩鏈熶笉鑳戒负绌�");
return;
@@ -262,9 +362,9 @@
return;
}
+ $("#Tongguojujue").val(tongyi);
-
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -285,7 +385,9 @@
_pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
}
catch (err) {
- parent._CloseTab1("/Signin/AskLeave/");
+ var pathname = window.location.pathname;
+ var search = window.location.search;
+ parent._CloseTab1(pathname + search);
}
}
@@ -351,7 +453,7 @@
var fileListDisplay = $("#file-list-display");
if (data.DataList && data.DataList.length > 0) {
for (var i = 0; i < data.DataList.length; i++) {
- var aaa = "<div><a download href ='" + data.DataList[i].Filepath + "'>" + data.DataList[i].Filefullname + " </a> <a href='javascript: void (0);' onclick='js_method(this,\"\")' ><i class='glyphicon glyphicon-remove'></i> </a> "
+ var aaa = "<div><a download href ='" + data.DataList[i].Filepath + "'>" + data.DataList[i].Filefullname + " </a> <a href='javascript: void (0);' class = 'fujianshanchu' onclick='js_method(this,\"\")' ><i class='glyphicon glyphicon-remove'></i> </a> "
aaa += ' <input type="hidden" name="attachmentid" value="" /> ';
aaa += ' <input type="hidden" name="Filepath" value="' + data.DataList[i].Filepath + '" /> ';
aaa += ' <input type="hidden" name="Filefullname" value="' + data.DataList[i].Filefullname + '" /> ';
@@ -407,7 +509,7 @@
}
-
+
function checktime() {
if ($("#StratTime").val() == '') {
@@ -422,8 +524,8 @@
return;
}
-
-
+
+
@@ -438,14 +540,14 @@
success: function (data) {
if (data.Result) {
$("#LaveDay").val(data.DataInfo.LaveDay);
- $("#LavehHour").val(data.DataInfo.LavehHour);
+ $("#LavehHour").val(data.DataInfo.LavehHour);
}
else {
toastr.error(data.Message);
}
-
-
+
+
},
error: function () {
--
Gitblit v1.9.1