From 56e5ef90ee97e296014b4faf6863315ad0c2ace4 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期四, 10 六月 2021 19:08:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

---
 zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml
index 15eb135..fa2198e 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/Signin.cshtml
@@ -33,8 +33,8 @@
             {
                 label: '璇峰亣', name: 'id', align: "center", sortable: false, editable: true,// labtype: 'txt', hidden: false
                 formatter: function (cellvalue, options, rowObject) {
-                    return '<a href="javascript:void(0)" onclick="AskLeave(\'' + $.trim(rowObject.Id) + '\');"><span style="background: #ECF3FF;">璇峰亣</span></a>&nbsp;&nbsp;&nbsp;&nbsp;' +
-                        '<a href="javascript:void(0)" onclick="AskLeaveOff(\'' + $.trim(rowObject.Id) +'\');"><span style="background: #ECF3FF;">閿�鍋�</span></a>';
+                    return '<a href="javascript:void(0)" onclick="AskLeave(\'\',\'' + new Date(rowObject.SgninDate).Format("yyyy-MM-dd") + '\',\'' + new Date(rowObject.SgninDate).Format("yyyy-MM-dd") + '\');"><span style="background: #ECF3FF;">璇峰亣</span></a>&nbsp;&nbsp;&nbsp;&nbsp;' +
+                        '<a href="javascript:void(0)" onclick="AskLeaveOff(\'\',\'' + new Date(rowObject.SgninDate).Format("yyyy-MM-dd") + '\',\'' + new Date(rowObject.SgninDate).Format("yyyy-MM-dd") + '\');"><span style="background: #ECF3FF;">閿�鍋�</span></a>';
                 }
             },
 
@@ -55,13 +55,13 @@
         ];
 
          
-        function AskLeave(id) {
-            OpenWindow("璇峰亣鐢宠", "500px", "800px", "/Signin/AskLeave/?signinId="+ id);
+        function AskLeave(id, StratTimeName, EndTimeName) {
+            OpenWindow("璇峰亣鐢宠", "500px", "800px", "/Signin/AskLeave?id=&StratTimeName=" + StratTimeName + "&EndTimeName=" + EndTimeName);
 
         }
 
-        function AskLeaveOff(id) {
-            OpenWindow("閿�鍋囩敵璇�", "500px", "800px", "/Signin/AskLeaveOff/?signinId=" + id);
+        function AskLeaveOff(id, StratTimeName, EndTimeName) {
+            OpenWindow("閿�鍋囩敵璇�", "500px", "800px", "/Signin/AskLeaveOff?id=&StratTimeName=" + StratTimeName + "&EndTimeName=" + EndTimeName);
         }
         var _afterSave = function (result) {
             if (result) {

--
Gitblit v1.9.1