From 3d862d3a9c3a18e4f82c98c9de3be370cd1c38ae Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 25 八月 2021 14:51:09 +0800
Subject: [PATCH] 辞职申请
---
zhengcaioa/IServices/IAskService.cs | 4
zhengcaioa/DTO/AdmAskCiZhiDTO.cs | 32 +
zhengcaioa/Services/WfRunProcessService.cs | 529 +++++++++++++++++++++
zhengcaioa/CommonToolsCore/SMSHelper.cs | 2
zhengcaioa/CommonToolsCore/SendMailHelper.cs | 2
zhengcaioa/IServices/IWfRunProcessService.cs | 2
zhengcaioa/Model/AdmAskCiZhi.cs | 30 +
zhengcaioa/Model/zhengcaioaContext.cs | 65 ++
表修改.sql | 143 +++++
zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs | 5
zhengcaioa/zhengcaioa/Views/AdmAsk/AskCiZhi.cshtml | 401 ++++++++++++++++
zhengcaioa/Services/AskService.cs | 67 ++
zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs | 179 +++++++
13 files changed, 1,457 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index 1a0ebb0..20fa615 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -250,7 +250,10 @@
CreateMap<AdmAskBaiFangDTO, AdmAskBaiFang>();
CreateMap<AdmCustomerWithdrawal, AdmCustomerWithdrawalDTO>();
- CreateMap<AdmCustomerWithdrawalDTO, AdmCustomerWithdrawal>();
+ CreateMap<AdmCustomerWithdrawalDTO, AdmCustomerWithdrawal>();
+
+ CreateMap<AdmAskCiZhi, AdmAskCiZhiDTO>();
+ CreateMap<AdmAskCiZhiDTO, AdmAskCiZhi>();
}
}
diff --git a/zhengcaioa/CommonToolsCore/SMSHelper.cs b/zhengcaioa/CommonToolsCore/SMSHelper.cs
index 55e32dd..024b475 100644
--- a/zhengcaioa/CommonToolsCore/SMSHelper.cs
+++ b/zhengcaioa/CommonToolsCore/SMSHelper.cs
@@ -96,7 +96,7 @@
public static string PushWToUserMES(string phone, string conment)
{
string url = "https://mb345.com/ws/BatchSend2.aspx";
- string data = "CorpID=XP010534&Pwd=123321&Mobile="+ phone + "&Content="+ conment + "銆愬洓宸濇斂閲囨嫑鎶曟爣鍜ㄨ鏈夐檺鍏徃銆�&SendTime=";
+ string data = "CorpID=XP010534&Pwd=123321&Mobile="+ phone + "&Content="+ conment + "銆愭斂閲囧挩璇㈢綉銆�&SendTime=";
string ssss = HttpClientRequest.HttpClientPostGB2312(url, "POST", data);
return ssss;
}
diff --git a/zhengcaioa/CommonToolsCore/SendMailHelper.cs b/zhengcaioa/CommonToolsCore/SendMailHelper.cs
index 3ff98e9..57f4679 100644
--- a/zhengcaioa/CommonToolsCore/SendMailHelper.cs
+++ b/zhengcaioa/CommonToolsCore/SendMailHelper.cs
@@ -33,7 +33,7 @@
}
model.Host = "smtp.qq.com";
model.Port = 587;
- model.SenderName = "鍥涘窛鏀块噰鎷涙姇鏍囧挩璇㈡湁闄愬叕鍙�";
+ model.SenderName = "鏀块噰鍜ㄨ缃�";
model.SenderAddress = "3543725713@qq.com";//272629192@qq.com
model.SenderPassword = "gumcmfdbcfnjdajd"; //mnooicotjaflbhdd
MailAddress sender = new MailAddress(model.SenderAddress, model.SenderName);
diff --git a/zhengcaioa/DTO/AdmAskCiZhiDTO.cs b/zhengcaioa/DTO/AdmAskCiZhiDTO.cs
new file mode 100644
index 0000000..835109e
--- /dev/null
+++ b/zhengcaioa/DTO/AdmAskCiZhiDTO.cs
@@ -0,0 +1,32 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+ public class AdmAskCiZhiDTO
+ {
+ public string Id { get; set; }
+ public string OrderType { get; set; }
+ public string Remark { get; set; }
+ public string ShenpiStatus { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ public string CreaterName { get; set; }
+ public string DeptName { get; set; }
+ public string PostName { get; set; }
+ public string CreatetimeName { get; set; }
+ public string RuzhitimeName { get; set; }
+ public string JiaojieUser { get; set; }
+ public string JiaojieUserName { get; set; }
+ public DateTime? Outtime { get; set; }
+ public string OuttimeName { get; set; }
+ public string Tittle { get; set; }
+ public string Content { get; set; }
+ public string Tongguojujue { get; set; }
+ public string Step { get; set; }
+ }
+}
diff --git a/zhengcaioa/IServices/IAskService.cs b/zhengcaioa/IServices/IAskService.cs
index 00062f7..efdd5b5 100644
--- a/zhengcaioa/IServices/IAskService.cs
+++ b/zhengcaioa/IServices/IAskService.cs
@@ -47,5 +47,9 @@
AdmCustomerWithdrawalDTO GetCustomerWithdrawal(string Id);
List<AdmCustomerWithdrawalDTO> GetCustomerWithdrawalList(string OrderNo);
+
+ //杈炶亴鐢宠
+ ResultEntity SaveAskCiZhi(AdmAskCiZhiDTO admAsk);
+ AdmAskCiZhiDTO GetAskCiZhi(string Id);
}
}
diff --git a/zhengcaioa/IServices/IWfRunProcessService.cs b/zhengcaioa/IServices/IWfRunProcessService.cs
index 3a8a641..713d8f5 100644
--- a/zhengcaioa/IServices/IWfRunProcessService.cs
+++ b/zhengcaioa/IServices/IWfRunProcessService.cs
@@ -44,5 +44,7 @@
ResultEntity WfAskBaiFang(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);
ResultEntity WfCustomerWithdrawal(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);
+
+ ResultEntity WfAskCiZhi(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);
}
}
diff --git a/zhengcaioa/Model/AdmAskCiZhi.cs b/zhengcaioa/Model/AdmAskCiZhi.cs
new file mode 100644
index 0000000..358c968
--- /dev/null
+++ b/zhengcaioa/Model/AdmAskCiZhi.cs
@@ -0,0 +1,30 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class AdmAskCiZhi
+ {
+ public string Id { get; set; }
+ public string OrderType { get; set; }
+ public string Remark { get; set; }
+ public string ShenpiStatus { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ public string CreaterName { get; set; }
+ public string DeptName { get; set; }
+ public string PostName { get; set; }
+ public string CreatetimeName { get; set; }
+ public string RuzhitimeName { get; set; }
+ public string JiaojieUser { get; set; }
+ public DateTime? Outtime { get; set; }
+ public string Tittle { get; set; }
+
+
+ }
+}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 654c745..9b75891 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -26,6 +26,7 @@
public virtual DbSet<AdmAskBaiFang> AdmAskBaiFangs { get; set; }
public virtual DbSet<AdmAskCar> AdmAskCars { get; set; }
+ public virtual DbSet<AdmAskCiZhi> AdmAskCiZhis { get; set; }
public virtual DbSet<AdmAskcost> AdmAskcosts { get; set; }
public virtual DbSet<AdmAskGood> AdmAskGoods { get; set; }
public virtual DbSet<AdmAskLeave> AdmAskLeaves { get; set; }
@@ -240,6 +241,70 @@
.HasColumnName("tittle");
});
+ modelBuilder.Entity<AdmAskCiZhi>(entity =>
+ {
+ entity.ToTable("ADM_AskCiZhi");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Creater)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("creater")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.CreaterName)
+ .HasMaxLength(50)
+ .HasColumnName("createrName");
+
+ entity.Property(e => e.Createtime)
+ .HasColumnType("datetime")
+ .HasColumnName("createtime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.CreatetimeName).HasMaxLength(50);
+
+ entity.Property(e => e.DeptName).HasMaxLength(50);
+
+ entity.Property(e => e.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.OrderType).HasMaxLength(50);
+
+ entity.Property(e => e.Outtime).HasColumnType("datetime");
+
+ entity.Property(e => e.PostName).HasMaxLength(50);
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.Remark).HasMaxLength(2000);
+
+ entity.Property(e => e.RuzhitimeName).HasMaxLength(50);
+
+ entity.Property(e => e.JiaojieUser).HasMaxLength(500);
+
+ entity.Property(e => e.ShenpiStatus)
+ .HasMaxLength(1)
+ .HasColumnName("shenpi_status")
+ .HasDefaultValueSql("('D')");
+
+ entity.Property(e => e.Tittle)
+ .HasMaxLength(50)
+ .HasColumnName("tittle");
+ });
+
modelBuilder.Entity<AdmAskcost>(entity =>
{
entity.ToTable("ADM_Askcost");
diff --git a/zhengcaioa/Services/AskService.cs b/zhengcaioa/Services/AskService.cs
index fcc03d9..3ebea55 100644
--- a/zhengcaioa/Services/AskService.cs
+++ b/zhengcaioa/Services/AskService.cs
@@ -525,5 +525,72 @@
#endregion
+
+ #region 杈炶亴鐢宠
+ public ResultEntity SaveAskCiZhi(AdmAskCiZhiDTO admAsk)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+ AdmAskCiZhi ask = _mapper.Map<AdmAskCiZhi>(admAsk);
+ if (string.IsNullOrEmpty(admAsk.Id))
+ {
+ ask.Id = Guid.NewGuid().ToString();
+ admAsk.Id = ask.Id;
+ _context.AdmAskCiZhis.Add(ask);
+ }
+ else
+ {
+ var entity = _context.AdmAskCiZhis.Find(admAsk.Id);
+
+ entity.Remark = admAsk.Remark;
+ entity.DeptName = admAsk.DeptName;
+ entity.PostName = admAsk.PostName;
+ entity.CreatetimeName = admAsk.CreatetimeName;
+ entity.RuzhitimeName = admAsk.RuzhitimeName;
+ entity.Outtime = admAsk.Outtime;
+
+
+
+
+ entity.ShenpiStatus = admAsk.ShenpiStatus;
+ entity.CreaterName = admAsk.CreaterName;
+ entity.Tittle = admAsk.Tittle;
+ entity.JiaojieUser = admAsk.JiaojieUser;
+
+
+ entity.Modifier = admAsk.Modifier;
+ entity.Modifytime = DateTime.Now;
+ }
+ _context.SaveChanges();
+ resultEntity.ReturnID = ask.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+ ex.Message.ToString();
+ }
+
+ return resultEntity;
+ }
+
+ public AdmAskCiZhiDTO GetAskCiZhi(string Id)
+ {
+ var entity = _context.AdmAskCiZhis.Where(e => e.RecStatus == "A" && e.Id == Id).FirstOrDefault();
+ if (entity == null)
+ {
+ entity = new AdmAskCiZhi();
+ }
+ var leaveDTO = _mapper.Map<AdmAskCiZhiDTO>(entity);
+ return leaveDTO;
+
+ }
+
+
+
+ #endregion
+
}
}
diff --git a/zhengcaioa/Services/WfRunProcessService.cs b/zhengcaioa/Services/WfRunProcessService.cs
index 8c7df35..9895060 100644
--- a/zhengcaioa/Services/WfRunProcessService.cs
+++ b/zhengcaioa/Services/WfRunProcessService.cs
@@ -6444,5 +6444,534 @@
return result;
}
+ public ResultEntity WfAskCiZhi(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, "21").FirstOrDefault();
+ if (wfRunProcessDTO != null)
+ {
+ version = wfRunProcessDTO.Version;
+ }
+
+
+ if (version == "v1")
+ {
+ if (step == "鎻愪氦")
+ {
+ //鏇存柊娴佺▼瀹炰緥
+ // WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "21").FirstOrDefault();
+ if (wfRunProcessDTO == null)
+ {
+ //鎻掑叆娴佺▼瀹炰緥
+ wfRunProcessDTO = new WfRunProcessDTO();
+ //wfRunProcessDTO.Applyno =
+ wfRunProcessDTO.Applytime = DateTime.Now;
+ wfRunProcessDTO.Applytiye = "21";
+ 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 = "/AdmAsk/AskCiZhi?id=" + DanjuId;
+ result = this.save(wfRunProcessDTO);
+ if (result.Result == false)
+ {
+ return result;
+ }
+ //鏌ヨ澶勭悊浜�
+ var user = _context.PltUsers.Find(Userid) ;
+ var hrDept = _context.HrDepts.Where(x => x.RecStatus == "A" && x.Id == user.DeptId).FirstOrDefault();
+ if (hrDept == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒伴儴闂�";
+ return result;
+ }
+
+ var pltUsers = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.Id == hrDept.Director).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 = "/AdmAsk/AskCiZhi?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 = "/AdmAsk/AskCiZhi?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 user = _context.PltUsers.Find(Userid);
+ var hrDept = _context.HrDepts.Where(x => x.RecStatus == "A" && x.Id == user.DeptId).FirstOrDefault();
+ if (hrDept == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒伴儴闂�";
+ return result;
+ }
+
+ var pltUsers = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.Id == hrDept.Director).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 = "/AdmAsk/AskCiZhi?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, "21").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 = "/AdmAsk/AskCiZhi?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 = "/AdmAsk/AskCiZhi?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, "21").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 admAskCiZhi = _context.AdmAskCiZhis.Find(DanjuId);
+ if (wfRunProcessDTO == null)
+ {
+ result.Result = false;
+ result.Message = "鏈壘鍒板崟鎹�";
+ return result;
+ }
+ admAskCiZhi.ShenpiStatus = "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 = "/AdmAsk/AskCiZhi?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/admin/AdmAskController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
index 3b23945..6818275 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
@@ -29,6 +29,7 @@
private readonly IAdmBreakPrecedentService _aAdmBreakPrecedentService;
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
private readonly IIntentionCustomerService _intentionCustomerService;
+ private readonly IHrPositionService _hrPositionService;
public AdmAskController(ILogger<AdmAskController> logger, IAskService askService, IHrDeptService hrDeptService, IWfRunProcessService wfRunProcessService
, IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService
@@ -37,7 +38,8 @@
, IUserService userService
, IAdmBreakPrecedentService aAdmBreakPrecedentService
, ICooperatecustomCustomerService cooperatecustomCustomerService
- , IIntentionCustomerService intentionCustomerService)
+ , IIntentionCustomerService intentionCustomerService
+ , IHrPositionService hrPositionService)
{
_logger = logger;
_hrDeptService = hrDeptService;
@@ -51,6 +53,7 @@
_aAdmBreakPrecedentService = aAdmBreakPrecedentService;
_cooperatecustomCustomerService = cooperatecustomCustomerService;
_intentionCustomerService = intentionCustomerService;
+ _hrPositionService = hrPositionService;
}
public IActionResult Askcost(string id = "")
@@ -1321,5 +1324,179 @@
}
return new JsonResult(resultEntity);
}
+
+ public IActionResult AskCiZhi(string id = "")
+ {
+ AdmAskCiZhiDTO dto = new AdmAskCiZhiDTO();
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+
+
+ //娴佺▼鐩稿叧
+ string shifoubiaoji = "A";
+ string sifoudangqian = "A";
+ string dangqianbuzhou = "鎻愪氦";
+ var lishiyijian = new List<WfHistoryDTO>();
+
+ if (string.IsNullOrEmpty(id))
+ {
+ dto.CreaterName = curentuser.UserName;
+ dto.Tittle = "杈炶亴鐢宠锛�" + curentuser.UserName + "锛�";
+ dto.RuzhitimeName = curentuser.Indate.HasValue? curentuser.Indate.Value.ToString("yyyy-MM-dd"):"";
+ dto.CreatetimeName = DateTime.Now.ToString("yyyy-MM-dd");
+ var deptDTO = _hrDeptService.Get(curentuser.DeptId);
+ if (deptDTO != null)
+ {
+ dto.DeptName = deptDTO.DeptName;
+ }
+ var positionDTO = _hrPositionService.Get(curentuser.HrPosition);
+
+ if (positionDTO != null)
+ {
+ dto.PostName = positionDTO.PostName;
+ }
+ }
+ else if (dto != null)
+ {
+ dto = _askService.GetAskCiZhi(id);
+ dto.OuttimeName = dto.Outtime.HasValue ? dto.Outtime.Value.ToString("yyyy-MM-dd"):"";
+ //dto.JineName = dto.Jine.Value.ToString("F2");
+
+ var wfRunProcessDTO = _wfRunProcessService.GetList(dto.Id, "21").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;
+
+ var userDTOs = _userService.GetList();
+ ViewData["UserIds"] = userDTOs;
+
+ string[] Userids = null;
+ if (!string.IsNullOrEmpty(dto.JiaojieUser) )
+ {
+ Userids = dto.JiaojieUser.Split(','); ;
+
+ }
+ else
+ {
+ Userids = new string[0];
+ }
+
+ ViewBag.Userid = Userids;
+
+ var userDTOsList = userDTOs.Where(x => Userids.Contains(x.Id)).ToList();
+ if(userDTOsList!=null && userDTOsList.Count > 0)
+ {
+ dto.JiaojieUserName = "";
+ foreach (var userDTO in userDTOsList)
+ {
+ dto.JiaojieUserName += userDTO.UserName + ",";
+ }
+ }
+
+
+
+ //ViewBag.jtype = _liaotianService.GetSYScode("CooperVisit", "jtype");
+ //ViewBag.visType = _liaotianService.GetSYScode("CooperVisit", "visType");
+ //var cooperatecustomCustomerDTOs = _cooperatecustomCustomerService.GetList();
+ //var intentionCustomerDTOs = _intentionCustomerService.GetList();
+
+ //ViewBag.CooperatecustomCustomerDTOs =
+
+ ViewData.Model = dto;
+ return View();
+ }
+
+
+ /// <summary>
+ /// 杈炶亴鐢宠
+ /// </summary>
+ /// <param name="data"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult SaveAskCiZhi(AdmAskCiZhiDTO data)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ResultEntity resultEntity = new ResultEntity();
+ using (TransactionScope scope = new TransactionScope())
+ {
+ if (data.Step == "鎻愪氦")
+ {
+
+ data.ShenpiStatus = "D";
+ data.RecStatus = "A";
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ data.Modifier = data.Creater;
+ data.Modifytime = data.Createtime;
+
+ resultEntity = _askService.SaveAskCiZhi(data);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+ else
+ {
+
+ var askCiZhiDTO = _askService.GetAskCiZhi(data.Id);
+ askCiZhiDTO.Outtime = data.Outtime;
+ askCiZhiDTO.JiaojieUser = data.JiaojieUser;
+ askCiZhiDTO.Modifier = curentuser.Id;
+ askCiZhiDTO.Modifytime = DateTime.Now;
+
+ resultEntity = _askService.SaveAskCiZhi(askCiZhiDTO);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+
+ if (data.Step == "鎬荤粡鐞嗗鎵�")
+ {
+ //鎬荤粡鐞嗗鎵瑰悓鎰忎箣鍚庯紝鎻掑叆宸ヤ綔浜ゆ帴
+ }
+
+
+
+ //鍙戣捣娴佺▼鐩稿叧
+
+ resultEntity = _wfRunProcessService.WfAskCiZhi(data.Id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.Tittle, "v1");
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
+ scope.Complete();
+ }
+ return new JsonResult(resultEntity);
+ }
}
}
diff --git a/zhengcaioa/zhengcaioa/Views/AdmAsk/AskCiZhi.cshtml b/zhengcaioa/zhengcaioa/Views/AdmAsk/AskCiZhi.cshtml
new file mode 100644
index 0000000..b2ab1f1
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/AdmAsk/AskCiZhi.cshtml
@@ -0,0 +1,401 @@
+锘緻model AdmAskCiZhiDTO;
+@using DTO;
+@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>; //瀹℃壒杩涘害
+
+
+ List<PltUserDTO> UserIds = ViewData["UserIds"] as List<PltUserDTO>; //鍛樺伐
+ string[] Userid = ViewBag.Userid as string[];
+}
+
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="ThemeBucket">
+ <link href="~/css/bootstrap.min.css" rel="stylesheet">
+ <link href="~/css/font-awesome.min.css" rel="stylesheet">
+ <link href="~/css/animate.min.css" rel="stylesheet">
+ <link href="~/css/style.min.css" rel="stylesheet">
+ <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
+ <link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">
+ <link href="~/css/style.min.css" rel="stylesheet">
+ <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
+
+ <!-- jqgrid-->
+ <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
+ <script src="~/js/bootstrap.min.js"></script>
+
+ <!--瀹瑰櫒-->
+ <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
+ <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
+ <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
+ <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
+ <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
+ <script src="~/js/TUJS.js"></script>
+
+ <style type="text/css">
+
+ div.clearfix > label {
+ padding-top: 8px;
+ }
+
+ .col-md-1.control-label {
+ padding-right: 0px;
+ font-weight: 400;
+ }
+ </style>
+
+
+</head>
+
+<body class="gray-bg" style="overflow:auto">
+ <form id="fm" method="post">
+ <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <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>
+ <div class="col-sm-2 col-md-2">
+ <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>
+ <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.DeptName" name="DeptName" id="DeptName" validate="RequiredField" autocomplete="off" readonly="readonly">
+
+ </div>
+ <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.PostName" name="PostName" id="PostName" 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="layui-input form-control" value="@Model.CreatetimeName" name="CreatetimeName" id="CreatetimeName" readonly="readonly">
+
+ </div>
+ <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="layui-input form-control" value="@Model.RuzhitimeName" name="RuzhitimeName" id="RuzhitimeName" 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-6 col-md-6">
+ <textarea class="form-control data" id="Remark" name="Remark" style="resize:none;overflow-y:hidden; height:80px;" maxlength="2000" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Remark</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-2 col-md-2">
+ <input type="text" class="layui-input layer-date ldate form-control" value="@Model.OuttimeName" name="Outtime" id="Outtime" readonly="readonly">
+
+ </div>
+ <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔浜ゆ帴浜�</label>
+ <div class="col-sm-2 col-md-2" id="JiaojieUser1div">
+ <select id="JiaojieUser1" class="form-control" name="JiaojieUser1" data-placeholder="閫夋嫨 搴忓垪 ..." style="font-weight:normal;" multiple>
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in UserIds)
+ {
+ @if (Userid.Contains(item.Id))
+ {
+ <option value="@item.Id" hassubinfo="true" selected="selected">
+ @item.UserName
+ </option>
+ }
+ else
+ {
+ <option value="@item.Id" hassubinfo="true">
+ @item.UserName
+ </option>
+ }
+
+ }
+
+
+ </select>
+ <input type="hidden" id="JiaojieUser" name="JiaojieUser" value="" />
+ </div>
+
+ <div class="col-sm-2 col-md-2" id="JiaojieUserNamediv">
+ <input type="text" class="layui-input form-control" value="@Model.JiaojieUserName" name="JiaojieUserName" id="JiaojieUserName" readonly="readonly">
+
+ </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>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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">
+ <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" 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);
+
+ toastr.options = {
+ "closeButton": true,
+ "debug": false,
+ "progressBar": true,
+ "positionClass": "toast-bottom-right",
+ "onclick": null,
+ "showDuration": "300",
+ "hideDuration": "600",
+ "timeOut": "4500",
+ "extendedTimeOut": "600",
+ "showEasing": "swing",
+ "hideEasing": "linear",
+ "showMethod": "fadeIn",
+ "hideMethod": "fadeOut"
+ };
+
+
+ $(function () {
+
+
+ var remark = document.getElementById("Remark");
+
+ remark.style.height = remark.scrollHeight + 'px';
+ $("#JiaojieUser1").chosen();
+
+ 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();
+ $('#JiaojieUserNamediv').hide();
+
+ $(".ldate").each(function (el) {
+ laydate({
+ elem: "#" + $(this).attr('id'), //瀵瑰簲id
+ format: 'YYYY-MM-DD', //鏃ユ湡鏍煎紡 // 鍒嗛殧绗﹀彲浠ヤ换鎰忓畾涔夛紝璇ヤ緥瀛愯〃绀哄彧鏄剧ず骞存湀
+ min: '2021-01-01', //璁惧畾鏈�灏忔棩鏈熶负褰撳墠鏃ユ湡
+ max: '2099-06-16', //鏈�澶ф棩鏈�
+ type: 'datetime',
+ festival: false, //鏄剧ず鑺傛棩
+ istime: true, 聽 //鏄惁鏄剧ず鏃跺垎绉�
+ istoday: true, //鏄惁鏄粖澶�
+ choose: function (datas) { //閫夋嫨鏃ユ湡瀹屾瘯鐨勫洖璋�
+ // console.log("234234234234324");
+ // end.min = datas; //寮�濮嬫棩閫夊ソ鍚庯紝閲嶇疆缁撴潫鏃ョ殑鏈�灏忔棩鏈�
+ // end.start = datas //灏嗙粨鏉熸棩鐨勫垵濮嬪�艰瀹氫负寮�濮嬫棩
+ checktime();
+ }
+ });
+
+ });
+
+ } else {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ $('#tijiao').hide();
+ $('#shenpiyijian').hide();
+ $('#JiaojieUser1div').hide();
+ }
+
+
+
+
+ } else {
+
+ $('#JiaojieUser1div').hide();
+ //瀹℃壒鐩稿叧
+ $('#shenpiyijian').hide();
+ if ("@sifoudangqian" == "A") {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+
+
+
+
+
+
+
+ } else {
+ $('#tongyi').hide();
+ $('#jujue').hide();
+ $('#tijiao').hide();
+
+
+ }
+
+
+ }
+
+ })
+
+
+ // 淇濆瓨
+ function saveSimCost(tongyi) {
+ if ($.trim($("#Remark").val()) == '') {
+ toastr.warning("杈炶亴鐢宠涓嶈兘涓虹┖");
+ return;
+ }
+
+ if (tongyi == "A" && $("#Step").val() != '鎻愪氦') {
+ if ($.trim($("#Outtime").val()) == '') {
+ toastr.warning("绂昏亴鏃堕棿涓嶈兘涓虹┖");
+ return;
+ }
+ if ($.trim($("#JiaojieUser1").val()) == '') {
+ toastr.warning("宸ヤ綔浜ゆ帴浜轰笉鑳戒负绌�");
+ return;
+ }
+ }
+
+
+ $("#Tongguojujue").val(tongyi);
+
+ $("#JiaojieUser").val($("#JiaojieUser1").val());
+
+ $.ajax({
+ type: "POST",
+ url: "/AdmAsk/SaveAskCiZhi",
+ dataType: "json",
+ global: false,
+ data: $('#fm').serialize(),
+ success: function (data) {
+
+ if (data.Result) {
+ parent.layer.msg('鎻愪氦鎴愬姛', { icon: 6 });
+ try {
+ _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+ }
+ catch (err) {
+ var pathname = window.location.pathname;
+ var search = window.location.search;
+ parent._CloseTab1(pathname + search);
+ }
+ }
+ else {
+ parent.layer.msg(data.Message, { icon: 5 });
+ }
+
+ },
+ error: function () {
+ parent.layer.msg('澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
+ function _pageAutoClose() {
+ try {
+ parent.window._reloadPageData();
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.isRefresh = true;
+ parent.layer.closeAll('loading');
+ parent.layer.close(index);
+ return false;
+ }
+ catch (err) {
+ var pathname = window.location.pathname;
+ var search = window.location.search;
+ parent._CloseTab1(pathname + search);
+ }
+
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
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 a60ca31..dc41df8 100644
--- "a/\350\241\250\344\277\256\346\224\271.sql"
+++ "b/\350\241\250\344\277\256\346\224\271.sql"
@@ -1,6 +1,149 @@
USE [zhengcaioa]
GO
+/****** Object: Table [dbo].[ADM_AskCiZhi] Script Date: 2021/8/25 8:43:44 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[ADM_AskCiZhi](
+ [Id] [nvarchar](50) NOT NULL,
+
+ [OrderType] [nvarchar](50) NULL,
+
+
+ [Remark] [nvarchar](2000) NULL,
+ [shenpi_status] [nvarchar](1) 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,
+ [createrName] [nvarchar](50) NULL,
+ [DeptName] [nvarchar](50) NULL,
+ [PostName] [nvarchar](50) NULL,
+ [CreatetimeName] [nvarchar](50) NULL,
+ [RuzhitimeName] [nvarchar](50) NULL,
+ [JiaojieUser] [nvarchar](500) NULL,
+ [Outtime] [datetime] NULL,
+ [tittle] [nvarchar](50) NULL,
+ CONSTRAINT [PK__AskCiZhi __3214EC077AC5FA48] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 100) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+ALTER TABLE [dbo].[ADM_AskCiZhi] ADD DEFAULT ('D') FOR [shenpi_status]
+GO
+
+ALTER TABLE [dbo].[ADM_AskCiZhi] ADD DEFAULT ('A') FOR [rec_status]
+GO
+
+ALTER TABLE [dbo].[ADM_AskCiZhi] ADD DEFAULT ('1') FOR [creater]
+GO
+
+ALTER TABLE [dbo].[ADM_AskCiZhi] ADD DEFAULT (getdate()) FOR [createtime]
+GO
+
+ALTER TABLE [dbo].[ADM_AskCiZhi] ADD DEFAULT ('1') FOR [modifier]
+GO
+
+ALTER TABLE [dbo].[ADM_AskCiZhi] ADD DEFAULT (getdate()) FOR [modifytime]
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
ALTER TABLE [dbo].[adm_goods_manage] ADD [haocai_status] [nvarchar](1) DEFAULT ('D')
GO
--
Gitblit v1.9.1