From 98cd7063d9b9a1570dcfbac92f5c2b35d904868b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 05 七月 2021 15:41:29 +0800
Subject: [PATCH] 修改修改
---
zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml | 5
zhengcaioa/DTO/ProjectDTO.cs | 12
zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml | 24
zhengcaioa/Model/Project.cs | 6
zhengcaioa/Services/HrSalaryService.cs | 17
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml | 12
zhengcaioa/Model/HrSalary.cs | 25
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml | 22
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 14
zhengcaioa/DTO/CooperatecustomCustomerDTO.cs | 6
zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs | 100 +-
zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs | 83 ++
zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml | 10
zhengcaioa/Model/zhengcaioaContext.cs | 33
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 89 ++
zhengcaioa/DTO/IntentionVisitDTO.cs | 3
zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml | 2
zhengcaioa/zhengcaioa/Views/Project/Add.cshtml | 28
zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml | 14
zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 62 +
zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml | 152 ++++
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | 6
zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml | 12
zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml | 87 ++
zhengcaioa/Model/CooperatecustomCustomer.cs | 2
zhengcaioa/Services/ProjectService.cs | 38 +
zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs | 4
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml | 10
zhengcaioa/Services/WfRunProcessService.cs | 528 ++++++++++++++++
zhengcaioa/Services/CooperatecustomCustomerService.cs | 6
zhengcaioa/IServices/IWfRunProcessService.cs | 2
zhengcaioa/zhengcaioa/Views/Project/Select.cshtml | 30
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml | 15
表修改.sql | 320 ++++++++++
zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml | 51
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs | 10
zhengcaioa/Services/IntentionVisitService.cs | 7
zhengcaioa/IServices/IHrSalaryService.cs | 2
zhengcaioa/DTO/IntentionCustomerDTO.cs | 5
zhengcaioa/Services/IntentionCustomerService.cs | 7
zhengcaioa/Model/IntentionCustomer.cs | 2
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml | 8
zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml | 24
zhengcaioa/zhengcaioa/Views/ServiceCharge/Edit.cshtml | 16
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 6
45 files changed, 1,743 insertions(+), 174 deletions(-)
diff --git a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
index 48a591d..f437293 100644
--- a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
+++ b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
@@ -54,6 +54,9 @@
public string YwjlName { get; set; }
public Boolean zhuanyi { get; set; }
+
+ public string Weixin { get; set; }
+ public string Shifoutianjiaweixin { get; set; }
}
public class CooperatecustomCustomerDTOSearch : SearchEntity
@@ -69,5 +72,8 @@
public string Createtime { get; set; }
+ public string Shifouweixin { get; set; }
+
+
}
}
diff --git a/zhengcaioa/DTO/IntentionCustomerDTO.cs b/zhengcaioa/DTO/IntentionCustomerDTO.cs
index 5bb9155..062b1b8 100644
--- a/zhengcaioa/DTO/IntentionCustomerDTO.cs
+++ b/zhengcaioa/DTO/IntentionCustomerDTO.cs
@@ -57,6 +57,9 @@
public string DianxiaozhuanyuanName { get; set; }
public DateTime? Zuijinzhuizongtime { get; set; }
public string ZuijinzhuizongtimeName { get; set; }
+
+ public string Weixin { get; set; }
+ public string Shifoutianjiaweixin { get; set; }
}
public class IntentionCustomerDTOSearch : SearchEntity
@@ -81,5 +84,7 @@
public string YwjlYx { get; set; }
+ public string Shifouweixin { get; set; }
+
}
}
diff --git a/zhengcaioa/DTO/IntentionVisitDTO.cs b/zhengcaioa/DTO/IntentionVisitDTO.cs
index f912688..e052dc0 100644
--- a/zhengcaioa/DTO/IntentionVisitDTO.cs
+++ b/zhengcaioa/DTO/IntentionVisitDTO.cs
@@ -25,6 +25,7 @@
public string JyName { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
+ public string CreaterName { get; set; }
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
@@ -52,5 +53,7 @@
public string Viscustomer { get; set; }
+ public string Creater { get; set; }
+
}
}
diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs
index b2bec69..a13e86a 100644
--- a/zhengcaioa/DTO/ProjectDTO.cs
+++ b/zhengcaioa/DTO/ProjectDTO.cs
@@ -59,9 +59,12 @@
public string Fbyy { get; set; }
public string Caigourenname { get; set; }
+
+ public string Caigourennamecunzai { get; set; }
public string Caigourenaddress { get; set; }
public string Caigourencontact { get; set; }
public string Dailiname { get; set; }
+ public string Dailinamecunzai { get; set; }
public string Dailiaddress { get; set; }
public string Dailicontact { get; set; }
@@ -72,6 +75,9 @@
public List<ProjectzhongbiaoDTO> Projectzhongbiaos { get; set; }
public string[] ZhuanjiaList { get; set; }
+
+ public decimal? Fencha { get; set; }
+ public int? Shuliang { get; set; }
}
public class ProjectDTOSearch : SearchEntity
@@ -108,5 +114,11 @@
public string Fencha { get; set; }
+ public string Caigourenname { get; set; }
+
+ public string Dailiname { get; set; }
+
+ public string Shuliang { get; set; }
+
}
}
diff --git a/zhengcaioa/IServices/IHrSalaryService.cs b/zhengcaioa/IServices/IHrSalaryService.cs
index 1bc8834..6e8a6d2 100644
--- a/zhengcaioa/IServices/IHrSalaryService.cs
+++ b/zhengcaioa/IServices/IHrSalaryService.cs
@@ -27,7 +27,7 @@
ResultEntity CheckAppea(HrSalaryAppeal model);
- HrSalaryAppeal GetAppeal(string id, string user);
+ HrSalaryAppeal GetAppeal(string id="", string user="",string salaryId = "");
ResultDataEntity<HrSalaryDTO> SearchByPagingFinish(HrSalaryDTOSearch searchEntity);
diff --git a/zhengcaioa/IServices/IWfRunProcessService.cs b/zhengcaioa/IServices/IWfRunProcessService.cs
index 3dd12ea..f0e91df 100644
--- a/zhengcaioa/IServices/IWfRunProcessService.cs
+++ b/zhengcaioa/IServices/IWfRunProcessService.cs
@@ -20,5 +20,7 @@
ResultEntity WfAskLeave(string DanjuId, string step, string tongguojujue , string Userid, string Content, string title, string version);
ResultEntity WfAskLeaveOff(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);
+
+ ResultEntity WfSalaryAppeal(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);
}
}
diff --git a/zhengcaioa/Model/CooperatecustomCustomer.cs b/zhengcaioa/Model/CooperatecustomCustomer.cs
index 3461669..c00b260 100644
--- a/zhengcaioa/Model/CooperatecustomCustomer.cs
+++ b/zhengcaioa/Model/CooperatecustomCustomer.cs
@@ -41,5 +41,7 @@
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+ public string Weixin { get; set; }
+ public string Shifoutianjiaweixin { get; set; }
}
}
diff --git a/zhengcaioa/Model/HrSalary.cs b/zhengcaioa/Model/HrSalary.cs
index b0bce30..f0fd961 100644
--- a/zhengcaioa/Model/HrSalary.cs
+++ b/zhengcaioa/Model/HrSalary.cs
@@ -49,9 +49,13 @@
public class HrSalaryAppeal
{
[Key]
- public int id { get; set; }
+ public string id { get; set; }
- public string salary_id { get; set; }
+ public string salary_id { get; set; }
+
+ public int Year { get; set; }
+
+ public int Month { get; set; }
public string reason { get; set; }
@@ -70,5 +74,22 @@
public string chk_result { get; set; }
public string status { get; set; }
+
+ public string createrName { get; set; }
+
+ public string tittle { get; set; }
+
+ public string shenpi_status { get; set; }
+ }
+
+
+ public class HrSalaryAppealDTO: HrSalaryAppeal
+ {
+ public string Step { get; set; }
+
+ public string Tongguojujue { get; set; }
+
+ public string Content { get; set; }
+
}
}
diff --git a/zhengcaioa/Model/IntentionCustomer.cs b/zhengcaioa/Model/IntentionCustomer.cs
index 5cc27b7..290df7a 100644
--- a/zhengcaioa/Model/IntentionCustomer.cs
+++ b/zhengcaioa/Model/IntentionCustomer.cs
@@ -45,5 +45,7 @@
public string Yixiang { get; set; }
public string Dianxiaozhuanyuan { get; set; }
public DateTime? Zuijinzhuizongtime { get; set; }
+ public string Weixin { get; set; }
+ public string Shifoutianjiaweixin { get; set; }
}
}
diff --git a/zhengcaioa/Model/Project.cs b/zhengcaioa/Model/Project.cs
index b888998..aff3e13 100644
--- a/zhengcaioa/Model/Project.cs
+++ b/zhengcaioa/Model/Project.cs
@@ -17,10 +17,8 @@
public string Name { get; set; }
public string Drhx { get; set; }
public string DrhxPrice { get; set; }
- public decimal? DrhxDefen { get; set; }
public string Dshx { get; set; }
public string DshxPrice { get; set; }
- public decimal? DshxDefen { get; set; }
public string Zhuanjia { get; set; }
public string Remark { get; set; }
public string RecStatus { get; set; }
@@ -41,5 +39,9 @@
public string Dailiname { get; set; }
public string Dailiaddress { get; set; }
public string Dailicontact { get; set; }
+ public decimal? DrhxDefen { get; set; }
+ public decimal? DshxDefen { get; set; }
+ public decimal? Fencha { get; set; }
+ public int? Shuliang { get; set; }
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 41132d1..4905e17 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -1684,6 +1684,10 @@
.HasColumnName("sheng")
.HasComment("鐪�");
+ entity.Property(e => e.Shifoutianjiaweixin)
+ .HasMaxLength(1)
+ .HasColumnName("shifoutianjiaweixin");
+
entity.Property(e => e.ShrAddress)
.HasMaxLength(500)
.HasColumnName("shr_address")
@@ -1708,6 +1712,10 @@
.HasMaxLength(500)
.HasColumnName("url")
.HasComment("缃戝潃");
+
+ entity.Property(e => e.Weixin)
+ .HasMaxLength(50)
+ .HasColumnName("weixin");
entity.Property(e => e.YwName)
.HasMaxLength(500)
@@ -3000,6 +3008,10 @@
.HasColumnName("sheng")
.HasComment("鐪�");
+ entity.Property(e => e.Shifoutianjiaweixin)
+ .HasMaxLength(1)
+ .HasColumnName("shifoutianjiaweixin");
+
entity.Property(e => e.ShrAddress)
.HasMaxLength(500)
.HasColumnName("shr_address")
@@ -3024,6 +3036,10 @@
.HasMaxLength(500)
.HasColumnName("url")
.HasComment("缃戝潃");
+
+ entity.Property(e => e.Weixin)
+ .HasMaxLength(50)
+ .HasColumnName("weixin");
entity.Property(e => e.Yixiang).HasMaxLength(50);
@@ -4006,6 +4022,7 @@
.HasMaxLength(50)
.HasColumnName("userId");
});
+
modelBuilder.Entity<Project>(entity =>
{
entity.ToTable("Project");
@@ -4075,21 +4092,21 @@
.HasMaxLength(500)
.HasColumnName("drhx");
- entity.Property(e => e.DrhxPrice)
- .HasMaxLength(500)
- .HasColumnName("drhx_price");
-
entity.Property(e => e.DrhxDefen)
.HasColumnType("money")
.HasColumnName("drhx_defen");
- entity.Property(e => e.DshxDefen)
- .HasColumnType("money")
- .HasColumnName("dshx_defen");
+ entity.Property(e => e.DrhxPrice)
+ .HasMaxLength(500)
+ .HasColumnName("drhx_price");
entity.Property(e => e.Dshx)
.HasMaxLength(500)
.HasColumnName("dshx");
+
+ entity.Property(e => e.DshxDefen)
+ .HasColumnType("money")
+ .HasColumnName("dshx_defen");
entity.Property(e => e.DshxPrice)
.HasMaxLength(500)
@@ -4103,6 +4120,8 @@
.HasMaxLength(100)
.HasColumnName("feibiaocishu");
+ entity.Property(e => e.Fencha).HasColumnType("money");
+
entity.Property(e => e.Modifier)
.IsRequired()
.HasMaxLength(50)
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index fa900d8..c0c54d3 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -93,7 +93,9 @@
updateproject.RecStatus = cooperatecustomCustomer.RecStatus;
updateproject.Modifier = cooperatecustomCustomer.Modifier;
updateproject.Modifytime = cooperatecustomCustomer.Modifytime;
+ updateproject.Weixin = cooperatecustomCustomer.Weixin;
+ updateproject.Shifoutianjiaweixin = cooperatecustomCustomer.Shifoutianjiaweixin;
}
_context.SaveChanges();
@@ -201,6 +203,8 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null) )
+
select new CooperatecustomCustomerDTO
{
@@ -248,6 +252,8 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
+ Weixin = a.Weixin,
+ Shifoutianjiaweixin = a.Shifoutianjiaweixin,
}
).OrderByDescending(x => x.Modifytime).ToList();
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index 656f00c..766985b 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -677,10 +677,13 @@
temp.reason = model.reason;
temp.amount = model.amount;
temp.basis = model.basis;
- temp.sub_time = DateTime.Now;
+ temp.shenpi_status = model.shenpi_status;
+
+
}
else
{
+ model.id = Guid.NewGuid().ToString();
model.sub_time = DateTime.Now;
model.status = "A";
_context.HrSalaryAppeal.Add(model);
@@ -705,12 +708,20 @@
/// <param name="id"></param>
/// <param name="user"></param>
/// <returns></returns>
- public HrSalaryAppeal GetAppeal(string id,string user)
+ public HrSalaryAppeal GetAppeal(string id = "", string user = "", string salaryId = "")
{
HrSalaryAppeal hd = new HrSalaryAppeal();
try
{
- hd = _context.HrSalaryAppeal.Where(e => e.salary_id == id && e.sub_user == user).SingleOrDefault();
+ if (!string.IsNullOrEmpty(salaryId))
+ {
+ hd = _context.HrSalaryAppeal.Where(e => e.salary_id == salaryId && e.sub_user == user && e.status == "A").FirstOrDefault();
+ }
+ else
+ {
+ hd = _context.HrSalaryAppeal.Where(e => e.id == id && e.status == "A").FirstOrDefault();
+ }
+
}
catch (Exception er)
{
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 73e8090..22e37f2 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -95,6 +95,9 @@
updateproject.Dianxiaozhuanyuan = intentionCustomer.Dianxiaozhuanyuan;
updateproject.Zuijinzhuizongtime = intentionCustomer.Zuijinzhuizongtime;
+ updateproject.Weixin = intentionCustomer.Weixin;
+ updateproject.Shifoutianjiaweixin = intentionCustomer.Shifoutianjiaweixin;
+
}
_context.SaveChanges();
@@ -227,6 +230,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Yixiangtime) || (a.Yixiangtime >= Yixiangtimestart && a.Yixiangtime <= Yixiangtimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Yixiang) || ( a.Yixiang == searchEntity.Yixiang.Trim() && (a.Ywjl == null || a.Ywjl == searchEntity.YwjlYx) ))
+ && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null))
select new IntentionCustomerDTO
{
Id = a.Id,
@@ -267,7 +271,8 @@
ShrTel = a.ShrTel,
ShrAddress = a.ShrAddress,
Remark = a.Remark,
-
+ Weixin = a.Weixin,
+ Shifoutianjiaweixin = a.Shifoutianjiaweixin,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
diff --git a/zhengcaioa/Services/IntentionVisitService.cs b/zhengcaioa/Services/IntentionVisitService.cs
index afa8354..62ad494 100644
--- a/zhengcaioa/Services/IntentionVisitService.cs
+++ b/zhengcaioa/Services/IntentionVisitService.cs
@@ -148,6 +148,11 @@
join h in _context.Areas on zz.City equals h.CodeId
join i in _context.Areas on zz.AreaId equals i.CodeId
+ join zzz in _context.PltUsers.Where(x => x.RecStatus == "A")
+ on a.Creater equals zzz.Id
+ into zsssss
+ from zzzzz in zsssss.DefaultIfEmpty()
+
@@ -162,6 +167,7 @@
&& (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())
+ && (string.IsNullOrWhiteSpace(searchEntity.Creater) || zz.Creater == searchEntity.Creater.Trim())
select new IntentionVisitDTO
{
Id = a.Id,
@@ -181,6 +187,7 @@
Talk = a.Talk,
Khfk = a.Khfk,
Yx = a.Yx,
+ CreaterName = zzzzz.UserName,
Jy = a.Jy,
Creater = a.Creater,
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index e837793..a46891d 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -92,6 +92,9 @@
updateproject.Dailiname = project.Dailiname;
updateproject.Dailicontact = project.Dailicontact;
updateproject.Dailiaddress = project.Dailiaddress;
+ updateproject.Fencha = project.Fencha;
+ updateproject.Shuliang = updateproject.Shuliang;
+
}
//瀛愯〃
@@ -292,7 +295,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.[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.[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] ");
@@ -331,7 +334,26 @@
}
}
- if (!string.IsNullOrWhiteSpace(searchEntity.Reasonname))
+
+ if (!string.IsNullOrWhiteSpace(searchEntity.Shuliang))
+ {
+ decimal aaaa = 0;
+ decimal.TryParse(searchEntity.Shuliang, out aaaa);
+ if (aaaa > 0)
+ {
+ sql.Append(" and exists ( select * from( select ( isnull((select COUNT(*) ProjectIdshuliang from [Projectzhongbiao] b where a.[Id]=b.[ProjectId] group by b.ProjectId) ,0)+ ");
+
+ sql.Append(" isnull( (select COUNT(*) ProjectIdshuliang from [Projectreason] b where a.[Id]=b.[ProjectId] group by b.ProjectId),0)+ ");
+ sql.Append(" isnull( (select COUNT(*) ProjectIdshuliang from [Projectyouxiao] b where a.[Id]=b.[ProjectId] group by b.ProjectId),0)+ ");
+ sql.Append(" isnull( ( select COUNT(*) ProjectIdshuliang from [Project] b where a.[Id]=b.[Id] and b.drhx is not null ),0)+ ");
+ sql.Append(" isnull( (select COUNT(*) ProjectIdshuliang from [Project] b where a.[Id]=b.[Id] and b.dshx is not null ),0) ");
+ sql.Append(" ) as sum_count ) a where a.sum_count <= " + aaaa + "");
+ sql.Append(" ) ");
+ }
+ }
+
+
+ if (!string.IsNullOrWhiteSpace(searchEntity.Reasonname))
{
sql.Append(" and exists (select b.[ProjectId] from [Projectreason] b where a.[Id]=b.[ProjectId] and b.[reasonname] like '%" + searchEntity.Reasonname + "%') ");
@@ -389,9 +411,19 @@
}
+ if (!string.IsNullOrWhiteSpace(searchEntity.Caigourenname))
+ {
+ sql.Append("and a.[caigourenname] like '%" + searchEntity.Caigourenname.Trim().Replace("'", "''") + "%'");
+
+ }
+
+ if (!string.IsNullOrWhiteSpace(searchEntity.Dailiname))
+ {
+ sql.Append("and a.[dailiname] like '%" + searchEntity.Dailiname.Trim().Replace("'", "''") + "%'");
+
+ }
-
if (!string.IsNullOrWhiteSpace(searchEntity.Sheng))
{
diff --git a/zhengcaioa/Services/WfRunProcessService.cs b/zhengcaioa/Services/WfRunProcessService.cs
index d35295e..33a5338 100644
--- a/zhengcaioa/Services/WfRunProcessService.cs
+++ b/zhengcaioa/Services/WfRunProcessService.cs
@@ -1284,5 +1284,533 @@
return result;
}
+
+ public ResultEntity WfSalaryAppeal(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version)
+ {
+
+ ResultEntity result = new ResultEntity();
+ result.Result = true;
+
+
+ WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
+ if (wfRunProcessDTO != null)
+ {
+ version = wfRunProcessDTO.Version;
+ }
+
+
+ if (version == "v1")
+ {
+ if (step == "鎻愪氦")
+ {
+ //鏇存柊娴佺▼瀹炰緥
+ // WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
+ if (wfRunProcessDTO == null)
+ {
+ //鎻掑叆娴佺▼瀹炰緥
+ wfRunProcessDTO = new WfRunProcessDTO();
+ //wfRunProcessDTO.Applyno =
+ wfRunProcessDTO.Applytime = DateTime.Now;
+ wfRunProcessDTO.Applytiye = "03";
+ wfRunProcessDTO.DanjuId = DanjuId;
+ wfRunProcessDTO.Content = title;
+ wfRunProcessDTO.Step = "浜轰簨瀹℃壒";
+ wfRunProcessDTO.ShenpiStatus = "D";
+ wfRunProcessDTO.Version = version;
+ wfRunProcessDTO.RecStatus = "A";
+ wfRunProcessDTO.Creater = Userid;
+ wfRunProcessDTO.Createtime = DateTime.Now;
+ wfRunProcessDTO.Modifier = Userid;
+ wfRunProcessDTO.Modifytime = DateTime.Now;
+ wfRunProcessDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
+ result = this.save(wfRunProcessDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+ //鏌ヨ澶勭悊浜�
+ var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && x.RoleName == "浜轰簨").FirstOrDefault();
+ if (hrPositions == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒拌亴浣�";
+ return result;
+ }
+ var pltUsers = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
+ join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && x.RoleId == hrPositions.Id) on a.Id equals b.UserId
+ select a
+ ).ToList();
+
+ if (pltUsers == null || pltUsers.Count == 0)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒板鐞嗕汉";
+ return result;
+ }
+ foreach (var pltUser in pltUsers)
+ {
+ //鎻掑叆寰呭姙
+ WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
+ wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
+ wfNeeddeelDTO.SendUserId = Userid;
+ wfNeeddeelDTO.DeelUserId = pltUser.Id;
+ wfNeeddeelDTO.Sendtime = DateTime.Now;
+ wfNeeddeelDTO.Resivetime = DateTime.Now;
+ wfNeeddeelDTO.Step = "浜轰簨瀹℃壒";
+ wfNeeddeelDTO.NeeddeelType = "1";
+ wfNeeddeelDTO.ChuliStatus = "0";
+ wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
+ wfNeeddeelDTO.Content = "";
+ wfNeeddeelDTO.Sort = 1;
+ wfNeeddeelDTO.RecStatus = "A";
+ wfNeeddeelDTO.Creater = Userid;
+ wfNeeddeelDTO.Createtime = DateTime.Now;
+ wfNeeddeelDTO.Modifier = Userid;
+ wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
+ result = _wfNeeddeelService.save(wfNeeddeelDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+ }
+
+ //鎻掑叆鏂扮殑宸插姙
+ WfHistory wfHistoryDTO1 = new WfHistory();
+ wfHistoryDTO1.Id = Guid.NewGuid().ToString();
+ wfHistoryDTO1.RunProcessId = wfRunProcessDTO.Id;
+ wfHistoryDTO1.SendUserId = Userid;
+ wfHistoryDTO1.DeelUserId = wfRunProcessDTO.Creater;
+ wfHistoryDTO1.Sendtime = DateTime.Now;
+ wfHistoryDTO1.Resivetime = DateTime.Now;
+ wfHistoryDTO1.Step = "鎻愪氦";
+ wfHistoryDTO1.NeeddeelType = "1";
+ wfHistoryDTO1.ChuliStatus = "2";
+ wfHistoryDTO1.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
+ wfHistoryDTO1.Content = "";
+ wfHistoryDTO1.Sort = 1;
+ wfHistoryDTO1.RecStatus = "A";
+ wfHistoryDTO1.Creater = Userid;
+ wfHistoryDTO1.Createtime = DateTime.Now;
+ wfHistoryDTO1.Modifier = Userid;
+ wfHistoryDTO1.Modifytime = wfHistoryDTO1.Createtime;
+ _context.WfHistories.Add(wfHistoryDTO1);
+ _context.SaveChanges();
+ }
+ else
+ {
+ wfRunProcessDTO.Step = "浜轰簨瀹℃壒";
+ wfRunProcessDTO.Modifier = Userid;
+ wfRunProcessDTO.Modifytime = DateTime.Now;
+ result = this.save(wfRunProcessDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+
+ //鏇存柊寰呭姙
+ List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "鎻愪氦");
+ var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);
+
+ var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
+ if (wfHistoryDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒颁唬鍔�";
+ return result;
+ }
+ wfHistoryDTO.Content = Content;
+ wfHistoryDTO.ChuliStatus = "2";
+ wfHistoryDTO.Modifier = Userid;
+ wfHistoryDTO.Modifytime = DateTime.Now;
+ var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
+ foreach (var wfHistory in wfHistories)
+ {
+ _context.WfHistories.Add(wfHistory);
+ }
+ var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
+ foreach (var wfNeeddeel in wfNeeddeels)
+ {
+ //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
+ _context.WfNeeddeels.Remove(wfNeeddeel);
+ }
+ _context.SaveChanges();
+
+ //鏌ヨ澶勭悊浜�
+ var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && x.RoleName == "浜轰簨").FirstOrDefault();
+ if (hrPositions == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒拌亴浣�";
+ return result;
+ }
+ var pltUsers = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
+ join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && x.RoleId == hrPositions.Id) on a.Id equals b.UserId
+ select a
+ ).ToList();
+
+ if (pltUsers == null || pltUsers.Count == 0)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒板鐞嗕汉";
+ return result;
+ }
+
+ foreach (var pltUser in pltUsers)
+ {
+ //鎻掑叆鏂扮殑寰呭姙
+ WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
+ wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
+ wfNeeddeelDTO.SendUserId = Userid;
+ wfNeeddeelDTO.DeelUserId = pltUser.Id;
+ wfNeeddeelDTO.Sendtime = DateTime.Now;
+ wfNeeddeelDTO.Resivetime = DateTime.Now;
+ wfNeeddeelDTO.Step = "浜轰簨瀹℃壒";
+ wfNeeddeelDTO.NeeddeelType = "1";
+ wfNeeddeelDTO.ChuliStatus = "0";
+ wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
+ wfNeeddeelDTO.Content = "";
+ wfNeeddeelDTO.Sort = 2;
+ wfNeeddeelDTO.RecStatus = "A";
+ wfNeeddeelDTO.Creater = Userid;
+ wfNeeddeelDTO.Createtime = DateTime.Now;
+ wfNeeddeelDTO.Modifier = Userid;
+ wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
+ result = _wfNeeddeelService.save(wfNeeddeelDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+ }
+ }
+
+
+
+
+ }
+ if (step == "浜轰簨瀹℃壒")
+ {
+ //鏇存柊娴佺▼瀹炰緥
+ //WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
+ if (wfRunProcessDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒版祦绋嬪疄渚�";
+ return result;
+ }
+ if (wfRunProcessDTO.Step != "浜轰簨瀹℃壒")
+ {
+ result.Result = false;
+ result.Message = "褰撳墠姝ラ宸茬粡澶勭悊";
+ return result;
+ }
+
+ if (tongguojujue == "A")
+ {
+ wfRunProcessDTO.Step = "鎬荤粡鐞嗗鎵�";
+ wfRunProcessDTO.Modifier = Userid;
+ wfRunProcessDTO.Modifytime = DateTime.Now;
+ result = this.save(wfRunProcessDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+
+ //鏇存柊寰呭姙
+ List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "浜轰簨瀹℃壒");
+
+
+
+ var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);
+
+ var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
+ if (wfHistoryDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒颁唬鍔�";
+ return result;
+ }
+
+ wfHistoryDTO.Content = Content;
+ wfHistoryDTO.ChuliStatus = "2";
+ wfHistoryDTO.Modifier = Userid;
+ wfHistoryDTO.Modifytime = DateTime.Now;
+
+
+ var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
+ foreach (var wfHistory in wfHistories)
+ {
+ _context.WfHistories.Add(wfHistory);
+ }
+ var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
+ foreach (var wfNeeddeel in wfNeeddeels)
+ {
+ //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
+ _context.WfNeeddeels.Remove(wfNeeddeel);
+ }
+ _context.SaveChanges();
+
+ //鏌ヨ澶勭悊浜�
+ var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && x.RoleName == "鎬荤粡鐞�").FirstOrDefault();
+ if (hrPositions == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒拌亴浣�";
+ return result;
+ }
+ var pltUsers = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
+ join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && x.RoleId == hrPositions.Id) on a.Id equals b.UserId
+ select a
+ ).ToList();
+
+ if (pltUsers == null || pltUsers.Count == 0)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒板鐞嗕汉";
+ return result;
+ }
+
+ foreach (var pltUser in pltUsers)
+ {
+ //鎻掑叆鏂扮殑寰呭姙
+ WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
+ wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
+ wfNeeddeelDTO.SendUserId = Userid;
+ wfNeeddeelDTO.DeelUserId = pltUser.Id;
+ wfNeeddeelDTO.Sendtime = DateTime.Now;
+ wfNeeddeelDTO.Resivetime = DateTime.Now;
+ wfNeeddeelDTO.Step = "鎬荤粡鐞嗗鎵�";
+ wfNeeddeelDTO.NeeddeelType = "1";
+ wfNeeddeelDTO.ChuliStatus = "0";
+ wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
+ wfNeeddeelDTO.Content = "";
+ wfNeeddeelDTO.Sort = 3;
+ wfNeeddeelDTO.RecStatus = "A";
+ wfNeeddeelDTO.Creater = Userid;
+ wfNeeddeelDTO.Createtime = DateTime.Now;
+ wfNeeddeelDTO.Modifier = Userid;
+ wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
+ result = _wfNeeddeelService.save(wfNeeddeelDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+ }
+ }
+ else
+ {
+ wfRunProcessDTO.Step = "鎻愪氦";
+ wfRunProcessDTO.Modifier = Userid;
+ wfRunProcessDTO.Modifytime = DateTime.Now;
+ result = this.save(wfRunProcessDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+
+ //鏇存柊寰呭姙
+ List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "浜轰簨瀹℃壒");
+ var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);
+
+ var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
+ if (wfHistoryDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒颁唬鍔�";
+ return result;
+ }
+ wfHistoryDTO.Content = Content;
+ wfHistoryDTO.ChuliStatus = "1";
+ wfHistoryDTO.Modifier = Userid;
+ wfHistoryDTO.Modifytime = DateTime.Now;
+ var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
+ foreach (var wfHistory in wfHistories)
+ {
+ _context.WfHistories.Add(wfHistory);
+ }
+ var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
+ foreach (var wfNeeddeel in wfNeeddeels)
+ {
+ //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
+ _context.WfNeeddeels.Remove(wfNeeddeel);
+ }
+ _context.SaveChanges();
+
+
+ //鎻掑叆鏂扮殑寰呭姙
+ WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
+ wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
+ wfNeeddeelDTO.SendUserId = Userid;
+ wfNeeddeelDTO.DeelUserId = wfRunProcessDTO.Creater;
+ wfNeeddeelDTO.Sendtime = DateTime.Now;
+ wfNeeddeelDTO.Resivetime = DateTime.Now;
+ wfNeeddeelDTO.Step = "鎻愪氦";
+ wfNeeddeelDTO.NeeddeelType = "1";
+ wfNeeddeelDTO.ChuliStatus = "0";
+ wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
+ wfNeeddeelDTO.Content = "";
+ wfNeeddeelDTO.Sort = 1;
+ wfNeeddeelDTO.RecStatus = "A";
+ wfNeeddeelDTO.Creater = Userid;
+ wfNeeddeelDTO.Createtime = DateTime.Now;
+ wfNeeddeelDTO.Modifier = Userid;
+ wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
+ result = _wfNeeddeelService.save(wfNeeddeelDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+
+ }
+
+
+
+
+
+ }
+
+ if (step == "鎬荤粡鐞嗗鎵�")
+ {
+ //鏇存柊娴佺▼瀹炰緥
+ //WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "03").FirstOrDefault();
+ if (wfRunProcessDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒版祦绋嬪疄渚�";
+ return result;
+ }
+ if (wfRunProcessDTO.Step != "鎬荤粡鐞嗗鎵�")
+ {
+ result.Result = false;
+ result.Message = "褰撳墠姝ラ宸茬粡澶勭悊";
+ return result;
+ }
+ if (tongguojujue == "A")
+ {
+
+ wfRunProcessDTO.Step = "瀹岀粨";
+ wfRunProcessDTO.ShenpiStatus = "A";
+ wfRunProcessDTO.Modifier = Userid;
+ wfRunProcessDTO.Modifytime = DateTime.Now;
+ result = this.save(wfRunProcessDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+ //鏇存柊鍗曟嵁
+ var salaryAppeal = _context.HrSalaryAppeal.Find(DanjuId);
+ if (wfRunProcessDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒板崟鎹�";
+ return result;
+ }
+ salaryAppeal.shenpi_status = "A";
+ _context.SaveChanges();
+
+ List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "鎬荤粡鐞嗗鎵�");
+
+ var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);
+
+ var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
+ if (wfHistoryDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒颁唬鍔�";
+ return result;
+ }
+ wfHistoryDTO.Content = Content;
+ wfHistoryDTO.ChuliStatus = "2";
+ wfHistoryDTO.Modifier = Userid;
+ wfHistoryDTO.Modifytime = DateTime.Now;
+ var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
+ foreach (var wfHistory in wfHistories)
+ {
+ _context.WfHistories.Add(wfHistory);
+ }
+ var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
+ foreach (var wfNeeddeel in wfNeeddeels)
+ {
+ // _wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
+ _context.WfNeeddeels.Remove(wfNeeddeel);
+ }
+ _context.SaveChanges();
+ }
+ else
+ {
+ wfRunProcessDTO.Step = "鎻愪氦";
+ wfRunProcessDTO.Modifier = Userid;
+ wfRunProcessDTO.Modifytime = DateTime.Now;
+ result = this.save(wfRunProcessDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+
+ //鏇存柊寰呭姙
+ List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "鎬荤粡鐞嗗鎵�");
+ var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs);
+
+ var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault();
+ if (wfHistoryDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒颁唬鍔�";
+ return result;
+ }
+ wfHistoryDTO.Content = Content;
+ wfHistoryDTO.ChuliStatus = "1";
+ wfHistoryDTO.Modifier = Userid;
+ wfHistoryDTO.Modifytime = DateTime.Now;
+ var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs);
+ foreach (var wfHistory in wfHistories)
+ {
+ _context.WfHistories.Add(wfHistory);
+ }
+ var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs);
+ foreach (var wfNeeddeel in wfNeeddeels)
+ {
+ //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid);
+ _context.WfNeeddeels.Remove(wfNeeddeel);
+ }
+ _context.SaveChanges();
+
+
+ //鎻掑叆鏂扮殑寰呭姙
+ WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO();
+ wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id;
+ wfNeeddeelDTO.SendUserId = Userid;
+ wfNeeddeelDTO.DeelUserId = wfRunProcessDTO.Creater;
+ wfNeeddeelDTO.Sendtime = DateTime.Now;
+ wfNeeddeelDTO.Resivetime = DateTime.Now;
+ wfNeeddeelDTO.Step = "鎻愪氦";
+ wfNeeddeelDTO.NeeddeelType = "1";
+ wfNeeddeelDTO.ChuliStatus = "0";
+ wfNeeddeelDTO.Deelurl = "/SalaryCheck/Appeal?id=" + DanjuId;
+ wfNeeddeelDTO.Content = "";
+ wfNeeddeelDTO.Sort = 1;
+ wfNeeddeelDTO.RecStatus = "A";
+ wfNeeddeelDTO.Creater = Userid;
+ wfNeeddeelDTO.Createtime = DateTime.Now;
+ wfNeeddeelDTO.Modifier = Userid;
+ wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime;
+ result = _wfNeeddeelService.save(wfNeeddeelDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+
+ }
+
+
+
+ }
+
+
+ }
+
+
+
+ return result;
+ }
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
index 41774d5..933fba3 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -100,7 +100,7 @@
ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.khly = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
@@ -170,6 +170,10 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
+ if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
+ {
+ data.Shifoutianjiaweixin = "D";
+ }
if (String.IsNullOrEmpty(data.Id))
{
data.Creater = curentuser.Id;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 95b6936..2d85f63 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -121,7 +121,7 @@
ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
-
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
@@ -258,6 +258,10 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
+ if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
+ {
+ data.Shifoutianjiaweixin = "D";
+ }
if (String.IsNullOrEmpty(data.Id))
{
data.Creater = curentuser.Id;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
index 12a155f..bfab3a8 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
@@ -80,6 +80,8 @@
ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
+ ViewBag.creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
+
ViewBag.Viscustomer = Viscustomer;
ViewBag.IsYwjl = IsYwjl;
@@ -112,6 +114,14 @@
{
dto.Viscustomer = Viscustomer;
}
+
+ dto.VisType = "01";
+ dto.Jtype = "02";
+ dto.Jdr = "02";
+ dto.Talk = "浠嬬粛鍏徃涓氬姟鍐呭鍜屼骇鍝併��";
+ dto.Yx = "03";
+ dto.Jy = "02";
+
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
index 1a0e812..00efc6d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
@@ -47,6 +47,15 @@
List<FiServiceDTO> fiServiceDTOs = _fiServiceService.GetList();
List<FiMemberDTO> fiMemberDTOs = _fiMemberService.GetList();
List<FiBookDTO> fiBookDTOs = _fiBookService.GetList();
+ foreach (var fiBookDTO in fiBookDTOs)
+ {
+ if (fiBookDTO.Chubantime.HasValue)
+ {
+ fiBookDTO.ChubantimeName = fiBookDTO.Chubantime.Value.ToString("yyyy-MM-dd");
+ }
+
+ }
+
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
decimal? Dianhuazixun = fiServiceDTOs.Where(x => x.ServiceType == "鐢佃瘽鍜ㄨ").FirstOrDefault().Feiyong;
serviceChargeDTO.Dianhuazixun = Dianhuazixun.HasValue? Dianhuazixun.Value.ToString("F2"): "";
@@ -65,31 +74,31 @@
decimal? Xuqiulunzheng5 = fiServiceDTOs.Where(x => x.ServiceType == "闇�姹傝璇�" && x.ServiceTypeTwo == "1000涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Xuqiulunzheng5 = Xuqiulunzheng5.HasValue ? Xuqiulunzheng5.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian1 = Zhudaotoubiaowenjian1.HasValue ? Zhudaotoubiaowenjian1.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian2 = Zhudaotoubiaowenjian2.HasValue ? Zhudaotoubiaowenjian2.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian3 = Zhudaotoubiaowenjian3.HasValue ? Zhudaotoubiaowenjian3.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian4 = Zhudaotoubiaowenjian4.HasValue ? Zhudaotoubiaowenjian4.Value.ToString("F2") : "";
- decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi1 = Daishuzhiyi1.HasValue ? Daishuzhiyi1.Value.ToString("F2") : "";
- decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi2 = Daishuzhiyi2.HasValue ? Daishuzhiyi2.Value.ToString("F2") : "";
- decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi3 = Daishuzhiyi3.HasValue ? Daishuzhiyi3.Value.ToString("F2") : "";
- decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi4 = Daishuzhiyi4.HasValue ? Daishuzhiyi4.Value.ToString("F2") : "";
- decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu1 = Daushutousu1.HasValue ? Daushutousu1.Value.ToString("F2") : "";
- decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu2 = Daushutousu2.HasValue ? Daushutousu2.Value.ToString("F2") : "";
- decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu3 = Daushutousu3.HasValue ? Daushutousu3.Value.ToString("F2") : "";
- decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu4 = Daushutousu4.HasValue ? Daushutousu4.Value.ToString("F2") : "";
decimal? Dainizhiyiwenda = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒绛斿").FirstOrDefault().Feiyong;
@@ -98,7 +107,7 @@
decimal? Dainitousuchulijueding = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾").FirstOrDefault().Feiyong;
serviceChargeDTO.Dainitousuchulijueding = Dainitousuchulijueding.HasValue ? Dainitousuchulijueding.Value.ToString("F2") : "";
- decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�").FirstOrDefault().Feiyong;
+ decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�").FirstOrDefault().Feiyong;
serviceChargeDTO.Jinzhengfuishou = Jinzhengfuishou.HasValue ? Jinzhengfuishou.Value.ToString("F2") : "";
decimal? Zhengcaidai = fiServiceDTOs.Where(x => x.ServiceType == "鏀块噰璐�").FirstOrDefault().Feiyong;
@@ -255,64 +264,64 @@
Xuqiulunzheng5.Feiyong = Xuqiulunzheng5decimal;
resultEntity = _fiServiceService.save(Xuqiulunzheng5);
- FiServiceDTO Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
decimal Zhudaotoubiaowenjian1decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian1, out Zhudaotoubiaowenjian1decimal);
Zhudaotoubiaowenjian1.Feiyong = Zhudaotoubiaowenjian1decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian1);
- FiServiceDTO Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
decimal Zhudaotoubiaowenjian2decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian2, out Zhudaotoubiaowenjian2decimal);
Zhudaotoubiaowenjian2.Feiyong = Zhudaotoubiaowenjian2decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian2);
- FiServiceDTO Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
decimal Zhudaotoubiaowenjian3decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian3, out Zhudaotoubiaowenjian3decimal);
Zhudaotoubiaowenjian3.Feiyong = Zhudaotoubiaowenjian3decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian3);
- FiServiceDTO Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
+ FiServiceDTO Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
decimal Zhudaotoubiaowenjian4decimal;
decimal.TryParse(data.Zhudaotoubiaowenjian4, out Zhudaotoubiaowenjian4decimal);
Zhudaotoubiaowenjian4.Feiyong = Zhudaotoubiaowenjian4decimal;
resultEntity = _fiServiceService.save(Zhudaotoubiaowenjian4);
- FiServiceDTO Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
decimal Daishuzhiyi1decimal;
decimal.TryParse(data.Daishuzhiyi1, out Daishuzhiyi1decimal);
Daishuzhiyi1.Feiyong = Daishuzhiyi1decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi1);
- FiServiceDTO Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
decimal Daishuzhiyi2decimal;
decimal.TryParse(data.Daishuzhiyi2, out Daishuzhiyi2decimal);
Daishuzhiyi2.Feiyong = Daishuzhiyi2decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi2);
- FiServiceDTO Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
decimal Daishuzhiyi3decimal;
decimal.TryParse(data.Daishuzhiyi3, out Daishuzhiyi3decimal);
Daishuzhiyi3.Feiyong = Daishuzhiyi3decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi3);
- FiServiceDTO Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
+ FiServiceDTO Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
decimal Daishuzhiyi4decimal;
decimal.TryParse(data.Daishuzhiyi4, out Daishuzhiyi4decimal);
Daishuzhiyi4.Feiyong = Daishuzhiyi4decimal;
resultEntity = _fiServiceService.save(Daishuzhiyi4);
- FiServiceDTO Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
+ FiServiceDTO Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault();
decimal Daushutousu1decimal;
decimal.TryParse(data.Daushutousu1, out Daushutousu1decimal);
Daushutousu1.Feiyong = Daushutousu1decimal;
resultEntity = _fiServiceService.save(Daushutousu1);
- FiServiceDTO Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
+ FiServiceDTO Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault();
decimal Daushutousu2decimal;
decimal.TryParse(data.Daushutousu2, out Daushutousu2decimal);
Daushutousu2.Feiyong = Daushutousu2decimal;
resultEntity = _fiServiceService.save(Daushutousu2);
- FiServiceDTO Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
+ FiServiceDTO Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault();
decimal Daushutousu3decimal;
decimal.TryParse(data.Daushutousu3, out Daushutousu3decimal);
Daushutousu3.Feiyong = Daushutousu3decimal;
resultEntity = _fiServiceService.save(Daushutousu3);
- FiServiceDTO Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
+ FiServiceDTO Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault();
decimal Daushutousu4decimal;
decimal.TryParse(data.Daushutousu4, out Daushutousu4decimal);
Daushutousu4.Feiyong = Daushutousu4decimal;
@@ -330,7 +339,7 @@
Dainitousuchulijueding.Feiyong = Dainitousuchulijuedingdecimal;
resultEntity = _fiServiceService.save(Dainitousuchulijueding);
- FiServiceDTO Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�").FirstOrDefault();
+ FiServiceDTO Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�").FirstOrDefault();
decimal Jinzhengfuishoudecimal;
decimal.TryParse(data.Jinzhengfuishou, out Jinzhengfuishoudecimal);
Jinzhengfuishou.Feiyong = Jinzhengfuishoudecimal;
@@ -470,8 +479,9 @@
if (!string.IsNullOrEmpty(id))
{
dto = _fiBookService.Get(id);
- dto.DanjiaName = dto.Danjia.Value.ToString("F2"); ;
- dto.ChubantimeName = dto.Chubantime.Value.ToString("yyyy-MM-dd");
+ dto.DanjiaName = dto.Danjia.Value.ToString("F2");
+ if(dto.Chubantime.HasValue)
+ dto.ChubantimeName = dto.Chubantime.Value.ToString("yyyy-MM-dd");
}
ViewData.Model = dto;
return View();
@@ -510,6 +520,14 @@
List<FiServiceDTO> fiServiceDTOs = _fiServiceService.GetList();
List<FiMemberDTO> fiMemberDTOs = _fiMemberService.GetList();
List<FiBookDTO> fiBookDTOs = _fiBookService.GetList();
+ foreach (var fiBookDTO in fiBookDTOs)
+ {
+ if (fiBookDTO.Chubantime.HasValue)
+ {
+ fiBookDTO.ChubantimeName = fiBookDTO.Chubantime.Value.ToString("yyyy-MM-dd");
+ }
+
+ }
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
decimal? Dianhuazixun = fiServiceDTOs.Where(x => x.ServiceType == "鐢佃瘽鍜ㄨ").FirstOrDefault().Feiyong;
serviceChargeDTO.Dianhuazixun = Dianhuazixun.HasValue ? Dianhuazixun.Value.ToString("F2") : "";
@@ -528,31 +546,31 @@
decimal? Xuqiulunzheng5 = fiServiceDTOs.Where(x => x.ServiceType == "闇�姹傝璇�" && x.ServiceTypeTwo == "1000涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Xuqiulunzheng5 = Xuqiulunzheng5.HasValue ? Xuqiulunzheng5.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian1 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian1 = Zhudaotoubiaowenjian1.HasValue ? Zhudaotoubiaowenjian1.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian2 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian2 = Zhudaotoubiaowenjian2.HasValue ? Zhudaotoubiaowenjian2.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian3 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian3 = Zhudaotoubiaowenjian3.HasValue ? Zhudaotoubiaowenjian3.Value.ToString("F2") : "";
- decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鎸囧鎶曟爣鏂囦欢" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Zhudaotoubiaowenjian4 = fiServiceDTOs.Where(x => x.ServiceType == "鏍囦功鎸囧" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Zhudaotoubiaowenjian4 = Zhudaotoubiaowenjian4.HasValue ? Zhudaotoubiaowenjian4.Value.ToString("F2") : "";
- decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi1 = Daishuzhiyi1.HasValue ? Daishuzhiyi1.Value.ToString("F2") : "";
- decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi2 = Daishuzhiyi2.HasValue ? Daishuzhiyi2.Value.ToString("F2") : "";
- decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi3 = Daishuzhiyi3.HasValue ? Daishuzhiyi3.Value.ToString("F2") : "";
- decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功璐ㄧ枒" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daishuzhiyi4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒鍑�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daishuzhiyi4 = Daishuzhiyi4.HasValue ? Daishuzhiyi4.Value.ToString("F2") : "";
- decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
+ decimal? Daushutousu1 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30涓囧厓浠ヤ笅").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu1 = Daushutousu1.HasValue ? Daushutousu1.Value.ToString("F2") : "";
- decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu2 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "30-200涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu2 = Daushutousu2.HasValue ? Daushutousu2.Value.ToString("F2") : "";
- decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
+ decimal? Daushutousu3 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "200-500涓囧厓").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu3 = Daushutousu3.HasValue ? Daushutousu3.Value.ToString("F2") : "";
- decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｄ功鎶曡瘔" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
+ decimal? Daushutousu4 = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔涔�" && x.ServiceTypeTwo == "500涓囧厓浠ヤ笂").FirstOrDefault().Feiyong;
serviceChargeDTO.Daushutousu4 = Daushutousu4.HasValue ? Daushutousu4.Value.ToString("F2") : "";
decimal? Dainizhiyiwenda = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙璐ㄧ枒绛斿").FirstOrDefault().Feiyong;
@@ -561,7 +579,7 @@
decimal? Dainitousuchulijueding = fiServiceDTOs.Where(x => x.ServiceType == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾").FirstOrDefault().Feiyong;
serviceChargeDTO.Dainitousuchulijueding = Dainitousuchulijueding.HasValue ? Dainitousuchulijueding.Value.ToString("F2") : "";
- decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�").FirstOrDefault().Feiyong;
+ decimal? Jinzhengfuishou = fiServiceDTOs.Where(x => x.ServiceType == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�").FirstOrDefault().Feiyong;
serviceChargeDTO.Jinzhengfuishou = Jinzhengfuishou.HasValue ? Jinzhengfuishou.Value.ToString("F2") : "";
decimal? Zhengcaidai = fiServiceDTOs.Where(x => x.ServiceType == "鏀块噰璐�").FirstOrDefault().Feiyong;
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index dd2c3c8..12c1eea 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -18,12 +18,19 @@
private readonly IHrDeptService _hrDeptService;
private readonly ILogger<SalaryCheckController> _logger;
private readonly IHrSalaryService _hrSalaryService;
+ private readonly IWfRunProcessService _wfRunProcessService;
+ private readonly IWfHistoryService _wfHistoryService;
+ private readonly IWfNeeddeelService _wfNeeddeelService;
- public SalaryCheckController(ILogger<SalaryCheckController> logger, IHrSalaryService hrSalaryService, IHrDeptService hrDeptService)
+ public SalaryCheckController(ILogger<SalaryCheckController> logger, IHrSalaryService hrSalaryService, IHrDeptService hrDeptService, IWfRunProcessService wfRunProcessService
+ , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService)
{
_logger = logger;
_hrDeptService = hrDeptService;
_hrSalaryService = hrSalaryService;
+ _wfRunProcessService = wfRunProcessService;
+ _wfHistoryService = wfHistoryService;
+ _wfNeeddeelService = wfNeeddeelService;
}
public IActionResult Index()
@@ -148,19 +155,69 @@
}
- public IActionResult Appeal(string id)
+ public IActionResult Appeal(string id="",string salaryId = "")
{
HrSalaryAppeal dto = new HrSalaryAppeal();
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
- if (!string.IsNullOrEmpty(id))
- {
- dto = _hrSalaryService.GetAppeal(id, curentuser.Id);
- if(dto==null)
+ dto = _hrSalaryService.GetAppeal(id, curentuser.Id, salaryId);
+
+ //娴佺▼鐩稿叧
+ string shifoubiaoji = "A";
+ string sifoudangqian = "A";
+ string dangqianbuzhou = "鎻愪氦";
+ var lishiyijian = new List<WfHistoryDTO>();
+
+ if (dto==null)
{
+ var salaryDTO = _hrSalaryService.Get(salaryId);
dto = new HrSalaryAppeal();
- dto.salary_id = id;
- }
+ dto.salary_id = salaryId;
+ dto.Year = salaryDTO.Year;
+ dto.Month = salaryDTO.Month;
+ dto.createrName = curentuser.UserName;
+ dto.tittle = "宸ヨ祫鐢宠瘔锛�" + curentuser.UserName + "锛�";
}
+ else if (dto != null)
+ {
+ var wfRunProcessDTO = _wfRunProcessService.GetList(dto.id, "03").FirstOrDefault();
+ if (wfRunProcessDTO == null)
+ {
+ shifoubiaoji = "D";
+ sifoudangqian = "D";
+ }
+ else
+ {
+ dangqianbuzhou = wfRunProcessDTO.Step;
+ //鏌ヨ鍘嗗彶鎰忚
+ lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id);
+ if (wfRunProcessDTO.Step != "鎻愪氦")
+ {
+ shifoubiaoji = "D";
+ }
+
+ //鏌ヨ寰呭姙
+ var chaxundaiban = _wfNeeddeelService.GetListTracking(wfRunProcessDTO.Id, wfRunProcessDTO.Step).Where(x => x.DeelUserId == curentuser.Id).ToList();
+ if (chaxundaiban != null && chaxundaiban.Count > 0)
+ {
+ sifoudangqian = "A";
+ }
+ else
+ {
+ sifoudangqian = "D";
+ }
+
+ }
+
+
+
+
+ }
+
+ ViewBag.shifoubiaoji = shifoubiaoji;
+ ViewBag.sifoudangqian = sifoudangqian;
+ ViewBag.lishiyijian = lishiyijian;
+ ViewBag.dangqianbuzhou = dangqianbuzhou;
+
ViewData.Model = dto;
return View();
}
@@ -171,14 +228,24 @@
/// <param name="data"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult SaveAppeal(HrSalaryAppeal data)
+ public IActionResult SaveAppeal(HrSalaryAppealDTO data)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ResultEntity resultEntity = new ResultEntity();
using (TransactionScope scope = new TransactionScope())
{
- data.sub_user = curentuser.Id;
- resultEntity = _hrSalaryService.CheckAppea(data);
+ if (data.Step == "鎻愪氦")
+ {
+ data.sub_user = curentuser.Id;
+ data.shenpi_status = "D";
+ data.status = "A";
+ resultEntity = _hrSalaryService.CheckAppea(data);
+ }
+
+
+ //鍙戣捣娴佺▼鐩稿叧
+
+ resultEntity = _wfRunProcessService.WfSalaryAppeal(data.id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.tittle, "v1");
scope.Complete();
}
return new JsonResult(resultEntity);
diff --git a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
index 37f91c7..6108fcf 100644
--- a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
@@ -429,7 +429,88 @@
/// <summary>
- /// 淇濆瓨
+ /// 鎻愪氦骞跺鏍�
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ [HttpPost]
+ [CheckLogin]
+ public async Task<string> TijiaobingshenheAsync(LiaotianDTO data)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ data.RecStatus = "A";
+ data.Clientid = "A";
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ }
+ data.Modifier = curentuser.Id;
+ data.Modifytime = DateTime.Now;
+
+
+
+ resultEntity = _liaotianService.saveLiaotian(data);
+
+ string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
+ string url = $"{api_domain}/liaotian/person/" + data.Id;
+ LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
+ liaotianElasticsearchDTO.id = data.Id;
+ liaotianElasticsearchDTO.question = data.Question;
+ liaotianElasticsearchDTO.anwser = data.Anwser;
+
+
+ string requestJson = JsonConvert.SerializeObject(liaotianElasticsearchDTO); ;
+ try
+ {
+ string result = string.Empty;
+ Uri postUrl = new Uri(url);
+
+ using (HttpContent httpContent = new StringContent(requestJson))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+ var httpClient = _clientFactory.CreateClient();
+ httpClient.Timeout = new TimeSpan(0, 0, 60);
+ var Result = await httpClient.PutAsync(postUrl, httpContent);
+ result = Result.Content.ReadAsStringAsync().Result;
+
+
+
+ }
+
+ Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);
+
+ if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
+ {
+ resultEntity.Result = true;
+ }
+ else
+ {
+ resultEntity.Result = false;
+ }
+
+ }
+ catch (Exception e)
+ {
+ resultEntity.Result = false;
+ throw e;
+
+
+ }
+
+
+
+
+
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+
+ /// <summary>
+ /// 瀹℃牳
/// </summary>
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
diff --git a/zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs b/zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs
index 9490308..8505c05 100644
--- a/zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs
@@ -32,7 +32,9 @@
public IActionResult Index()
{
- ViewBag.wfApplytypeDTOs = _wfApplytypeService.GetList();
+
+
+ ViewBag.wfApplytypeDTOs = _wfApplytypeService.GetList().Where(x => x.Applyno != "03").ToList();
return View();
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index 084e8a4..02a69c9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -24,15 +24,17 @@
private readonly ILiaotianService _liaotianService;
private readonly IIntentionCustomerService _intentionCustomerService;
private readonly IUserService _userService;
+ private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
-
- public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService)
+ public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService
+ , ICooperatecustomCustomerService cooperatecustomCustomerService)
{
_logger = logger;
_projectService = projectService;
_liaotianService = liaotianService;
_intentionCustomerService = intentionCustomerService;
_userService = userService;
+ _cooperatecustomCustomerService = cooperatecustomCustomerService;
}
[CheckLogin]
public IActionResult Index()
@@ -68,6 +70,7 @@
{
projectDTO = _projectService.GetLiaotianEntity(id);
var intentionCustomerDTOs = _intentionCustomerService.GetList();
+ var cooperatecustomCustomerDTOs = _cooperatecustomCustomerService.GetList();
if (projectDTO.Projectzhongbiaos!=null && projectDTO.Projectzhongbiaos.Count > 0)
{
@@ -75,6 +78,11 @@
{
var intt = intentionCustomerDTOs.Count(x=>x.Name == projectDTO.Projectzhongbiaos[i].Names);
+ if (intt > 0)
+ {
+ projectDTO.Projectzhongbiaos[i].ProjectId = "yes";
+ }
+ intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Projectzhongbiaos[i].Names);
if (intt > 0)
{
projectDTO.Projectzhongbiaos[i].ProjectId = "yes";
@@ -89,12 +97,22 @@
{
projectDTO.Drcunzai = "yes";
}
+ intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Drhx);
+ if (intt > 0)
+ {
+ projectDTO.Drcunzai = "yes";
+ }
}
if (!string.IsNullOrWhiteSpace(projectDTO.Dshx))
{
var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Dshx);
+ if (intt > 0)
+ {
+ projectDTO.Dscunzai = "yes";
+ }
+ intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Dshx);
if (intt > 0)
{
projectDTO.Dscunzai = "yes";
@@ -106,6 +124,11 @@
{
var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.projectreasons[i].Reasonname);
+ if (intt > 0)
+ {
+ projectDTO.projectreasons[i].ProjectId = "yes";
+ }
+ intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.projectreasons[i].Reasonname);
if (intt > 0)
{
projectDTO.projectreasons[i].ProjectId = "yes";
@@ -123,6 +146,41 @@
{
projectDTO.Projectyouxiaos[i].ProjectId = "yes";
}
+ intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Projectyouxiaos[i].Namesyouxiao);
+ if (intt > 0)
+ {
+ projectDTO.Projectyouxiaos[i].ProjectId = "yes";
+ }
+ }
+ }
+
+ if (!string.IsNullOrWhiteSpace(projectDTO.Caigourenname))
+ {
+ var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Caigourenname);
+
+ if (intt > 0)
+ {
+ projectDTO.Caigourennamecunzai = "yes";
+ }
+ intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Caigourenname);
+ if (intt > 0)
+ {
+ projectDTO.Caigourennamecunzai = "yes";
+ }
+ }
+
+ if (!string.IsNullOrWhiteSpace(projectDTO.Dailiname))
+ {
+ var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Dailiname);
+
+ if (intt > 0)
+ {
+ projectDTO.Dailinamecunzai = "yes";
+ }
+ intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Dailiname);
+ if (intt > 0)
+ {
+ projectDTO.Dailinamecunzai = "yes";
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index 2f1cabc..1f55740 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
@@ -262,8 +262,8 @@
string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
Regex rStr = new Regex(s);
- if (rStr.IsMatch(userdata.IpMac))
- {
+ //if (rStr.IsMatch(userdata.IpMac))
+ //{
using (TransactionScope scope = new TransactionScope())
{
bool charujues = false;
@@ -355,11 +355,11 @@
}
scope.Complete();
}
- }
- else
- {
- resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
- }
+ //}
+ //else
+ //{
+ // resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
+ //}
return JsonConvert.SerializeObject(resultEntity);
}
#endregion
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
index 2dc9a78..96be61d 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
@@ -138,7 +138,7 @@
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">琛屼笟鍒嗙被<i class="red">*</i></label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <select id="Hyfl" class="form-control" name="Hyfl" data-placeholder="閫夋嫨 搴忓垪 ..." >
+ <select id="Hyfl" class="form-control" name="Hyfl" data-placeholder="閫夋嫨 搴忓垪 ...">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in hyfl)
{
@@ -320,8 +320,22 @@
<input class="form-control" label="瀹㈡埛鍗曚綅" name="Name" id="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">
+ <input class="form-control" label="瀹㈡埛寰俊" name="Weixin" id="Weixin" labtype="txt" addvisible="true" editvisible="true" maxlength="50" reg="" ismust="true" type="text" value="@Model.Weixin">
+ </div>
+ <div class="col-sm-2 col-md-2">
+ 鏄惁娣诲姞寰俊
+ @if (Model.Shifoutianjiaweixin == "A")
+ {
+ <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" checked="checked" value="A" class="type_b">
+ }
+ else
+ {
+ <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" value="A" class="type_b">
-
+ }
+ </div>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -423,8 +437,8 @@
<input class="form-control" label="鏀惰揣鍦板潃" name="ShrAddress" id="ShrAddress" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.ShrAddress">
</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">澶囨敞锛�</label>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index fe4b9cc..963813d 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -4,12 +4,14 @@
}
@section headerStyle{
<script type="text/javascript">
-
+
var khlxs = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.khlx))';
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))';
+ var shifou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.shifou))';
+
loseherght = 60;
gridConfig = { multiselect: true, selectcol: "Id" };
dataCol = [
@@ -21,7 +23,7 @@
return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperatecustomCustomer/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
}
},
-
+ { label: '鑱旂郴鐢佃瘽', name: 'Tel', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
{ label: '瀹㈡埛鏉ユ簮', name: 'KhlyName', labtype: 'txt', hidden: false, width: 100 },
{ label: '琛屼笟鍒嗙被', name: 'HyflName', labtype: 'txt', hidden: false, width: 100 },
@@ -29,7 +31,7 @@
{ 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 },
-
+
];
dataUrl = "/CooperatecustomCustomer/GetList";
searchCol = [
@@ -44,7 +46,7 @@
{ label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '寤烘。鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
-
+ { label: '鏄惁鏈夊井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
];
var _pageAdd = function () {
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
index 4abd377..a46af01 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
@@ -318,7 +318,22 @@
<div class="col-sm-6 col-md-6">
<input class="form-control" label="瀹㈡埛鍗曚綅" name="Name" id="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">
+ <input class="form-control" label="瀹㈡埛寰俊" name="Weixin" id="Weixin" labtype="txt" addvisible="true" editvisible="true" maxlength="50" reg="" ismust="true" type="text" value="@Model.Weixin">
+ </div>
+ <div class="col-sm-2 col-md-2">
+ 鏄惁娣诲姞寰俊
+ @if (Model.Shifoutianjiaweixin == "A")
+ {
+ <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" checked="checked" value="A" class="type_b">
+ }
+ else
+ {
+ <input id="Shifoutianjiaweixin" name="Shifoutianjiaweixin" type="radio" value="A" class="type_b">
+ }
+ </div>
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
index 35f748e..4514ede 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
@@ -9,7 +9,8 @@
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 Creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Creater))';
+ var Creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Creater))';
+ var shifou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.shifou))';
loseherght = 60;
gridConfig = { multiselect: true, selectcol: "Id" };
dataCol = [
@@ -21,7 +22,7 @@
return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/IntentionCustomer/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
}
},
-
+
{ label: '鑱旂郴鐢佃瘽', name: 'Tel', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
{ label: '瀹㈡埛鏉ユ簮', name: 'KhlyName', labtype: 'txt', hidden: false, width: 100 },
@@ -49,6 +50,7 @@
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '寤烘。鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
{ label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater), cwidth: '5%', cccwidth: '8%' },
+ { label: '鏄惁鏈夊井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
@@ -120,7 +122,7 @@
global: false,
data: "",
success: function (data) {
-
+
if (data.Result) {
toastr.success("杞Щ鎴愬姛");
} else {
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
index 06bed25..12f0037 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
@@ -11,6 +11,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 creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.creater))';
+
var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
loseherght = 60;
gridConfig = { multiselect: true, selectcol: "Id" };
@@ -33,6 +35,7 @@
{ label: '瀹㈡埛鍙嶉', name: 'Khfk', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎴愪氦鎰忓悜', name: 'YxName', labtype: 'txt', hidden: false, width: 100 },
{ label: '璺熻釜寤鸿', name: 'JyName', labtype: 'txt', hidden: false, width: 100 },
+ { label: '褰曞叆浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 100 },
];
dataUrl = "/IntentionVisit/GetList?Viscustomer=@Viscustomer";
@@ -47,6 +50,8 @@
{ label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '鎷滆鏃堕棿', name: 'Vistime', labtype: 'datearea', hidden: false },
+ { label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(creater), cwidth: '5%', cccwidth: '8%'},
+
diff --git a/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml
index 2576ec2..7eb43f8 100644
--- a/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml
@@ -5,6 +5,20 @@
List<SysCodeDtl> questiontype = ViewData["questiontype"] as List<SysCodeDtl>; //闂绫诲瀷
List<DTO.PageEntity> pageEntities = ViewData["pageEntities"] as List<DTO.PageEntity>; //闂绫诲瀷
+ var shenhesto = pageEntities.Where(x => x.PageName == "瀹℃牳").FirstOrDefault();
+ string shenhe = "";
+ if (shenhesto != null)
+ {
+ shenhe = shenhesto.PageName;
+ }
+ var tijiaobingshenhesto = pageEntities.Where(x => x.PageName == "鎻愪氦骞跺鏍�").FirstOrDefault();
+ string tijiaobingshenhe = "";
+ if (tijiaobingshenhesto != null)
+ {
+ tijiaobingshenhe = tijiaobingshenhesto.PageName;
+ }
+
+
}
<!DOCTYPE html>
<html>
@@ -178,6 +192,10 @@
<div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
<div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��">
+ <a class="btn btn-success" id="tijiaobingshenhebtn" href="javascript:void(0)" onclick="tijiaobingshenhePosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦骞跺鏍�</span>
+ </a>
+
<a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
@@ -210,15 +228,23 @@
$("#div_content").height(hh);
var id = '@Model.Id';
- var pageEntities = @pageEntities.Count;
+ var shenhe = '@shenhe';
+ var tijiaobingshenhe = '@tijiaobingshenhe';
var Clientid = '@Model.Clientid';
if (id == null || id == '') {
$("#shenhebtn").hide();
- } else if (pageEntities <= 0 || Clientid == "A") {
+ } else if (shenhe == "" || Clientid == "A") {
$("#shenhebtn").hide();
} else {
$("#shenhebtn").show();
}
+
+ if (tijiaobingshenhe == "") {
+ $("#tijiaobingshenhebtn").hide();
+ } else {
+ $("#tijiaobingshenhebtn").show();
+ }
+
toastr.options = {
"closeButton": true,
"debug": false,
@@ -375,6 +401,63 @@
+ // 淇濆瓨宀椾綅淇℃伅
+ var tijiaobingshenhePosition = function () {
+ if (Verify.isNull($("#Questiontype").val())) {
+ toastr.warning("闂绫诲埆涓嶈兘涓虹┖");
+ return;
+ }
+ if (Verify.isNull($("#Problemtype").val())) {
+ toastr.warning("棰樼洰绫诲埆涓嶈兘涓虹┖");
+ return;
+ }
+ if (Verify.isNull($("#Question").val())) {
+ toastr.warning("闂涓嶈兘涓虹┖");
+ return;
+ }
+
+ if (Verify.isNull($("#Anwser").val())) {
+ toastr.warning("绛旀涓嶈兘涓虹┖");
+ return;
+ }
+
+ imgLoad = parent.layer.load(2, { shade: [0.2, '#fff'] });
+ $.ajax({
+ type: "POST",
+ url: "/Liaotian/Tijiaobingshenhe",
+ dataType: "json",
+ global: false,
+ data: { Id: id, Question: $("#Question").val(), Anwser: $("#Anwser").val(), Questiontype: $("#Questiontype").val(), Problemtype: $("#Problemtype").val(), Shiyongfatiao: $("#Shiyongfatiao").val() },
+ success: function (data) {
+
+
+ if (data.Result) {
+ // parent._afterSave(true);
+ parent.layer.msg('淇濆瓨鎴愬姛', { icon: 6 });
+ _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+ }
+ else {
+ if ($.isNumber(imgLoad)) {
+ parent.layer.close(imgLoad);
+ }
+ // toastr.error("");
+ parent.layer.msg(data.Message, { icon: 5 });
+ }
+
+ },
+ error: function () {
+ if ($.isNumber(imgLoad)) {
+ parent.layer.close(imgLoad);
+ }
+ //toastr.error("淇濆瓨澶辫触");
+
+ parent.layer.msg('淇濆瓨澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
+
$("#Questiontype").change(function () {
diff --git a/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml b/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
index c04c8e5..d7ec3a7 100644
--- a/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Liaotian/Indexcheck.cshtml
@@ -175,13 +175,35 @@
}
+
+
+
+ function sendHuidaStatus() {
+
+ var msg = $("#PBSShifoushenhe");
+
+
+ if (msg.length > 0) {
+ $("#PBSShifoushenhe").val("D");
+ $("#PBSShifoushenhe").trigger('chosen:updated');//鏇存柊閫夐」
+ _pageSearch();
+ } else {
+ setTimeout(sendHuidaStatus, 1000);
+ }
+ }
+
send();
+ sendHuidaStatus();
+
-
+
+
+
+
</script>
}
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
index 79fcb8d..e740abf 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
@@ -476,12 +476,24 @@
<div class="col-sm-3 col-md-3">
<input id="Caigourenname" class="form-control" label="閲囪喘浜哄悕绉�" name="Caigourenname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourenname">
</div>
+ <div class="col-sm-1 col-md-1" style="width:100px;">
+ @if (Model.Caigourennamecunzai != null && Model.Caigourennamecunzai == "yes")
+ {
+ <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button>
+ }
+ else
+ {
+ <button type="button" onclick="_pageAdd('@Model.Caigourenname')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button>
+ }
+
+
+ </div>
<label class="text-right col-sm-1 col-md-1 control-label">鍦板潃</label>
<div class="col-sm-3 col-md-3">
<input id="Caigourenaddress" class="form-control" label="鍦板潃" name="Caigourenaddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourenaddress">
</div>
<label class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鏂瑰紡</label>
- <div class="col-sm-3 col-md-3">
+ <div class="col-sm-2 col-md-2">
<input id="Caigourencontact" class="form-control" label="鑱旂郴鏂瑰紡" name="Caigourencontact" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Caigourencontact">
</div>
</div>
@@ -491,12 +503,24 @@
<div class="col-sm-3 col-md-3">
<input id="Dailiname" class="form-control" label="閲囪喘浜哄悕绉�" name="Dailiname" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailiname">
</div>
+ <div class="col-sm-1 col-md-1" style="width:100px;">
+ @if (Model.Dailinamecunzai != null && Model.Dailinamecunzai == "yes")
+ {
+ <button type="button" data-type="1">娣诲姞渚涘簲鍟�</button>
+ }
+ else
+ {
+ <button type="button" onclick="_pageAdd('@Model.Dailiname')" data-type="1" style="color:red;">娣诲姞渚涘簲鍟�</button>
+ }
+
+
+ </div>
<label class="text-right col-sm-1 col-md-1 control-label">鍦板潃</label>
<div class="col-sm-3 col-md-3">
<input id="Dailiaddress" class="form-control" label="鍦板潃" name="Dailiaddress" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailiaddress">
</div>
<label class="text-right col-sm-1 col-md-1 control-label">鑱旂郴鏂瑰紡</label>
- <div class="col-sm-3 col-md-3">
+ <div class="col-sm-2 col-md-2">
<input id="Dailicontact" class="form-control" label="鑱旂郴鏂瑰紡" name="Dailicontact" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dailicontact">
</div>
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
index 7df2289..652b595 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
@@ -11,7 +11,7 @@
var ShiFouyReasonname = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShiFouyReasonname))';
- loseherght = 70;
+ loseherght = 90;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -88,12 +88,16 @@
//{ label: '鍏憡鏃堕棿', name: 'StartTimestar', labtype: 'date', hidden: false },
//{ label: '--', name: 'StartTimeend', labtype: 'date', hidden: false, cwidth: '1%', cccwidth: '15%' },
{ label: '鍏憡鏃堕棿', name: 'StartTimestar', labtype: 'datearea', hidden: false },
- { label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false },
+ { label: '鐪�', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '2%', cccwidth: '6%' },
+ { label: '', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '0%', cccwidth: '6%' },
+ { label: '', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '0%', cccwidth: '6%' },
+ //{ label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false },
{ label: '椤圭洰鍚嶇О', name: 'Name', labtype: 'txt', hidden: false },
- { label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */},
- { label: '鐪�', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '5%', cccwidth: '10%' },
- { label: '甯�', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '10%' },
- { label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2.5%', cccwidth: '10%' },
+ { label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
+
+ { label: '閲囪喘浠ｇ悊浜�', name: 'Caigourenname', labtype: 'txt', hidden: false },
+ { label: '閲囪喘浠ｇ悊鏈烘瀯', name: 'Dailiname', labtype: 'txt', hidden: false },
+
{ label: '閲囪喘鏂瑰紡', name: 'Cgfs', labtype: 'combox', hidden: false, data: JSON.parse(projectDropDown) },
{ label: '鏄惁搴熸爣', name: 'fblx', labtype: 'combox', hidden: false, data: JSON.parse(flbx)/*, cwidth: '5%', cccwidth: '8%' */ },
{ label: '涓爣渚涘簲鍟�', name: 'Names', labtype: 'txt', hidden: false },
@@ -105,7 +109,7 @@
{ label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater)/*, cwidth: '5%', cccwidth: '8%'*/ },
{ label: '鍒嗗樊灏忎簬', name: 'Fencha', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
-
+ { label: '渚涘簲鍟嗘暟閲�', name: 'Shuliang', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
];
var _pageAdd = function () {
@@ -230,14 +234,14 @@
$(function () {
-
-
- $("#PBSfblx").parent().prev().prev().remove();
+ $("#PBSAreaId").parent().next().remove();
+ $("#PBSZhuanjia").parent().after("<br>");
+ $("#PBSDailiname").parent().next().remove();
$("#PBSfblx").parent().after("<br>");
- $("#PBSShiFouyReasonname").parent().next().remove();
+ $("#PBSNamesToubiao").parent().next().remove();
$("#PBSReasonname").parent().after("<br>");
- $("#PBSFencha").parent().next().remove();
-
+ $("#PBSCreater").parent().next().remove();
+
});
</script>
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
index 5a151fe..9954684 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
@@ -3,6 +3,13 @@
@using zhengcaioa.Models;
@{
Layout = null;
+
+ //娴佺▼鐩稿叧
+ string shifoubiaoji = ViewBag.shifoubiaoji as string;
+ string sifoudangqian = ViewBag.sifoudangqian as string;
+ string dangqianbuzhou = ViewBag.dangqianbuzhou as string;
+
+ List<WfHistoryDTO> lishiyijian = ViewData["lishiyijian"] as List<WfHistoryDTO>; //鍘嗗彶鎰忚
}
<!DOCTYPE html>
@@ -57,9 +64,32 @@
<div id="div_content" class="ibox-content" style="background-color:white;">
<div class="row">
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-right col-sm-1 col-md-1 control-label">鐢宠瘔鐞嗙敱<i class="red">*</i></label>
+ <label class="text-right col-sm-1 col-md-1 control-label">鍗曟嵁鍚嶇О<i class="red">*</i></label>
<div class="col-sm-2 col-md-2">
- <textarea class="form-control bt" id="ssly" name="reason" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; height:80px;">@Model.reason</textarea>
+ <input type="text" class="form-control" value="@Model.tittle" name="tittle" id="tittle" validate="RequiredField" autocomplete="off" readonly="readonly">
+
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">鐢宠浜�<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2">
+ <input type="text" class="form-control" value="@Model.createrName" name="createrName" id="createrName" validate="RequiredField" autocomplete="off" readonly="readonly">
+
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">宸ヨ祫鏈堜唤<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2">
+ <input class="form-control" id="YearMonth" name="YearMonth" type="text" value="@Model.Year-@Model.Month" readonly="readonly">
+ <input type="hidden" name="Year" value="@Model.Year" />
+ <input type="hidden" name="Month" value="@Model.Month" />
+ </div>
+ </div>
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">鐢宠瘔鐞嗙敱<i class="red">*</i></label>
+ <div class="col-sm-6 col-md-6">
+ <textarea class="form-control bt" id="ssly" name="reason" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; height:80px;">@Model.reason</textarea>
</div>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -70,10 +100,47 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">鍒跺害渚濇嵁<i class="red">*</i></label>
- <div class="col-sm-2 col-md-2">
+ <div class="col-sm-6 col-md-6">
<input type="hidden" name="salary_id" value="@Model.salary_id" />
<input class="form-control" id="zdyj" name="basis" labtype="txt" addvisible="true" editvisible="true" type="text" value="@Model.basis">
</div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;" id="shenpiyijian" >
+ <label class="text-right col-sm-1 col-md-1 control-label">瀹℃壒鎰忚</label>
+ <div class="col-sm-6 col-md-6">
+ <textarea class="form-control data" id="Content" name="Content" style="resize:none;overflow-y:hidden; height:80px;" maxlength="500"></textarea>
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">鍘嗗彶鎰忚</label>
+ <div class="col-sm-6 col-md-6">
+ <table>
+ @if (lishiyijian.Count > 0)
+ {
+ <tr>
+ <td style="border:1px solid #ccc;width:150px;">姝ラ </td>
+ <td style="border:1px solid #ccc;width:150px;"> 鎵瑰鐘舵��</td>
+ <td style="border:1px solid #ccc;width:150px;">鎵瑰鏃堕棿</td>
+ <td style="border:1px solid #ccc;width:300px;"> 瀹℃壒鎰忚</td>
+ <td style="border:1px solid #ccc;width:100px;"> 鎵瑰浜�</td>
+ </tr>
+ }
+
+ @foreach (var wfHistory in lishiyijian)
+ {
+ <tr>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
+ <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
+ <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>
+ </tr>
+ }
+ </table>
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:60px;">
+
</div>
</div>
</div>
@@ -86,16 +153,27 @@
<a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-remove"></i> <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" id="tijiao" href="javascript:void(0)" onclick="saveSimCost('');" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
+
+ <a class="btn btn-success" id="tongyi" href="javascript:void(0)" onclick="saveSimCost('A');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">鍚屾剰</span>
+ </a>
+
+ <a class="btn btn-success" id="jujue" href="javascript:void(0)" onclick="saveSimCost('D');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">鎷掔粷</span>
+ </a>
+ <input type="hidden" id="id" name="id" value="@Model.id" />
+ <input type="hidden" id="Tongguojujue" name="Tongguojujue" value="" />
+ <input type="hidden" id="Step" name="Step" value="@dangqianbuzhou" />
</div>
</div>
</form>
<script type="text/javascript">
-
+
var hh = document.body.clientHeight - $("#top").height() * 2 - 50;
$("#div_content").height(hh);
@@ -115,8 +193,63 @@
"hideMethod": "fadeOut"
};
+
+ $(function () {
+
+
+
+
+
+ if ("@shifoubiaoji" != "A") {
+ $("input").attr('readonly', true);
+ $("textarea").attr('readonly', true);
+ $(':radio').attr('disabled', true);
+ $(':checkbox').attr('disabled', true);
+ $(':button').attr('disabled', true);
+ //$('a').removeAttr('onclick');
+ $('select').attr('disabled', true);
+ $("#fileUp").attr('disabled', true);
+
+ $('.fujianshanchu').removeAttr('onclick');
+
+
+ if ("@sifoudangqian" == "A") {
+ $("#Content").attr('readonly', false);
+ $('#tijiao').hide();
+ } else {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ $('#tijiao').hide();
+ $('#shenpiyijian').hide();
+ }
+
+ } else {
+
+
+ //瀹℃壒鐩稿叧
+ $('#shenpiyijian').hide();
+ if ("@sifoudangqian" == "A") {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ } else {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ $('#tijiao').hide();
+ }
+
+
+ }
+
+ })
+
+
// 淇濆瓨
- function saveSimCost() {
+ function saveSimCost(tongyi) {
+ if ($("#salary_id").val() == '') {
+ toastr.warning("蹇呴』鍜屽伐璧勬寕閽�");
+ return;
+ }
+
if ($("#ssly").val() == '') {
toastr.warning("鐢宠瘔鐞嗙敱涓嶈兘涓虹┖");
@@ -130,7 +263,8 @@
toastr.warning("鍒跺害渚濇嵁涓嶈兘涓虹┖");
return;
}
-
+ $("#Tongguojujue").val(tongyi);
+
$.ajax({
type: "POST",
url: "/SalaryCheck/SaveAppeal",
@@ -145,7 +279,9 @@
_pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
}
catch (err) {
- parent._CloseTab1("/SalaryCheck/Appeal/");
+ var pathname = window.location.pathname;
+ var search = window.location.search;
+ parent._CloseTab1(pathname + search);
}
}
else {
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
index 197060d..9b5d903 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
@@ -90,7 +90,7 @@
<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" 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})?/)">
+ <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="CheckNum(this);">
</div>
</div>
@@ -226,6 +226,18 @@
parent.layer.close(index);
return false;
}
+
+ //鐢ㄦ埛鍙兘杈撳叆姝ｈ礋鏁颁笌灏忔暟
+ function CheckNum(obj) {
+
+ if (isNaN(obj.value) && !/^-$/.test(obj.value)) {
+ obj.value = "";
+ }
+ if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(obj.value)) {
+ obj.value = obj.value.replace(/\.\d{2,}$/, obj.value.substr(obj.value.indexOf('.'), 3));
+ }
+
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
index 4457c23..c1d9ded 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
@@ -196,7 +196,7 @@
toastr.error("閿欒鎻愮ず锛氭鏈堜唤宸插畬鎴愮‘璁�,涓嶈兘鐢宠瘔锛�");
}
else {
- OpenWindow('鐢宠瘔', '40%', '50%', '/SalaryCheck/Appeal?id=' + dt);
+ OpenWindow('鐢宠瘔', '80%', '80%', '/SalaryCheck/Appeal?salaryId=' + dt);
}
}
else {
diff --git a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Edit.cshtml
index c202ac2..c39278a 100644
--- a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Edit.cshtml
@@ -217,14 +217,14 @@
return;
}
- if ($.trim($("#Chubanshe").val()) == '') {
- toastr.warning("鍑虹増绀句笉鑳戒负绌�");
- return;
- }
- if ($.trim($("#Chubantime").val()) == '') {
- toastr.warning("鍑虹増鏃堕棿涓嶈兘涓虹┖");
- return;
- }
+ //if ($.trim($("#Chubanshe").val()) == '') {
+ // toastr.warning("鍑虹増绀句笉鑳戒负绌�");
+ // return;
+ //}
+ //if ($.trim($("#Chubantime").val()) == '') {
+ // toastr.warning("鍑虹増鏃堕棿涓嶈兘涓虹┖");
+ // return;
+ //}
if ($.trim($("#Danjia").val()) == '') {
toastr.warning("鍗曚环涓嶈兘涓虹┖");
return;
diff --git a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
index b543845..3fb51d1 100644
--- a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
@@ -184,7 +184,7 @@
<th style="width:15%;">
璐у彿
</th>
- <th style="width:15%;">
+ <th style="width:20%;">
涔﹀悕
</th>
<th style="width:15%;">
@@ -208,22 +208,25 @@
{
for (int i = 0; i < Book.Count; i++)
{
- <tr>
- <td>@(i+1)</td>
- <td>@Book[i].BookNo</td>
- <td>@Book[i].BookName</td>
- <td>@Book[i].Chubanshe</td>
- <td>@Book[i].Chubantime.Value.ToString("yyyy-MM-dd")</td>
- <td>@Book[i].Danjia.Value.ToString("F2")</td>
- <td>
- <a href="javascript:void(0)" onclick="OpenWindow('@Book[i].BookName','98%','100%', '/ServiceCharge/Edit?id=@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
- <span class="bold">淇敼</span>
- </a>
- <a href="javascript:void(0)" onclick="delPosition('@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
- <span class="bold">鍒犻櫎</span>
- </a>
- </td>
- </tr>
+ <tr>
+ <td>@(i+1)</td>
+ <td>@Book[i].BookNo</td>
+ <td>@Book[i].BookName</td>
+ <td>@Book[i].Chubanshe</td>
+
+ <td>@Book[i].ChubantimeName </td>
+
+
+ <td>@Book[i].Danjia.Value.ToString("F2")</td>
+ <td>
+ <a href="javascript:void(0)" onclick="OpenWindow('@Book[i].BookName','98%','100%', '/ServiceCharge/Edit?id=@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">淇敼</span>
+ </a>
+ <a href="javascript:void(0)" onclick="delPosition('@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">鍒犻櫎</span>
+ </a>
+ </td>
+ </tr>
}
}
}
@@ -300,7 +303,7 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">4銆佹寚瀵兼姇鏍囨枃浠讹細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">4銆佹爣涔︽寚瀵硷細</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -341,7 +344,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">5銆佷唬涔﹁川鐤戯細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">5銆佷唬鎷熻川鐤戝嚱锛�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -382,7 +385,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">6銆佷唬涔︽姇璇夛細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">6銆佷唬鎷熸姇璇変功锛�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -431,17 +434,17 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">8銆佷唬鎷熸姇璇夊鐞嗗喅瀹氾細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label" style="width:10%;">8銆佷唬鎷熸姇璇夊鐞嗗喅瀹氾細</label>
<div class="col-sm-2 col-md-2">
- <input class="form-control" label="8銆佺珵浜夊鎵嬪拰璇勫涓撳鏌ヨ锛�" name="Dainitousuchulijueding" id="Dainitousuchulijueding" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dainitousuchulijueding" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="8銆佷唬鎷熸姇璇夊鐞嗗喅瀹氾細" name="Dainitousuchulijueding" id="Dainitousuchulijueding" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dainitousuchulijueding" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label class="text-left col-sm-1 col-md-1 control-label">鍏�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">9銆佺珵浜夊鎵嬪拰璇勫涓撳鏌ヨ锛�</label>
+ <label class="text-left col-sm-1 col-md-1 control-label" style="width:20%;">9銆佺珵浜夊鎵嬪拰璇勫涓撳鍙傚姞鏀垮簻閲囪喘鏁版嵁淇℃伅鏌ヨ锛�</label>
<div class="col-sm-2 col-md-2">
- <input class="form-control" label="9銆佺珵浜夊鎵嬪拰璇勫涓撳鏌ヨ锛�" name="Jinzhengfuishou" id="Jinzhengfuishou" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jinzhengfuishou" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="9銆佺珵浜夊鎵嬪拰璇勫涓撳鍙傚姞鏀垮簻閲囪喘鏁版嵁淇℃伅鏌ヨ锛�" name="Jinzhengfuishou" id="Jinzhengfuishou" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jinzhengfuishou" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label class="text-left col-sm-1 col-md-1 control-label">鍏�/骞�</label>
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml
index 8882de7..b3af9bd 100644
--- a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml
@@ -233,7 +233,7 @@
<td>@Book[i].BookNo</td>
<td>@Book[i].BookName</td>
<td>@Book[i].Chubanshe</td>
- <td>@Book[i].Chubantime.Value.ToString("yyyy-MM-dd")</td>
+ <td>@Book[i].ChubantimeName</td>
<td>@Book[i].Danjia.Value.ToString("F2")</td>
</tr>
@@ -306,7 +306,7 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">4銆佹寚瀵兼姇鏍囨枃浠讹細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">4銆佹爣涔︽寚瀵硷細</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -347,7 +347,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">5銆佷唬涔﹁川鐤戯細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">5銆佷唬鎷熻川鐤戝嚱锛�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -388,7 +388,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">6銆佷唬涔︽姇璇夛細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">6銆佷唬鎷熸姇璇変功锛�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -439,7 +439,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- 9銆佺珵浜夊鎵嬪拰璇勫涓撳鏌ヨ锛� @Model.Jinzhengfuishou 鍏�/骞�
+ 9銆佺珵浜夊鎵嬪拰璇勫涓撳鍙傚姞鏀垮簻閲囪喘鏁版嵁淇℃伅鏌ヨ锛� @Model.Jinzhengfuishou 鍏�/骞�
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml
index b22b742..06dcaf8 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml
@@ -173,15 +173,25 @@
</tr>
<tr>
<td colspan="10"> <table>
+ @if (lishiyijian.Count > 0)
+ {
+ <tr>
+ <td style="border:1px solid #ccc;width:150px;">姝ラ </td>
+ <td style="border:1px solid #ccc;width:150px;"> 鎵瑰鐘舵��</td>
+ <td style="border:1px solid #ccc;width:150px;">鎵瑰鏃堕棿</td>
+ <td style="border:1px solid #ccc;width:300px;"> 瀹℃壒鎰忚</td>
+ <td style="border:1px solid #ccc;width:100px;"> 鎵瑰浜�</td>
+ </tr>
+ }
@foreach (var wfHistory in lishiyijian)
{
- <tr>
- <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
- <td style="border:1px solid #ccc;width:50px;">@wfHistory.ChuliStatusName</td>
- <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
- <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
- <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>
- </tr>
+ <tr>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
+ <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
+ <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>
+ </tr>
}
</table></td>
diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml
index 58f0816..346adcf 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/AskLeaveOff.cshtml
@@ -204,11 +204,21 @@
<tr>
<td colspan="10">
<table>
+ @if (lishiyijian.Count > 0)
+ {
+ <tr>
+ <td style="border:1px solid #ccc;width:150px;">姝ラ </td>
+ <td style="border:1px solid #ccc;width:150px;"> 鎵瑰鐘舵��</td>
+ <td style="border:1px solid #ccc;width:150px;">鎵瑰鏃堕棿</td>
+ <td style="border:1px solid #ccc;width:300px;"> 瀹℃壒鎰忚</td>
+ <td style="border:1px solid #ccc;width:100px;"> 鎵瑰浜�</td>
+ </tr>
+ }
@foreach (var wfHistory in lishiyijian)
{
<tr>
<td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
- <td style="border:1px solid #ccc;width:50px;">@wfHistory.ChuliStatusName</td>
+ <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
<td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
<td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
<td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>
diff --git a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
index 3c754a5..c01cbfd 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
@@ -447,7 +447,7 @@
</div>
- <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔鐢佃剳MAC<i class="red">*</i> </label>
+ <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔鐢佃剳MAC</label>
<div class="col-sm-2 col-md-2">
<input id="IpMac" class="form-control" label="宸ヤ綔鐢佃剳MAC" name="IpMac" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@Model.IpMac">
</div>
@@ -946,10 +946,10 @@
return;
}
- if ($.trim($("#IpMac").val()) == '') {
- toastr.warning("宸ヤ綔鐢佃剳MAC涓嶈兘涓虹┖");
- return;
- }
+ //if ($.trim($("#IpMac").val()) == '') {
+ // toastr.warning("宸ヤ綔鐢佃剳MAC涓嶈兘涓虹┖");
+ // return;
+ //}
$.ajax({
type: "POST",
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 1d9825a..b5438b0 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,323 @@
+USE [zhengcaioa]
+GO
+
+/****** Object: Table [dbo].[fi_member] Script Date: 2021/7/5 14:33:24 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS(Select 1 From Sysobjects Where Name='fi_member') --查询表名costSeparateConfig是否存在
+drop table [fi_member]
+GO
+CREATE TABLE [dbo].[fi_member](
+ [Id] [nvarchar](50) NOT NULL,
+ [member_type] [nvarchar](50) NULL,
+ [member_authority] [nvarchar](500) NULL,
+ [huifei] [money] NULL,
+ [rec_status] [nvarchar](1) NOT NULL,
+ [creater] [nvarchar](50) NOT NULL,
+ [createtime] [datetime] NOT NULL,
+ [modifier] [nvarchar](50) NOT NULL,
+ [modifytime] [datetime] NOT NULL,
+ CONSTRAINT [PK_fi_member] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[fi_member] ADD CONSTRAINT [DF_fi_member_rec_status] DEFAULT ('A') FOR [rec_status]
+GO
+
+ALTER TABLE [dbo].[fi_member] ADD CONSTRAINT [DF_fi_member_creater] DEFAULT ('1') FOR [creater]
+GO
+
+ALTER TABLE [dbo].[fi_member] ADD CONSTRAINT [DF_fi_member_createtime] DEFAULT (getdate()) FOR [createtime]
+GO
+
+ALTER TABLE [dbo].[fi_member] ADD CONSTRAINT [DF_fi_member_modifier] DEFAULT ('1') FOR [modifier]
+GO
+
+ALTER TABLE [dbo].[fi_member] ADD CONSTRAINT [DF_fi_member_modifytime] DEFAULT (getdate()) FOR [modifytime]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会员类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'fi_member', @level2type=N'COLUMN',@level2name=N'member_type'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会员权限' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'fi_member', @level2type=N'COLUMN',@level2name=N'member_authority'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会费' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'fi_member', @level2type=N'COLUMN',@level2name=N'huifei'
+GO
+
+
+
+
+
+ALTER TABLE [dbo].[CooperatecustomCustomer] ADD [weixin] [nvarchar](50) NULL;
+GO
+
+
+ALTER TABLE [dbo].[CooperatecustomCustomer] ADD [shifoutianjiaweixin] [nvarchar](1) NULL;
+GO
+
+
+update [CooperatecustomCustomer] set [shifoutianjiaweixin]='D'
+
+GO
+
+
+
+
+ALTER TABLE [dbo].[IntentionCustomer] ADD [weixin] [nvarchar](50) NULL;
+GO
+
+
+ALTER TABLE [dbo].[IntentionCustomer] ADD [shifoutianjiaweixin] [nvarchar](1) NULL;
+GO
+
+
+update [IntentionCustomer] set [shifoutianjiaweixin]='D'
+
+GO
+
+
+
+
+USE [zhengcaioa]
+GO
+delete from [dbo].[fi_books]
+GO
+INSERT [dbo].[fi_books] ([Id], [book_no], [book_name], [chubanshe], [chubantime], [danjia], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'b7b78ceb-d3d5-484a-bfd3-12118ce7d8ac', N'1001', N'《四川省政府采购政策文件汇编》', NULL, NULL, 98.0000, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:02:12.253' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:20:26.563' AS DateTime))
+INSERT [dbo].[fi_books] ([Id], [book_no], [book_name], [chubanshe], [chubantime], [danjia], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'b7b78ceb-d3d5-484a-bfd3-12118ce7d8ad', N'2001', N'《3天学会政府采购》', NULL, NULL, 49.0000, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:02:12.253' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:20:32.160' AS DateTime))
+INSERT [dbo].[fi_books] ([Id], [book_no], [book_name], [chubanshe], [chubantime], [danjia], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'b7b78ceb-d3d5-484a-bfd3-12118ce7d8ae', N'2002', N'《2022年政府采购100大典型投诉案例 》', NULL, NULL, 88.0000, N'A', N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:02:12.253' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:20:34.183' AS DateTime))
+GO
+delete from [dbo].[fi_member]
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'0d513d92-41fd-e33f-a55f-47780e03d26d', N'AA1会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作3件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）、其他业务8折', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:10.103' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.730' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'1dcfd55f-b172-855e-bcad-a83869d200b1', N'AAA2会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、质疑投诉6件、履约纠纷5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）、其他业务6折', 50000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:29.513' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.737' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'2ab09dee-6244-e410-fcc9-36dd6152851c', N'AA2会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）、其他业务8折', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:13.670' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.730' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c43', N'普通会员1', N'小采问答', 98.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.293' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.653' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c44', N'普通会员2', N'政采课堂', 398.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.297' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.723' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c45', N'普通会员3', N'小采问答、政采课堂', 498.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.300' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.727' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'34166043-a10f-7767-9b6c-5774dfa39c46', N'普通会员4', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:45:20.400' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.727' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'c9c8068f-7630-e5ee-eebc-71e6e63cdfab', N'A1会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作1件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:45:56.243' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.727' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'd0e3abf0-8f22-5291-d605-c95cbb7ed53c', N'AA4会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作10个项目、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）、其他业务8折', 30000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:20.487' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.733' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'e7238216-3448-83d9-798c-ba71a3da6424', N'AA3会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、质疑投诉5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）、其他业务8折', 30000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:16.823' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.733' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'eeb9c016-e265-aa9d-e56f-498387f7a7fe', N'AAA1会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、标书制作10个项目、质疑投诉5件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）、其他业务6折', 50000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:25.980' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.733' AS DateTime))
+INSERT [dbo].[fi_member] ([Id], [member_type], [member_authority], [huifei], [rec_status], [creater], [createtime], [modifier], [modifytime]) VALUES (N'fab8d7f7-f807-9d10-8d99-0f8f16dce2d1', N'A2会员', N'小采问答、政采课堂、问题咨询（电话咨询、当面咨询）、质疑投诉1件、最新政采图书（《四川省政府采购政策文件汇编》、《3天学会政府采购》、《2022年政府采购100大典型投诉案例 》）', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:46:06.653' AS DateTime), N'e4c93811-b9b1-4998-89f5-c416ebab0c07', CAST(N'2021-07-05T14:41:33.730' AS DateTime))
+GO
+delete from [dbo].[fi_service]
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'01204ed4-c825-2f6e-d19a-870683c12e56', N'标书指导', N'200-500万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:54.090' AS DateTime), N'1', CAST(N'2021-05-28T10:52:54.090' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'0bbc9d36-3827-29b2-bbc2-96a1dce615e9', N'竞争对手和评审专家参加政府采购数据信息查询', NULL, 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:20.923' AS DateTime), N'1', CAST(N'2021-05-28T10:54:20.923' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'0c9559cc-2feb-4f01-4446-91568194538d', N'不具备条件', NULL, 50000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:15.643' AS DateTime), N'1', CAST(N'2021-05-28T11:06:15.643' AS DateTime), N'06')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1565b317-e3e7-65eb-abbb-0607b1f2d28e', N'标书指导', N'30-200万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:51.117' AS DateTime), N'1', CAST(N'2021-05-28T10:52:51.117' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1650e01e-dace-5036-5395-a56ef7c3a3a7', N'自动标书制作软件', NULL, 20000.0000, N'A', N'1', CAST(N'2021-05-28T11:08:08.043' AS DateTime), N'1', CAST(N'2021-05-28T11:08:08.043' AS DateTime), N'09')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'17471db7-f6b8-5448-9917-495e1306f77d', N'代拟投诉书', N'30万元以下', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:09.620' AS DateTime), N'1', CAST(N'2021-05-28T10:53:09.620' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1913662b-acfc-5a82-2bcc-782139e90908', N'需求论证', N'500-1000万元', 8000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:40.247' AS DateTime), N'1', CAST(N'2021-05-28T10:52:40.247' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1a7fbc0e-89da-88f5-6bbe-a19a6f0eeaa1', N'投标信息管理系统', NULL, 50000.0000, N'A', N'1', CAST(N'2021-05-28T11:08:11.290' AS DateTime), N'1', CAST(N'2021-05-28T11:08:11.290' AS DateTime), N'09')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'1ebde632-88d2-039e-7325-2062c122da67', N'履约纠纷', N'1000万元以上', 100000.0000, N'A', N'1', CAST(N'2021-05-28T11:07:01.997' AS DateTime), N'1', CAST(N'2021-05-28T11:07:01.997' AS DateTime), N'07')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'24d25b49-de97-8f9f-81d4-decdcf30bdb7', N'代拟质疑函', N'200-500万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:04.540' AS DateTime), N'1', CAST(N'2021-05-28T10:53:04.540' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'2872e063-a4c3-4c83-2c92-a94e7f333bb4', N'线下讲座', NULL, 998.0000, N'A', N'1', CAST(N'2021-05-28T10:54:38.953' AS DateTime), N'1', CAST(N'2021-05-28T10:54:38.953' AS DateTime), N'04')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'396c50c4-fd7a-66de-c0e9-b50020fc9e8f', N'代拟投诉书', N'500万元以上', 30000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:17.717' AS DateTime), N'1', CAST(N'2021-05-28T10:53:17.717' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'3d892e90-d52b-3d6d-9910-9f0c3b5dfe8a', N'标书指导', N'30万元以下', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:48.263' AS DateTime), N'1', CAST(N'2021-05-28T10:52:48.263' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'48694773-2045-43cc-7340-dcc8fca74ab6', N'标书制作', N'30万元以下', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:26.083' AS DateTime), N'1', CAST(N'2021-05-28T10:54:26.083' AS DateTime), N'03')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'4dbac1ab-d980-40a1-8035-b08e386a2f77', N'代拟质疑答复', NULL, 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:14.410' AS DateTime), N'1', CAST(N'2021-05-28T10:54:14.410' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'521aaa43-f2e6-4113-7d50-73695e80768f', N'需求论证', N'200-500万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:30.837' AS DateTime), N'1', CAST(N'2021-05-28T10:52:30.837' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'56c7a576-26cc-3a1b-4ed7-6832e001ffa9', N'标书指导', N'500万元以上', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:56.680' AS DateTime), N'1', CAST(N'2021-05-28T10:52:56.680' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'600688d7-24c4-4ff8-5bc9-b86c17ad4c0b', N'代拟投诉处理决定', NULL, 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:18.210' AS DateTime), N'1', CAST(N'2021-05-28T10:54:18.210' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'606fb37a-9db2-26c8-b0fa-b1e8ebdb3c08', N'履约纠纷', N'30-200万元', 20000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:21.513' AS DateTime), N'1', CAST(N'2021-05-28T11:06:21.513' AS DateTime), N'07')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'7034105f-9a0e-c122-4106-2608272f132e', N'履约纠纷', N'30万元以下', 10000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:18.257' AS DateTime), N'1', CAST(N'2021-05-28T11:06:18.257' AS DateTime), N'07')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'772c660a-3f45-0977-1720-1f3598a029d0', N'标书制作', N'200-500万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:30.943' AS DateTime), N'1', CAST(N'2021-05-28T10:54:30.943' AS DateTime), N'03')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'7be6965b-e08a-6e01-9409-14592b06354b', N'采购人培训', NULL, 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:44.113' AS DateTime), N'1', CAST(N'2021-05-28T10:54:44.113' AS DateTime), N'04')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'7fa99d1a-995f-7b49-6127-2ebeef823104', N'政采贷', NULL, 1.0000, N'A', N'1', CAST(N'2021-05-28T10:54:23.563' AS DateTime), N'1', CAST(N'2021-05-28T10:54:23.563' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'81839b9a-4c55-5fcd-426a-4e9535509af0', N'履约纠纷', N'500-1000万元', 50000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:35.410' AS DateTime), N'1', CAST(N'2021-05-28T11:06:35.410' AS DateTime), N'07')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9337f9e5-ab86-2be9-72d4-9b1db3078e33', N'增加品目', NULL, 10000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:12.417' AS DateTime), N'1', CAST(N'2021-05-28T11:06:12.417' AS DateTime), N'06')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'94f7a7c6-a73a-f845-9345-28bd8de79ae2', N'代拟质疑函', N'30-200万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:01.920' AS DateTime), N'1', CAST(N'2021-05-28T10:53:01.920' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9934cb44-3aa8-1dda-093e-5d8a2aa6963f', N'需求论证', N'30万元以下', 2000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:19.827' AS DateTime), N'1', CAST(N'2021-05-28T10:52:19.827' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'994491fa-c74d-7df2-f4d1-cfdba128ab35', N'供应商培训', NULL, 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:41.513' AS DateTime), N'1', CAST(N'2021-05-28T10:54:41.513' AS DateTime), N'04')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9c5f799f-176a-787b-82b9-321aa16422f3', N'当面咨询', NULL, 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:17.007' AS DateTime), N'1', CAST(N'2021-05-28T10:52:17.007' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'9ff378fd-dba7-315c-9a3b-ec9cd07ba597', N'履约纠纷', N'200-500万元', 30000.0000, N'A', N'1', CAST(N'2021-05-28T11:06:25.220' AS DateTime), N'1', CAST(N'2021-05-28T11:06:25.220' AS DateTime), N'07')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'a4971acc-b09d-c56e-f612-e6ca79c374fe', N'在线讲座', NULL, 20.0000, N'A', N'1', CAST(N'2021-05-28T10:54:36.463' AS DateTime), N'1', CAST(N'2021-05-28T10:54:36.463' AS DateTime), N'04')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'b4b5bf29-6887-19d0-695b-e022b207b6cf', N'电话咨询', NULL, 1000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:11.850' AS DateTime), N'1', CAST(N'2021-05-28T10:52:11.850' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'b9d9fd86-da94-3a03-3714-bf962a2af5fd', N'标书制作', N'500万元以上', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:33.800' AS DateTime), N'1', CAST(N'2021-05-28T10:54:33.800' AS DateTime), N'03')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'ca4ef6e0-bab8-e61e-d209-1e9a08fca42e', N'具备条件', NULL, 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:46.593' AS DateTime), N'1', CAST(N'2021-05-28T10:54:46.593' AS DateTime), N'06')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'd945d55b-9392-c97c-71ee-5e83cc1d9c80', N'需求论证', N'30-200万元', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:23.660' AS DateTime), N'1', CAST(N'2021-05-28T10:52:23.660' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'de752562-a4a3-bf20-04f8-06f2e320b8db', N'代拟质疑函', N'30万元以下', 3000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:59.240' AS DateTime), N'1', CAST(N'2021-05-28T10:52:59.240' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'e39f6ba7-70c7-822d-c104-fe4a562e0b2a', N'代拟质疑函', N'500万元以上', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:07.117' AS DateTime), N'1', CAST(N'2021-05-28T10:53:07.117' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'e510300a-b278-cc48-3f56-6b98b6b685dd', N'代拟投诉书', N'30-200万元', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:12.380' AS DateTime), N'1', CAST(N'2021-05-28T10:53:12.380' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'ecb0bd60-3653-3ac4-8584-c330a66f6637', N'需求论证', N'1000万元以上', 10000.0000, N'A', N'1', CAST(N'2021-05-28T10:52:45.873' AS DateTime), N'1', CAST(N'2021-05-28T10:52:45.873' AS DateTime), N'02')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'eeec65e5-94f4-4a7a-4159-d2d1ae83c5c4', N'标书制作', N'30-200万元', 5000.0000, N'A', N'1', CAST(N'2021-05-28T10:54:28.513' AS DateTime), N'1', CAST(N'2021-05-28T10:54:28.513' AS DateTime), N'03')
+INSERT [dbo].[fi_service] ([Id], [service_type], [service_type_two], [feiyong], [rec_status], [creater], [createtime], [modifier], [modifytime], [service_type_top]) VALUES (N'fd9cbc17-dbbb-2e54-215c-a87da04603e2', N'代拟投诉书', N'200-500万元', 20000.0000, N'A', N'1', CAST(N'2021-05-28T10:53:14.987' AS DateTime), N'1', CAST(N'2021-05-28T10:53:14.987' AS DateTime), N'02')
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ALTER TABLE [dbo].[Project] ADD [Fencha] [money] NULL;
+GO
+
+
+
+
+ALTER TABLE [dbo].[Project] ADD [Shuliang] [int] NULL;
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
+/****** Object: Table [dbo].[t_salary_appeal] Script Date: 2021/7/2 9:06:14 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+IF EXISTS(Select 1 From Sysobjects Where Name='t_salary_appeal') --查询表名costSeparateConfig是否存在
+drop table [t_salary_appeal]
+GO
+
+CREATE TABLE [dbo].[t_salary_appeal](
+ [id] [nvarchar](50) NOT NULL,
+ [salary_id] [nvarchar](50) NULL,
+ [year] [int] NOT NULL,
+ [month] [int] NOT NULL,
+ [reason] [nvarchar](1000) NULL,
+ [amount] [decimal](10, 2) NULL,
+ [basis] [nvarchar](500) NULL,
+ [sub_user] [nvarchar](50) NULL,
+ [sub_time] [datetime] NULL,
+ [chk_user] [nvarchar](50) NULL,
+ [chk_time] [datetime] NULL,
+ [chk_result] [nvarchar](1000) NULL,
+ [status] [nvarchar](1) NULL,
+ [createrName] [nvarchar](50) NULL,
+ [tittle] [nvarchar](50) NULL,
+ [shenpi_status] [nvarchar](1) NULL,
+ CONSTRAINT [PK_T_SALARY_APPEAL] PRIMARY KEY CLUSTERED
+(
+ [id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
USE [zhengcaioa]
--
Gitblit v1.9.1