工资核对状态逻辑修改，3天自动确认；物品添加默认启用；

LR-20210131IOQH\Administrator

2021-06-27 45c0e976bd0864dbf103717b45d68a6e0419f456

工资核对状态逻辑修改，3天自动确认；物品添加默认启用；

 zhengcaioa/.vs/zhengcaioa/DesignTimeBuild/.dtbcache.v2

Binary files differ

 zhengcaioa/.vs/zhengcaioa/config/applicationhost.config

File was deleted

 zhengcaioa/.vs/zhengcaioa/v16/.suo

Binary files differ

 zhengcaioa/DTO/HrSalaryDTO.cs

@@ -92,6 +92,10 @@
                        str = "未确认";
                        break;

                    case "H":
                        str = "已核准";
                        break;

                    case "S":
                        str = "申诉";
                        break;

 zhengcaioa/IServices/IHrSalaryService.cs

@@ -31,5 +31,7 @@
        ResultDataEntity<HrSalaryDTO> SearchSalaryByPaging(HrSalaryDTOSearch searchEntity);

        ResultEntity SaveCheckSalary(HrSalaryDTO dto);

        void AutoCheck();
    }
}

 zhengcaioa/Services/HrSalaryService.cs

@@ -178,7 +178,7 @@
                        }
                    }

                    updatepltRole.Islock = "Q";
                    updatepltRole.Islock = "H";
                    updatepltRole.Modifier = dto.Modifier;
                    updatepltRole.Modifytime =DateTime.Now;
                    var count= _context.SaveChanges();
@@ -558,7 +558,7 @@
            var entity = (from a in _context.HrSalaries
                          join b in _context.PltUsers on a.Userid equals b.Id
                          join c in _context.HrDepts on b.DeptId equals c.Id
                          where a.RecStatus=="A" && a.Userid == userid && a.Year == year && a.Month==month
                          where a.RecStatus=="A" && a.Islock!="D" && a.Userid == userid && a.Year == year && a.Month==month
                          select new HrSalaryDTO()
                          {
                              Id = a.Id,
@@ -799,5 +799,17 @@
            data.LoadData(searchEntity, rolelist);
            return data;
        }

        public void AutoCheck()
        {
            try
            {
                var salary = _context.Database.ExecuteSqlRaw("update [hr_salary] set islock='Q',[modifier]='e4c93811-b9b1-4998-89f5-c416ebab0c07',modifytime=getdate() where islock = 'H' and DATEDIFF(hh,[modifytime], getdate()) > 72");
            }
            catch (Exception)
            {
                throw;
            }
        }
    }
}

 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs

@@ -62,6 +62,8 @@
        /// <returns></returns>
        public IActionResult GetList(HrSalaryDTOSearch search)
        {
            _hrSalaryService.AutoCheck();

            return new JsonResult(_hrSalaryService.SearchSalaryByPaging(search));
        }

@@ -212,6 +214,9 @@
        /// <returns></returns>
        public IActionResult GetSearchList(HrSalaryDTOSearch search)
        {
            //自动确认
            _hrSalaryService.AutoCheck();

            return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
        }
        

 zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml

@@ -270,10 +270,23 @@
            "hideMethod": "fadeOut"
        };

        var id = '@Model.Id';

         $(function () {

             if (id.length > 0) {

             }
             else {
                 $("#GoodsStatus").val("A");
             }

            });



         var id = '@Model.Id';



        var delPosition = function () {
            if (id == null || id == '') {
@@ -315,7 +328,7 @@
        // 保存岗位信息
        var savePosition = function () {

          


            if ($("#ClassifyId").val() == '') {
                toastr.warning("物品类别不能为空");
@@ -329,7 +342,7 @@
                toastr.warning("物品数量不能为空");
                return;
            }
            

            if ($("#GoodsStatus").val() == '') {
                toastr.warning("物品状态不能为空");
                return;
@@ -339,7 +352,7 @@
                toastr.warning("物品名称不能为空");
                return;
            }
            




@@ -354,7 +367,7 @@
                global: false,
                data: $('form').serializeArray(),
                success: function (data) {
                  



                        if (data.Result) {

 zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml

@@ -72,25 +72,25 @@
                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                <label class="text-right col-sm-3 col-md-3 control-label">奖金</label>
                                <div class="col-sm-9 col-md-9">
                                    <input class="form-control" name="Jiangjin" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiangjin" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    <input class="form-control" id="Jiangjin" name="Jiangjin" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiangjin" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                </div>
                            </div>
                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                <label class="text-right col-sm-3 col-md-3 control-label">补发工资</label>
                                <div class="col-sm-9 col-md-9">
                                    <input class="form-control" name="Bufagongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Bufagongzi" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    <input class="form-control" id="Bufagongzi" name="Bufagongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Bufagongzi" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                </div>
                            </div>
                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                <label class="text-right col-sm-3 col-md-3 control-label">赔偿</label>
                                <div class="col-sm-9 col-md-9">
                                    <input class="form-control" name="Peichang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Peichang" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    <input class="form-control" id="Peichang" name="Peichang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Peichang" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                </div>
                            </div>
                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                <label class="text-right col-sm-3 col-md-3 control-label">纠错</label>
                                <div class="col-sm-9 col-md-9">
                                    <input class="form-control" label="薪资待遇" name="Jiucuo" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiucuo" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                    <input class="form-control" id="Jiucuo" name="Jiucuo" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiucuo" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                                </div>
                            </div>

@@ -133,7 +133,7 @@
                <a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">取消</span>
                </a>
                <a class="btn btn-success" href="javascript:void(0)" onclick="saveSimCost();" style="margin-left:4px; border-radius:4px;">
                <a class="btn btn-success" href="javascript:void(0)" onclick="saveCheck();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">提交</span>
                </a>
            </div>
@@ -173,24 +173,29 @@
        };

        // 保存
        function saveSimCost() {
        function saveCheck() {

            if ($("#cbbCard").val() == '') {
                toastr.warning("电话卡号不能为空");
            if ($("#Jiangjin").val() == '') {
                toastr.warning("奖金不能为空");
                return;
            }
            if ($("#billamount").val() == '') {
                toastr.warning("实际电话费用不能为空");
            if ($("#Bufagongzi").val() == '') {
                toastr.warning("补发工资不能为空");
                return;
            }
            if ($("#acTime").val() == '') {
                toastr.warning("费用记账日期不能为空");
            if ($("#Peichang").val() == '') {
                toastr.warning("赔偿不能为空");
                return;
            }
            if ($("#Jiucuo").val() == '') {
                toastr.warning("纠错不能为空");
                return;
            }

           
            $.ajax({
                type: "POST",
                url: "/SimCost/SaveSimCost2",
                url: "/SalaryCheck/SaveCheck",
                dataType: "json",
                global: false,
                data: $('#fm').serialize(),
@@ -198,12 +203,7 @@

                        if (data.Result) {
                            parent.layer.msg('设置成功', { icon: 6 });
                            try {
                                _pageAutoClose();//自动关闭页面方法
                            }
                            catch (err) {
                                parent._CloseTab1("/SimCost/Edit/");
                            }
                            _pageAutoClose();//自动关闭页面方法                            
                        }
                        else {
                            // toastr.error("失败");

 zhengcaioa/zhengcaioa/zhengcaioa.csproj.user

@@ -15,6 +15,6 @@
    <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>False</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <ShowAllFiles>true</ShowAllFiles>
    <ShowAllFiles>false</ShowAllFiles>
  </PropertyGroup>
</Project>