今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增，短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 ...

username@email.com

2021-08-04 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86

今日开发          专家派工-没有审批的专家不能派工
  意向客户访问新增，短信发送不要红星
  合作客户  在客户资料列表增加快捷访问链接
                       工作报表  修改排版
                       问题维护    试用法条  改为1000字， 问题查询打开直接默认未审核，不要停两秒再刷新
  项目新增 增加字段：采购预算 万元
  工作考评  考聘不称职当天无工资

 zhengcaioa/DTO/CooperVisitDTO.cs

@@ -47,5 +47,7 @@

        public string Vistime { get; set; }

        public string Viscustomer { get; set; }

    }
}

 zhengcaioa/DTO/ProjectDTO.cs

@@ -78,6 +78,10 @@

        public decimal? Fencha { get; set; }
        public int? Shuliang { get; set; }

        public decimal? Caigouyusuan { get; set; }

        public string CaigouyusuanName { get; set; }
    }

    public class ProjectDTOSearch : SearchEntity
@@ -124,5 +128,7 @@

        public string Baojiachaxiaoyu { get; set; }

      

    }
}

 zhengcaioa/DTO/TongjiBaoBiaoDTO.cs

@@ -35,6 +35,8 @@
        public List<TongjiBaoBiaoDTO> xiangmushishiDTOs { get; set; }
        public int dingdanDTOsCount { get; set; }
        public string UserName { get; set; }

        public string UserDaka { get; set; }
    }



 zhengcaioa/IServices/IAdmEvaluateService.cs

@@ -19,5 +19,7 @@
        ResultEntity ModifyStatus(string id, string userid);

        ResultDataEntity<PltUserDTO> SearchUserByPaging(PltUserDTOSearch searchEntity);

        List<AdmEvaluateDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
    }
}

 zhengcaioa/Model/Project.cs

@@ -43,5 +43,6 @@
        public decimal? DshxDefen { get; set; }
        public decimal? Fencha { get; set; }
        public int? Shuliang { get; set; }
        public decimal? Caigouyusuan { get; set; }
    }
}

 zhengcaioa/Model/zhengcaioaContext.cs

@@ -3884,7 +3884,7 @@
                    .HasColumnName("shenhetime");

                entity.Property(e => e.Shiyongfatiao)
                    .HasMaxLength(500)
                    .HasMaxLength(1000)
                    .HasColumnName("shiyongfatiao");
            });
            modelBuilder.Entity<LiaotianShoucang>(entity =>
@@ -4926,6 +4926,10 @@
                    .HasColumnType("money")
                    .HasColumnName("drhx_defen");

                entity.Property(e => e.Caigouyusuan)
                   .HasColumnType("money")
                   .HasColumnName("caigouyusuan");

                entity.Property(e => e.DrhxPrice)
                    .HasMaxLength(500)
                    .HasColumnName("drhx_price");

 zhengcaioa/Services/AdmEvaluateService.cs

@@ -303,5 +303,24 @@
            data.LoadData(searchEntity, lianlist);
            return data;
        }



        public List<AdmEvaluateDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
        {


            // var listCooperVisits = _context.CooperVisits.Where(r => id.Contains(r.Id) && r.RecStatus == "A").Select(x => x.Viscustomer).ToList();

            var admEvaluates = _context.AdmEvaluates.Where(r => r.RecStatus == "A" && r.UserId == userid && r.Evaluatetime >= datemin && r.Evaluatetime < datemax).ToList();

            var result = _mapper.Map<List<AdmEvaluateDTO>>(admEvaluates);





            return result;
        }
    }
}

 zhengcaioa/Services/CooperVisitService.cs

@@ -131,19 +131,35 @@
            var query = (from a in _context.CooperVisits
                         join b in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "visType")
                         on a.VisType equals b.CodeSn
                            into bzsssss
                         from bzzzzz in bzsssss.DefaultIfEmpty()

                         join c in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jtype")
                         on a.Jtype equals c.CodeSn
                           into czsssss
                         from czzzzz in czsssss.DefaultIfEmpty()

                         join d in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "zw")
                          on a.Zw equals d.CodeSn
                            into dzsssss
                         from dzzzzz in dzsssss.DefaultIfEmpty()

                         join e in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "yx")
                         on a.Yx equals e.CodeSn
                           into ezsssss
                         from ezzzzz in ezsssss.DefaultIfEmpty()

                         join f in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jy")
                          on a.Jy equals f.CodeSn
                         join zz in _context.CooperatecustomCustomers.Where(x => x.RecStatus == "A")
                            into fzsssss
                         from fzzzzz in fzsssss.DefaultIfEmpty()

                         join zz in _context.CooperatecustomCustomers
                         on a.Viscustomer equals zz.Id
                         join g in _context.Areas on zz.Sheng equals g.CodeId
                         join h in _context.Areas on zz.City equals h.CodeId
                         join i in _context.Areas on zz.AreaId equals i.CodeId
                          
                             //join g in _context.Areas on zz.Sheng equals g.CodeId
                             //join h in _context.Areas on zz.City equals h.CodeId
                             //join i in _context.Areas on zz.AreaId equals i.CodeId



@@ -158,7 +174,7 @@
                              && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || zz.Sheng == searchEntity.Sheng.Trim())
                               && (string.IsNullOrWhiteSpace(searchEntity.City) || zz.City == searchEntity.City.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || zz.AreaId == searchEntity.AreaId.Trim())

                                 && (string.IsNullOrWhiteSpace(searchEntity.Viscustomer) || a.Viscustomer == searchEntity.Viscustomer.Trim())
                         select new CooperVisitDTO
                         {
                             Id = a.Id,
@@ -168,12 +184,12 @@
                             Name = zz.Name,
                             Jtype = a.Jtype,
                             Jdr = a.Jdr,
                             ShengName = g.Name + "-" + h.Name + "-" + i.Name,
                             VisTypeName = b.Comments,
                             JtypeName = c.Comments,
                             ZwName = d.Comments,
                             YxName = e.Comments,
                             JyName = f.Comments,
                             //ShengName = g.Name + "-" + h.Name + "-" + i.Name,
                             VisTypeName = bzzzzz.Comments,
                             JtypeName = czzzzz.Comments,
                             ZwName = dzzzzz.Comments,
                             YxName = ezzzzz.Comments,
                             JyName = fzzzzz.Comments,
                             Zw = a.Zw,
                             Talk = a.Talk,
                             Khfk = a.Khfk,

 zhengcaioa/Services/ExpertService.cs

@@ -268,7 +268,7 @@

        public List<ExpertDTO> GetList()
        {
            var listExperts = _context.Experts.Where(e => e.RecStatus == "A").ToList();
            var listExperts = _context.Experts.Where(e => e.RecStatus == "A" && e.ShenheStatus == "A").ToList();
            var list = _mapper.Map<List<ExpertDTO>>(listExperts);
            return list;
        }

 zhengcaioa/Services/ProjectService.cs

@@ -93,7 +93,8 @@
                    updateproject.Dailicontact = project.Dailicontact;
                    updateproject.Dailiaddress = project.Dailiaddress;
                    updateproject.Fencha = project.Fencha;
                    updateproject.Shuliang = updateproject.Shuliang;
                    updateproject.Shuliang = project.Shuliang;
                    updateproject.Caigouyusuan = project.Caigouyusuan;

                }

@@ -236,6 +237,7 @@
            var projectDTO = _mapper.Map<ProjectDTO>(entity);
            projectDTO.DrhxDefenName = projectDTO.DrhxDefen.HasValue ? projectDTO.DrhxDefen.Value.ToString("F2") : "";
            projectDTO.DshxDefenName = projectDTO.DshxDefen.HasValue ? projectDTO.DshxDefen.Value.ToString("F2") : "";
            projectDTO.CaigouyusuanName = projectDTO.Caigouyusuan.HasValue ? projectDTO.Caigouyusuan.Value.ToString() : "";
            if (projectreasons!=null && projectreasons.Count>0)
            {
                projectDTO.projectreasons = projectreasons;
@@ -295,7 +297,7 @@
            List<ProjectDTO> list = new List<ProjectDTO>();
            //筛选
            StringBuilder sql = new StringBuilder();
            sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[dshx_defen] ,b.[name] +'-'+c.[name]+'-'+d.[name]  Sheng ,a.city  ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime       ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[Fencha],a.[Shuliang],a.[remark],a.[rec_status] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia]  , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact] ,toubiaocishu = stuff((select '、'+ f.[names] from  [Projectzhongbiao] f where  f.[ProjectId] = a.[Id]  for xml path('')), 1,1, '')   "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where  CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '') 
            sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[caigouyusuan],a.[dshx_defen] ,b.[name] +'-'+c.[name]+'-'+d.[name]  Sheng ,a.city  ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime       ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[Fencha],a.[Shuliang],a.[remark],a.[rec_status] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia]  , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact] ,toubiaocishu = stuff((select '、'+ f.[names] from  [Projectzhongbiao] f where  f.[ProjectId] = a.[Id]  for xml path('')), 1,1, '')   "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where  CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '') 
            sql.Append("FROM [Project] a ");
            sql.Append("left join  [Area] b  on a.[sheng]  = b.[codeID] ");
            sql.Append("left join  [Area] c  on a.[city]  = c.[codeID] ");

 zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs

@@ -45,7 +45,7 @@
            _cusFangwenjiluService = cusFangwenjiluService;
        }

        public IActionResult Index()
        public IActionResult Index(string Viscustomer = "")
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
@@ -77,7 +77,7 @@
            ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();



            ViewBag.Viscustomer = Viscustomer;

            ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
            return View();
@@ -90,7 +90,7 @@
            return new JsonResult(_cooperVisitService.SearchByPaging(search));
        }

        public IActionResult Edit(string id = null)
        public IActionResult Edit(string id = null, string Viscustomer = null)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
@@ -103,6 +103,7 @@
            }
            else
            {
                dto.Viscustomer = Viscustomer;
                dto.Vistime = DateTime.Now;
            }


 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -3505,18 +3505,20 @@
                    tongjibaobiaobaobiaoDTO.UserName = "";
                    if (deptDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserName += "部门：" + deptDTO.DeptName + "  ";
                        tongjibaobiaobaobiaoDTO.UserName += "部门：" + deptDTO.DeptName + "&nbsp&nbsp&nbsp&nbsp";
                    }
                    tongjibaobiaobaobiaoDTO.UserName = "姓名：" + userDTO.UserName + "  ";
                    tongjibaobiaobaobiaoDTO.UserName += "姓名：" + userDTO.UserName + "&nbsp&nbsp&nbsp&nbsp";

                    tongjibaobiaobaobiaoDTO.UserDaka = ""; 
                    if (hrPositionDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserName += "职务：" + hrPositionDTO.PostName + "  ";
                        tongjibaobiaobaobiaoDTO.UserDaka += "职务：" + hrPositionDTO.PostName + "&nbsp&nbsp&nbsp&nbsp";
                    }
                    if (admSignInDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserName += "打卡时间：上午 " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
                            + "下午 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
                              + "加班 " + (admSignInDTO.OvertimeIn.HasValue ? admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
                        tongjibaobiaobaobiaoDTO.UserDaka += "    æ‰“卡时间：上午 " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
                            + "&nbsp&nbsp&nbsp&nbsp下午 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
                              + (admSignInDTO.OvertimeIn.HasValue ? "    åŠ ç­ " + admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") + "-" : "") + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
                    }

                    tongjibaobiaobaobiaoDTOs.Add(tongjibaobiaobaobiaoDTO);

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -49,6 +49,7 @@
        private readonly IConfiguration _configuration;
        private readonly IHttpClientFactory _clientFactory;
        private readonly IAskService _askService; 
        private readonly IAdmEvaluateService _admEvaluateService;

        private readonly decimal jiabangongzibiaozhun = new decimal(21.5);
        public TimedBackgroundService(ILogger<TimedBackgroundService> logger, IServiceScopeFactory factory)
@@ -81,6 +82,7 @@
            _configuration = factory.CreateScope().ServiceProvider.GetRequiredService<IConfiguration>();
            _clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>();
            _askService= factory.CreateScope().ServiceProvider.GetRequiredService<IAskService>();
            _admEvaluateService = factory.CreateScope().ServiceProvider.GetRequiredService<IAdmEvaluateService>();
        }
        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
        {
@@ -1336,8 +1338,10 @@
                searchEntity.AttendanceId = admAttendanceDTO.Id;
                List<AdmAttendanceDtlDTO> admAttendanceDtlDTOs = _admAttendanceDtlService.GetList(searchEntity).OrderBy(x => x.SgninDate).ToList();

                //查询是否有不称职的工作考评
               var admEvaluateDTOs = _admEvaluateService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x=>x.EvaluateValue == "03").ToList();
                //当月出勤率
                decimal chuqinlv = Math.Round(admAttendanceDTO.Shijichuqin / admAttendanceDTO.Yingchuqin,4); 
                decimal chuqinlv = Math.Round((admAttendanceDTO.Shijichuqin- admEvaluateDTOs.Count) / admAttendanceDTO.Yingchuqin,4); 

                //查询当前员工职务的基本工资配置

@@ -1392,7 +1396,12 @@
                                    }
                            }
                        }
                        shiyongqichuqinlv = Math.Round(shiyongqichuqintianshu / admAttendanceDTO.Yingchuqin, 4);

                        //查询是否有不称职的工作考评
                        var admEvaluateDTOsshiyongqi = _admEvaluateService.GetListsalary(userList[i].Id, dateminkaoqin, userList[i].ShiyongDateEnd.Value.AddDays(1)).Where(x => x.EvaluateValue == "03").ToList();


                        shiyongqichuqinlv = Math.Round((shiyongqichuqintianshu- admEvaluateDTOsshiyongqi.Count) / admAttendanceDTO.Yingchuqin, 4);
                    }
                    else
                    {

 zhengcaioa/zhengcaioa/Views/CooperVisit/Index.cshtml

@@ -1,6 +1,7 @@
@{
    ViewBag.Title = "CooperVisit";
    Layout = "~/Views/Shared/_Layout_Search.cshtml";
    string Viscustomer = ViewBag.Viscustomer as string;
}
@section headerStyle{
    <script type="text/javascript">
@@ -9,6 +10,7 @@
        var hyfls = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.hyfl))';
        var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
         var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';

        loseherght = 60;
        gridConfig = { multiselect: true, selectcol: "Id" };
        dataCol = [
@@ -21,7 +23,7 @@
                }
            },

            { label: '所属区域', name: 'ShengName', labtype: 'txt', hidden: false, width: 100  },
            //{ label: '所属区域', name: 'ShengName', labtype: 'txt', hidden: false, width: 100  },
            { label: '客户单位', name: 'Name', labtype: 'txt', hidden: false, width: 100  },
            { label: '拜访方式', name: 'VisTypeName', labtype: 'txt', hidden: false, width: 100 },
            { label: '接待人', name: 'Jdr', labtype: 'txt', hidden: false, width: 100},
@@ -32,7 +34,7 @@
            { label: '跟踪建议', name: 'JyName', labtype: 'txt', hidden: false, width: 100 },

        ];
        dataUrl = "/CooperVisit/GetList";
        dataUrl = "/CooperVisit/GetList?Viscustomer=@Viscustomer";
        searchCol = [
            { label: '客户来源', name: 'Khly', labtype: 'combox', hidden: false, data: JSON.parse(khlys), cwidth: '5%', cccwidth: '8%' },
            { label: '行业分类', name: 'Hyfl', labtype: 'combox', hidden: false, data: JSON.parse(hyfls), cwidth: '5%', cccwidth: '15%' },
@@ -49,7 +51,7 @@

        ];
        var _pageAdd = function () {
            OpenWindow("新增意向客户拜访", "98%", "90%", "/CooperVisit/Edit/");
            OpenWindow("新增合作客户回访", "98%", "90%", "/CooperVisit/Edit?Viscustomer=@Viscustomer");
        }



 zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml

@@ -31,7 +31,18 @@
            { label: '业务经理', name: 'YwjlName', labtype: 'txt', hidden: false, width: 100 },
            { label: '订单数量', name: 'Ordercount', labtype: 'txt', hidden: false, width: 100 },
            { label: '订单产值', name: 'Moneycount', labtype: 'txt', hidden: false, width: 100 },

            {
                label: '客户回访', name: 'Name111', labtype: 'txt', hidden: false, width: 100,
                formatter: function (cellvalue, options, rowObject) {
                    return "<a onclick=\"OpenWindow('新增合作客户回访','98%','100%', '/CooperVisit/Edit?id=&Viscustomer=" + rowObject.Id + "')\"  >客户回访</a>";
                }
            },
            {
                label: '回访记录', name: 'Name112', labtype: 'txt', hidden: false, width: 100,
                formatter: function (cellvalue, options, rowObject) {
                    return "<a onclick=\"OpenWindow('回访记录','98%','100%', '/CooperVisit/Index?IsYwjl=true&Viscustomer=" + rowObject.Id + "')\"  >回访记录</a>";
                }
            },
        ];
        dataUrl = "/CooperatecustomCustomer/GetList";
        searchCol = [

 zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml

@@ -325,7 +325,7 @@

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">短信模板<i class="red">*</i></label>
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">短信模板</label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <select id="Duanxin" class="form-control" name="Duanxin" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
@@ -345,7 +345,7 @@
                                    </div>
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">短信内容<i class="red">*</i></label>
                                    <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">短信内容</label>
                                    <div class="col-sm-8 col-md-8">
                                        <textarea class="form-control bt" id="DuanxinNeirong" name="DuanxinNeirong" title="短信内容" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.DuanxinNeirong</textarea>
                                    </div>

 zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml

@@ -54,7 +54,7 @@
            { label: '修改人', name: 'Modifier', labtype: 'txt', hidden: true },
            { label: '修改时间', name: 'Modifytimetxt', labtype: 'txt', hidden: true }
        ];
        dataUrl = "/Liaotian/GetLiaotianList";
        dataUrl = "/Liaotian/GetLiaotianList?Shifoushenhe=D";
        searchCol = [

            { label: '问题类别', name: 'Questiontype', labtype: 'combox', hidden: false, data: JSON.parse(questiontypeDropDown), cwidth: '5%', cccwidth: '8%' },
@@ -70,6 +70,18 @@
        var _pageAdd = function () {
            OpenWindow("新增问题", "98%", "90%", "/Liaotian/Edit/");
        }
        var _pageSearch = function () {
            $("#jqGrid").jqGrid('setGridParam', {
                url:'/Liaotian/GetLiaotianList',   postData: jsons, page: 1
            }); //重新载入
            var jsons = GetSearchEnd();
            if (jsons == false) {
                msg.info("请录入查询条件");
                return false;
            }
            LoadGrid(jsons);
        }
        


        var _pageZhuanyi = function () {
@@ -216,12 +228,12 @@

        $(document).ready(function () {

            setTimeout(
                function () {
            //setTimeout(
            //    function () {
                    $("#PBSShifoushenhe").val("D");
                    $("#PBSShifoushenhe").trigger('chosen:updated');//更新选项
                    _pageSearch();
                }, 2000);
                //    _pageSearch();
                //}, 2000);

         
        }); 

 zhengcaioa/zhengcaioa/Views/Project/Add.cshtml

@@ -226,9 +226,14 @@
                                        <input id="Number" class="form-control" label="公告时间" name="Number" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Number">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">项目名称<i class="red">*</i></label>
                                    <div class="col-sm-7 col-md-7">
                                    <div class="col-sm-4 col-md-4">
                                        <input id="Name" class="form-control" label="公告时间" name="Name" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Name">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">采购预算</label>
                                    <div class="col-sm-2 col-md-2" style="width:10%;">
                                        <input class="form-control" label="评审得分" name="Caigouyusuan" id="Caigouyusuan" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.CaigouyusuanName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,4})?/)">
                                    </div>
                                    <label class="text-left col-sm-1 col-md-1 control-label" style="width:60px;">万元</label>
                                </div>
                                <div id="addlist_1">
                                    @for (int i = 0; i < Projectzhongbiaos.Count; i++)

 zhengcaioa/zhengcaioa/Views/Shared/_Layout_Header.cshtml

@@ -77,7 +77,7 @@
                    </a>
                </li>
                <li class="hidden-xs">
                    <a href="http://192.168.0.113:8087/login/houtaidengluLogin?User=@actionlist.UserSn&psw=@actionlist.Password" target="_blank"  class="J_menuItem"title="政采用户后台" data-index="0">
                    <a href="http://47.108.235.38:8087/login/houtaidengluLogin?User=@actionlist.UserSn&psw=@actionlist.Password" target="_blank"  class="J_menuItem"title="政采用户后台" data-index="0">
                        <i class="fa fa-lock"></i>政采用户后台
                    </a>
                </li>

 zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml

@@ -145,13 +145,13 @@
                padding: .5em 1em;
            }

            .pure-table thead {
           /* .pure-table thead {
                background-color: #e0e0e0 !important;
                color: #000;
                text-align: left;
                vertical-align: bottom;
                -webkit-print-color-adjust: exact;
            }
            }*/

            .pure-table td {
                background-color: transparent;
@@ -266,7 +266,7 @@
                                    {
                                        <div class="">

                                            <h3> @tongjibaobiaobaobiaoDTO.UserName </h3>
                                <h3 style="display:inline;"> @Html.Raw(tongjibaobiaobaobiaoDTO.UserName) </h3> @Html.Raw(@tongjibaobiaobaobiaoDTO.UserDaka)

                                        </div>
                                    }
@@ -276,7 +276,7 @@
                                    {
                                        <div class="">

                                            <h3>@aaa ã€æŽ¨å¹¿</h3>
                                            @aaa ã€æŽ¨å¹¿

                                        </div>

@@ -287,27 +287,27 @@
                                            <table class="pure-table pure-table-bordered" style="width:100%;">
                                                <thead>
                                                    <tr>
                                                        <th style="width:8%;">
                                                        <td style="width:8%;">
                                                            åºå·
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æŽ¨å¹¿å·¥ä½œ
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æœˆæŽ¨å¹¿æ•°é‡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æœˆä»»åŠ¡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æ—¥æŽ¨å¹¿æ•°é‡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æ—¥ä»»åŠ¡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            å½“日绩效考核
                                                        </th>
                                                        </td>
                                                    </tr>

                                                </thead>
@@ -341,7 +341,7 @@
                                    {
                                        <div class="">

                                            <h3>@aaa ã€æ‹œè®¿å®¢æˆ·</h3>
                                           @aaa ã€æ‹œè®¿å®¢æˆ·

                                        </div>

@@ -352,27 +352,27 @@
                                            <table class="pure-table pure-table-bordered" style="width:100%;">
                                                <thead>
                                                    <tr>
                                                        <th style="width:8%;">
                                                        <td style="width:8%;">
                                                            åºå·
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æ‹œè®¿ç±»åž‹
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æœˆæ‹œè®¿æ•°é‡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æœˆä»»åŠ¡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æ—¥æ‹œè®¿æ•°é‡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æ—¥ä»»åŠ¡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            å½“日绩效考核
                                                        </th>
                                                        </td>
                                                    </tr>

                                                </thead>
@@ -404,7 +404,7 @@
                                    {
                                        <div class="">

                                            <h3>@aaa  ã€æ–°å¢žè®¢å•</h3>
                                            @aaa  ã€æ–°å¢žè®¢å•

                                        </div>

@@ -415,28 +415,28 @@
                                            <table class="pure-table pure-table-bordered" style="width:100%;">
                                                <thead>
                                                    <tr>
                                                        <th style="width:8%;">
                                                        <td style="width:8%;">
                                                            åºå·
                                                        </th>
                                                        </td>

                                                        <th style="width:15%;">
                                                        <td style="width:15%;">
                                                            è®¢å•ç¼–号
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            è®¢å•åç§°
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            å•ä»·
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æ•°é‡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            é‡‘额
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æœˆç´¯è®¡é‡‘额
                                                        </th>
                                                        </td>
                                                    </tr>

                                                </thead>
@@ -467,7 +467,7 @@
                                    {
                                        <div class="">

                                            <h3>@aaa  ã€èµ„料维护</h3>
                                           @aaa  ã€èµ„料维护

                                        </div>

@@ -478,22 +478,22 @@
                                            <table class="pure-table pure-table-bordered" style="width:100%;">
                                                <thead>
                                                    <tr>
                                                        <th style="width:8%;">
                                                        <td style="width:8%;">
                                                            åºå·
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            èµ„料类别
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æœˆæ•°é‡
                                                        </th>
                                                        </td>

                                                        <th style="width:15%;">
                                                        <td style="width:15%;">
                                                            æœ¬æ—¥æ•°é‡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            å½“日绩效考核
                                                        </th>
                                                        </td>
                                                    </tr>

                                                </thead>
@@ -525,7 +525,7 @@
                                    {
                                        <div class="">

                                            <h3>@aaa  ã€é¡¹ç›®å®žæ–½</h3>
                                            @aaa  ã€é¡¹ç›®å®žæ–½

                                        </div>

@@ -536,22 +536,22 @@
                                            <table class="pure-table pure-table-bordered" style="width:100%;">
                                                <thead>
                                                    <tr>
                                                        <th style="width:8%;">
                                                        <td style="width:8%;">
                                                            åºå·
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            å®žæ–½ç±»åˆ«
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            æœ¬æœˆæ•°é‡
                                                        </th>
                                                        </td>

                                                        <th style="width:15%;">
                                                        <td style="width:15%;">
                                                            æœ¬æ—¥æ•°é‡
                                                        </th>
                                                        <th style="width:15%;">
                                                        </td>
                                                        <td style="width:15%;">
                                                            å½“日绩效考核
                                                        </th>
                                                        </td>
                                                    </tr>

                                                </thead>

 ±íÐÞ¸Ä.sql

@@ -1,3 +1,56 @@

USE [zhengcaioa]
GO


ALTER TABLE [Liaotian] ALTER COLUMN [shiyongfatiao] [nvarchar](1000) NULL
GO



ALTER TABLE [dbo].[Project] ADD  [caigouyusuan] [money] NULL
GO









































USE [zhengcaioa]
GO

@@ -159,6 +212,10 @@







USE [zhengcaioa]
GO