From fe1d552606aa8a989647ff12d7c124dd6ac5a1dd Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 07 七月 2021 15:07:00 +0800
Subject: [PATCH] 线下培训的订单
---
zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml | 6
zhengcaioa/Services/OrderBanciOrderService.cs | 250 ++++
zhengcaioa/DTO/ProjectDTO.cs | 2
zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml | 369 ++++++
zhengcaioa/zhengcaioa/Startup.cs | 4
zhengcaioa/Model/OrderBanci.cs | 23
zhengcaioa/IServices/IOrderBanciOrderService.cs | 21
zhengcaioa/Model/zhengcaioaContext.cs | 252 ++++
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 2
zhengcaioa/Model/OrderBanciOrder.cs | 29
zhengcaioa/DTO/IntentionVisitDTO.cs | 4
zhengcaioa/DTO/OrderBanciDTO.cs | 38
zhengcaioa/Services/OrderBanciDtlService.cs | 221 +++
zhengcaioa/Services/ProjectService.cs | 9
zhengcaioa/IServices/IOrderBanciService.cs | 21
zhengcaioa/Model/IntentionVisit.cs | 1
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs | 324 +++++
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml | 123 ++
zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml | 79 +
zhengcaioa/zhengcaioa/Views/OrderBanci/IndexDtl.cshtml | 69 +
zhengcaioa/zhengcaioa/Views/Project/Select.cshtml | 4
zhengcaioa/Model/OrderBanciDtl.cs | 23
zhengcaioa/Services/OrderBanciService.cs | 221 +++
表修改.sql | 232 +++
zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs | 9
zhengcaioa/DTO/OrderBanciOrderDTO.cs | 44
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs | 7
zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml | 4
zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml | 17
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 265 ++++
zhengcaioa/Services/IntentionVisitService.cs | 67
zhengcaioa/DTO/OrderBanciDtlDTO.cs | 30
zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml | 361 ++++++
zhengcaioa/IServices/IOrderBanciDtlService.cs | 20
zhengcaioa/Model/IntentionVisitDuanxin.cs | 19
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Duanxin.cshtml | 225 +++
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/print.cshtml | 123 ++
37 files changed, 3,482 insertions(+), 36 deletions(-)
diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index 72234ee..4363cff 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -206,6 +206,15 @@
CreateMap<LZhuanjiahuidum, LZhuanjiahuidumDTO>();
CreateMap<LZhuanjiahuidumDTO, LZhuanjiahuidum>();
+ CreateMap<OrderBanci, OrderBanciDTO>();
+ CreateMap<OrderBanciDTO, OrderBanci>();
+
+ CreateMap<OrderBanciDtl, OrderBanciDtlDTO>();
+ CreateMap<OrderBanciDtlDTO, OrderBanciDtl>();
+
+ CreateMap<OrderBanciOrder, OrderBanciOrderDTO>();
+ CreateMap<OrderBanciOrderDTO, OrderBanciOrder>();
+
}
}
}
diff --git a/zhengcaioa/DTO/IntentionVisitDTO.cs b/zhengcaioa/DTO/IntentionVisitDTO.cs
index e052dc0..a524127 100644
--- a/zhengcaioa/DTO/IntentionVisitDTO.cs
+++ b/zhengcaioa/DTO/IntentionVisitDTO.cs
@@ -35,7 +35,9 @@
public string Name { get; set; }
public string IsYwjl { get; set; }
-
+
+ public string DuanxinNeirong { get; set; }
+
}
public class IntentionVisitDTOSearch : SearchEntity
diff --git a/zhengcaioa/DTO/OrderBanciDTO.cs b/zhengcaioa/DTO/OrderBanciDTO.cs
new file mode 100644
index 0000000..e009079
--- /dev/null
+++ b/zhengcaioa/DTO/OrderBanciDTO.cs
@@ -0,0 +1,38 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+ public class OrderBanciDTO
+ {
+ public string Id { get; set; }
+ public string Banci { get; set; }
+ public DateTime? Shijian { get; set; }
+ public string ShijianName { get; set; }
+ public DateTime? Shijianend { get; set; }
+ public string ShijianendName { get; set; }
+ public string Didian { 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 List<OrderBanciDtlDTO> orderBanciDtlDTOs{ get; set; }
+ public string Mingcheng { get; set; }
+
+ public int? Renshu { get; set; }
+
+ }
+
+ public class OrderBanciDTOSearch : SearchEntity
+ {
+ public string Banci { get; set; }
+
+ public string Shijian { get; set; }
+
+ public string Didian { get; set; }
+
+ public string Createtime { get; set; }
+ }
+}
diff --git a/zhengcaioa/DTO/OrderBanciDtlDTO.cs b/zhengcaioa/DTO/OrderBanciDtlDTO.cs
new file mode 100644
index 0000000..d397ea4
--- /dev/null
+++ b/zhengcaioa/DTO/OrderBanciDtlDTO.cs
@@ -0,0 +1,30 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+ public class OrderBanciDtlDTO
+ {
+ public string Id { get; set; }
+ public string Shangxiawu { get; set; }
+ public string ShangxiawuName { get; set; }
+ public string Shijian { get; set; }
+ public string Shixiamg { get; set; }
+ public string Zhujiangren { 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 OrderBanciId { get; set; }
+ public int? Sort { get; set; }
+ }
+
+ public class OrderBanciDtlDTOSearch : SearchEntity
+ {
+
+ public string OrderBanciId { get; set; }
+ public string Shixiamg { get; set; }
+ }
+}
diff --git a/zhengcaioa/DTO/OrderBanciOrderDTO.cs b/zhengcaioa/DTO/OrderBanciOrderDTO.cs
new file mode 100644
index 0000000..6e7f266
--- /dev/null
+++ b/zhengcaioa/DTO/OrderBanciOrderDTO.cs
@@ -0,0 +1,44 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+ public class OrderBanciOrderDTO
+ {
+ public string Id { get; set; }
+ public DateTime Baomingtime { get; set; }
+ public string BaomingtimeName { get; set; }
+ public string BanciId { get; set; }
+ public string Peixunbanci { get; set; }
+ public string KechengleixingId { get; set; }
+ public string Kechengleixing { get; set; }
+ public string PersonId { get; set; }
+ public string Xingming { get; set; }
+ public string Lianxidianhua { get; set; }
+ public decimal? Xuefei { get; set; }
+ public int? Baomingrenshu { get; set; }
+ public decimal? Jine { 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 Shenfenzheng { get; set; }
+ }
+
+ public class OrderBanciOrderDTOSearch : SearchEntity
+ {
+ public string Baomingtime { get; set; }
+
+ public string Peixunbanci { get; set; }
+
+ public string Kechengleixing { get; set; }
+
+ public string Xingming { get; set; }
+ public string Lianxidianhua { get; set; }
+
+ public string BanciId { get; set; }
+ }
+}
diff --git a/zhengcaioa/DTO/ProjectDTO.cs b/zhengcaioa/DTO/ProjectDTO.cs
index a13e86a..8c1cbb4 100644
--- a/zhengcaioa/DTO/ProjectDTO.cs
+++ b/zhengcaioa/DTO/ProjectDTO.cs
@@ -120,5 +120,7 @@
public string Shuliang { get; set; }
+ public string Fenchadayu { get; set; }
+
}
}
diff --git a/zhengcaioa/IServices/IOrderBanciDtlService.cs b/zhengcaioa/IServices/IOrderBanciDtlService.cs
new file mode 100644
index 0000000..bd93441
--- /dev/null
+++ b/zhengcaioa/IServices/IOrderBanciDtlService.cs
@@ -0,0 +1,20 @@
+锘縰sing DTO;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+
+namespace IServices
+{
+ public interface IOrderBanciDtlService
+ {
+ ResultEntity save(OrderBanciDtlDTO dto);
+
+ OrderBanciDtlDTO Get(string id);
+
+ ResultDataEntity<OrderBanciDtlDTO> SearchByPaging(OrderBanciDtlDTOSearch searchEntity);
+ ResultEntity ModifyStatus(string id, string userid);
+
+ List<OrderBanciDtlDTO> GetList(string OrderBanciId = "");
+ }
+}
diff --git a/zhengcaioa/IServices/IOrderBanciOrderService.cs b/zhengcaioa/IServices/IOrderBanciOrderService.cs
new file mode 100644
index 0000000..11ae723
--- /dev/null
+++ b/zhengcaioa/IServices/IOrderBanciOrderService.cs
@@ -0,0 +1,21 @@
+锘縰sing DTO;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+
+namespace IServices
+{
+ public interface IOrderBanciOrderService
+ {
+ ResultEntity save(OrderBanciOrderDTO dto);
+
+ OrderBanciOrderDTO Get(string id);
+
+ ResultDataEntity<OrderBanciOrderDTO> SearchByPaging(OrderBanciOrderDTOSearch searchEntity);
+
+ ResultEntity ModifyStatus(string id, string userid);
+
+ List<OrderBanciOrderDTO> GetList(string[] id);
+ }
+}
diff --git a/zhengcaioa/IServices/IOrderBanciService.cs b/zhengcaioa/IServices/IOrderBanciService.cs
new file mode 100644
index 0000000..f5738a0
--- /dev/null
+++ b/zhengcaioa/IServices/IOrderBanciService.cs
@@ -0,0 +1,21 @@
+锘縰sing DTO;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+
+namespace IServices
+{
+ public interface IOrderBanciService
+ {
+ ResultEntity save(OrderBanciDTO dto);
+
+ OrderBanciDTO Get(string id);
+
+ ResultDataEntity<OrderBanciDTO> SearchByPaging(OrderBanciDTOSearch searchEntity);
+
+ ResultEntity ModifyStatus(string id, string userid);
+
+ List<OrderBanciDTO> GetList();
+ }
+}
diff --git a/zhengcaioa/Model/IntentionVisit.cs b/zhengcaioa/Model/IntentionVisit.cs
index b945a4e..29b6e3f 100644
--- a/zhengcaioa/Model/IntentionVisit.cs
+++ b/zhengcaioa/Model/IntentionVisit.cs
@@ -23,5 +23,6 @@
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+ public string DuanxinNeirong { get; set; }
}
}
diff --git a/zhengcaioa/Model/IntentionVisitDuanxin.cs b/zhengcaioa/Model/IntentionVisitDuanxin.cs
new file mode 100644
index 0000000..463a1e1
--- /dev/null
+++ b/zhengcaioa/Model/IntentionVisitDuanxin.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class IntentionVisitDuanxin
+ {
+ public string Id { get; set; }
+ public string DuanxinTitle { get; set; }
+ public string DuanxinNeirong { 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; }
+ }
+}
diff --git a/zhengcaioa/Model/OrderBanci.cs b/zhengcaioa/Model/OrderBanci.cs
new file mode 100644
index 0000000..58b827a
--- /dev/null
+++ b/zhengcaioa/Model/OrderBanci.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class OrderBanci
+ {
+ public string Id { get; set; }
+ public string Banci { get; set; }
+ public DateTime? Shijian { get; set; }
+ public DateTime? Shijianend { get; set; }
+ public string Didian { 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 Mingcheng { get; set; }
+ public int? Renshu { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/OrderBanciDtl.cs b/zhengcaioa/Model/OrderBanciDtl.cs
new file mode 100644
index 0000000..c16deb8
--- /dev/null
+++ b/zhengcaioa/Model/OrderBanciDtl.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class OrderBanciDtl
+ {
+ public string Id { get; set; }
+ public string OrderBanciId { get; set; }
+ public string Shangxiawu { get; set; }
+ public string Shijian { get; set; }
+ public string Shixiamg { get; set; }
+ public string Zhujiangren { get; set; }
+ public int? Sort { 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; }
+ }
+}
diff --git a/zhengcaioa/Model/OrderBanciOrder.cs b/zhengcaioa/Model/OrderBanciOrder.cs
new file mode 100644
index 0000000..2490bfa
--- /dev/null
+++ b/zhengcaioa/Model/OrderBanciOrder.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class OrderBanciOrder
+ {
+ public string Id { get; set; }
+ public DateTime Baomingtime { get; set; }
+ public string BanciId { get; set; }
+ public string Peixunbanci { get; set; }
+ public string KechengleixingId { get; set; }
+ public string Kechengleixing { get; set; }
+ public string PersonId { get; set; }
+ public string Xingming { get; set; }
+ public string Lianxidianhua { get; set; }
+ public decimal? Xuefei { get; set; }
+ public int? Baomingrenshu { get; set; }
+ public decimal? Jine { 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 Shenfenzheng { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 4905e17..cda5db5 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -67,9 +67,13 @@
public virtual DbSet<IntentionCustomer> IntentionCustomers { get; set; }
public virtual DbSet<IntentionOrder> IntentionOrders { get; set; }
public virtual DbSet<IntentionVisit> IntentionVisits { get; set; }
+ public virtual DbSet<IntentionVisitDuanxin> IntentionVisitDuanxins { get; set; }
public virtual DbSet<Liaotian> Liaotians { get; set; }
public virtual DbSet<LZhuanjiahuidum> LZhuanjiahuida { get; set; }
public virtual DbSet<Oayouhui> Oayouhuis { get; set; }
+ public virtual DbSet<OrderBanci> OrderBancis { get; set; }
+ public virtual DbSet<OrderBanciDtl> OrderBanciDtls { get; set; }
+ public virtual DbSet<OrderBanciOrder> OrderBanciOrders { get; set; }
public virtual DbSet<PltAuth> PltAuths { get; set; }
public virtual DbSet<PltPage> PltPages { get; set; }
public virtual DbSet<PltRole> PltRoles { get; set; }
@@ -2180,7 +2184,7 @@
.HasComment("浼氳垂");
entity.Property(e => e.MemberAuthority)
- .HasMaxLength(100)
+ .HasMaxLength(500)
.HasColumnName("member_authority")
.HasComment("浼氬憳鏉冮檺");
@@ -3163,6 +3167,10 @@
.HasColumnName("createtime")
.HasDefaultValueSql("(getdate())");
+ entity.Property(e => e.DuanxinNeirong)
+ .HasMaxLength(500)
+ .HasColumnName("duanxin_neirong");
+
entity.Property(e => e.Jdr)
.HasMaxLength(500)
.HasColumnName("jdr")
@@ -3230,6 +3238,49 @@
.HasMaxLength(50)
.HasColumnName("zw")
.HasComment("鑱屽姟");
+ });
+
+ modelBuilder.Entity<IntentionVisitDuanxin>(entity =>
+ {
+ entity.ToTable("IntentionVisit_duanxin");
+
+ 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.DuanxinNeirong)
+ .HasMaxLength(500)
+ .HasColumnName("duanxin_neirong");
+
+ entity.Property(e => e.DuanxinTitle)
+ .HasMaxLength(50)
+ .HasColumnName("duanxin_title");
+
+ 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<Liaotian>(entity =>
@@ -3408,6 +3459,205 @@
.HasComment("浼樻儬绫诲瀷");
});
+ modelBuilder.Entity<OrderBanci>(entity =>
+ {
+ entity.ToTable("order_banci");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Mingcheng)
+ .HasMaxLength(100)
+ .HasColumnName("mingcheng");
+
+ entity.Property(e => e.Banci)
+ .HasMaxLength(100)
+ .HasColumnName("banci");
+
+ 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.Didian)
+ .HasMaxLength(500)
+ .HasColumnName("didian");
+
+ 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.Renshu)
+ .HasColumnName("renshu");
+
+ entity.Property(e => e.Shijian)
+ .HasColumnType("datetime")
+ .HasColumnName("shijian");
+
+ entity.Property(e => e.Shijianend)
+ .HasColumnType("datetime")
+ .HasColumnName("shijianend");
+ });
+
+ modelBuilder.Entity<OrderBanciDtl>(entity =>
+ {
+ entity.ToTable("order_banci_dtl");
+
+ 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.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.OrderBanciId)
+ .HasMaxLength(50)
+ .HasColumnName("order_banci_id");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.Shangxiawu)
+ .HasMaxLength(100)
+ .HasColumnName("shangxiawu");
+
+ entity.Property(e => e.Shijian)
+ .HasMaxLength(100)
+ .HasColumnName("shijian");
+
+ entity.Property(e => e.Shixiamg)
+ .HasMaxLength(500)
+ .HasColumnName("shixiamg");
+
+ entity.Property(e => e.Sort)
+ .HasColumnName("sort")
+ .HasDefaultValueSql("((0))");
+
+ entity.Property(e => e.Zhujiangren)
+ .HasMaxLength(100)
+ .HasColumnName("zhujiangren");
+ });
+
+ modelBuilder.Entity<OrderBanciOrder>(entity =>
+ {
+ entity.ToTable("order_banci_order");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.BanciId)
+ .HasMaxLength(50)
+ .HasColumnName("banci_id");
+
+ entity.Property(e => e.Baomingrenshu).HasColumnName("baomingrenshu");
+
+ entity.Property(e => e.Baomingtime)
+ .HasColumnType("datetime")
+ .HasColumnName("baomingtime");
+
+ 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.Jine)
+ .HasColumnType("money")
+ .HasColumnName("jine");
+
+ entity.Property(e => e.Kechengleixing)
+ .HasMaxLength(100)
+ .HasColumnName("kechengleixing");
+
+ entity.Property(e => e.KechengleixingId)
+ .HasMaxLength(50)
+ .HasColumnName("kechengleixing_id");
+
+ entity.Property(e => e.Lianxidianhua)
+ .HasMaxLength(100)
+ .HasColumnName("lianxidianhua");
+
+ 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.Peixunbanci)
+ .HasMaxLength(100)
+ .HasColumnName("peixunbanci");
+
+ entity.Property(e => e.PersonId)
+ .HasMaxLength(100)
+ .HasColumnName("person_id");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.Shenfenzheng)
+ .HasMaxLength(100)
+ .HasColumnName("shenfenzheng");
+
+ entity.Property(e => e.Xingming)
+ .HasMaxLength(100)
+ .HasColumnName("xingming");
+
+ entity.Property(e => e.Xuefei)
+ .HasColumnType("money")
+ .HasColumnName("xuefei");
+ });
+
modelBuilder.Entity<PltAuth>(entity =>
{
entity.ToTable("plt_auth");
diff --git a/zhengcaioa/Services/IntentionVisitService.cs b/zhengcaioa/Services/IntentionVisitService.cs
index 62ad494..05b58f5 100644
--- a/zhengcaioa/Services/IntentionVisitService.cs
+++ b/zhengcaioa/Services/IntentionVisitService.cs
@@ -60,6 +60,7 @@
updateproject.RecStatus = entity.RecStatus;
updateproject.Modifier = entity.Modifier;
updateproject.Modifytime = entity.Modifytime;
+ updateproject.DuanxinNeirong = entity.DuanxinNeirong;
}
@@ -134,19 +135,46 @@
var query = (from a in _context.IntentionVisits
join b in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "visType")
on a.VisType equals b.CodeSn
+ into bzsssss
+ from bzzzzz in bzsssss.DefaultIfEmpty()
+
join c in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jtype")
on a.Jtype equals c.CodeSn
+ into czsssss
+ from czzzzz in czsssss.DefaultIfEmpty()
+
join d in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "zw")
on a.Zw equals d.CodeSn
+ into dzsssss
+ from dzzzzz in dzsssss.DefaultIfEmpty()
+
join e in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "yx")
on a.Yx equals e.CodeSn
+ into ezsssss
+ from ezzzzz in ezsssss.DefaultIfEmpty()
+
join f in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jy")
on a.Jy equals f.CodeSn
+ into fzsssss
+ from fzzzzz in fzsssss.DefaultIfEmpty()
+
join zz in _context.IntentionCustomers.Where(x => x.RecStatus == "A")
on a.Viscustomer equals zz.Id
- join g in _context.Areas on zz.Sheng equals g.CodeId
- join h in _context.Areas on zz.City equals h.CodeId
- join i in _context.Areas on zz.AreaId equals i.CodeId
+ into zzzsssss
+ from zzzzzzz in zzzsssss.DefaultIfEmpty()
+
+ //join g in _context.Areas on zzzzzzz.Sheng equals g.CodeId
+ //into gzsssss
+ //from gzzzzz in gzsssss.DefaultIfEmpty()
+
+ //join h in _context.Areas on zzzzzzz.City equals h.CodeId
+ //into hzsssss
+ //from hzzzzz in hzsssss.DefaultIfEmpty()
+
+ //join i in _context.Areas on zzzzzzz.AreaId equals i.CodeId
+ //into izsssss
+ //from izzzzz in izsssss.DefaultIfEmpty()
+
join zzz in _context.PltUsers.Where(x => x.RecStatus == "A")
on a.Creater equals zzz.Id
@@ -158,31 +186,31 @@
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.Vistime) || (a.Vistime >= Vistimestart && a.Vistime <= Vistimeend))
- && (string.IsNullOrWhiteSpace(searchEntity.Name) || zz.Name.Contains(searchEntity.Name.Trim()))
- && (string.IsNullOrWhiteSpace(searchEntity.Khly) || zz.Khly == searchEntity.Khly.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.Hyfl) || zz.Hyfl == searchEntity.Hyfl.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.Khlx) || zz.Khlx == searchEntity.Khlx.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || zz.Ywjl == searchEntity.Ywjl.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || zz.Sheng == searchEntity.Sheng.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.City) || zz.City == searchEntity.City.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || zz.AreaId == searchEntity.AreaId.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Name) || zzzzzzz.Name.Contains(searchEntity.Name.Trim()))
+ && (string.IsNullOrWhiteSpace(searchEntity.Khly) || zzzzzzz.Khly == searchEntity.Khly.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Hyfl) || zzzzzzz.Hyfl == searchEntity.Hyfl.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Khlx) || zzzzzzz.Khlx == searchEntity.Khlx.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || zzzzzzz.Ywjl == searchEntity.Ywjl.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || zzzzzzz.Sheng == searchEntity.Sheng.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.City) || zzzzzzz.City == searchEntity.City.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || zzzzzzz.AreaId == searchEntity.AreaId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Viscustomer) || a.Viscustomer == searchEntity.Viscustomer.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.Creater) || zz.Creater == searchEntity.Creater.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.Creater) || a.Creater == searchEntity.Creater.Trim())
select new IntentionVisitDTO
{
Id = a.Id,
Vistime = a.Vistime,
VisType = a.VisType,
Viscustomer = a.Viscustomer,
- Name = zz.Name,
+ Name = zzzzzzz.Name,
Jtype = a.Jtype,
Jdr = a.Jdr,
- ShengName = g.Name + "-" + h.Name + "-" + i.Name,
- VisTypeName = b.Comments,
- JtypeName = c.Comments,
- ZwName = d.Comments,
- YxName = e.Comments,
- JyName = f.Comments,
+ //ShengName = gzzzzz.Name + "-" + hzzzzz.Name + "-" + izzzzz.Name,
+ VisTypeName = bzzzzz.Comments,
+ JtypeName = czzzzz.Comments,
+ ZwName = dzzzzz.Comments,
+ YxName = ezzzzz.Comments,
+ JyName = fzzzzz.Comments,
Zw = a.Zw,
Talk = a.Talk,
Khfk = a.Khfk,
@@ -197,6 +225,7 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
VistimeName = a.Vistime.ToString("yyyy-MM-dd"),
+ DuanxinNeirong = a.DuanxinNeirong,
}
).OrderByDescending(x => x.Vistime).ToList();
diff --git a/zhengcaioa/Services/OrderBanciDtlService.cs b/zhengcaioa/Services/OrderBanciDtlService.cs
new file mode 100644
index 0000000..c91993e
--- /dev/null
+++ b/zhengcaioa/Services/OrderBanciDtlService.cs
@@ -0,0 +1,221 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AutoMapper;
+using DTO;
+using IServices;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using zhengcaioa.Models;
+
+
+
+namespace Services
+{
+ public class OrderBanciDtlService: IOrderBanciDtlService
+ {
+ private readonly zhengcaioaContext _context;
+ private readonly IMapper _mapper;
+ public OrderBanciDtlService(zhengcaioaContext context, IMapper mapper)
+ {
+ _context = context;
+ _mapper = mapper;
+ }
+ public ResultEntity save(OrderBanciDtlDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ var entity = _mapper.Map<OrderBanciDtl>(dto);
+
+
+ if (String.IsNullOrEmpty(entity.Id))
+ {
+ entity.Id = Guid.NewGuid().ToString();
+ dto.Id = entity.Id;
+ _context.OrderBanciDtls.Add(entity);
+ }
+ else
+ {
+ var updateproject = _context.OrderBanciDtls.Find(entity.Id);
+
+ updateproject.Shangxiawu = entity.Shangxiawu;
+ updateproject.Shijian = entity.Shijian;
+
+ updateproject.Shixiamg = entity.Shixiamg;
+ updateproject.Zhujiangren = entity.Zhujiangren;
+
+ updateproject.RecStatus = entity.RecStatus;
+ updateproject.Modifier = entity.Modifier;
+ updateproject.Modifytime = entity.Modifytime;
+ updateproject.Sort = entity.Sort;
+ updateproject.OrderBanciId = entity.OrderBanciId;
+
+ }
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = entity.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+ public OrderBanciDtlDTO Get(string id)
+ {
+
+ var entity = _context.OrderBanciDtls.Find(id);
+
+ if (entity.RecStatus != "A")
+ {
+ entity = new OrderBanciDtl();
+ }
+
+ var result = _mapper.Map<OrderBanciDtlDTO>(entity);
+
+
+ return result;
+ }
+
+ public ResultDataEntity<OrderBanciDtlDTO> SearchByPaging(OrderBanciDtlDTOSearch searchEntity)
+ {
+
+
+
+ ResultDataEntity<OrderBanciDtlDTO> data = new ResultDataEntity<OrderBanciDtlDTO>();
+ List<OrderBanciDtlDTO> list = new List<OrderBanciDtlDTO>();
+
+
+
+ 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"
+ 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
+ }
+ );
+
+ ///OrderBanciDtls
+ ///
+
+
+
+
+ var query = (from a in _context.OrderBanciDtls
+
+ join d in listCode.Where(x => x.CodeTable == "order_banci_dtl" && x.CodeField == "shangxiawu")
+ on a.Shangxiawu equals d.CodeSn
+ into dzsssss
+ from dzzzzz in dzsssss.DefaultIfEmpty()
+
+
+ where a.RecStatus == "A"
+
+
+ && (string.IsNullOrWhiteSpace(searchEntity.OrderBanciId) || a.OrderBanciId == searchEntity.OrderBanciId.Trim())
+
+ && (string.IsNullOrWhiteSpace(searchEntity.Shixiamg) || a.Shixiamg.Contains(searchEntity.Shixiamg.Trim()))
+
+
+
+ select new OrderBanciDtlDTO
+ {
+ Id = a.Id,
+ OrderBanciId = a.OrderBanciId,
+ Shangxiawu = a.Shangxiawu,
+ Shijian = a.Shijian,
+ Shixiamg = a.Shixiamg,
+ Zhujiangren = a.Zhujiangren,
+ Sort = a.Sort,
+ ShangxiawuName = dzzzzz.Comments,
+
+
+
+
+
+ Creater = a.Creater,
+ Createtime = a.Createtime,
+
+ RecStatus = a.RecStatus,
+ Modifier = a.Modifier,
+ Modifytime = a.Modifytime,
+
+ }
+ ).OrderBy(x => x.Sort).ToList();
+
+
+
+ if (searchEntity.totalrows == 0)
+ searchEntity.totalrows = query.Count();
+ var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.LoadData(searchEntity, lianlist);
+ return data;
+ }
+
+
+
+
+
+
+
+ /// <summary>
+ /// 淇敼涓昏〃鐘舵��
+ /// </summary>
+ /// <param name="id">涓籭d</param>
+ /// <param name="userid">鐢ㄦ埛</param>
+ /// <returns></returns>
+ public ResultEntity ModifyStatus(string id, string userid)
+ {
+ ResultEntity result = new ResultEntity();
+ result.Result = true;
+
+ var model = _context.OrderBanciDtls.Find(id);
+ if (model != null)
+ {
+ model.RecStatus = "D";
+ model.Modifier = userid;
+ model.Modifytime = DateTime.Now;
+ _context.SaveChanges();
+ }
+
+ return result;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋湁鏁堣鑹�
+ /// </summary>
+ /// <returns></returns>
+ public List<OrderBanciDtlDTO> GetList(string OrderBanciId = "")
+ {
+
+
+ var listRole = _context.OrderBanciDtls.Where(r => r.RecStatus == "A").OrderBy(x => x.Sort).ToList();
+ if (!string.IsNullOrEmpty(OrderBanciId))
+ {
+ listRole = listRole.Where(x => x.OrderBanciId == OrderBanciId).ToList();
+ }
+
+ var list = _mapper.Map<List<OrderBanciDtlDTO>>(listRole);
+ return list;
+ }
+ }
+}
diff --git a/zhengcaioa/Services/OrderBanciOrderService.cs b/zhengcaioa/Services/OrderBanciOrderService.cs
new file mode 100644
index 0000000..08362c8
--- /dev/null
+++ b/zhengcaioa/Services/OrderBanciOrderService.cs
@@ -0,0 +1,250 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AutoMapper;
+using DTO;
+using IServices;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using zhengcaioa.Models;
+
+
+
+namespace Services
+{
+ public class OrderBanciOrderService: IOrderBanciOrderService
+ {
+ private readonly zhengcaioaContext _context;
+ private readonly IMapper _mapper;
+ public OrderBanciOrderService(zhengcaioaContext context, IMapper mapper)
+ {
+ _context = context;
+ _mapper = mapper;
+ }
+ public ResultEntity save(OrderBanciOrderDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ var entity = _mapper.Map<OrderBanciOrder>(dto);
+
+
+ if (String.IsNullOrEmpty(entity.Id))
+ {
+ entity.Id = Guid.NewGuid().ToString();
+ dto.Id = entity.Id;
+ _context.OrderBanciOrders.Add(entity);
+ }
+ else
+ {
+ var updateproject = _context.OrderBanciOrders.Find(entity.Id);
+
+ updateproject.Baomingtime = entity.Baomingtime;
+ updateproject.BanciId = entity.BanciId;
+
+ updateproject.Peixunbanci = entity.Peixunbanci;
+ updateproject.KechengleixingId = entity.KechengleixingId;
+ updateproject.Kechengleixing = entity.Kechengleixing;
+ updateproject.PersonId = entity.PersonId;
+ updateproject.Xingming = entity.Xingming;
+ updateproject.Lianxidianhua = entity.Lianxidianhua;
+ updateproject.Xuefei = entity.Xuefei;
+ updateproject.Baomingrenshu = entity.Baomingrenshu;
+
+
+ updateproject.RecStatus = entity.RecStatus;
+ updateproject.Modifier = entity.Modifier;
+ updateproject.Modifytime = entity.Modifytime;
+ updateproject.Shenfenzheng = entity.Shenfenzheng;
+ }
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = entity.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+ public OrderBanciOrderDTO Get(string id)
+ {
+
+ var entity = _context.OrderBanciOrders.Find(id);
+
+ if (entity.RecStatus != "A")
+ {
+ entity = new OrderBanciOrder();
+ }
+
+ var result = _mapper.Map<OrderBanciOrderDTO>(entity);
+
+
+ return result;
+ }
+
+ public ResultDataEntity<OrderBanciOrderDTO> SearchByPaging(OrderBanciOrderDTOSearch searchEntity)
+ {
+
+
+
+ ResultDataEntity<OrderBanciOrderDTO> data = new ResultDataEntity<OrderBanciOrderDTO>();
+ List<OrderBanciOrderDTO> list = new List<OrderBanciOrderDTO>();
+
+
+
+ //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"
+ // 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
+ // }
+ //);
+
+ ///OrderBanciOrders
+ ///
+ DateTime Baomingtimestart = DateTime.Now;
+ DateTime Baomingtimeend = DateTime.Now;
+ if (!string.IsNullOrWhiteSpace(searchEntity.Baomingtime))
+ {
+ string[] Baomingtimes = searchEntity.Baomingtime.Split("|");
+ DateTime.TryParse(Baomingtimes[0], out Baomingtimestart);
+ DateTime.TryParse(Baomingtimes[1], out Baomingtimeend);
+ Baomingtimeend = Baomingtimeend.AddDays(1);
+ }
+
+ var query = (from a in _context.OrderBanciOrders
+
+
+
+
+ where a.RecStatus == "A"
+ && (string.IsNullOrWhiteSpace(searchEntity.Baomingtime) || (a.Baomingtime >= Baomingtimestart && a.Baomingtime <= Baomingtimeend))
+ && (string.IsNullOrWhiteSpace(searchEntity.Peixunbanci) || a.Peixunbanci.Contains(searchEntity.Peixunbanci.Trim()))
+
+ && (string.IsNullOrWhiteSpace(searchEntity.Kechengleixing) || a.KechengleixingId == searchEntity.Kechengleixing.Trim())
+
+ && (string.IsNullOrWhiteSpace(searchEntity.Xingming) || a.Xingming.Contains(searchEntity.Xingming.Trim()))
+
+ && (string.IsNullOrWhiteSpace(searchEntity.Lianxidianhua) || a.Lianxidianhua.Contains(searchEntity.Lianxidianhua.Trim()))
+
+ && (string.IsNullOrWhiteSpace(searchEntity.BanciId) || a.BanciId == searchEntity.BanciId.Trim())
+
+
+
+
+
+
+ select new OrderBanciOrderDTO
+ {
+ Id = a.Id,
+
+ Baomingtime = a.Baomingtime,
+ BaomingtimeName = a.Baomingtime.ToString("yyyy-MM-dd"),
+ BanciId = a.BanciId,
+ Peixunbanci = a.Peixunbanci,
+
+
+ KechengleixingId = a.KechengleixingId,
+
+ Kechengleixing = a.Kechengleixing,
+
+ PersonId = a.PersonId,
+ Xingming = a.Xingming,
+ Lianxidianhua = a.Lianxidianhua,
+ Xuefei = a.Xuefei??0,
+ Baomingrenshu = a.Baomingrenshu??0,
+ Jine = a.Jine??0,
+
+
+ Creater = a.Creater,
+ Createtime = a.Createtime,
+
+ RecStatus = a.RecStatus,
+ Modifier = a.Modifier,
+ Modifytime = a.Modifytime,
+ Shenfenzheng = a.Shenfenzheng,
+
+ }
+ ).OrderByDescending(x => x.Baomingtime).ThenByDescending(x=>x.Modifytime).ToList();
+
+
+
+ if (searchEntity.totalrows == 0)
+ searchEntity.totalrows = query.Count();
+ var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.LoadData(searchEntity, lianlist);
+ return data;
+ }
+
+
+
+
+
+
+ /// <summary>
+ /// 淇敼涓昏〃鐘舵��
+ /// </summary>
+ /// <param name="id">涓籭d</param>
+ /// <param name="userid">鐢ㄦ埛</param>
+ /// <returns></returns>
+ public ResultEntity ModifyStatus(string id, string userid)
+ {
+ ResultEntity result = new ResultEntity();
+ result.Result = true;
+
+ var model = _context.OrderBanciOrders.Find(id);
+ if (model != null)
+ {
+ model.RecStatus = "D";
+ model.Modifier = userid;
+ model.Modifytime = DateTime.Now;
+ _context.SaveChanges();
+ }
+
+ return result;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋湁鏁堣鑹�
+ /// </summary>
+ /// <returns></returns>
+ public List<OrderBanciOrderDTO> GetList(string[] id)
+ {
+
+ List<OrderBanciOrderDTO> result = new List<OrderBanciOrderDTO>();
+
+
+ if (id != null)
+ {
+ var listRole = _context.OrderBanciOrders.Where(r => r.RecStatus == "A" && id.Contains(r.Id)).ToList();
+
+
+
+ result = _mapper.Map<List<OrderBanciOrderDTO>>(listRole);
+ }
+
+
+
+ return result;
+ }
+ }
+}
diff --git a/zhengcaioa/Services/OrderBanciService.cs b/zhengcaioa/Services/OrderBanciService.cs
new file mode 100644
index 0000000..ce15e69
--- /dev/null
+++ b/zhengcaioa/Services/OrderBanciService.cs
@@ -0,0 +1,221 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AutoMapper;
+using DTO;
+using IServices;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using zhengcaioa.Models;
+
+
+
+namespace Services
+{
+ public class OrderBanciService: IOrderBanciService
+ {
+ private readonly zhengcaioaContext _context;
+ private readonly IMapper _mapper;
+ public OrderBanciService(zhengcaioaContext context, IMapper mapper)
+ {
+ _context = context;
+ _mapper = mapper;
+ }
+ public ResultEntity save(OrderBanciDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ var entity = _mapper.Map<OrderBanci>(dto);
+
+
+ if (String.IsNullOrEmpty(entity.Id))
+ {
+ entity.Id = Guid.NewGuid().ToString();
+ dto.Id = entity.Id;
+ _context.OrderBancis.Add(entity);
+ }
+ else
+ {
+ var updateproject = _context.OrderBancis.Find(entity.Id);
+
+ updateproject.Banci = entity.Banci;
+ updateproject.Shijian = entity.Shijian;
+
+ updateproject.Shijianend = entity.Shijianend;
+ updateproject.Didian = entity.Didian;
+
+ updateproject.RecStatus = entity.RecStatus;
+ updateproject.Modifier = entity.Modifier;
+ updateproject.Modifytime = entity.Modifytime;
+ updateproject.Mingcheng = entity.Mingcheng;
+ updateproject.Renshu = entity.Renshu;
+ }
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = entity.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+ public OrderBanciDTO Get(string id)
+ {
+
+ var entity = _context.OrderBancis.Find(id);
+
+ if (entity.RecStatus != "A")
+ {
+ entity = new OrderBanci();
+ }
+
+ var result = _mapper.Map<OrderBanciDTO>(entity);
+
+
+ return result;
+ }
+
+ public ResultDataEntity<OrderBanciDTO> SearchByPaging(OrderBanciDTOSearch searchEntity)
+ {
+
+
+
+ ResultDataEntity<OrderBanciDTO> data = new ResultDataEntity<OrderBanciDTO>();
+ List<OrderBanciDTO> list = new List<OrderBanciDTO>();
+
+
+
+ //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"
+ // 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
+ // }
+ //);
+
+ ///OrderBancis
+ ///
+ DateTime Shijianstart = DateTime.Now;
+ DateTime Shijianend = DateTime.Now;
+ if (!string.IsNullOrWhiteSpace(searchEntity.Shijian))
+ {
+ string[] Shijians = searchEntity.Shijian.Split("|");
+ DateTime.TryParse(Shijians[0], out Shijianstart);
+ DateTime.TryParse(Shijians[1], out Shijianend);
+ //Shijianend = Shijianend.AddDays(1);
+ }
+
+ var query = (from a in _context.OrderBancis
+
+
+
+
+ where a.RecStatus == "A"
+
+ && (string.IsNullOrWhiteSpace(searchEntity.Banci) || a.Banci.Contains(searchEntity.Banci.Trim()))
+ && (string.IsNullOrWhiteSpace(searchEntity.Shijian) || (a.Shijian >= Shijianstart && a.Shijian <= Shijianend))
+ && (string.IsNullOrWhiteSpace(searchEntity.Didian) || a.Didian.Contains(searchEntity.Didian.Trim()))
+
+ && (string.IsNullOrWhiteSpace(searchEntity.Createtime) || a.Shijian >= DateTime.Parse(searchEntity.Createtime) )
+
+
+
+
+ select new OrderBanciDTO
+ {
+ Id = a.Id,
+ Banci = a.Banci,
+ Shijian = a.Shijian,
+ ShijianName = a.Shijian.HasValue? a.Shijian.Value.ToString("yyyy-MM-dd HH:mm"):"",
+ Didian = a.Didian,
+ Shijianend = a.Shijianend,
+ ShijianendName = a.Shijianend.HasValue ? a.Shijianend.Value.ToString("yyyy-MM-dd HH:mm") : "",
+
+ Mingcheng = a.Mingcheng,
+
+ Renshu = a.Renshu??0,
+
+
+ Creater = a.Creater,
+ Createtime = a.Createtime,
+
+ RecStatus = a.RecStatus,
+ Modifier = a.Modifier,
+ Modifytime = a.Modifytime,
+
+ }
+ ).OrderByDescending(x => x.Modifytime).ToList();
+
+
+
+ if (searchEntity.totalrows == 0)
+ searchEntity.totalrows = query.Count();
+ var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.LoadData(searchEntity, lianlist);
+ return data;
+ }
+
+
+
+
+
+
+ /// <summary>
+ /// 淇敼涓昏〃鐘舵��
+ /// </summary>
+ /// <param name="id">涓籭d</param>
+ /// <param name="userid">鐢ㄦ埛</param>
+ /// <returns></returns>
+ public ResultEntity ModifyStatus(string id, string userid)
+ {
+ ResultEntity result = new ResultEntity();
+ result.Result = true;
+
+ var model = _context.OrderBancis.Find(id);
+ if (model != null)
+ {
+ model.RecStatus = "D";
+ model.Modifier = userid;
+ model.Modifytime = DateTime.Now;
+ _context.SaveChanges();
+ }
+
+ return result;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋湁鏁堣鑹�
+ /// </summary>
+ /// <returns></returns>
+ public List<OrderBanciDTO> GetList()
+ {
+
+
+ var listRole = _context.OrderBancis.Where(r => r.RecStatus == "A").ToList();
+
+
+ var list = _mapper.Map<List<OrderBanciDTO>>(listRole);
+ return list;
+ }
+ }
+}
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index a46891d..14bf1cf 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -334,6 +334,15 @@
}
}
+ if (!string.IsNullOrWhiteSpace(searchEntity.Fenchadayu))
+ {
+ decimal aaaa = 0;
+ decimal.TryParse(searchEntity.Fenchadayu, out aaaa);
+ if (aaaa > 0)
+ {
+ sql.Append(" and exists ( select b.[ProjectId] from [Projectzhongbiao] b where a.[Id]=b.[ProjectId] and (b.[defen]-a.[drhx_defen]) >= " + aaaa + " ) ");
+ }
+ }
if (!string.IsNullOrWhiteSpace(searchEntity.Shuliang))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index ce5a7e6..3841d6b 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -740,7 +740,7 @@
if (OrderType == "02" )
{
- if(OrderType1== "鐢佃瘽鍜ㄨ" || OrderType1 == "褰撻潰鍜ㄨ" || OrderType1 == "浠ｆ嫙璐ㄧ枒绛斿" || OrderType1 == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾" || OrderType1 == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�" || OrderType1 == "鏀块噰璐�")
+ if(OrderType1== "鐢佃瘽鍜ㄨ" || OrderType1 == "褰撻潰鍜ㄨ" || OrderType1 == "浠ｆ嫙璐ㄧ枒绛斿" || OrderType1 == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾" || OrderType1 == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�" || OrderType1 == "鏀块噰璐�")
{
var shi = _fiServiceService.GetList().Where(x => x.ServiceTypeTop == OrderType && x.ServiceType == OrderType1).FirstOrDefault();
result = JsonConvert.SerializeObject(shi);
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
new file mode 100644
index 0000000..ff76167
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
@@ -0,0 +1,324 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AutoMapper;
+using AngleSharp.Html.Parser;
+using DTO;
+using IServices;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Bot.Builder.Integration.AspNet.Core;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System.Net.Http;
+using System.Threading.Tasks;
+using zhengcaioa.Models;
+using zhengcaioa.IService;
+using CommonToolsCore;
+using Services;
+
+namespace zhengcaioa.Controllers.BusinessOrder
+{
+
+ public class OrderBanciController : Controller
+ {
+ private readonly ILogger<OrderBanciController> _logger;
+ private readonly ILiaotianService _liaotianService;
+ private readonly IOrderBanciService _orderBanciService;
+ private readonly IOrderBanciDtlService _orderBanciDtlService;
+
+
+ public OrderBanciController(ILogger<OrderBanciController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService)
+ {
+ _logger = logger;
+ _liaotianService = liaotianService;
+ _orderBanciService = orderBanciService;
+ _orderBanciDtlService = orderBanciDtlService;
+ }
+
+ [CheckLogin]
+ public IActionResult Index()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = 0;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = "Add";
+ actionEntity1.PageIco = "fa fa-plus";
+ actionEntity1.ActionName = "鏂板";
+ actionlist.Add(actionEntity1);
+ ViewData["ActionInfo"] = actionlist;
+
+
+
+
+
+ return View();
+
+ }
+ [CheckLogin]
+ public IActionResult GetList(OrderBanciDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_orderBanciService.SearchByPaging(search));
+ }
+ [CheckLogin]
+ public IActionResult Edit(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ OrderBanciDTO dto = new OrderBanciDTO();
+ if (!String.IsNullOrEmpty(id))
+ {
+ dto = _orderBanciService.Get(id);
+ if (dto.Shijian.HasValue)
+ {
+ dto.ShijianName = dto.Shijian.Value.ToString("yyyy-MM-dd HH:mm");
+ }
+ if (dto.Shijianend.HasValue)
+ {
+ dto.ShijianendName = dto.Shijianend.Value.ToString("yyyy-MM-dd HH:mm");
+ }
+
+ }
+ else
+ {
+ dto.Shijian = DateTime.Now;
+ dto.ShijianName = dto.Shijian.Value.ToString("yyyy-MM-dd HH:mm");
+ dto.Shijianend = DateTime.Now;
+ dto.ShijianendName = dto.Shijianend.Value.ToString("yyyy-MM-dd HH:mm");
+ }
+
+
+
+
+
+
+
+
+
+
+ ViewData.Model = dto;
+ return View();
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ [HttpPost]
+ public IActionResult Save(OrderBanciDTO data)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ data.RecStatus = "A";
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ }
+ data.Modifier = curentuser.Id;
+ data.Modifytime = DateTime.Now;
+
+ ResultEntity resultEntity = _orderBanciService.save(data);
+
+ return new JsonResult(resultEntity);
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎涓讳俊鎭�
+ /// </summary>
+ /// <param name="info">瀹炰綋</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ public IActionResult Nullify(string Id = "")
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ return new JsonResult(_orderBanciService.ModifyStatus(Id, curentuser.Id));
+ }
+
+
+
+
+
+ [CheckLogin]
+ public IActionResult IndexDtl(string OrderBanciId)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = 0;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = "Add";
+ actionEntity1.PageIco = "fa fa-plus";
+ actionEntity1.ActionName = "鏂板";
+ actionlist.Add(actionEntity1);
+ ViewData["ActionInfo"] = actionlist;
+
+ ViewBag.OrderBanciId = OrderBanciId;
+
+
+
+ return View();
+
+ }
+ [CheckLogin]
+ public IActionResult GetListDtl(OrderBanciDtlDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_orderBanciDtlService.SearchByPaging(search));
+ }
+ [CheckLogin]
+ public IActionResult EditDtl(string id = null,string OrderBanciId = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ OrderBanciDtlDTO dto = new OrderBanciDtlDTO();
+ if (!String.IsNullOrEmpty(id))
+ {
+ dto = _orderBanciDtlService.Get(id);
+
+
+ }
+ else
+ {
+ dto.OrderBanciId = OrderBanciId;
+ }
+
+
+
+ ViewData["shangxiawu"] = _liaotianService.GetSYScode("order_banci_dtl", "shangxiawu");
+
+
+
+
+
+
+ ViewData.Model = dto;
+ return View();
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ [HttpPost]
+ public IActionResult SaveDtl(OrderBanciDtlDTO data)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ data.RecStatus = "A";
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ }
+ data.Modifier = curentuser.Id;
+ data.Modifytime = DateTime.Now;
+
+ ResultEntity resultEntity = _orderBanciDtlService.save(data);
+
+ return new JsonResult(resultEntity);
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎涓讳俊鎭�
+ /// </summary>
+ /// <param name="info">瀹炰綋</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ public IActionResult NullifyDtl(string Id = "")
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ return new JsonResult(_orderBanciDtlService.ModifyStatus(Id, curentuser.Id));
+ }
+
+
+
+ //鑾峰彇褰撳墠鐨勫煿璁�
+ public IActionResult GetBanCi()
+ {
+ ReturnMsg<OrderBanciDTO> returnMsg = new ReturnMsg<OrderBanciDTO>();
+ returnMsg.code = 2;
+ try
+ {
+ OrderBanciDTOSearch search = new OrderBanciDTOSearch();
+ search.page = 1;
+ search.rows = 1000;
+ search.Createtime = DateTime.Now.Date.ToString();
+ ResultDataEntity < OrderBanciDTO > resultDataEntity = _orderBanciService.SearchByPaging(search);
+ var ssss = resultDataEntity.DataList.OrderBy(x=>x.Shijian).FirstOrDefault();
+
+ if (ssss != null)
+ {
+ var sysCodeDtls = _liaotianService.GetSYScode("order_banci_dtl", "shangxiawu");
+ List<OrderBanciDtlDTO> orderBanciDtlDTOs = _orderBanciDtlService.GetList(ssss.Id);
+ if(orderBanciDtlDTOs!=null&& orderBanciDtlDTOs.Count > 0)
+ {
+ foreach (var orderBanciDtlDTO in orderBanciDtlDTOs)
+ {
+ var sysCodeDtl = sysCodeDtls.Where(x => x.CodeSn == orderBanciDtlDTO.Shangxiawu).FirstOrDefault();
+ if (sysCodeDtl != null)
+ {
+ orderBanciDtlDTO.ShangxiawuName = sysCodeDtl.Comments;
+ }
+ }
+ }
+
+
+ ssss.orderBanciDtlDTOs = orderBanciDtlDTOs;
+ returnMsg.code = 1;
+ returnMsg.count = 1;
+ returnMsg.returnObj = ssss;
+ }
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
+
+ }
+}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
new file mode 100644
index 0000000..4a0a6b5
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -0,0 +1,265 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AutoMapper;
+using AngleSharp.Html.Parser;
+using DTO;
+using IServices;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Bot.Builder.Integration.AspNet.Core;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System.Net.Http;
+using System.Threading.Tasks;
+using zhengcaioa.Models;
+using zhengcaioa.IService;
+using CommonToolsCore;
+using Services;
+using System.Transactions;
+
+namespace zhengcaioa.Controllers.BusinessOrder
+{
+ public class OrderBanciOrderController : Controller
+ {
+ private readonly ILogger<OrderBanciOrderController> _logger;
+ private readonly ILiaotianService _liaotianService;
+ private readonly IOrderBanciService _orderBanciService;
+ private readonly IOrderBanciDtlService _orderBanciDtlService;
+ private readonly IOrderBanciOrderService _orderBanciOrderService;
+
+ public OrderBanciOrderController(ILogger<OrderBanciOrderController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService
+ ,IOrderBanciOrderService orderBanciOrderService)
+ {
+ _logger = logger;
+ _liaotianService = liaotianService;
+ _orderBanciService = orderBanciService;
+ _orderBanciDtlService = orderBanciDtlService;
+ _orderBanciOrderService = orderBanciOrderService;
+ }
+
+ [CheckLogin]
+ public IActionResult Index()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+ ActionEntity actionEntity3 = new ActionEntity();
+ actionEntity3.OpenType = 0;
+ actionEntity3.ActionUrl = "";
+ actionEntity3.ActionFun = "Print";
+ actionEntity3.PageIco = "fa fa-print";
+ actionEntity3.ActionName = "鎵撳嵃";
+ actionlist.Add(actionEntity3);
+
+
+ ActionEntity actionEntity4 = new ActionEntity();
+ actionEntity4.OpenType = 0;
+ actionEntity4.ActionUrl = "";
+ actionEntity4.ActionFun = "Duanxin";
+ actionEntity4.PageIco = "";
+ actionEntity4.ActionName = "鍙戦�佺煭淇�";
+ actionlist.Add(actionEntity4);
+
+ ViewData["ActionInfo"] = actionlist;
+
+ ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+
+
+ return View();
+
+ }
+ [CheckLogin]
+ public IActionResult GetList(OrderBanciOrderDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_orderBanciOrderService.SearchByPaging(search));
+ }
+
+
+
+ [CheckLogin]
+ public IActionResult print(OrderBanciOrderDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ search.rows = 1000;
+ search.page = 1;
+ ViewBag.listLiaotianDTO = _orderBanciOrderService.SearchByPaging(search).DataList as List<OrderBanciOrderDTO>;
+
+
+
+ return View();
+ }
+
+ [CheckLogin]
+ public IActionResult Duanxin(string id = null)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ ViewData["baifangid"] = id;
+
+
+
+ return View();
+ }
+
+ [CheckLogin]
+ public IActionResult Fasong(string neirong, string baifangid)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<OrderBanciOrderDTO> result = new List<OrderBanciOrderDTO>();
+
+ if (baifangid != null)
+ {
+ result = _orderBanciOrderService.GetList(baifangid.Split(","));
+ }
+ else
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鏃犺仈绯讳汉鍙风爜";
+ }
+ string customename = "";
+ StringBuilder number = new StringBuilder(); ;
+ if (result != null && result.Count > 0)
+ {
+ for (int i = 0; i < result.Count; i++)
+ {
+ number.Append(result[i].Lianxidianhua);
+ customename += result[i].Xingming + ",";
+ if (i != result.Count - 1)
+ {
+ number.Append(",");
+ }
+ }
+ }
+ else
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鏃犺仈绯讳汉";
+ }
+
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong);
+ if (int.Parse(sss) <= 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鐭俊鍙戦�佸け璐�";
+ return new JsonResult(resultEntity);
+ }
+
+ _logger.LogInformation(curentuser.UserName + "鍙戦�佺煭淇＄粰瀹㈡埛" + customename);
+ return new JsonResult(resultEntity);
+ }
+
+
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [HttpPost]
+ public IActionResult Save([FromBody] OrderBanciOrderDTO data)
+ {
+ //var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ //ViewData["curentuser"] = curentuser;
+ ReturnMsg<OrderBanciOrderDTO> returnMsg = new ReturnMsg<OrderBanciOrderDTO>();
+ returnMsg.code = 2;
+ try
+ {
+ using (TransactionScope scope = new TransactionScope())
+ {
+ data.RecStatus = "A";
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Creater = "1";
+ data.Createtime = DateTime.Now;
+ }
+ data.Modifier = "1";
+ data.Modifytime = DateTime.Now;
+
+ OrderBanciOrderDTOSearch search = new OrderBanciOrderDTOSearch();
+ search.page = 1;
+ search.rows = 1000;
+ search.BanciId = data.BanciId;
+ ResultDataEntity<OrderBanciOrderDTO> resultDataEntity = _orderBanciOrderService.SearchByPaging(search);
+
+
+ data.Baomingrenshu = search.totalrows + 1;
+ data.Jine = resultDataEntity.DataList.Sum(x => x.Xuefei);
+ data.Jine += data.Xuefei;
+ ResultEntity resultEntity = _orderBanciOrderService.save(data);
+ if (resultEntity.Result)
+ {
+ returnMsg.code = 1;
+ returnMsg.count = 1;
+ returnMsg.returnObj = data;
+ }
+ else
+ {
+ returnMsg.error = resultEntity.Message;
+ }
+ scope.Complete();
+ }
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+
+ return new JsonResult(returnMsg);
+ }
+
+
+
+ //鑾峰彇褰撳墠鐨勬姤鍚嶇殑浜烘暟
+ public IActionResult GetBaoMingRenShu([FromBody] OrderBanciOrderDTOSearch search)
+ {
+ ReturnMsg<List<OrderBanciOrderDTO>> returnMsg = new ReturnMsg<List<OrderBanciOrderDTO>>();
+ returnMsg.code = 2;
+ try
+ {
+
+ search.page = 1;
+ search.rows = 1;
+ ResultDataEntity<OrderBanciOrderDTO> resultDataEntity = _orderBanciOrderService.SearchByPaging(search);
+
+ returnMsg.code = 1;
+ returnMsg.count = search.totalrows;
+ returnMsg.returnObj = resultDataEntity.DataList;
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
+ }
+}
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
index bfab3a8..ebb16bc 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
@@ -117,11 +117,14 @@
dto.VisType = "01";
dto.Jtype = "02";
- dto.Jdr = "02";
+ //dto.Jdr = "02";
dto.Talk = "浠嬬粛鍏徃涓氬姟鍐呭鍜屼骇鍝併��";
dto.Yx = "03";
dto.Jy = "02";
-
+ dto.Zw = "02";
+
+
+
}
diff --git a/zhengcaioa/zhengcaioa/Startup.cs b/zhengcaioa/zhengcaioa/Startup.cs
index 85a2881..58f88ba 100644
--- a/zhengcaioa/zhengcaioa/Startup.cs
+++ b/zhengcaioa/zhengcaioa/Startup.cs
@@ -136,6 +136,10 @@
services.AddScoped(typeof(IWfRunProcessService), typeof(WfRunProcessService));
services.AddScoped(typeof(IWfNeeddeelService), typeof(WfNeeddeelService));
services.AddScoped(typeof(IWfHistoryService), typeof(WfHistorieservice));
+ services.AddScoped(typeof(IOrderBanciDtlService), typeof(OrderBanciDtlService));
+ services.AddScoped(typeof(IOrderBanciService), typeof(OrderBanciService));
+ services.AddScoped(typeof(IOrderBanciOrderService), typeof(OrderBanciOrderService));
+
//定时执行
services.AddHostedService<TimedBackgroundService>();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
index fcb893f..11bf0b5 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -611,7 +611,7 @@
$("#Price").val("");
- if (OrderType != "02" || sheng == "鐢佃瘽鍜ㄨ" || sheng == "褰撻潰鍜ㄨ" || sheng == "浠ｆ嫙璐ㄧ枒绛斿" || sheng == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾" || sheng == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�" || sheng == "鏀块噰璐�") {
+ if (OrderType != "02" || sheng == "鐢佃瘽鍜ㄨ" || sheng == "褰撻潰鍜ㄨ" || sheng == "浠ｆ嫙璐ㄧ枒绛斿" || sheng == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾" || sheng == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�" || sheng == "鏀块噰璐�") {
if (OrderType == "01") {
$("#Price").val(data.Danjia);
} else if (OrderType == "05") {
@@ -739,7 +739,7 @@
data: "",
success: function (data) {
var city = $("#OrderType2");
- if (order_type != "02" || order_type1 == "鐢佃瘽鍜ㄨ" || order_type1 == "褰撻潰鍜ㄨ" || order_type1 == "浠ｆ嫙璐ㄧ枒绛斿" || order_type1 == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾" || order_type1 == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹舵煡璇�" || order_type1 == "鏀块噰璐�") {
+ if (order_type != "02" || order_type1 == "鐢佃瘽鍜ㄨ" || order_type1 == "褰撻潰鍜ㄨ" || order_type1 == "浠ｆ嫙璐ㄧ枒绛斿" || order_type1 == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾" || order_type1 == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�" || order_type1 == "鏀块噰璐�") {
} else {
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
index dc79de5..a588d53 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
@@ -198,13 +198,13 @@
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎺ュ緟浜�<i class="red">*</i></label>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鎺ュ緟浜�</label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
<input class="form-control" label="鎺ュ緟浜�" name="Jdr" id="Jdr" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jdr">
</div>
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱屽姟<i class="red">*</i></label>
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鑱屽姟</label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
<select id="Zw" class="form-control" name="Zw" data-placeholder="閫夋嫨 搴忓垪 ...">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@@ -419,11 +419,16 @@
toastr.warning("璁块棶涓氬姟涓嶈兘涓虹┖");
return;
};
+
+ //if ($("#Zw").val() == '') {
+ // toastr.warning("鑱屽姟涓嶈兘涓虹┖");
+ // return;
+ //};
- if ($("#Jdr").val() == '') {
- toastr.warning("鎺ュ緟浜轰笉鑳戒负绌�");
- return;
- }
+ //if ($("#Jdr").val() == '') {
+ // toastr.warning("鎺ュ緟浜轰笉鑳戒负绌�");
+ // return;
+ //}
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
index 12f0037..544c922 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
@@ -26,7 +26,7 @@
}
},
- { label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
+ //{ label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎷滆鏂瑰紡', name: 'VisTypeName', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎺ュ緟浜�', name: 'Jdr', labtype: 'txt', hidden: false, width: 100},
@@ -35,7 +35,7 @@
{ label: '瀹㈡埛鍙嶉', name: 'Khfk', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎴愪氦鎰忓悜', name: 'YxName', labtype: 'txt', hidden: false, width: 100 },
{ label: '璺熻釜寤鸿', name: 'JyName', labtype: 'txt', hidden: false, width: 100 },
- { label: '褰曞叆浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 100 },
+ { label: '璁块棶浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 100 },
];
dataUrl = "/IntentionVisit/GetList?Viscustomer=@Viscustomer";
@@ -50,7 +50,7 @@
{ label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '鎷滆鏃堕棿', name: 'Vistime', labtype: 'datearea', hidden: false },
- { label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(creater), cwidth: '5%', cccwidth: '8%'},
+ { label: '璁块棶浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(creater), cwidth: '5%', cccwidth: '8%'},
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
new file mode 100644
index 0000000..d1cb762
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
@@ -0,0 +1,369 @@
+锘緻model DTO.OrderBanciDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+
+
+
+
+}
+@{
+ 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> 鍩烘湰淇℃伅</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 grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鐝<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="鐝" name="Banci" id="Banci" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.Banci">
+
+ </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-6 col-md-6" grouptype="Vdata">
+ <input class="form-control" label="鍚嶇О" name="Mingcheng" id="Mingcheng" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.Mingcheng">
+
+ </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 id="Shijian" class="form-control" label="寮�濮嬫椂闂�" name="Shijian" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShijianName" readonly="readonly">
+
+ </div>
+
+ <input type="hidden" id="Id" name="Id" value="@Model.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">
+ <input id="Shijianend" class="form-control" label="缁撴潫鏃堕棿" name="Shijianend" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShijianendName" readonly="readonly">
+
+ </div>
+
+ <input type="hidden" id="Id" name="Id" value="@Model.Id" />
+ </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" grouptype="Vdata">
+ <input class="form-control" label="鍦扮偣" name="Didian" id="Didian" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.Didian">
+
+ </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-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="浜烘暟" name="Renshu" id="Renshu" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.Renshu" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup = "value=value.replace(/[^\d]/g,'')" >
+
+
+
+ </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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
+ </a>
+
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <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"
+ };
+
+ laydate({ elem: "#Shijian", format: 'YYYY-MM-DD hh:mm', istime: true, event: "focus" });
+ laydate({ elem: "#Shijianend", format: 'YYYY-MM-DD hh:mm', istime: true, event: "focus" });
+ var id = '@Model.Id';
+ var bUpload = false;
+ var bAdd = false; // 鏂板鎿嶄綔
+ var fileId = ""; // 涓婁紶鏂囦欢鐢熸垚鐨処d
+ var bEditFile = false; // 缂栬緫鏃讹紝鏄惁鍏宠仈浜嗛檮浠�
+ var bDeleteFile = false; // 鍒犻櫎鎿嶄綔
+ var attachment_id = 0; // 闄勪欢id
+ var imgLoad = new Object();
+
+
+
+ var delPosition = function () {
+
+
+ if (id == null || id == '') {
+ toastr.warning("璇峰厛淇濆瓨");
+ return;
+ }
+ $.ajax({
+ type: "GET",
+ url: "/OrderBanci/Nullify?id=" + id,
+ dataType: "json",
+ global: false,
+ data: '',
+ success: function (data) {
+
+
+ if (data.Result) {
+ // parent._afterSave(true);
+ parent.layer.msg('鍒犻櫎鎴愬姛', { icon: 6 });
+ _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+ }
+ else {
+ // toastr.error("");
+ parent.layer.msg('鍒犻櫎澶辫触', { icon: 5 });
+ }
+
+ },
+ error: function () {
+ if ($.isNumber(imgLoad)) {
+ parent.layer.close(imgLoad);
+ }
+ //toastr.error("淇濆瓨澶辫触");
+
+ parent.layer.msg('淇濆瓨澶辫触', { icon: 5 });
+ }
+ });
+
+ }
+
+ // 淇濆瓨宀椾綅淇℃伅
+ var savePosition = function () {
+
+ if ($("#Shijian").val() == '') {
+ toastr.warning("寮�濮嬫椂闂翠笉鑳戒负绌�");
+ return;
+ }
+
+ if ($("#Shijianend").val() == '') {
+ toastr.warning("缁撴潫鏃堕棿涓嶈兘涓虹┖");
+ return;
+ }
+
+ if ($.trim($("#Banci").val()) == '') {
+ toastr.warning("鐝涓嶈兘涓虹┖");
+ return;
+ }
+ if ($.trim($("#Mingcheng").val()) == '') {
+ toastr.warning("鍚嶇О涓嶈兘涓虹┖");
+ return;
+ }
+ if ($.trim($("#Renshu").val()) == '') {
+ toastr.warning("浜烘暟涓嶈兘涓虹┖");
+ return;
+ }
+
+ if ($.trim($("#Didian").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: "/OrderBanci/Save",
+ 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("/OrderBanci/Edit/");
+ }
+
+ }
+ else {
+ // toastr.error("澶辫触");
+ parent.layer.msg(data.Message, { icon: 5 });
+ }
+
+ },
+ error: function () {
+
+
+ parent.layer.msg('澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
+
+
+
+
+ function _pageAutoClose() {
+ parent.window._reloadPageData();
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.isRefresh = true;
+ parent.layer.closeAll('loading');
+ parent.layer.close(index);
+ return false;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml
new file mode 100644
index 0000000..7bf5f0d
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml
@@ -0,0 +1,361 @@
+锘緻model DTO.OrderBanciDtlDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+
+ List<SysCodeDtl> shangxiawu = ViewData["shangxiawu"] as List<SysCodeDtl>; //涓婁笅鍗�
+
+
+}
+@{
+ 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> 鍩烘湰淇℃伅</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">
+ <select id="shangxiawu" class="form-control" name="shangxiawu" data-placeholder="閫夋嫨 搴忓垪 ..." style="font-weight:normal;">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in shangxiawu)
+ {
+ @if (!item.CodeSn.Equals(Model.Shangxiawu))
+ {
+ <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">鏃堕棿<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2">
+ <input class="form-control" label="鏃堕棿" name="Shijian" id="Shijian" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.Shijian">
+
+ </div>
+
+ <input type="hidden" id="Id" name="Id" value="@Model.Id" />
+ <input type="hidden" id="OrderBanciId" name="OrderBanciId" value="@Model.OrderBanciId" />
+ </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" grouptype="Vdata">
+ <input class="form-control" label="浜嬮」" name="Shixiamg" id="Shixiamg" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.Shixiamg">
+
+ </div>
+
+
+
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">涓昏浜�</label>
+ <div class="col-sm-8 col-md-8" grouptype="Vdata">
+ <input class="form-control" label="涓昏浜�" name="Zhujiangren" id="Zhujiangren" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.Zhujiangren">
+
+ </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 class="form-control" label="鎺掑簭" name="Sort" id="Sort" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="number" value="@Model.Sort">
+
+ </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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
+ </a>
+
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <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"
+ };
+
+
+
+ var id = '@Model.Id';
+ var bUpload = false;
+ var bAdd = false; // 鏂板鎿嶄綔
+ var fileId = ""; // 涓婁紶鏂囦欢鐢熸垚鐨処d
+ var bEditFile = false; // 缂栬緫鏃讹紝鏄惁鍏宠仈浜嗛檮浠�
+ var bDeleteFile = false; // 鍒犻櫎鎿嶄綔
+ var attachment_id = 0; // 闄勪欢id
+ var imgLoad = new Object();
+
+
+
+ var delPosition = function () {
+
+
+ if (id == null || id == '') {
+ toastr.warning("璇峰厛淇濆瓨");
+ return;
+ }
+ $.ajax({
+ type: "GET",
+ url: "/OrderBanci/NullifyDtl?id=" + id,
+ dataType: "json",
+ global: false,
+ data: '',
+ success: function (data) {
+
+
+ if (data.Result) {
+ // parent._afterSave(true);
+ parent.layer.msg('鍒犻櫎鎴愬姛', { icon: 6 });
+ _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+ }
+ else {
+ // toastr.error("");
+ parent.layer.msg('鍒犻櫎澶辫触', { icon: 5 });
+ }
+
+ },
+ error: function () {
+ if ($.isNumber(imgLoad)) {
+ parent.layer.close(imgLoad);
+ }
+ //toastr.error("淇濆瓨澶辫触");
+
+ parent.layer.msg('淇濆瓨澶辫触', { icon: 5 });
+ }
+ });
+
+ }
+
+ // 淇濆瓨宀椾綅淇℃伅
+ var savePosition = function () {
+
+ if ($("#shangxiawu").val() == '') {
+ toastr.warning("涓婁笅鍗堜笉鑳戒负绌�");
+ return;
+ }
+
+ if ($.trim($("#Shijian").val()) == '') {
+ toastr.warning("鏃堕棿涓嶈兘涓虹┖");
+ return;
+ }
+
+
+ if ($.trim($("#Shixiamg").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: "/OrderBanci/SaveDtl",
+ 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("/OrderBanci/EditDtl/");
+ }
+
+ }
+ else {
+ // toastr.error("澶辫触");
+ parent.layer.msg(data.Message, { icon: 5 });
+ }
+
+ },
+ error: function () {
+
+
+ parent.layer.msg('澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
+
+
+
+
+ function _pageAutoClose() {
+ parent.window._reloadPageData();
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.isRefresh = true;
+ parent.layer.closeAll('loading');
+ parent.layer.close(index);
+ return false;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
new file mode 100644
index 0000000..f2cab0f
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
@@ -0,0 +1,79 @@
+锘緻{
+ ViewBag.Title = "OrderBanci";
+ Layout = "~/Views/Shared/_Layout_Search.cshtml";
+}
+@section headerStyle{
+ <script type="text/javascript">
+
+ dataCol = [
+ { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
+
+ {
+ label: '鐝', name: 'Banci', labtype: 'txt', hidden: false, width: 100,
+ formatter: function (cellvalue, options, rowObject) {
+ return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/OrderBanci/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ }
+ },
+ { label: '鍚嶇О', name: 'Mingcheng', labtype: 'txt', hidden: false, width: 200 },
+ { label: '寮�濮嬫椂闂�', name: 'ShijianName', labtype: 'txt', hidden: false, width: 200 },
+ { label: '缁撴潫鏃堕棿', name: 'ShijianendName', labtype: 'txt', hidden: false, width: 200 },
+ { label: '鍦扮偣', name: 'Didian', labtype: 'txt', hidden: false, width: 400 },
+ { label: '浜烘暟', name: 'Renshu', labtype: 'txt', hidden: false, width: 200 },
+ {
+ label: '鍩硅鏃堕棿', name: 'Creater', labtype: 'txt', hidden: false, width: 100,
+ formatter: function (cellvalue, options, rowObject) {
+ return "<a onclick=\"OpenWindow('" + rowObject.Banci.replace(/'/g, '') + "','98%','100%', '/OrderBanci/IndexDtl?OrderBanciId=" + rowObject.Id + "')\" >鍩硅鏃堕棿</a>";
+ }
+ },
+
+
+ ];
+ dataUrl = "/OrderBanci/GetList";
+ searchCol = [
+ { label: '寮�濮嬫椂闂�', name: 'Shijian', labtype: 'datearea', hidden: false },
+ { label: '鐝', name: 'Banci', labtype: 'txt', hidden: false },
+ { label: '鍦扮偣', name: 'Didian', labtype: 'txt', hidden: false },
+
+
+
+
+
+
+
+ ];
+ var _pageAdd = function () {
+ OpenWindow("鏂板鐝", "98%", "90%", "/OrderBanci/Edit/");
+ }
+
+
+
+
+ var _afterSave = function (result) {
+ if (result) {
+ toastr.success("淇濆瓨鎴愬姛");
+ } else {
+ toastr.error("淇濆瓨澶辫触");
+ }
+ }
+
+ var _afterDel = function (result) {
+ if (result) {
+ toastr.success("鍒犻櫎鎴愬姛");
+ } else {
+ /**/
+ toastr.error("鍒犻櫎鎴愬姛");
+ /**/
+ }
+}
+ </script>
+}
+
+@section footerScripts{
+ <script type="text/javascript">
+
+
+
+
+
+ </script>
+}
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/IndexDtl.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/IndexDtl.cshtml
new file mode 100644
index 0000000..bd5f5c5
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/IndexDtl.cshtml
@@ -0,0 +1,69 @@
+锘緻{
+ ViewBag.Title = "OrderBanciDtl";
+ Layout = "~/Views/Shared/_Layout_Search.cshtml";
+ string OrderBanciId = ViewBag.OrderBanciId as string;
+}
+@section headerStyle{
+ <script type="text/javascript">
+
+ dataCol = [
+ { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
+
+ {
+ label: '涓婁笅鍗�', name: 'ShangxiawuName', labtype: 'txt', hidden: false, width: 100,
+ formatter: function (cellvalue, options, rowObject) {
+ return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/OrderBanci/EditDtl?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ }
+ },
+
+ { label: '鏃堕棿', name: 'Shijian', labtype: 'txt', hidden: false, width: 100 },
+ { label: '浜嬮」', name: 'Shixiamg', labtype: 'txt', hidden: false, width: 400 },
+ { label: '涓昏浜�', name: 'Zhujiangren', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鎺掑簭', name: 'Sort', labtype: 'txt', hidden: false, width: 100 },
+
+ ];
+ dataUrl = "/OrderBanci/GetListDtl?OrderBanciId=@OrderBanciId";
+ searchCol = [
+
+ { label: '浜嬮」', name: 'Shixiamg', labtype: 'txt', hidden: false },
+
+
+
+
+ ];
+ var _pageAdd = function () {
+ OpenWindow("鏂板鐝", "98%", "90%", "/OrderBanci/EditDtl?OrderBanciId=@OrderBanciId");
+ }
+
+
+
+
+ var _afterSave = function (result) {
+ if (result) {
+ toastr.success("淇濆瓨鎴愬姛");
+ } else {
+ toastr.error("淇濆瓨澶辫触");
+ }
+ }
+
+ var _afterDel = function (result) {
+ if (result) {
+ toastr.success("鍒犻櫎鎴愬姛");
+ } else {
+ /**/
+ toastr.error("鍒犻櫎鎴愬姛");
+ /**/
+ }
+}
+ </script>
+}
+
+@section footerScripts{
+ <script type="text/javascript">
+
+
+
+
+
+ </script>
+}
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Duanxin.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Duanxin.cshtml
new file mode 100644
index 0000000..96eab6d
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Duanxin.cshtml
@@ -0,0 +1,225 @@
+锘緻model DTO.CooperatecustomCustomerDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+ string baifangid = ViewData["baifangid"] as string; //鎷滆鏂瑰紡
+
+
+}
+@{
+ 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> 缇ゅ彂鐭俊</h5>
+ </div>
+ <div id="div_content" class="ibox-content" style="background-color:white;">
+ <div class="row">
+
+ <input type="hidden" id="baifangid" name="baifangid" value="@baifangid" />
+
+
+
+ <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="neirong" name="neirong" title="鐭俊鍐呭" isempty="" maxlength="4000" length="long"></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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
+ </a>*@
+
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <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"
+ };
+
+
+
+
+
+
+ // 淇濆瓨宀椾綅淇℃伅
+ var savePosition = function () {
+
+
+
+
+
+ if ($.trim($("#neirong").val()) == '') {
+ toastr.warning("浜よ皥鍐呭涓嶈兘涓虹┖");
+ return;
+ }
+
+
+
+ var data = { neirong: $("#neirong").val(), baifangid: $("#baifangid").val()}
+ $.ajax({
+ type: "POST",
+ url: "/OrderBanciOrder/Fasong",
+ dataType: "json",
+ global: false,
+ data: data,
+ success: function (data) {
+
+
+
+ if (data.Result) {
+ // parent._afterSave(true);
+ parent.layer.msg('鐭俊鍙戦�佹垚鍔�', { icon: 6 });
+ //window.location = "/Project/add?id=" + data.ReturnID;
+
+
+
+ _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+
+
+ }
+ else {
+ // toastr.error("澶辫触");
+ parent.layer.msg(data.Message, { icon: 5 });
+ }
+
+ },
+ error: function () {
+
+
+ parent.layer.msg('澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
+
+
+
+
+ function _pageAutoClose() {
+ parent.window._reloadPageData();
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.isRefresh = true;
+ parent.layer.closeAll('loading');
+ parent.layer.close(index);
+ return false;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml
new file mode 100644
index 0000000..8642fc4
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Index.cshtml
@@ -0,0 +1,123 @@
+锘緻{
+ ViewBag.Title = "OrderBanciOrder";
+ Layout = "~/Views/Shared/_Layout_Search.cshtml";
+}
+@section headerStyle{
+ <script type="text/javascript">
+ var kechengleixing = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.kechengleixing))';
+ gridConfig = { multiselect: true, selectcol: "Id" };
+ dataCol = [
+ { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
+
+ {
+ label: '鎶ュ悕鏃堕棿', name: 'BaomingtimeName', labtype: 'txt', hidden: false, width: 100
+ //,
+ //formatter: function (cellvalue, options, rowObject) {
+ // return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/OrderBanciOrder/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ //}
+ },
+ { label: '鍩硅鐝', name: 'Peixunbanci', labtype: 'txt', hidden: false, width: 100 },
+ { label: '璇剧▼绫诲瀷', name: 'Kechengleixing', labtype: 'txt', hidden: false, width: 100 },
+ { label: '濮撳悕', name: 'Xingming', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鑱旂郴鐢佃瘽', name: 'Lianxidianhua', labtype: 'txt', hidden: false, width: 100 },
+ { label: '韬唤璇�', name: 'Shenfenzheng', labtype: 'txt', hidden: false, width: 100 },
+ { label: '瀛﹁垂', name: 'Xuefei', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鎶ュ悕浜烘暟', name: 'Baomingrenshu', labtype: 'txt', hidden: false, width: 100 },
+ { label: '閲戦', name: 'Jine', labtype: 'txt', hidden: false, width: 100 },
+
+
+ ];
+ dataUrl = "/OrderBanciOrder/GetList";
+ searchCol = [
+ { label: '鎶ュ悕鏃堕棿', name: 'Baomingtime', labtype: 'datearea', hidden: false },
+ { label: '鍩硅鐝', name: 'Peixunbanci', labtype: 'txt', hidden: false },
+ { label: '璇剧▼绫诲瀷', name: 'Kechengleixing', labtype: 'combox', hidden: false, data: JSON.parse(kechengleixing)/*, cwidth: '5%', cccwidth: '8%' */ },
+ { label: '濮撳悕', name: 'Xingming', labtype: 'txt', hidden: false },
+ { label: '鑱旂郴鐢佃瘽', name: 'Lianxidianhua', labtype: 'txt', hidden: false },
+
+
+
+
+
+
+ ];
+ //var _pageAdd = function () {
+ // OpenWindow("鏂板鐝", "98%", "90%", "/OrderBanciOrder/Edit/");
+ //}
+
+
+
+
+ var _afterSave = function (result) {
+ if (result) {
+ toastr.success("淇濆瓨鎴愬姛");
+ } else {
+ toastr.error("淇濆瓨澶辫触");
+ }
+ }
+
+ var _afterDel = function (result) {
+ if (result) {
+ toastr.success("鍒犻櫎鎴愬姛");
+ } else {
+ /**/
+ toastr.error("鍒犻櫎鎴愬姛");
+ /**/
+ }
+ }
+
+ var _pageDuanxin = function () {
+ var duanxin = GetGridSelect();
+ var baifangid = "";
+ if (duanxin != '') {
+ for (var i = 0; i < duanxin.length; i++) {
+ baifangid += duanxin[i] + ','
+ }
+ baifangid = baifangid.substring(0, baifangid.length - 1);
+ } else {
+ toastr.error("璇烽�夋嫨璁㈠崟");
+ return;
+ }
+
+ OpenWindow("缇ゅ彂鐭俊", "50%", "50%", "/OrderBanciOrder/Duanxin?id=" + baifangid);
+
+ }
+
+
+ var _pagePrint = function () {
+
+ var Baomingtime = $("#PBSBaomingtime").val();
+ var Peixunbanci = $("#PBSPeixunbanci").val();
+ var Kechengleixing = $("#PBSKechengleixing").val();
+ var Xingming = $("#PBSXingming").val();
+ var Lianxidianhua = $("#PBSLianxidianhua").val();
+
+
+
+ var Createtimestart = $("#PBSCreatetimestart").val();
+
+ var Createtimeend = $("#PBSCreatetimeend").val();
+ var Createtime = '';
+ if (Createtimestart != '' && Createtimeend != '') {
+ Createtime = Createtimestart + '|' + Createtimeend;
+ }
+
+
+ var url = "/OrderBanciOrder/print?Baomingtime=" + Baomingtime + "&Peixunbanci=" + Peixunbanci + "&Kechengleixing=" + Kechengleixing + "&Xingming=" + Xingming + "&Lianxidianhua=" + Lianxidianhua;
+ var me = window.open(url, "鎵撳嵃"); //鎵撳紑鏂扮獥鍙�
+
+
+ }
+
+ </script>
+}
+
+@section footerScripts{
+ <script type="text/javascript">
+
+
+
+
+
+ </script>
+}
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/print.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/print.cshtml
new file mode 100644
index 0000000..c34a57f
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/print.cshtml
@@ -0,0 +1,123 @@
+锘緻using DTO;
+@{
+ ViewBag.Title = "Liaotian";
+ Layout = null;
+ List<OrderBanciOrderDTO> liaotianDTOs = ViewBag.listLiaotianDTO as List<OrderBanciOrderDTO>; //闂绫诲瀷
+}
+
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="Pragma" content="no-cache">
+ <meta http-equiv="Cache-Control" content="no-siteapp" />
+ <meta http-equiv="Cache-Control" content="no-cache">
+ <meta http-equiv="Expires" content="0">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+ <meta name="renderer" content="webkit">
+ <title>@SiteConfig.SiteName</title>
+ <meta name="keywords" content="@SiteConfig.Keywords">
+ <meta name="description" content="@SiteConfig.Description">
+ <meta name="author" content="@SiteConfig.Author">
+ <link rel="icon" type="image/x-icon" href="@SiteConfig.ShortcutIcon">
+ <!-- uc寮哄埗绔栧睆 -->
+ <meta name="screen-orientation" content="portrait">
+ <!-- QQ寮哄埗绔栧睆 -->
+ <meta name="x5-orientation" content="portrait">
+ <!-- UC寮哄埗鍏ㄥ睆 -->
+ <meta name="full-screen" content="yes">
+ <!-- QQ寮哄埗鍏ㄥ睆 -->
+ <meta name="x5-fullscreen" content="true">
+ <!--[if lt IE 9]>
+ <meta http-equiv="refresh" content="0;ie.html" />
+ <![endif]-->
+ <script src="~/js/jquery.min.js"></script>
+ <style type="text/css">
+ body {
+ text-align: left;
+ font-size: 12px;
+ }
+
+ table {
+ border-collapse: collapse;
+ border: none;
+ width: 900px;
+ margin-left: 0px;
+ text-align: center;
+ }
+
+ td {
+ border: solid #000000 1px;
+ }
+ </style>
+</head>
+<body>
+ <button type="button" onclick="onprint()">鎵撳嵃</button>
+ <div id="printArea">
+ @if (liaotianDTOs != null && liaotianDTOs.Count > 0)
+ {
+
+
+ <table>
+ @*<tr>
+ <td style="width:10%;"> 闂绫诲埆</td>
+ <td style="width:10%;"> 棰樼洰绫诲埆</td>
+ <td style="width:30%;"> 闂</td>
+ <td style="width:50%;"> 鍥炵瓟</td>
+ </tr>*@
+
+
+ @{
+ int i = 1;
+ }
+ <tr>
+ <td style="width:4%;"> 缂栧彿</td>
+ <td style="width:7%;"> 鎶ュ悕鏃堕棿</td>
+ <td style="width:7%;"> 鍩硅鐝</td>
+ <td style="width:7%;"> 璇剧▼绫诲瀷</td>
+ <td style="width:7%;"> 濮撳悕</td>
+ <td style="width:7%;"> 鑱旂郴鐢佃瘽</td>
+ <td style="width:7%;"> 韬唤璇�</td>
+ <td style="width:7%;"> 瀛﹁垂</td>
+ <td style="width:7%;"> 鎶ュ悕浜烘暟</td>
+ <td style="width:7%;"> 閲戦</td>
+
+ </tr>
+ @foreach (var liaotianDTO in liaotianDTOs)
+ {
+
+ <tr>
+ <td> @i</td>
+ <td> @liaotianDTO.BaomingtimeName</td>
+ <td> @liaotianDTO.Peixunbanci</td>
+ <td> @liaotianDTO.Kechengleixing</td>
+ <td> @liaotianDTO.Xingming</td>
+ <td> @liaotianDTO.Lianxidianhua</td>
+ <td> @liaotianDTO.Shenfenzheng</td>
+ <td> @liaotianDTO.Xuefei.Value.ToString("F2")</td>
+ <td> @liaotianDTO.Baomingrenshu</td>
+ <td> @liaotianDTO.Jine.Value.ToString("F2")</td>
+ </tr>
+
+ i++;
+ }
+
+ </table>
+ }
+ </div>
+</body>
+<script type="text/javascript">
+
+ function printHtml(html) {
+ var bodyHtml = document.body.innerHTML;
+ document.body.innerHTML = html;
+ window.print();
+ document.body.innerHTML = bodyHtml;
+ }
+ function onprint() {
+ var html = $("#printArea").html();
+ printHtml(html);
+ }
+</script>
+</html>
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
index 652b595..ce8c6f2 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
@@ -11,7 +11,7 @@
var ShiFouyReasonname = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShiFouyReasonname))';
- loseherght = 90;
+ loseherght = 110;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -109,6 +109,7 @@
{ label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater)/*, cwidth: '5%', cccwidth: '8%'*/ },
{ label: '鍒嗗樊灏忎簬', name: 'Fencha', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
+ { label: '鍒嗗樊澶т簬', name: 'Fenchadayu', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
{ label: '渚涘簲鍟嗘暟閲�', name: 'Shuliang', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
];
@@ -241,6 +242,7 @@
$("#PBSNamesToubiao").parent().next().remove();
$("#PBSReasonname").parent().after("<br>");
$("#PBSCreater").parent().next().remove();
+ $("#PBSFenchadayu").parent().after("<br>");
});
diff --git "a/\350\241\250\344\277\256\346\224\271.sql" "b/\350\241\250\344\277\256\346\224\271.sql"
index b5438b0..f5c27f9 100644
--- "a/\350\241\250\344\277\256\346\224\271.sql"
+++ "b/\350\241\250\344\277\256\346\224\271.sql"
@@ -1,6 +1,238 @@
USE [zhengcaioa]
GO
+/****** Object: Table [dbo].[order_banci_order] Script Date: 2021/7/5 14:33:24 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS(Select 1 From Sysobjects Where Name='order_banci_order') --查询表名costSeparateConfig是否存在
+drop table [order_banci_order]
+GO
+CREATE TABLE [dbo].[order_banci_order](
+ [Id] [nvarchar](50) NOT NULL,
+ [baomingtime] [datetime] NOT NULL,
+ [banci_id] [nvarchar](50) NULL,
+ [peixunbanci] [nvarchar](100) NULL,
+ [kechengleixing_id] [nvarchar](50) NULL,
+ [kechengleixing] [nvarchar](100) NULL,
+ [person_id] [nvarchar](100) NULL,
+ [xingming] [nvarchar](100) NULL,
+ [lianxidianhua] [nvarchar](100) NULL,
+ [shenfenzheng] [nvarchar](100) NULL,
+ [xuefei] [money] NULL,
+ [baomingrenshu] [int] NULL,
+ [jine] [money] NULL,
+
+ [rec_status] [nvarchar](1) NOT NULL,
+ [creater] [nvarchar](50) NOT NULL,
+ [createtime] [datetime] NOT NULL,
+ [modifier] [nvarchar](50) NOT NULL,
+ [modifytime] [datetime] NOT NULL,
+ CONSTRAINT [PK_order_banci_order] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+ALTER TABLE [dbo].[order_banci_order] ADD CONSTRAINT [DF_order_banci_order_rec_status] DEFAULT ('A') FOR [rec_status]
+GO
+
+ALTER TABLE [dbo].[order_banci_order] ADD CONSTRAINT [DF_order_banci_order_creater] DEFAULT ('1') FOR [creater]
+GO
+
+ALTER TABLE [dbo].[order_banci_order] ADD CONSTRAINT [DF_order_banci_order_createtime] DEFAULT (getdate()) FOR [createtime]
+GO
+
+ALTER TABLE [dbo].[order_banci_order] ADD CONSTRAINT [DF_order_banci_order_modifier] DEFAULT ('1') FOR [modifier]
+GO
+
+ALTER TABLE [dbo].[order_banci_order] ADD CONSTRAINT [DF_order_banci_order_modifytime] DEFAULT (getdate()) FOR [modifytime]
+GO
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
+/****** Object: Table [dbo].[order_banci] Script Date: 2021/7/5 14:33:24 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS(Select 1 From Sysobjects Where Name='order_banci') --查询表名costSeparateConfig是否存在
+drop table [order_banci]
+GO
+CREATE TABLE [dbo].[order_banci](
+ [Id] [nvarchar](50) NOT NULL,
+ [banci] [nvarchar](100) NULL,
+ [mingcheng] [nvarchar](100) NULL,
+ [shijian] [datetime] NULL,
+ [shijianend] [datetime] NULL,
+ [didian] [nvarchar](500) NULL,
+ [renshu] [int] 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_order_banci] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[order_banci] ADD CONSTRAINT [DF_order_banci_rec_status] DEFAULT ('A') FOR [rec_status]
+GO
+
+ALTER TABLE [dbo].[order_banci] ADD CONSTRAINT [DF_order_banci_creater] DEFAULT ('1') FOR [creater]
+GO
+
+ALTER TABLE [dbo].[order_banci] ADD CONSTRAINT [DF_order_banci_createtime] DEFAULT (getdate()) FOR [createtime]
+GO
+
+ALTER TABLE [dbo].[order_banci] ADD CONSTRAINT [DF_order_banci_modifier] DEFAULT ('1') FOR [modifier]
+GO
+
+ALTER TABLE [dbo].[order_banci] ADD CONSTRAINT [DF_order_banci_modifytime] DEFAULT (getdate()) FOR [modifytime]
+GO
+
+
+
+USE [zhengcaioa]
+GO
+
+/****** Object: Table [dbo].[order_banci_dtl] Script Date: 2021/7/5 14:33:24 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS(Select 1 From Sysobjects Where Name='order_banci_dtl') --查询表名costSeparateConfig是否存在
+drop table [order_banci_dtl]
+GO
+CREATE TABLE [dbo].[order_banci_dtl](
+ [Id] [nvarchar](50) NOT NULL,
+ [order_banci_id] [nvarchar](50) NULL,
+ [shangxiawu] [nvarchar](100) NULL,
+ [shijian] [nvarchar](100) NULL,
+ [shixiamg] [nvarchar](500) NULL,
+ [zhujiangren] [nvarchar](100) NULL,
+ [sort] [int] 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_order_banci_dtl] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+ALTER TABLE [dbo].[order_banci_dtl] ADD CONSTRAINT [DF_order_banci_order_sort] DEFAULT (0) FOR [sort]
+GO
+ALTER TABLE [dbo].[order_banci_dtl] ADD CONSTRAINT [DF_order_banci_dtl_rec_status] DEFAULT ('A') FOR [rec_status]
+GO
+
+ALTER TABLE [dbo].[order_banci_dtl] ADD CONSTRAINT [DF_order_banci_dtl_creater] DEFAULT ('1') FOR [creater]
+GO
+
+ALTER TABLE [dbo].[order_banci_dtl] ADD CONSTRAINT [DF_order_banci_dtl_createtime] DEFAULT (getdate()) FOR [createtime]
+GO
+
+ALTER TABLE [dbo].[order_banci_dtl] ADD CONSTRAINT [DF_order_banci_dtl_modifier] DEFAULT ('1') FOR [modifier]
+GO
+
+ALTER TABLE [dbo].[order_banci_dtl] ADD CONSTRAINT [DF_order_banci_dtl_modifytime] DEFAULT (getdate()) FOR [modifytime]
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
+/****** Object: Table [dbo].[IntentionVisit_duanxin] Script Date: 2021/7/5 14:33:24 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS(Select 1 From Sysobjects Where Name='IntentionVisit_duanxin') --查询表名costSeparateConfig是否存在
+drop table [IntentionVisit_duanxin]
+GO
+CREATE TABLE [dbo].[IntentionVisit_duanxin](
+ [Id] [nvarchar](50) NOT NULL,
+ [duanxin_title] [nvarchar](50) NULL,
+ [duanxin_neirong] [nvarchar](500) 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_IntentionVisit_duanxin] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[IntentionVisit_duanxin] ADD CONSTRAINT [DF_IntentionVisit_duanxin_rec_status] DEFAULT ('A') FOR [rec_status]
+GO
+
+ALTER TABLE [dbo].[IntentionVisit_duanxin] ADD CONSTRAINT [DF_IntentionVisit_duanxin_creater] DEFAULT ('1') FOR [creater]
+GO
+
+ALTER TABLE [dbo].[IntentionVisit_duanxin] ADD CONSTRAINT [DF_IntentionVisit_duanxin_createtime] DEFAULT (getdate()) FOR [createtime]
+GO
+
+ALTER TABLE [dbo].[IntentionVisit_duanxin] ADD CONSTRAINT [DF_IntentionVisit_duanxin_modifier] DEFAULT ('1') FOR [modifier]
+GO
+
+ALTER TABLE [dbo].[IntentionVisit_duanxin] ADD CONSTRAINT [DF_IntentionVisit_duanxin_modifytime] DEFAULT (getdate()) FOR [modifytime]
+GO
+
+
+
+
+ ALTER TABLE [dbo].[IntentionVisit] ADD [duanxin_neirong] [nvarchar](500) NULL
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
/****** Object: Table [dbo].[fi_member] Script Date: 2021/7/5 14:33:24 ******/
SET ANSI_NULLS ON
GO
--
Gitblit v1.9.1