username@email.com
2022-01-04 0c7b13e91cd472e21e4a620355e6fcabc11f695a
计件登记,汇总,打印
6个文件已修改
1个文件已添加
198 ■■■■■ 已修改文件
zhengcaioa/Services/AdmPieceCheckService.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/printList.cshtml 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/AdmPieceCheckService.cs
@@ -199,7 +199,11 @@
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            data.Heji1 = Math.Round(query.Sum(x => x.Gongzi) ?? 0, 2);
            data.Heji2 = Math.Round(query.Sum(x => x.Shuliang ?? 0), 2);
            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Gongzi) ?? 0, 2);
            data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Shuliang ?? 0), 2);
            data.LoadData(searchEntity, lianlist);
            return data;
        }
zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs
@@ -59,6 +59,15 @@
            actionEntity1.PageIco = "fa fa-plus";
            actionEntity1.ActionName = "新增";
            actionlist.Add(actionEntity1);
            ActionEntity actionEntity3 = new ActionEntity();
            actionEntity3.OpenType = 0;
            actionEntity3.ActionUrl = "";
            actionEntity3.ActionFun = "Print";
            actionEntity3.PageIco = "fa fa-print";
            actionEntity3.ActionName = "打印";
            actionlist.Add(actionEntity3);
            ViewData["ActionInfo"] = actionlist;
@@ -70,13 +79,29 @@
            return View();
        }
        public IActionResult GetList(AdmPieceCheckDTOSearch search)
        {
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            return new JsonResult(_admPieceCheckService.SearchByPaging(search));
        }
        public IActionResult printList(AdmPieceCheckDTOSearch search)
        {
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            search.rows = 1000;
            search.page = 1;
            var resultDataEntity = _admPieceCheckService.SearchByPaging(search);
            ViewBag.ListCooperOrderDTO = resultDataEntity.DataList as List<AdmPieceCheckDTO>;
            ViewBag.Heji1 = resultDataEntity.Heji1;
            ViewBag.Heji2 = resultDataEntity.Heji2;
            return View();
        }
        public IActionResult Edit(string id = null)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml
@@ -94,6 +94,10 @@
            var year = date.getFullYear();
            var month = date.getMonth();
            var strDate = date.getDate();
            if (month == 0) {
                year = year - 1;
                month = 12;
            }
            if (month >= 1 && month <= 9) {
                month = "0" + month;
            }
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
@@ -48,7 +48,34 @@
            OpenWindow("新增计件登记", "98%", "90%", "/AdmPieceCheck/Edit/");
        }
        var _afterLoadDataload = function (xhr) {
            //var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_shouru = 0, total_zhuchu = 0, total_yue = 0;
            //for (var i = 0, l = rows.length; i < l; i++) {
            //    total_shouru += (rows[i].AllIncome - 0);
            //    total_zhuchu += (rows[i].AllExpenses - 0);
            //    total_yue += (rows[i].Balance - 0);
            //}
            jQuery("#jqGrid").jqGrid("footerData", "set", { Remark: "<font color='darkgoldenrod'>--当页合计--</font> </br>  <font color='darkgoldenrod'>--合计--</font>", Gongzi: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", Shuliang: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>"});
        };
        var _pagePrint = function () {
            var WorkTime = $("#PBSWorkTimestart").val() + '|' + $("#PBSWorkTimeend").val();
            var DeptId = $("#PBSDeptId").val();
            var UserName = $("#PBSUserName").val();
            var url = "/AdmPieceCheck/printList?WorkTime=" + WorkTime + "&DeptId=" + DeptId + "&UserName=" + UserName;
            var me = window.open(url, "打印");  //打开新窗口
        }
        var _afterSave = function (result) {
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/printList.cshtml
New file
@@ -0,0 +1,128 @@
@model DTO.AdmPieceCheckDTO
@using DTO;
@{
    ViewBag.Title = "CooperOrder";
    Layout = null;
    List<AdmPieceCheckDTO> ListCooperOrderDTO = ViewBag.ListCooperOrderDTO as List<AdmPieceCheckDTO>; //问题类型
                                                                                                      //string  Heji1 = ViewBag.Heji1;
                                                                                                      //string Heji2 = ViewBag.Heji2;
}
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta http-equiv="Pragma" content="no-cache">
    <meta http-equiv="Cache-Control" content="no-siteapp" />
    <meta http-equiv="Cache-Control" content="no-cache">
    <meta http-equiv="Expires" content="0">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
    <meta name="renderer" content="webkit">
    <title>@SiteConfig.SiteName</title>
    <meta name="keywords" content="@SiteConfig.Keywords">
    <meta name="description" content="@SiteConfig.Description">
    <meta name="author" content="@SiteConfig.Author">
    <link rel="icon" type="image/x-icon" href="@SiteConfig.ShortcutIcon">
    <!-- uc强制竖屏 -->
    <meta name="screen-orientation" content="portrait">
    <!-- QQ强制竖屏 -->
    <meta name="x5-orientation" content="portrait">
    <!-- UC强制全屏 -->
    <meta name="full-screen" content="yes">
    <!-- QQ强制全屏 -->
    <meta name="x5-fullscreen" content="true">
    <!--[if lt IE 9]>
    <meta http-equiv="refresh" content="0;ie.html" />
    <![endif]-->
    <script src="~/js/jquery.min.js"></script>
    <style type="text/css">
        body {
            text-align: left;
            font-size: 12px;
        }
        table {
            border-collapse: collapse;
            border: none;
            width: 900px;
            margin-left: 0px;
            text-align: center;
        }
        td {
            border: solid #000000 1px;
        }
    </style>
</head>
<body>
    <button type="button" onclick="onprint()">打印</button>
    <div id="printArea">
        @if (ListCooperOrderDTO != null && ListCooperOrderDTO.Count > 0)
        {<table>
    @{
        int i = 1;
    }
             <tr>
                 <td style="width:4%;">  编号</td>
                 <td style="width:12%;">  工作时间</td>
                 <td style="width:12%;"> 部门</td>
                 <td style="width:12%;"> 员工姓名</td>
                 <td style="width:12%;"> 计件类别</td>
                 <td style="width:12%;"> 计件项目</td>
                 <td style="width:12%;"> 工作内容</td>
                 <td style="width:12%;"> 绩效提成(元)</td>
                 <td style="width:12%;"> 数量</td>
             </tr>
    @foreach (var CooperOrderDTO in ListCooperOrderDTO)
    {
        <tr>
            <td>  @i</td>
            <td>   @CooperOrderDTO.WorkTimeName</td>
            <td>   @CooperOrderDTO.DeptName</td>
            <td>   @CooperOrderDTO.UserName</td>
            <td>   @CooperOrderDTO.PayTypeName</td>
            <td>   @CooperOrderDTO.WorkProName</td>
            <td>   @CooperOrderDTO.Remark</td>
            <td>   @CooperOrderDTO.Gongzi.Value.ToString("F2")</td>
            <td>   @CooperOrderDTO.Shuliang.Value.ToString("F2")</td>
        </tr>
        i++;
    }
    <tr>
        <td>  </td>
        <td> </td>
        <td>   </td>
        <td>   </td>
        <td>   </td>
        <td>  </td>
        <td>--合计--</td>
        <td>  @ViewBag.Heji1</td>
        <td>   @ViewBag.Heji2</td>
    </tr>
</table>
        }
    </div>
</body>
<script type="text/javascript">
    function printHtml(html) {
        var bodyHtml = document.body.innerHTML;
        document.body.innerHTML = html;
        window.print();
        document.body.innerHTML = bodyHtml;
    }
    function onprint() {
        var html = $("#printArea").html();
        printHtml(html);
    }
</script>
</html>
zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
@@ -130,6 +130,10 @@
            var year = date.getFullYear();
            var month = date.getMonth();
            var strDate = date.getDate();
            if (month == 0) {
                year = year - 1;
                month = 12;
            }
            if (month >= 1 && month <= 9) {
                month = "0" + month;
            }
zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
@@ -123,6 +123,10 @@
            var seperator1 = "-";
            var year = date.getFullYear();
            var month = date.getMonth();
            if (month == 0) {
                year = year - 1;
                month = 12;
            }
            var strDate = date.getDate();
            if (month >= 1 && month <= 9) {
                month = "0" + month;