Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

LR-20210131IOQH\Administrator

2021-06-10 56e5ef90ee97e296014b4faf6863315ad0c2ace4

 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) {