From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 八月 2021 14:29:15 +0800
Subject: [PATCH] 今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增，短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 工作报表 修改排版 问题维护 试用法条 改为1000字， 问题查询打开直接默认未审核，不要停两秒再刷新 项目新增 增加字段：采购预算 万元 工作考评 考聘不称职当天无工资
---
zhengcaioa/Services/ProjectService.cs | 6
zhengcaioa/DTO/ProjectDTO.cs | 6
zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 14 +
zhengcaioa/Model/Project.cs | 1
zhengcaioa/zhengcaioa/Views/CooperVisit/Index.cshtml | 12 +
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml | 13 +
zhengcaioa/DTO/CooperVisitDTO.cs | 2
zhengcaioa/Services/AdmEvaluateService.cs | 19 ++
zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs | 7
zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml | 144 ++++++++++----------
zhengcaioa/zhengcaioa/Views/Shared/_Layout_Header.cshtml | 2
zhengcaioa/DTO/TongjiBaoBiaoDTO.cs | 2
zhengcaioa/Model/zhengcaioaContext.cs | 6
表修改.sql | 57 ++++++++
zhengcaioa/Services/ExpertService.cs | 2
zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml | 4
zhengcaioa/zhengcaioa/Views/Project/Add.cshtml | 9 +
zhengcaioa/IServices/IAdmEvaluateService.cs | 2
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 15 +
zhengcaioa/Services/CooperVisitService.cs | 40 ++++-
zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml | 24 ++
21 files changed, 270 insertions(+), 117 deletions(-)
diff --git a/zhengcaioa/DTO/CooperVisitDTO.cs b/zhengcaioa/DTO/CooperVisitDTO.cs
index 34ad3a7..7e39880 100644
--- a/zhengcaioa/DTO/CooperVisitDTO.cs
+++ b/zhengcaioa/DTO/CooperVisitDTO.cs
@@ -47,5 +47,7 @@
public string Vistime { get; set; }
+ public string Viscustomer { get; set; }
+
}
}
diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs
index e0262f0..7116042 100644
--- a/zhengcaioa/DTO/ProjectDTO.cs
+++ b/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; }
+
+
}
}
diff --git a/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs b/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs
index 05dd685..2dff620 100644
--- a/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs
+++ b/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; }
}
diff --git a/zhengcaioa/IServices/IAdmEvaluateService.cs b/zhengcaioa/IServices/IAdmEvaluateService.cs
index 26013d3..48c1566 100644
--- a/zhengcaioa/IServices/IAdmEvaluateService.cs
+++ b/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);
}
}
diff --git a/zhengcaioa/Model/Project.cs b/zhengcaioa/Model/Project.cs
index aff3e13..83d6377 100644
--- a/zhengcaioa/Model/Project.cs
+++ b/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; }
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 7cc84d4..48b9af5 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/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");
diff --git a/zhengcaioa/Services/AdmEvaluateService.cs b/zhengcaioa/Services/AdmEvaluateService.cs
index b1356ca..94bf227 100644
--- a/zhengcaioa/Services/AdmEvaluateService.cs
+++ b/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;
+ }
}
}
diff --git a/zhengcaioa/Services/CooperVisitService.cs b/zhengcaioa/Services/CooperVisitService.cs
index c093088..19f433a 100644
--- a/zhengcaioa/Services/CooperVisitService.cs
+++ b/zhengcaioa/Services/CooperVisitService.cs
@@ -130,20 +130,36 @@
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
+ 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,
diff --git a/zhengcaioa/Services/ExpertService.cs b/zhengcaioa/Services/ExpertService.cs
index f7f3d43..d7fdd28 100644
--- a/zhengcaioa/Services/ExpertService.cs
+++ b/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;
}
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index 5193469..ca6e783 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/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] ");
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
index 562766a..df6185e 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
+++ b/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;
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 48124d5..5247888 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -3505,18 +3505,20 @@
tongjibaobiaobaobiaoDTO.UserName = "";
if (deptDTO != null)
{
- tongjibaobiaobaobiaoDTO.UserName += "閮ㄩ棬锛�" + deptDTO.DeptName + " ";
+ tongjibaobiaobaobiaoDTO.UserName += "閮ㄩ棬锛�" + deptDTO.DeptName + "    ";
}
- tongjibaobiaobaobiaoDTO.UserName = "濮撳悕锛�" + userDTO.UserName + " ";
+ tongjibaobiaobaobiaoDTO.UserName += "濮撳悕锛�" + userDTO.UserName + "    ";
+
+ tongjibaobiaobaobiaoDTO.UserDaka = "";
if (hrPositionDTO != null)
{
- tongjibaobiaobaobiaoDTO.UserName += "鑱屽姟锛�" + hrPositionDTO.PostName + " ";
+ tongjibaobiaobaobiaoDTO.UserDaka += "鑱屽姟锛�" + hrPositionDTO.PostName + "    ";
}
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") : "")
+ + "    涓嬪崍 " + (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);
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 55d12c3..d0fcf9d 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -48,7 +48,8 @@
private readonly IDtChannelArticleNewsService _dtChannelArticleNewsService;
private readonly IConfiguration _configuration;
private readonly IHttpClientFactory _clientFactory;
- private readonly IAskService _askService;
+ 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
{
diff --git a/zhengcaioa/zhengcaioa/Views/CooperVisit/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperVisit/Index.cshtml
index 16b47ca..74f4bc9 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperVisit/Index.cshtml
+++ b/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">
@@ -8,7 +9,8 @@
var khlys = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.khly))';
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))';
+ 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,11 +51,11 @@
];
var _pageAdd = function () {
- OpenWindow("鏂板鎰忓悜瀹㈡埛鎷滆", "98%", "90%", "/CooperVisit/Edit/");
+ OpenWindow("鏂板鍚堜綔瀹㈡埛鍥炶", "98%", "90%", "/CooperVisit/Edit?Viscustomer=@Viscustomer");
}
-
+
var _afterSave = function (result) {
if (result) {
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index 15af9c4..f01c1d7 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/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 = [
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
index 975a3ff..4101485 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
+++ b/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>
diff --git a/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml b/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
index d23e13c..47f473e 100644
--- a/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
+++ b/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,7 +70,19 @@
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 () {
$.ajax({
@@ -216,12 +228,12 @@
$(document).ready(function () {
- setTimeout(
- function () {
+ //setTimeout(
+ // function () {
$("#PBSShifoushenhe").val("D");
$("#PBSShifoushenhe").trigger('chosen:updated');//鏇存柊閫夐」
- _pageSearch();
- }, 2000);
+ // _pageSearch();
+ //}, 2000);
});
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
index e740abf..86ef060 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
@@ -216,7 +216,7 @@
</select>
</div>
-
+
</div>
@@ -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++)
diff --git a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Header.cshtml b/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Header.cshtml
index 97f1157..a959e4b 100644
--- a/zhengcaioa/zhengcaioa/Views/Shared/_Layout_Header.cshtml
+++ b/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>
diff --git a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml
index e224a9d..e529096 100644
--- a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml
+++ b/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;
@@ -264,11 +264,11 @@
|| tongjibaobiaobaobiaoDTO.xiangmushishiDTOs.Count > 0
)
{
- <div class="">
+ <div class="">
- <h3> @tongjibaobiaobaobiaoDTO.UserName </h3>
+ <h3 style="display:inline;"> @Html.Raw(tongjibaobiaobaobiaoDTO.UserName) </h3> @Html.Raw(@tongjibaobiaobaobiaoDTO.UserDaka)
- </div>
+ </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>
diff --git "a/\350\241\250\344\277\256\346\224\271.sql" "b/\350\241\250\344\277\256\346\224\271.sql"
index 0091523..d20455c 100644
--- "a/\350\241\250\344\277\256\346\224\271.sql"
+++ "b/\350\241\250\344\277\256\346\224\271.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
@@ -63,6 +116,10 @@
+
+
+
+
--
Gitblit v1.9.1