63f97a810a8dcd213f4624533aa52f7bc2647d49..7b9e068cfe4e295f9ee960457d848c631f0136c7
2021-08-27 username@email.com
工作交接
7b9e06 对比 | 目录
2021-08-25 username@email.com
辞职申请
3d862d 对比 | 目录
14个文件已修改
9个文件已添加
3509 ■■■■■ 已修改文件
zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/CommonToolsCore/SMSHelper.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/CommonToolsCore/SendMailHelper.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/AdmAskCiZhiDTO.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/AdmAskJiaojieDTO.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/DTO/AdmAskJiaojieDtlDTO.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/IServices/IAskService.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/IServices/IWfRunProcessService.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/AdmAskCiZhi.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/AdmAskJiaojie.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/AdmAskJiaojieDtl.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Model/zhengcaioaContext.cs 173 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/AskService.cs 244 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/WfNeeddeelService.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/WfRunProcessService.cs 894 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs 478 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/AdmAsk/AskCiZhi.cshtml 401 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/AdmAsk/AskJiaojie.cshtml 480 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/AdmAsk/EditAskJiaojie.cshtml 302 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
表修改.sql 317 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -250,7 +250,16 @@
            CreateMap<AdmAskBaiFangDTO, AdmAskBaiFang>();
            CreateMap<AdmCustomerWithdrawal, AdmCustomerWithdrawalDTO>();
            CreateMap<AdmCustomerWithdrawalDTO, AdmCustomerWithdrawal>();
            CreateMap<AdmCustomerWithdrawalDTO, AdmCustomerWithdrawal>();
            CreateMap<AdmAskCiZhi, AdmAskCiZhiDTO>();
            CreateMap<AdmAskCiZhiDTO, AdmAskCiZhi>();
            CreateMap<AdmAskJiaojie, AdmAskJiaojieDTO>();
            CreateMap<AdmAskJiaojieDTO, AdmAskJiaojie>();
            CreateMap<AdmAskJiaojieDtl, AdmAskJiaojieDtlDTO>();
            CreateMap<AdmAskJiaojieDtlDTO, AdmAskJiaojieDtl>();
        }
    }
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;
        }
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);
zhengcaioa/DTO/AdmAskCiZhiDTO.cs
New file
@@ -0,0 +1,32 @@
using 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; }
    }
}
zhengcaioa/DTO/AdmAskJiaojieDTO.cs
New file
@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace DTO
{
    public class AdmAskJiaojieDTO
    {
        public string id { get; set; }
        public string Id { get; set; }
        public string CiZhiId { 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 Tittle { get; set; }
        public string Content { get; set; }
        public string Tongguojujue { get; set; }
        public string Step { get; set; }
        public string JiaojieDtlId { get; set; }
        public List<AdmAskJiaojieDtlDTO> admAskJiaojieDtlDTOs { get; set; }
        public DateTime? JiaojietimeStart { get; set; }
        public string JiaojietimeStartName { get; set; }
        public DateTime? JiaojietimeEnd { get; set; }
        public string JiaojietimeEndName { get; set; }
        public string JiaojieStatus { get; set; }
    }
}
zhengcaioa/DTO/AdmAskJiaojieDtlDTO.cs
New file
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace DTO
{
    public class AdmAskJiaojieDtlDTO
    {
        public string Id { get; set; }
        public string JiaojieId { get; set; }
        public DateTime? Jiaojietime { get; set; }
        public string JiaojietimeName { get; set; }
        public string JiaojieType { get; set; }
        public string JiaojieTypeName { get; set; }
        public string Kehudanwei { get; set; }
        public string JiaojieNeirong { get; set; }
        public string JiaojieUserId { get; set; }
        public string JiaojieUserName { get; set; }
        public DateTime? JieShoutime { get; set; }
        public string JieShoutimeName { get; set; }
        public string JiaojieStatus { 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; }
    }
}
zhengcaioa/IServices/IAskService.cs
@@ -47,5 +47,17 @@
        AdmCustomerWithdrawalDTO GetCustomerWithdrawal(string Id);
        List<AdmCustomerWithdrawalDTO> GetCustomerWithdrawalList(string OrderNo);
        //辞职申请
        ResultEntity SaveAskCiZhi(AdmAskCiZhiDTO admAsk);
        AdmAskCiZhiDTO GetAskCiZhi(string Id);
        //工作交接
        ResultEntity SaveAskJiaojie(AdmAskJiaojieDTO admAsk);
        AdmAskJiaojieDTO GetAskJiaojie(string Id);
        ResultEntity SaveAskJiaojieDtl(AdmAskJiaojieDtlDTO admAsk);
        List<AdmAskJiaojieDtlDTO> GetAskJiaojieDtls(string JiaojieId);
        AdmAskJiaojieDtlDTO GetAskJiaojieDtl(string Id);
    }
}
zhengcaioa/IServices/IWfRunProcessService.cs
@@ -44,5 +44,9 @@
        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);
        ResultEntity WfAskJiaojie(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version);
    }
}
zhengcaioa/Model/AdmAskCiZhi.cs
New file
@@ -0,0 +1,30 @@
using 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; }
    }
}
zhengcaioa/Model/AdmAskJiaojie.cs
New file
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace zhengcaioa.Models
{
    public partial class AdmAskJiaojie
    {
        public string Id { get; set; }
        public string CiZhiId { 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 Tittle { get; set; }
    }
}
zhengcaioa/Model/AdmAskJiaojieDtl.cs
New file
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace zhengcaioa.Models
{
    public partial class AdmAskJiaojieDtl
    {
        public string Id { get; set; }
        public string JiaojieId { get; set; }
        public DateTime? Jiaojietime { get; set; }
        public string JiaojieType { get; set; }
        public string Kehudanwei { get; set; }
        public string JiaojieNeirong { get; set; }
        public string JiaojieUserId { get; set; }
        public DateTime? JieShoutime { get; set; }
        public string JiaojieStatus { 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; }
    }
}
zhengcaioa/Model/zhengcaioaContext.cs
@@ -26,8 +26,11 @@
        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<AdmAskJiaojie> AdmAskJiaojies { get; set; }
        public virtual DbSet<AdmAskJiaojieDtl> AdmAskJiaojieDtls { get; set; }
        public virtual DbSet<AdmAskLeave> AdmAskLeaves { get; set; }
        public virtual DbSet<AdmAskLeaveOff> AdmAskLeaveOffs { get; set; }
        public virtual DbSet<AdmAskMarketingCost> AdmAskMarketingCosts { get; set; }
@@ -240,6 +243,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");
@@ -350,6 +417,112 @@
                    .HasColumnName("tittle");
            });
            modelBuilder.Entity<AdmAskJiaojie>(entity =>
            {
                entity.ToTable("ADM_AskJiaojie");
                entity.Property(e => e.Id).HasMaxLength(50);
                entity.Property(e => e.CiZhiId).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.Modifier)
                    .IsRequired()
                    .HasMaxLength(50)
                    .HasColumnName("modifier")
                    .HasDefaultValueSql("('1')");
                entity.Property(e => e.Modifytime)
                    .HasColumnType("datetime")
                    .HasColumnName("modifytime")
                    .HasDefaultValueSql("(getdate())");
                entity.Property(e => e.RecStatus)
                    .IsRequired()
                    .HasMaxLength(1)
                    .HasColumnName("rec_status")
                    .HasDefaultValueSql("('A')");
                entity.Property(e => e.Remark).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<AdmAskJiaojieDtl>(entity =>
            {
                entity.ToTable("ADM_AskJiaojieDtl");
                entity.Property(e => e.Id).HasMaxLength(50);
                entity.Property(e => e.Creater)
                    .IsRequired()
                    .HasMaxLength(50)
                    .HasColumnName("creater")
                    .HasDefaultValueSql("('1')");
                entity.Property(e => e.Createtime)
                    .HasColumnType("datetime")
                    .HasColumnName("createtime")
                    .HasDefaultValueSql("(getdate())");
                entity.Property(e => e.JiaojieId).HasMaxLength(50);
                entity.Property(e => e.JiaojieNeirong).HasMaxLength(500);
                entity.Property(e => e.JiaojieStatus)
                    .HasMaxLength(1)
                    .HasColumnName("jiaojie_status")
                    .HasDefaultValueSql("('D')");
                entity.Property(e => e.JiaojieType).HasMaxLength(50);
                entity.Property(e => e.JiaojieUserId).HasMaxLength(50);
                entity.Property(e => e.Jiaojietime).HasColumnType("datetime");
                entity.Property(e => e.JieShoutime).HasColumnType("datetime");
                entity.Property(e => e.Kehudanwei).HasMaxLength(500);
                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.RecStatus)
                    .IsRequired()
                    .HasMaxLength(1)
                    .HasColumnName("rec_status")
                    .HasDefaultValueSql("('A')");
            });
            modelBuilder.Entity<AdmAskLeave>(entity =>
            {
                entity.ToTable("ADM_AskLeave");
zhengcaioa/Services/AskService.cs
@@ -525,5 +525,249 @@
        #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
        #region å·¥ä½œäº¤æŽ¥
        public ResultEntity SaveAskJiaojie(AdmAskJiaojieDTO admAsk)
        {
            ResultEntity resultEntity = new ResultEntity();
            try
            {
                AdmAskJiaojie ask = _mapper.Map<AdmAskJiaojie>(admAsk);
                if (string.IsNullOrEmpty(admAsk.Id))
                {
                    ask.Id = Guid.NewGuid().ToString();
                    admAsk.Id = ask.Id;
                    _context.AdmAskJiaojies.Add(ask);
                }
                else
                {
                    var entity = _context.AdmAskJiaojies.Find(admAsk.Id);
                    entity.Remark = admAsk.Remark;
                    entity.CiZhiId = admAsk.CiZhiId;
                    entity.ShenpiStatus = admAsk.ShenpiStatus;
                    entity.CreaterName = admAsk.CreaterName;
                    entity.Tittle = admAsk.Tittle;
                    entity.Modifier = admAsk.Modifier;
                    entity.Modifytime = DateTime.Now;
                }
                _context.SaveChanges();
                resultEntity.ReturnID = admAsk.Id;
                resultEntity.Result = true;
            }
            catch (Exception ex)
            {
                resultEntity.Result = false;
                resultEntity.Message = "保存失败,请联系管理员";
                ex.Message.ToString();
            }
            return resultEntity;
        }
        public AdmAskJiaojieDTO GetAskJiaojie(string Id)
        {
            var entity = _context.AdmAskJiaojies.Where(e => e.RecStatus == "A" && e.Id == Id).FirstOrDefault();
            if (entity == null)
            {
                entity = new AdmAskJiaojie();
            }
            var leaveDTO = _mapper.Map<AdmAskJiaojieDTO>(entity);
            return leaveDTO;
        }
        public ResultEntity SaveAskJiaojieDtl(AdmAskJiaojieDtlDTO admAsk)
        {
            ResultEntity resultEntity = new ResultEntity();
            try
            {
                AdmAskJiaojieDtl ask = _mapper.Map<AdmAskJiaojieDtl>(admAsk);
                if (string.IsNullOrEmpty(admAsk.Id))
                {
                    ask.Id = Guid.NewGuid().ToString();
                    admAsk.Id = ask.Id;
                    _context.AdmAskJiaojieDtls.Add(ask);
                }
                else
                {
                    var entity = _context.AdmAskJiaojieDtls.Find(admAsk.Id);
                    entity.JiaojieId = admAsk.JiaojieId;
                    entity.Jiaojietime = admAsk.Jiaojietime;
                    entity.JiaojieType = admAsk.JiaojieType;
                    entity.Kehudanwei = admAsk.Kehudanwei;
                    entity.JiaojieNeirong = admAsk.JiaojieNeirong;
                    entity.JiaojieUserId = admAsk.JiaojieUserId;
                    entity.JieShoutime = admAsk.JieShoutime;
                    entity.JiaojieStatus = admAsk.JiaojieStatus;
                    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 List<AdmAskJiaojieDtlDTO> GetAskJiaojieDtls(string JiaojieId)
        {
            var entity = _context.AdmAskJiaojieDtls.Where(e => e.RecStatus == "A" && e.JiaojieId == JiaojieId).OrderBy(x=>x.JiaojieType).ToList();
            var leaveDTOs = _mapper.Map<List<AdmAskJiaojieDtlDTO>>(entity);
            var listCode = (from a in _context.SysCodeDtls
                            join b in _context.SysCodes
                            on a.CodeId equals b.Id
                            where a.RecStatus == "A"
                                          && b.RecStatus == "A"
                                          && b.CodeTable == "ADM_AskJiaojieDtl"
                                          && b.CodeField == "JiaojieType"
                            select new CodeDataEntity()
                            {
                                CodeId = b.Id,
                                CodeTable = b.CodeTable,
                                CodeField = b.CodeField,
                                CodeSn = a.CodeSn,
                                Comments = a.Comments,
                                Contents = a.Contents,
                                RecStatus = a.RecStatus,
                                Sort = a.Sort
                            }
                        ).ToList();
            var pltUsers = _context.PltUsers.Where(e => e.RecStatus == "A" && e.Zhiwustatus == "A").ToList();
            foreach (var leaveDTO in leaveDTOs)
            {
                leaveDTO.JiaojietimeName = leaveDTO.Jiaojietime.HasValue ? leaveDTO.Jiaojietime.Value.ToString("yyyy-MM-dd") : "";
                leaveDTO.JieShoutimeName = leaveDTO.JieShoutime.HasValue ? leaveDTO.JieShoutime.Value.ToString("yyyy-MM-dd") : "";
                var codeDataEntity = listCode.Where(x => x.CodeSn == leaveDTO.JiaojieType).FirstOrDefault();
                if (codeDataEntity != null)
                {
                    leaveDTO.JiaojieTypeName = codeDataEntity.Comments;
                }
                var pltUser = pltUsers.Where(x => x.Id == leaveDTO.JiaojieUserId).FirstOrDefault();
                if (pltUser != null)
                {
                    leaveDTO.JiaojieUserName = pltUser.UserName;
                }
            }
            return leaveDTOs;
        }
        public AdmAskJiaojieDtlDTO GetAskJiaojieDtl(string Id)
        {
            var entity = _context.AdmAskJiaojieDtls.Where(e => e.RecStatus == "A" && e.Id == Id).FirstOrDefault();
            if (entity == null)
            {
                entity = new AdmAskJiaojieDtl();
            }
            var leaveDTO = _mapper.Map<AdmAskJiaojieDtlDTO>(entity);
            return leaveDTO;
        }
        #endregion
    }
}
zhengcaioa/Services/WfNeeddeelService.cs
@@ -143,6 +143,8 @@
                         join d in _context.WfApplytypes
                       on k.Applytiye equals d.Applyno
                         into dsssss
                         from ddd in dsssss.DefaultIfEmpty()
                         join b in _context.PltUsers 
                        on k.Creater equals b.Id
@@ -185,7 +187,7 @@
                             Applyno = k.Applyno,
                             CreaterName = b.UserName,
                             DeptName = c.DeptName,
                             Applytiye = d.Applytiye,
                             Applytiye = ddd.Applytiye,
                             Content = k.Content,
                             ShenpiStatusName = eee.Comments,
                             Resivetime = a.Resivetime,
zhengcaioa/Services/WfRunProcessService.cs
@@ -6444,5 +6444,899 @@
            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;
        }
        public ResultEntity WfAskJiaojie(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, "22").FirstOrDefault();
            if (wfRunProcessDTO != null)
            {
                version = wfRunProcessDTO.Version;
            }
            if (version == "v1")
            {
                if (step == "保存")
                {
                    //更新流程实例
                    // WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "22").FirstOrDefault();
                    if (wfRunProcessDTO == null)
                    {
                        //插入流程实例
                        wfRunProcessDTO = new WfRunProcessDTO();
                        //wfRunProcessDTO.Applyno =
                        wfRunProcessDTO.Applytime = DateTime.Now;
                        wfRunProcessDTO.Applytiye = "22";
                        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/AskJiaojie?id=" + DanjuId+ "&JiaojieStatus=D";
                        result = this.save(wfRunProcessDTO);
                        if (result.Result == false)
                        {
                            return result;
                        }
                        //查询处理人
                        var pltUsers = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.Id == Userid).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/AskJiaojie?id=" + DanjuId + "&JiaojieStatus=D";
                            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;
                            }
                        }
                        _context.SaveChanges();
                    }
                }
                if (step == "提交")
                {
                    //更新流程实例
                    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 pltUsers = new List<PltUser>();
                    //查询处理人角色
                    var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && (x.RoleName == "财务" || x.RoleName == "人事" || x.RoleName == "行政" || x.RoleName == "总经理")).Select(x=>x.Id).ToList();
                    if (hrPositions == null || hrPositions.Count == 0)
                    {
                        result.Result = false;
                        result.Message = "未找到职位";
                        return result;
                    }
                    var pltUsersrole = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
                                    join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && hrPositions.Contains(x.RoleId)) on a.Id equals b.UserId
                                    select a
                                    ).ToList();
                    foreach (var pltUser1 in pltUsersrole)
                    {
                        pltUsers.Add(pltUser1);
                    }
                    //查询处理人主管
                    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 pltUserszhuguan = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.Id == hrDept.Director).ToList();
                    foreach (var pltUser1 in pltUserszhuguan)
                    {
                        pltUsers.Add(pltUser1);
                    }
                    //查询处理人交接
                    var admAskJiaojie = _context.AdmAskJiaojies.Find(DanjuId);
                    if (admAskJiaojie != null)
                    {
                        var admAskCiZhi = _context.AdmAskCiZhis.Find(admAskJiaojie.CiZhiId);
                        if (admAskCiZhi != null)
                        {
                            var JiaojieUser = admAskCiZhi.JiaojieUser.Split(',');
                            if (JiaojieUser.Length > 0)
                            {
                                var pltUsersJiaojie = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && JiaojieUser.Contains(x.Id)).ToList();
                                foreach (var pltUser1 in pltUsersJiaojie)
                                {
                                    pltUsers.Add(pltUser1);
                                }
                            }
                        }
                    }
                    pltUsers = pltUsers.Distinct().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/AskJiaojie?id=" + DanjuId + "&JiaojieStatus=D";
                        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, "22").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 admAskJiaojie = _context.AdmAskJiaojies.Find(DanjuId);
                        if (wfRunProcessDTO == null)
                        {
                            result.Result = false;
                            result.Message = "未找到单据";
                            return result;
                        }
                        admAskJiaojie.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/AskJiaojie?id=" + DanjuId + "&JiaojieStatus=D";
                        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;
        }
    }
}
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -442,6 +442,14 @@
                data.Creater = curentuser.Id;
                data.Createtime = DateTime.Now;
            }
            else
            {
                var intentionCustomerDTO = _intentionCustomerService.Get(data.Id);
                data.Yixiangtime = intentionCustomerDTO.Yixiangtime;
                data.Yixiang = intentionCustomerDTO.Yixiang;
                data.Dianxiaozhuanyuan = intentionCustomerDTO.Dianxiaozhuanyuan;
                data.Zuijinzhuizongtime = intentionCustomerDTO.Zuijinzhuizongtime;
            }
            data.Modifier = curentuser.Id;
            data.Modifytime = DateTime.Now;
zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs
@@ -34,7 +34,7 @@
        {
            
            ViewBag.wfApplytypeDTOs = _wfApplytypeService.GetList().Where(x => x.Applyno != "03" && x.Applyno != "20").ToList();
            ViewBag.wfApplytypeDTOs = _wfApplytypeService.GetList().Where(x => x.Applyno != "03" && x.Applyno != "20" && x.Applyno != "22").ToList();
            return View();
        }
    }
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,478 @@
            }
            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 == "总经理审批")
                {
                    //总经理审批同意之后,插入工作交接
                    var askCiZhiDTO = _askService.GetAskCiZhi(resultEntity.ReturnID);
                    var pltUserDTO = _userService.GetPltUserEntity(askCiZhiDTO.Creater);
                    AdmAskJiaojieDTO admAskJiaojieDTO = new AdmAskJiaojieDTO();
                    admAskJiaojieDTO.CiZhiId = resultEntity.ReturnID;
                    admAskJiaojieDTO.Remark = "";
                    admAskJiaojieDTO.ShenpiStatus = "D";
                    admAskJiaojieDTO.RecStatus = "A";
                    admAskJiaojieDTO.Creater = askCiZhiDTO.Creater;
                    admAskJiaojieDTO.Createtime = DateTime.Now;
                    admAskJiaojieDTO.Modifier = askCiZhiDTO.Creater;
                    admAskJiaojieDTO.Modifytime = admAskJiaojieDTO.Createtime;
                    admAskJiaojieDTO.CreaterName = pltUserDTO.UserName;
                    admAskJiaojieDTO.Tittle = "工作交接(" + pltUserDTO.UserName + ")";
                    resultEntity = _askService.SaveAskJiaojie(admAskJiaojieDTO);
                    if (!resultEntity.Result)
                    {
                        return new JsonResult(resultEntity);
                    }
                    //查询合作客户
                    CooperatecustomCustomerDTOSearch searchEntity = new CooperatecustomCustomerDTOSearch();
                    searchEntity.page = 1;
                    searchEntity.rows = 10000;
                    searchEntity.Ywjl = admAskJiaojieDTO.Creater;
                   var resultDataEntity =  _cooperatecustomCustomerService.SearchByPaging(searchEntity);
                    var cooperatecustomCustomerDTOs  = resultDataEntity.DataList;
                    foreach (var cooperatecustomCustomerDTO in cooperatecustomCustomerDTOs)
                    {
                        AdmAskJiaojieDtlDTO admAskJiaojieDtl = new AdmAskJiaojieDtlDTO();
                        admAskJiaojieDtl.JiaojieId = admAskJiaojieDTO.Id;
                        admAskJiaojieDtl.Jiaojietime = DateTime.Now;
                        admAskJiaojieDtl.JiaojieType = "01";
                        admAskJiaojieDtl.Kehudanwei = cooperatecustomCustomerDTO.Name;
                        admAskJiaojieDtl.JiaojieStatus = "D";
                        admAskJiaojieDtl.RecStatus = "A";
                        admAskJiaojieDtl.Creater = admAskJiaojieDTO.Creater;
                        admAskJiaojieDtl.Createtime = admAskJiaojieDTO.Createtime;
                        admAskJiaojieDtl.Modifier = admAskJiaojieDTO.Creater;
                        admAskJiaojieDtl.Modifytime = admAskJiaojieDTO.Createtime;
                        resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl);
                        if (!resultEntity.Result)
                        {
                            return new JsonResult(resultEntity);
                        }
                    }
                    //查询意向客户
                    IntentionCustomerDTOSearch searchEntityin = new IntentionCustomerDTOSearch();
                    searchEntityin.page = 1;
                    searchEntityin.rows = 10000;
                    searchEntityin.YwjlYx = admAskJiaojieDTO.Creater;
                    searchEntityin.Ywjl = admAskJiaojieDTO.Creater;
                    searchEntityin.Yixiang = "05";
                    var resultDataEntity1  = _intentionCustomerService.SearchByPaging(searchEntityin);
                    var intentionCustomerDTOs = resultDataEntity1.DataList;
                    foreach (var intentionCustomerDTO in intentionCustomerDTOs)
                    {
                        AdmAskJiaojieDtlDTO admAskJiaojieDtl = new AdmAskJiaojieDtlDTO();
                        admAskJiaojieDtl.JiaojieId = admAskJiaojieDTO.Id;
                        admAskJiaojieDtl.Jiaojietime = DateTime.Now;
                        admAskJiaojieDtl.JiaojieType = "02";
                        admAskJiaojieDtl.Kehudanwei = intentionCustomerDTO.Name;
                        admAskJiaojieDtl.JiaojieStatus = "D";
                        admAskJiaojieDtl.RecStatus = "A";
                        admAskJiaojieDtl.Creater = admAskJiaojieDTO.Creater;
                        admAskJiaojieDtl.Createtime = admAskJiaojieDTO.Createtime;
                        admAskJiaojieDtl.Modifier = admAskJiaojieDTO.Creater;
                        admAskJiaojieDtl.Modifytime = admAskJiaojieDTO.Createtime;
                        resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl);
                        if (!resultEntity.Result)
                        {
                            return new JsonResult(resultEntity);
                        }
                    }
                    //插入交接明细
                    resultEntity = _wfRunProcessService.WfAskJiaojie(admAskJiaojieDTO.Id, "保存", "A", admAskJiaojieDTO.Creater, "", admAskJiaojieDTO.Tittle, "v1");
                    if (!resultEntity.Result)
                    {
                        return new JsonResult(resultEntity);
                    }
                }
                //发起流程相关
                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);
        }
        public IActionResult AskJiaojie(AdmAskJiaojieDTO data)
        {
            AdmAskJiaojieDTO dto = new AdmAskJiaojieDTO();
            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(data.id))
            {
                dto.CreaterName = curentuser.UserName;
                dto.Tittle = "工作交接(" + curentuser.UserName + ")";
                dto.admAskJiaojieDtlDTOs = new List<AdmAskJiaojieDtlDTO>();
            }
            else if (dto != null)
            {
                dto = _askService.GetAskJiaojie(data.id);
                dto.JiaojietimeStart = data.JiaojietimeStart;
                dto.JiaojietimeEnd = data.JiaojietimeEnd;
                dto.JiaojieStatus = data.JiaojieStatus;
                dto.JiaojietimeStartName = dto.JiaojietimeStart.HasValue? dto.JiaojietimeStart.Value.ToString("yyyy-MM-dd"):"";
                dto.JiaojietimeEndName = dto.JiaojietimeEnd.HasValue ? dto.JiaojietimeEnd.Value.ToString("yyyy-MM-dd") : "";
                //dto.JineName = dto.Jine.Value.ToString("F2");
                var admAskJiaojieDtlDTOs = _askService.GetAskJiaojieDtls(data.id);
                if (!string.IsNullOrEmpty(data.JiaojieStatus))
                {
                    admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.JiaojieStatus == data.JiaojieStatus).ToList();
                }
                if (data.JiaojietimeStart.HasValue)
                {
                    admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.Jiaojietime >= data.JiaojietimeStart).ToList();
                }
                if (data.JiaojietimeEnd.HasValue)
                {
                    admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.Jiaojietime <= data.JiaojietimeEnd.Value.AddDays(1)).ToList();
                }
                dto.admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs;
                var wfRunProcessDTO = _wfRunProcessService.GetList(dto.Id, "22").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;
            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");
            //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 SaveAskJiaojie(AdmAskJiaojieDTO 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.SaveAskJiaojie(data);
                    if (!resultEntity.Result)
                    {
                        return new JsonResult(resultEntity);
                    }
                    //发起流程相关
                    resultEntity = _wfRunProcessService.WfAskJiaojie(data.Id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.Tittle, "v1");
                    if (!resultEntity.Result)
                    {
                        return new JsonResult(resultEntity);
                    }
                }
                else if (data.Step == "工作交接")
                {
                  var ids  =  data.JiaojieDtlId.Split(',');
                    foreach(var  id in ids)
                    {
                        if (string.IsNullOrEmpty(id))
                        {
                            continue;
                        }
                        var admAskJiaojieDtl = _askService.GetAskJiaojieDtl(id);
                        if (admAskJiaojieDtl.JiaojieStatus == "A")
                        {
                            continue;
                        }
                        else
                        {
                            admAskJiaojieDtl.JiaojieStatus = "A";
                            admAskJiaojieDtl.JiaojieUserId = curentuser.Id;
                            admAskJiaojieDtl.Jiaojietime = DateTime.Now;
                            admAskJiaojieDtl.JieShoutime = admAskJiaojieDtl.Jiaojietime;
                            admAskJiaojieDtl.Modifier = curentuser.Id; ;
                            admAskJiaojieDtl.Modifytime = admAskJiaojieDtl.Jiaojietime.Value;
                            resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl);
                            if (!resultEntity.Result)
                            {
                                return new JsonResult(resultEntity);
                            }
                        }
                    }
                    var admAskJiaojieDtls = _askService.GetAskJiaojieDtls(data.Id).Where(x => x.JiaojieStatus == "D").ToList();
                    if(admAskJiaojieDtls ==null || admAskJiaojieDtls.Count == 0)
                    {
                        //发起流程相关
                        resultEntity = _wfRunProcessService.WfAskJiaojie(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);
        }
        public IActionResult EditAskJiaojie(string id)
        {
            ViewBag.id = id;
            ViewBag.JiaojieType = _liaotianService.GetSYScode("ADM_AskJiaojieDtl", "JiaojieType");
            ViewData.Model = new AdmAskJiaojieDtlDTO();
            return View();
        }
        /// <summary>
        /// ä¿å­˜
        /// </summary>
        /// <param name="data">岗位实体类对象</param>
        /// <returns></returns>
        [HttpPost]
        public string SaveAskJiaojieDtl(AdmAskJiaojieDtlDTO data)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            data.JiaojieStatus = "D";
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater = curentuser.Id;
                data.Createtime = DateTime.Now;
            }
            data.Modifier = curentuser.Id;
            data.Modifytime = DateTime.Now;
            ResultEntity resultEntity = _askService.SaveAskJiaojieDtl(data);
            return JsonConvert.SerializeObject(resultEntity);
        }
    }
}
zhengcaioa/zhengcaioa/Views/AdmAsk/AskCiZhi.cshtml
New file
@@ -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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>
zhengcaioa/zhengcaioa/Views/AdmAsk/AskJiaojie.cshtml
New file
@@ -0,0 +1,480 @@
@model AdmAskJiaojieDTO;
@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<SysCodeDtl> shifou = ViewBag.shifou as List<SysCodeDtl>;
    List<AdmAskJiaojieDtlDTO> admAskJiaojieDtlDTOs = Model.admAskJiaojieDtlDTOs;
}
<!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;
        }
        table {
            border-collapse: collapse;
            border-spacing: 0;
        }
        td, th {
            padding: 0;
        }
        .pure-table {
            border-collapse: collapse;
            border-spacing: 0;
            empty-cells: show;
            border: 1px solid #cbcbcb;
        }
            .pure-table caption {
                color: #000;
                font: italic 85%/1 arial,sans-serif;
                padding: 1em 0;
                text-align: center;
            }
            .pure-table td, .pure-table th {
                border-left: 1px solid #cbcbcb;
                border-width: 0 0 0 1px;
                font-size: inherit;
                margin: 0;
                overflow: visible;
                padding: .5em 1em;
            }
            .pure-table thead {
                background-color: #e0e0e0 !important;
                color: #000;
                text-align: left;
                vertical-align: bottom;
                -webkit-print-color-adjust: exact;
            }
            .pure-table td {
                background-color: transparent;
            }
        .pure-table-bordered td {
            border-bottom: 1px solid #cbcbcb;
        }
        .pure-table-bordered tbody > tr:last-child > td {
            border-bottom-width: 0;
        }
    </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>
                                </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.JiaojietimeStartName" name="JiaojietimeStart" id="JiaojietimeStart" readonly="readonly">
                                    </div>
                                    <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.JiaojietimeEndName" name="JiaojietimeEnd" id="JiaojietimeEnd" readonly="readonly">
                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">是否交接</label>
                                    <div class="col-sm-2 col-md-2">
                                        <select id="JiaojieStatus" class="form-control" name="JiaojieStatus" data-placeholder="选择 åºåˆ— ..." style="font-weight:normal;">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in shifou)
                                            {
                                                @if (Model.JiaojieStatus == item.CodeSn)
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                            }
                                        </select>
                                    </div>
                                    <div class="col-sm-2 col-md-2">
                                        <a class="btn btn-success"  href="javascript:void(0)" onclick="chaxun();" style="margin-left:4px; border-radius:4px;">
                                            æŸ¥è¯¢
                                        </a>
                                        @if (dangqianbuzhou == "提交")
                                        {
                                            <a class="btn btn-success"  href="javascript:void(0)" onclick="_pageAdd();" style="margin-left:4px; border-radius:4px;">
                                                æ–°å¢žäº¤æŽ¥
                                            </a>
                                        }
                                    </div>
                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <table class="pure-table pure-table-bordered" style="width:100%;">
                                        <thead>
                                            <tr>
                                                <th style="width:5%;">
                                                    é€‰æ‹©
                                                </th>
                                                <th style="width:8%;">
                                                    åºå·
                                                </th>
                                                <th style="width:15%;">
                                                    äº¤æŽ¥æ—¶é—´
                                                </th>
                                                <th style="width:15%;">
                                                    äº¤æŽ¥ç±»åž‹
                                                </th>
                                                <th style="width:15%;">
                                                    å®¢æˆ·å•位(工作事项)
                                                </th>
                                                <th style="width:15%;">
                                                    äº¤æŽ¥å†…容
                                                </th>
                                                <th style="width:15%;">
                                                    æŽ¥æ”¶äºº
                                                </th>
                                                <th style="width:15%;">
                                                    æŽ¥æ”¶æ—¶é—´
                                                </th>
                                            </tr>
                                        </thead>
                                        <tbody>
                                            @{
                                                if (admAskJiaojieDtlDTOs != null && admAskJiaojieDtlDTOs.Count > 0)
                                                {
                                                    for (int i = 0; i < admAskJiaojieDtlDTOs.Count; i++)
                                                    {
                                                                                        <tr>
                                                                                            <td><input type="checkbox" name="checkbox" value="@admAskJiaojieDtlDTOs[i].Id" /></td>
                                                                                            <td>@(i+1)</td>
                                                                                            <td>@admAskJiaojieDtlDTOs[i].JiaojietimeName</td>
                                                                                            <td>@admAskJiaojieDtlDTOs[i].JiaojieTypeName</td>
                                                                                            <td>@admAskJiaojieDtlDTOs[i].Kehudanwei</td>
                                                                                            <td>@admAskJiaojieDtlDTOs[i].JiaojieNeirong</td>
                                                                                            <td>@admAskJiaojieDtlDTOs[i].JiaojieUserName</td>
                                                                                            <td>@admAskJiaojieDtlDTOs[i].JieShoutimeName</td>
                                                                                        </tr>
                                                    }
                                                }
                                            }
                                        </tbody>
                                    </table>
                                </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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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>
                <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" />
                <input type="hidden" id="JiaojieDtlId" name="JiaojieDtlId" value="" />
            </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 () {
            $('#shenpiyijian').hide();
             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();
                     $('#tijiao').hide();
                     $('#shenpiyijian').hide();
                 }
            } else {
                  //审批相关
                 $('#shenpiyijian').hide();
                 if ("@sifoudangqian" == "A") {
                     $('#tongyi').hide();
                 } else {
                     $('#tongyi').hide();
                      $('#tijiao').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();
                    }
                });
            });
        })
        function chaxun() {
            window.location.href = "/AdmAsk/AskJiaojie?id=@Model.Id&JiaojietimeStart=" + $("#JiaojietimeStart").val() + "&JiaojietimeEnd=" + $("#JiaojietimeEnd").val() + "&JiaojieStatus=" + $("#JiaojieStatus").val();
        }
        // ä¿å­˜
        function saveSimCost(tongyi) {
            var aa = "";
            if (tongyi == "A") {
                $("input[name='checkbox']:checkbox:checked").each(function () {
                    aa += $(this).val()+","
                })
            }
            if (aa == "") {
                toastr.warning("请选择交接的工作");
                return;
            }
            $("#JiaojieDtlId").val(aa);
            $("#Tongguojujue").val(tongyi);
            $.ajax({
                type: "POST",
                url: "/AdmAsk/SaveAskJiaojie",
                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 });
                }
            });
        }
        var _pageAdd = function () {
            OpenWindow("新增交接", "90%", "90%", "/AdmAsk/EditAskJiaojie?id=@Model.Id");
        }
        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>
zhengcaioa/zhengcaioa/Views/AdmAsk/EditAskJiaojie.cshtml
New file
@@ -0,0 +1,302 @@
@model DTO.AdmAskJiaojieDtlDTO
@using DTO;
@using zhengcaioa.Models;
@{
    string id = ViewBag.id as string;
    List<SysCodeDtl> JiaojieType = ViewBag.JiaojieType as List<SysCodeDtl>;
    //string[] arrJobLevel = (Model.Zhuanjia ?? "").Split(',');
}
@{
    Layout = null;
}
<!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">
    <title>@(SiteConfig.SiteName)</title>
    <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/plugins/iCheck/custom.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/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
    <link href="~/css/style.min.css" rel="stylesheet">
    <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
    <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
    <style type="text/css">
        .webuploader-pick {
            position: relative;
            display: inline-block;
            cursor: pointer;
            background: #00b7ee;
            padding: 8px 14px 7px 14px;
            color: #fff;
            text-align: center;
            border-radius: 3px;
            overflow: hidden;
        }
        div.clearfix > label {
            padding-top: 8px;
        }
        .chosen-container {
            border-radius: 1px;
            border: 1px solid #e5e6e7;
        }
        .col-md-1.control-label {
            padding-right: 0px;
            font-weight: 400;
        }
    </style>
    <!-- jqgrid-->
    @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
    <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
    <script src="~/js/bootstrap.min.js"></script>
    @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
    <!--容器-->
    @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
    @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
    @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
    <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
    @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
    <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
    @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
    @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
    <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
    <script src="~/js/plugins/webuploader/webuploader.min.js"></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/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
    @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
    <script src="~/js/TUJS.js"></script>
</head>
<body class="gray-bg" style="overflow:auto">
    <form id="formtest">
        <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 class="ibox-title">
                            <h5>                            <i class="fa fa-list"></i>&nbsp;基本信息</h5>
                        </div>
                        <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="layui-input  layer-date  ldate form-control" value="@Model.JiaojietimeName" name="Jiaojietime" id="Jiaojietime" readonly="readonly">
                                    </div>
                                    <input type="hidden" id="JiaojieId" name="JiaojieId" value="@id" />
                                </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">
                                            <select id="JiaojieType" class="form-control" name="JiaojieType" data-placeholder="选择 åºåˆ— ..." style="font-weight:normal;">
                                                <option value="" hassubinfo="true">请选择</option>
                                                @foreach (var item in JiaojieType)
                                                {
                                                    @if (!item.CodeSn.Equals(Model.JiaojieType))
                                                    {
                                                        <option value="@item.CodeSn" hassubinfo="true">
                                                            @item.Comments
                                                        </option>
                                                    }
                                                    else
                                                    {
                                                        <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                            @item.Comments
                                                        </option>
                                                    }
                                                }
                                            </select>
                                        </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-8 col-md-8">
                                            <input class="form-control" label="客户单位" name="Kehudanwei" id="Kehudanwei" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Kehudanwei">
                                        </div>
                                    </div>
                                    <div class="clearfix layer-area" style="padding-bottom:15px;">
                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">交接内容<i class="red">*</i></label>
                                        <div class="col-sm-8 col-md-8">
                                            <textarea class="form-control bt" id="JiaojieNeirong" name="JiaojieNeirong" title="备注" isempty="" maxlength="500" length="long">@Model.JiaojieNeirong</textarea>
                                        </div>
                                    </div>
                                </div>
                            </div>
                    </div>
                </div>
            </div>
        </div>
        <div class="wrapper wrapper-content" style="margin-top:0px"></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" data-bootstro-content="功能按钮:“保存”,“删除”">
                <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
                    <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">提交</span>
                </a>
            </div>
        </div>
    </form>
    <script type="text/javascript">
        var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95;
        $("#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"
        };
        $(".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();
                }
            });
        });
        // ä¿å­˜å²—位信息
        var savePosition = function () {
            if ($("#Jiaojietime").val() == '') {
                toastr.warning("交接时间不能为空");
                return;
            }
            if ($("#JiaojieType").val() == '') {
                toastr.warning("交接类型不能为空");
                return;
            }
            if ($.trim($("#JiaojieNeirong").val()) == '') {
                toastr.warning("交接内容不能为空");
                return;
            }
            //var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
            $.ajax({
                type: "POST",
                url: "/AdmAsk/SaveAskJiaojieDtl",
                dataType: "json",
                global: false,
                data: $('form').serializeArray(),
                success: function (data) {
                        if (data.Result) {
                            //  parent._afterSave(true);
                            parent.layer.msg('成功保存', { icon: 6 });
                            //window.location = "/Project/add?id=" + data.ReturnID;
                            try {
                                _pageAutoClose();//自动关闭页面方法
                            }
                            catch (err) {
                                parent._CloseTab1("/AdmAsk/EditAskJiaojie/");
                            }
                        }
                        else {
                            // toastr.error("失败");
                            parent.layer.msg(data.Message, { icon: 5 });
                        }
                },
                error: function () {
                    parent.layer.msg('失败', { icon: 5 });
                }
            });
        }
        function _pageAutoClose() {
            parent.window.chaxun();
            var index = parent.layer.getFrameIndex(window.name);
            parent.layer.isRefresh = true;
            parent.layer.closeAll('loading');
            parent.layer.close(index);
            return false;
        }
    </script>
</body>
</html>
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
@@ -131,6 +131,7 @@
                                        </select>
                                        <input type="hidden" id="Id" name="Id" value="@Model.Id" />
                                        <input type="hidden" id="Yixiang" name="Yixiang" value="@Model.Yixiang" />
                                    </div>
±íÐÞ¸Ä.sql
@@ -1,6 +1,323 @@
USE [zhengcaioa]
GO
/****** Object:  Table [dbo].[ADM_AskJiaojie]    Script Date: 2021/8/26 8:56:15 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
CREATE TABLE [dbo].[ADM_AskJiaojie](
    [Id] [nvarchar](50) NOT NULL,
    [CiZhiId] [nvarchar](50)  NULL,
    [Remark] [nvarchar](500) 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,
    [tittle] [nvarchar](50) NULL,
 CONSTRAINT [PK__AskJiaojie__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_AskJiaojie] ADD  DEFAULT ('D') FOR [shenpi_status]
GO
ALTER TABLE [dbo].[ADM_AskJiaojie] ADD  DEFAULT ('A') FOR [rec_status]
GO
ALTER TABLE [dbo].[ADM_AskJiaojie] ADD  DEFAULT ('1') FOR [creater]
GO
ALTER TABLE [dbo].[ADM_AskJiaojie] ADD  DEFAULT (getdate()) FOR [createtime]
GO
ALTER TABLE [dbo].[ADM_AskJiaojie] ADD  DEFAULT ('1') FOR [modifier]
GO
ALTER TABLE [dbo].[ADM_AskJiaojie] ADD  DEFAULT (getdate()) FOR [modifytime]
GO
USE [zhengcaioa]
GO
/****** Object:  Table [dbo].[ADM_AskJiaojieDtl]    Script Date: 2021/8/26 8:56:15 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
CREATE TABLE [dbo].[ADM_AskJiaojieDtl](
    [Id] [nvarchar](50) NOT NULL,
    [JiaojieId] [nvarchar](50)  NULL,
    [Jiaojietime] [datetime]   NULL,
    [JiaojieType] [nvarchar](50)  NULL,
    [Kehudanwei] [nvarchar](500) NULL,
    [JiaojieNeirong] [nvarchar](500) NULL,
    [JiaojieUserId] [nvarchar](50)  NULL,
    [JieShoutime] [datetime]   NULL,
    [jiaojie_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,
 CONSTRAINT [PK__AskJiaojieDtl__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_AskJiaojieDtl] ADD  DEFAULT ('D') FOR [jiaojie_status]
GO
ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD  DEFAULT ('A') FOR [rec_status]
GO
ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD  DEFAULT ('1') FOR [creater]
GO
ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD  DEFAULT (getdate()) FOR [createtime]
GO
ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD  DEFAULT ('1') FOR [modifier]
GO
ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD  DEFAULT (getdate()) FOR [modifytime]
GO
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