From c888afad7b611e6341b8e733eff5e651ae82695b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 10 六月 2021 14:58:43 +0800
Subject: [PATCH] 计件登记,考勤设计

---
 zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml |   73 ++++++++++++++++++++++++++++++------
 1 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml
index 0ba7480..4155779 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml
@@ -4,9 +4,16 @@
 
 @{
     Layout = null;
-   
-      ResultDataEntity<SysAttachmentDTO> attachment = ViewBag.attachment as  ResultDataEntity<SysAttachmentDTO>; //闂绫诲瀷
-      List<SysAttachmentDTO>  attachmentsssss =  attachment.DataList;
+
+    ResultDataEntity<SysAttachmentDTO> attachment = ViewBag.attachment as  ResultDataEntity<SysAttachmentDTO>; //闂绫诲瀷
+    List<SysAttachmentDTO>  attachmentsssss =  attachment.DataList;
+
+    if (attachmentsssss == null)
+    {
+        attachmentsssss = new List<SysAttachmentDTO>();
+    }
+
+    List<SysCodeDtl> Lavetype = ViewData["Lavetype"] as List<SysCodeDtl>; //鎷滆鏂瑰紡
 }
 
 <!DOCTYPE html>
@@ -99,27 +106,58 @@
         <table style="width: 100%;text-align: left; background-color:white">
             <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>
+
+                </tr>
+                <tr>
+                    <td class="title">鐢宠浜�</td>
+                    <td>
+                        <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>
-                        <input type="text" class="layui-input  layer-date  ldate form-control" value="@Model.StratTime.ToString("yyyy-MM-dd HH:mm:ss")" name="StratTime" id="StratTime" style="width:150px;margin-right: 4px;" autocomplete="off" readonly="readonly">-
-                        <input type="text" class="layui-input  layer-date ldate form-control" value="@Model.EndTime.ToString("yyyy-MM-dd HH:mm:ss")" name="EndTime" id="EndTime" style="width:150px;margin-right: 4px;" autocomplete="off" readonly="readonly">
+                        <input type="text" class="layui-input  layer-date  ldate form-control" value="@Model.StratTimeName" name="StratTime" id="StratTime" style="width:150px;margin-right: 4px;" 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;" autocomplete="off" readonly="readonly">
                     </td>
                 </tr>
                 <tr>
                     <td class="title">閿�鍋囩被鍨�</td>
                     <td>
                         <select class="leaveType form-control" name="Lavetype" id="Lavetype" style="width:150px;margin-right: 4px;">
-                            <option value="">璇烽�夋嫨</option>
-                            <option value="1">鍑哄樊</option>
-                            <option value="2">鐥呭亣</option>
-                            <option value="3">蹇樻墦鍗�</option>
+                            <option value="" hassubinfo="true">璇烽�夋嫨</option>
+                            @foreach (var item in Lavetype)
+                            {
+                                @if (!item.CodeSn.Equals(Model.Lavetype))
+                                {
+                                    <option value="@item.CodeSn" hassubinfo="true">
+                                        @item.Comments
+                                    </option>
+                                }
+                                else
+                                {
+                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+                                        @item.Comments
+                                    </option>
+                                }
+
+                            }
+                            @*<option value="">璇烽�夋嫨</option>
+                    <option value="1">鍑哄樊</option>
+                    <option value="2">鐥呭亣</option>
+                    <option value="3">蹇樻墦鍗�</option>*@
                         </select>
                     </td>
                 </tr>
                 <tr>
                     <td class="title">鐢宠鐞嗙敱</td>
                     <td>
-                        <textarea name="Remark" style="width:374px; vertical-align: top;height:100px">@Model.Remark</textarea>
+                        <textarea name="Remark" style="width:374px; vertical-align: top;height:100px" maxlength="500">@Model.Remark</textarea>
                     </td>
                 </tr>
 
@@ -201,7 +239,7 @@
             $(".ldate").each(function (el) {
                 laydate({
                     elem: "#" + $(this).attr('id'), //瀵瑰簲id
-                    format: 'YYYY-MM-DD hh:mm:ss', //鏃ユ湡鏍煎紡 // 鍒嗛殧绗﹀彲浠ヤ换鎰忓畾涔夛紝璇ヤ緥瀛愯〃绀哄彧鏄剧ず骞存湀
+                    format: 'YYYY-MM-DD hh:mm', //鏃ユ湡鏍煎紡 // 鍒嗛殧绗﹀彲浠ヤ换鎰忓畾涔夛紝璇ヤ緥瀛愯〃绀哄彧鏄剧ず骞存湀
                     min: '2021-01-01', //璁惧畾鏈�灏忔棩鏈熶负褰撳墠鏃ユ湡
                     max: '2099-06-16', //鏈�澶ф棩鏈�
                     type: 'datetime',
@@ -264,20 +302,29 @@
 
         function Save() {
             if ($("#StratTime").val() == '') {
-                toastr.warning("寮�濮嬫椂闂翠笉鑳戒负绌�");
+                toastr.warning("寮�濮嬫棩鏈熶笉鑳戒负绌�");
                 return;
             }
 
             if ($("#EndTime").val() == '') {
-                toastr.warning("缁撴潫鏃堕棿涓嶈兘涓虹┖");
+                toastr.warning("缁撴潫鏃ユ湡涓嶈兘涓虹┖");
                 return;
             }
+
+            if ($("#EndTime").val() <= $("#StratTime").val()) {
+                toastr.warning("缁撴潫鏃ユ湡涓嶈兘灏忎簬寮�濮嬫棩鏈�");
+                return;
+            }
+
+            
 
             if ($("#Lavetype").val() == '') {
                 toastr.warning("閿�鍋囩被鍨嬩笉鑳戒负绌�");
                 return;
             }
 
+           
+
 
           
             //var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }

--
Gitblit v1.9.1