From fd865638a82d6691a7904ce1aaccff1e050c7c14 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 09 七月 2021 13:18:02 +0800
Subject: [PATCH] 订单管理： 订单数量默认1 列表 订单类别 显示三级 收货人默认客户资料的收货人 订单批量打印 打印需要批量打印 回访：需要增加 接待人，回访情况，用户评价.客户意见， 送货。 送货公司，单号，时间
---
zhengcaioa/zhengcaioa/Views/CooperOrder/Print.cshtml | 4
zhengcaioa/Model/CooperOrder.cs | 5
zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml | 133 +++++---
zhengcaioa/Model/zhengcaioaContext.cs | 20 +
zhengcaioa/Services/CooperOrderService.cs | 34 +
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 143 ++++++--
表修改.sql | 65 ++++
zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml | 29 +
zhengcaioa/DTO/CooperOrderDTO.cs | 9
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | 17 +
zhengcaioa/zhengcaioa/Views/CooperOrder/Huifang.cshtml | 87 ++++
zhengcaioa/zhengcaioa/Views/CooperOrder/Songhuo.cshtml | 264 ++++++++++++++++
zhengcaioa/zhengcaioa/Views/CooperOrder/printList.cshtml | 133 ++++++++
13 files changed, 845 insertions(+), 98 deletions(-)
diff --git a/zhengcaioa/DTO/CooperOrderDTO.cs b/zhengcaioa/DTO/CooperOrderDTO.cs
index b63d46b..44cc798 100644
--- a/zhengcaioa/DTO/CooperOrderDTO.cs
+++ b/zhengcaioa/DTO/CooperOrderDTO.cs
@@ -62,7 +62,15 @@
public DateTime? Songhuotime { get; set; }
public string OrderType1 { get; set; }
+
+ public string OrderType1Name { get; set; }
public string OrderType2 { get; set; }
+
+ public string SonghuoGongsi { get; set; }
+ public string SonghuoDanhao { get; set; }
+ public DateTime? SonghuoTime1 { get; set; }
+ public string HuifangJdr { get; set; }
+ public string HuifangKehuyijian { get; set; }
}
public class CooperOrderDTOSearch : SearchEntity
@@ -86,5 +94,6 @@
public string HuifangStatussss { get; set; }
+
}
}
diff --git a/zhengcaioa/Model/CooperOrder.cs b/zhengcaioa/Model/CooperOrder.cs
index b55e389..ab9ccaf 100644
--- a/zhengcaioa/Model/CooperOrder.cs
+++ b/zhengcaioa/Model/CooperOrder.cs
@@ -50,5 +50,10 @@
public DateTime? Songhuotime { get; set; }
public string OrderType1 { get; set; }
public string OrderType2 { get; set; }
+ public string SonghuoGongsi { get; set; }
+ public string SonghuoDanhao { get; set; }
+ public DateTime? SonghuoTime1 { get; set; }
+ public string HuifangJdr { get; set; }
+ public string HuifangKehuyijian { get; set; }
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 6d92116..ec20a40 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -1297,6 +1297,14 @@
.HasColumnName("createtime")
.HasDefaultValueSql("(getdate())");
+ entity.Property(e => e.HuifangJdr)
+ .HasMaxLength(100)
+ .HasColumnName("huifang_jdr");
+
+ entity.Property(e => e.HuifangKehuyijian)
+ .HasMaxLength(500)
+ .HasColumnName("huifang_kehuyijian");
+
entity.Property(e => e.HuifangStatus)
.HasMaxLength(2)
.HasColumnName("huifang_status")
@@ -1423,12 +1431,24 @@
.HasColumnName("shr_tel")
.HasComment("鑱旂郴鐢佃瘽");
+ entity.Property(e => e.SonghuoDanhao)
+ .HasMaxLength(100)
+ .HasColumnName("songhuo_danhao");
+
+ entity.Property(e => e.SonghuoGongsi)
+ .HasMaxLength(100)
+ .HasColumnName("songhuo_gongsi");
+
entity.Property(e => e.SonghuoStatus)
.HasMaxLength(2)
.HasColumnName("songhuo_status")
.HasDefaultValueSql("('D')")
.HasComment("閫佽揣鐘舵��");
+ entity.Property(e => e.SonghuoTime1)
+ .HasColumnType("datetime")
+ .HasColumnName("songhuo_time");
+
entity.Property(e => e.Songhuoer)
.HasMaxLength(50)
.HasColumnName("songhuoer");
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 6c62ba6..ddc570d 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -82,6 +82,12 @@
updateproject.Modifier = entity.Modifier;
updateproject.Modifytime = entity.Modifytime;
+ updateproject.SonghuoGongsi = entity.SonghuoGongsi;
+ updateproject.SonghuoDanhao = entity.SonghuoDanhao;
+ updateproject.SonghuoTime1 = entity.SonghuoTime1;
+ updateproject.HuifangJdr = entity.HuifangJdr;
+ updateproject.HuifangKehuyijian = entity.HuifangKehuyijian;
+
}
_context.SaveChanges();
@@ -205,6 +211,16 @@
into ksssss
from kkk in ksssss.DefaultIfEmpty()
+ join l in _context.FiBooks
+ on a.OrderType1 equals l.Id
+ into lsssss
+ from lll in lsssss.DefaultIfEmpty()
+
+ join m in _context.FiMembers
+ on a.OrderType1 equals m.Id
+ into msssss
+ from mmm in msssss.DefaultIfEmpty()
+
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (a.XdTime >= XdTimestart && a.XdTime <= XdTimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || ggg.Ywjl == searchEntity.Ywjl.Trim())
@@ -288,6 +304,13 @@
YouhuiStatus = kkk.Id,
OrderType1 = a.OrderType1,
OrderType2 = a.OrderType2,
+ OrderType1Name = string.IsNullOrEmpty(lll.BookName)? string.IsNullOrEmpty(mmm.MemberType)? a.OrderType1 : mmm.MemberType : lll.BookName,
+
+ SonghuoGongsi = a.SonghuoGongsi,
+ SonghuoDanhao = a.SonghuoDanhao,
+ SonghuoTime1 = a.SonghuoTime1,
+ HuifangJdr = a.HuifangJdr,
+ HuifangKehuyijian = a.HuifangKehuyijian,
}
).OrderByDescending(x => x.OrderNo).ToList();
@@ -416,8 +439,11 @@
updateproject.SonghuoStatus = dto.SonghuoStatus;
updateproject.Songhuoer = dto.Songhuoer;
updateproject.Songhuotime = dto.Songhuotime;
+ updateproject.ShouliStatus = dto.ShouliStatus;
-
+ updateproject.SonghuoTime1 = dto.SonghuoTime1;
+ updateproject.SonghuoDanhao = dto.SonghuoDanhao;
+ updateproject.SonghuoGongsi = dto.SonghuoGongsi;
_context.SaveChanges();
resultEntity.ReturnID = dto.Id;
@@ -480,13 +506,13 @@
var updateproject = _context.CooperOrders.Find(dto.Id);
-
-
+ updateproject.HuifangKehuyijian = dto.HuifangKehuyijian;
+ updateproject.HuifangJdr = dto.HuifangJdr;
updateproject.Huifanger = dto.Huifanger;
updateproject.Huifangtime = dto.Huifangtime;
updateproject.HuifangStatus = dto.HuifangStatus;
updateproject.Huifangremark = dto.Huifangremark;
-
+ updateproject.PingjiaStatus = dto.PingjiaStatus;
_context.SaveChanges();
resultEntity.ReturnID = dto.Id;
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 3841d6b..e9c3bbd 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -72,6 +72,15 @@
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);
+
ViewData["ActionInfo"] = actionlist;
List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/Index/");
@@ -87,6 +96,7 @@
ViewBag.PingjiaStatus = _liaotianService.GetSYScode("CooperOrder", "pingjia_status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+ ViewBag.ShouliStatus = _liaotianService.GetSYScode("CooperOrder", "shouli_status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
return View();
}
@@ -348,6 +358,8 @@
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
+
+
ViewData["ActionInfo"] = actionlist;
ViewBag.OrderType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -386,6 +398,7 @@
else
{
dto.XdTime = DateTime.Now;
+ dto.OrderNum = 1;
ViewBag.ShouliStatus = "1";
}
@@ -484,13 +497,22 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
- CooperOrderDTO dto= new CooperOrderDTO();
- dto.Id = id;
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
+
+ CooperOrderDTO dto = _cooperOrderService.Get(id);
+ if(dto.ShouliStatus != "1")
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鍙湁宸蹭笅鍗曠姸鎬佺殑璁㈠崟鎵嶈兘鍙楃悊";
+ return new JsonResult(resultEntity);
+ }
+
dto.Shoulier = curentuser.Id;
dto.Shoulitime = DateTime.Now;
dto.ShouliStatus = "2";
- ResultEntity resultEntity = _cooperOrderService.shouli(dto);
+ resultEntity = _cooperOrderService.shouli(dto);
return new JsonResult(resultEntity);
}
@@ -518,27 +540,7 @@
return new JsonResult(resultEntity);
}
- /// <summary>
- /// 閫佽揣
- /// </summary>
- /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
- /// <returns></returns>
- ///
-
- public IActionResult Songhuo(string id)
- {
- var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
- ViewData["curentuser"] = curentuser;
- CooperOrderDTO dto = _cooperOrderService.Get(id);
- // dto.Id = id;
- dto.Songhuoer = curentuser.Id;
- dto.Songhuotime = DateTime.Now;
- dto.ShouliStatus = "5";
-
- ResultEntity resultEntity = _cooperOrderService.save(dto);
-
- return new JsonResult(resultEntity);
- }
+
public IActionResult Chedan(string id = null)
{
@@ -553,13 +555,21 @@
public IActionResult chedantuihuan(decimal Price, string Chedanid)
{
- ResultEntity resultEntity = new ResultEntity();
- resultEntity.Result = true;
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
+
+ CooperOrderDTO dto = _cooperOrderService.Get(Chedanid);
+ if (dto.ShouliStatus != "2")
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鍙湁鍙楃悊鐘舵�佺殑璁㈠崟鎵嶈兘鎾ゅ崟";
+ return new JsonResult(resultEntity);
+ }
+
- CooperOrderDTO dto = new CooperOrderDTO();
- dto.Id = Chedanid;
dto.Chedaner = curentuser.Id;
dto.Chedantime = DateTime.Now;
dto.ChedanStatus = "A";
@@ -577,29 +587,82 @@
ViewData["curentuser"] = curentuser;
ViewData["Huifangid"] = id;
-
+ ViewData["PingjiaStatus"] = _liaotianService.GetSYScode("CooperOrder", "pingjia_status");
+ ViewData.Model = _cooperOrderService.Get(id);
return View();
}
- public IActionResult Huifangtuihuan(string Huifangremark, string Huifangid)
+ public IActionResult Huifangtuihuan(CooperOrderDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
resultEntity.Result = true;
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
- CooperOrderDTO dto = new CooperOrderDTO();
- dto.Id = Huifangid;
+
+
dto.Huifanger = curentuser.Id;
dto.Huifangtime = DateTime.Now;
dto.HuifangStatus = "A";
- dto.Huifangremark = Huifangremark;
+
resultEntity = _cooperOrderService.huifang(dto);
return new JsonResult(resultEntity);
}
+
+
+ /// <summary>
+ /// 閫佽揣
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+
+ public IActionResult Songhuo(string id)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ ViewData["Huifangid"] = id;
+
+ var cooperOrderDTO = _cooperOrderService.Get(id);
+ if (!cooperOrderDTO.SonghuoTime1.HasValue)
+ {
+ cooperOrderDTO.SonghuoTime1 = DateTime.Now;
+ }
+
+ ViewData.Model = cooperOrderDTO;
+
+ return View();
+
+
+ }
+
+
+ public IActionResult Songhuotuihuan(CooperOrderDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var cooperOrderDTO = _cooperOrderService.Get(dto.Id);
+ if (cooperOrderDTO.ShouliStatus != "2")
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鍙湁鍙楃悊鐘舵�佺殑璁㈠崟鎵嶈兘閫佽揣";
+ return new JsonResult(resultEntity);
+ }
+
+ dto.Songhuoer = curentuser.Id;
+ dto.Songhuotime = DateTime.Now;
+ dto.ShouliStatus = "5";
+
+ resultEntity = _cooperOrderService.Songhuo(dto);
+
+ return new JsonResult(resultEntity);
+ }
+
public IActionResult Pingjia(string id = null)
{
@@ -662,6 +725,20 @@
}
+ public IActionResult printList(CooperOrderDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ search.rows = 1000;
+ search.page = 1;
+ ViewBag.ListCooperOrderDTO = _cooperOrderService.SearchByPaging(search).DataList as List<CooperOrderDTO>;
+
+
+
+ return View();
+ }
+
+
+
/// <summary>
/// 鑾峰彇鐗╁搧
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
index 933fba3..5635721 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -158,6 +158,23 @@
}
+
+ public IActionResult GetCustomer(string id)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+
+
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(id);
+
+
+
+ return new JsonResult(cooperatecustomCustomerDTO);
+ }
+
+
+
/// <summary>
/// 淇濆瓨
/// </summary>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
index 11bf0b5..422a85c 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -777,6 +777,35 @@
}
+
+
+
+
+ $("#Khdw").change(function () {
+ var Khdw = $("#Khdw").val();
+
+ $.ajax({
+ type: "GET",
+ url: "/CooperatecustomCustomer/GetCustomer?id=" + Khdw,
+ dataType: "json",
+ global: false,
+ data: "",
+ success: function (data) {
+
+ $("#Shr").val(data.ShrName);
+ $("#ShrAddress").val(data.ShrAddress);
+ $("#ShrTel").val(data.ShrTel);
+
+ },
+ error: function () {
+
+
+ parent.layer.msg('澶辫触', { icon: 5 });
+ }
+ });
+ });
+
+
function _pageAutoClose() {
parent.window._reloadPageData();
var index = parent.layer.getFrameIndex(window.name);
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Huifang.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Huifang.cshtml
index 5b9948d..6506b1f 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Huifang.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Huifang.cshtml
@@ -1,10 +1,10 @@
-锘緻model DTO.CooperatecustomCustomerDTO
+锘緻model DTO.CooperOrderDTO
@using DTO;
@using zhengcaioa.Models;
@{
string Huifangid = ViewData["Huifangid"] as string; //鎷滆鏂瑰紡
-
+ List<SysCodeDtl> PingjiaStatus = ViewData["PingjiaStatus"] as List<SysCodeDtl>; //璁㈠崟绫诲瀷
}
@{
Layout = null;
@@ -90,25 +90,64 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5> <i class="fa fa-list"></i> 鍥炶澶囨敞</h5>
+ <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="Huifangid" name="Huifangid" value="@Huifangid" />
+ <input type="hidden" id="Id" name="Id" value="@Huifangid" />
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-2 col-md-2 control-label">鎺ュ緟浜�</label>
+ <div class="col-sm-6 col-md-6">
+ <input id="HuifangJdr" class="form-control" label="鎺ュ緟浜�" name="HuifangJdr" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.HuifangJdr" >
+ </div>
+ </div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
-
- <div class="col-sm-12 col-md-12">
- <textarea class="form-control bt" id="Huifangremark" name="Huifangremark" title="鍥炶澶囨敞" isempty="" maxlength="4000" length="long"></textarea>
+ <label class="text-right col-sm-2 col-md-2 control-label">鍥炶鎯呭喌<i class="red">*</i></label>
+ <div class="col-sm-10 col-md-10">
+ <textarea class="form-control bt" id="Huifangremark" name="Huifangremark" title="鍥炶鎯呭喌" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'" >@Model.Huifangremark</textarea>
</div>
</div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-2 col-md-2 control-label">鐢ㄦ埛璇勪环<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2">
+ <select id="PingjiaStatus" class="form-control" name="PingjiaStatus" data-placeholder="閫夋嫨 搴忓垪 ...">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in PingjiaStatus)
+ {
+ @if (!item.CodeSn.Equals(Model.PingjiaStatus))
+ {
+ <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-2 col-md-2 control-label">瀹㈡埛鎰忚</label>
+ <div class="col-sm-10 col-md-10">
+ <textarea class="form-control bt" id="HuifangKehuyijian" name="HuifangKehuyijian" title="瀹㈡埛鎰忚" isempty="" maxlength="500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'" >@Model.HuifangKehuyijian</textarea>
+ </div>
+ </div>
@@ -133,6 +172,15 @@
</form>
<script type="text/javascript">
+ var Huifangremark = document.getElementById("Huifangremark");
+
+ Huifangremark.style.height = Huifangremark.scrollHeight + 'px';
+
+ var HuifangKehuyijian = document.getElementById("HuifangKehuyijian");
+
+ HuifangKehuyijian.style.height = HuifangKehuyijian.scrollHeight + 'px';
+
+
var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95;
$("#div_content").height(hh);
@@ -155,7 +203,19 @@
// var id = '@Model.';
+ $(document).ready(function () {
+ if ("@Model.HuifangStatus" == "A") {
+ $("input").attr('readonly', true);
+ $("textarea").attr('readonly', true);
+ $(':radio').attr('disabled', true);
+ $(':checkbox').attr('disabled', true);
+ $(':button').attr('disabled', true);
+ $('a').removeAttr('onclick');
+ $('select').attr('disabled', true);
+ $('.btn-success').hide();
+ }
+ });
// 淇濆瓨宀椾綅淇℃伅
var savePosition = function () {
@@ -165,21 +225,26 @@
if ($.trim($("#Huifangremark").val()) == '') {
- toastr.warning("鍥炶澶囨敞涓嶈兘涓虹┖");
+ toastr.warning("鍥炶鎯呭喌涓嶈兘涓虹┖");
+ return;
+ }
+
+ if ($.trim($("#PingjiaStatus").val()) == '') {
+ toastr.warning("鐢ㄦ埛璇勪环涓嶈兘涓虹┖");
return;
}
- var data = { Huifangid: $("#Huifangid").val(), Huifangremark: $("#Huifangremark").val()}
+ // var data = { Huifangid: $("#Huifangid").val(), Huifangremark: $("#Huifangremark").val()}
$.ajax({
type: "POST",
url: "/CooperOrder/Huifangtuihuan",
dataType: "json",
global: false,
- data: data,
+ data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
index 8ff8474..7271917 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
@@ -10,6 +10,8 @@
var Khlx = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Khlx))';
var HuifangStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.HuifangStatus))';
var PingjiaStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.PingjiaStatus))';
+ var ShouliStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShouliStatus))';
+
var pageEntities = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.pageEntities))';
var pageEntitiesJson = JSON.parse(pageEntities);
@@ -38,9 +40,9 @@
pingjiabool = false;
} else if (pageEntitiesJson[i].PageName == "浼樻儬") {
youhuibool = false;
- }
+ }
}
-
+ //gridConfig = { multiselect: true, selectcol: "Id" };
loseherght = 60;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -57,7 +59,18 @@
}
},
- { label: '璁㈠崟绫诲埆', name: 'OrderTypeName', labtype: 'txt', hidden: false, width: 100 },
+ {
+ label: '璁㈠崟绫诲埆', name: 'OrderTypeName', labtype: 'txt', hidden: false, width: 100,
+ formatter: function (cellvalue, options, rowObject) {
+ var OrderTypea = rowObject.OrderTypeName;
+ if (rowObject.OrderType1Name != null && rowObject.OrderType1Name != '') {
+ OrderTypea += '-' + rowObject.OrderType1Name;
+ }
+ if (rowObject.OrderType2 != null && rowObject.OrderType2 != '') {
+ OrderTypea += '-' + rowObject.OrderType2;
+ }
+ return OrderTypea;
+ } },
{ label: '瀹㈡埛鍚嶇О', name: 'KhdwName', labtype: 'txt', hidden: false, width: 200 },
{ label: '鏁伴噺', name: 'OrderNum', labtype: 'txt', hidden: false, width: 60 },
@@ -110,7 +123,7 @@
label: '閫佽揣', name: 'SonghuoStatusName', labtype: 'txt', hidden: songhuobool, width: 60,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.ShouliStatus == '5') {
- return "鈭�";
+ return "<a onclick=\"songhuo('" + rowObject.Id + "')\" >鈭�</a>";
} else {
if (rowObject.ShouliStatus == '1' || rowObject.ChedanStatus == 'A') {
return "";
@@ -132,12 +145,12 @@
}
} else {
- return "鈭�";
+ return "<a onclick=\"huifang('" + rowObject.Id + "')\" >鈭�</a>";
}
}
},
{
- label: '璇勪环', name: 'PingjiaStatusName', labtype: 'txt', hidden: pingjiabool, width: 60,
+ label: '璇勪环', name: 'PingjiaStatusName', labtype: 'txt', hidden: true, width: 60,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.PingjiaStatus == 'D') {
if (rowObject.ShouliStatus == '1') {
@@ -182,7 +195,7 @@
];
-
+
dataUrl = "/CooperOrder/GetList";
@@ -196,8 +209,8 @@
{ label: '鍥炶', name: 'HuifangStatus', labtype: 'combox', hidden: false, data: JSON.parse(HuifangStatus), cwidth: '5%', cccwidth: '8%' },
{ label: '璇勪环', name: 'PingjiaStatus', labtype: 'combox', hidden: false, data: JSON.parse(PingjiaStatus), cwidth: '5%', cccwidth: '8%' },
-
-
+ { label: '璁㈠崟鐘舵��', name: 'ShouliStatus', labtype: 'combox', hidden: false, data: JSON.parse(ShouliStatus), cwidth: '5%', cccwidth: '8%' },
+
@@ -230,7 +243,7 @@
global: false,
data: "",
success: function (data) {
-
+
if (data.Result) {
toastr.success("鍙楃悊鎴愬姛");
window._reloadPageData();
@@ -261,7 +274,7 @@
}
function huifang(id) {
- OpenWindow("鍥炶", "20%", "30%", "/CooperOrder/Huifang?id=" + id);
+ OpenWindow("鍥炶", "50%", "60%", "/CooperOrder/Huifang?id=" + id);
}
function pingjia(id) {
@@ -270,47 +283,47 @@
function songhuo(id) {
+ OpenWindow("閫佽揣", "50%", "60%", "/CooperOrder/Songhuo?id=" + id);
+ //// 1銆佹墦寮�寮瑰嚭灞�
+ //var index = layer.open({
+ // type: 1,銆�銆�//鍩烘湰灞傜被鍨�
+ // icon: 0, //鍥炬爣
+ // content: '纭閫佽揣锛�', //鍐呭
+ // shade: 0.3, //閬僵,濡傛灉鎯冲畾涔夊埆鐨勯鑹�,鍙互shade:[0.5,'#fff']
+ // shadeClose: 1, //鏄惁鐐瑰嚮閬僵鍏抽棴
+ // skin: 'demoClass', //鏍峰紡绫诲悕
+ // moveType: 1, //鎷栨嫿椋庢牸,榛樿涓�0(浼氭湁涓繃搴︾殑閫忔槑妗�)
+ // btn: ['纭畾', '鍙栨秷'], //鎸夐挳
+ // btn1: function () { //鎸夐挳涓�鐨勫洖璋�
- // 1銆佹墦寮�寮瑰嚭灞�
- var index = layer.open({
- type: 1,銆�銆�//鍩烘湰灞傜被鍨�
- icon: 0, //鍥炬爣
- content: '纭閫佽揣锛�', //鍐呭
- shade: 0.3, //閬僵,濡傛灉鎯冲畾涔夊埆鐨勯鑹�,鍙互shade:[0.5,'#fff']
- shadeClose: 1, //鏄惁鐐瑰嚮閬僵鍏抽棴
- skin: 'demoClass', //鏍峰紡绫诲悕
- moveType: 1, //鎷栨嫿椋庢牸,榛樿涓�0(浼氭湁涓繃搴︾殑閫忔槑妗�)
- btn: ['纭畾', '鍙栨秷'], //鎸夐挳
- btn1: function () { //鎸夐挳涓�鐨勫洖璋�
+ // layer.close(index);
- layer.close(index);
+ // $.ajax({
+ // type: "GET",
+ // url: "/CooperOrder/Songhuo?id=" + id,
+ // dataType: "json",
+ // global: false,
+ // data: "",
+ // success: function (data) {
- $.ajax({
- type: "GET",
- url: "/CooperOrder/Songhuo?id=" + id,
- dataType: "json",
- global: false,
- data: "",
- success: function (data) {
-
- if (data.Result) {
- toastr.success("閫佽揣鎴愬姛");
- window._reloadPageData();
- } else {
- toastr.error("閫佽揣澶辫触" + data.Message);
- }
- },
- error: function () {
+ // if (data.Result) {
+ // toastr.success("閫佽揣鎴愬姛");
+ // window._reloadPageData();
+ // } else {
+ // toastr.error("閫佽揣澶辫触" + data.Message);
+ // }
+ // },
+ // error: function () {
- toastr.error("閫佽揣澶辫触");
- }
- });
- },
- // btn2:function(){ //鎸夐挳浜岀殑鍥炶皟
- //
- // }
- });
+ // toastr.error("閫佽揣澶辫触");
+ // }
+ // });
+ // },
+ // // btn2:function(){ //鎸夐挳浜岀殑鍥炶皟
+ // //
+ // // }
+ //});
}
function wangong(id) {
@@ -336,7 +349,7 @@
global: false,
data: "",
success: function (data) {
-
+
if (data.Result) {
toastr.success("瀹屽伐鎴愬姛");
window._reloadPageData();
@@ -356,6 +369,30 @@
// }
});
}
+
+ var _pagePrint = function () {
+
+ var XdTime = $("#PBSXdTime").val();
+ var OrderNo = $("#PBSOrderNo").val();
+ var OrderType = $("#PBSOrderType").val();
+ var Ywjl = $("#PBSYwjl").val();
+ var KhdwName = $("#PBSKhdwName").val();
+
+
+ var Khlx = $("#PBSKhlx").val();
+ var HuifangStatus = $("#PBSHuifangStatus").val();
+ var PingjiaStatus = $("#PBSPingjiaStatus").val();
+
+
+
+ var url = "/CooperOrder/printList?XdTime=" + XdTime + "&OrderNo=" + OrderNo + "&OrderType=" + OrderType + "&Ywjl=" + Ywjl + "&KhdwName=" + KhdwName + "&Khlx=" + Khlx + "&HuifangStatus=" + HuifangStatus + "&PingjiaStatus=" + PingjiaStatus;
+ var me = window.open(url, "鎵撳嵃"); //鎵撳紑鏂扮獥鍙�
+
+
+ }
+
+
+
var _afterSave = function (result) {
if (result) {
toastr.success("淇濆瓨鎴愬姛");
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Print.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Print.cshtml
index 574b066..0bb20ae 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Print.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Print.cshtml
@@ -76,8 +76,8 @@
<tr>
<td style="width:10%;"> 璁㈠崟绫诲瀷</td>
<td style="width:40%;"> @Model.OrderTypeName</td>
- <td style="width:10%;"> </td>
- <td style="width:40%;"> </td>
+ <td style="width:10%;"> 璁㈠崟鐘舵��</td>
+ <td style="width:40%;"> @Model.ShouliStatusName </td>
</tr>
<tr>
<td style="width:10%;"> 璁㈠崟绫诲瀷1</td>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Songhuo.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Songhuo.cshtml
new file mode 100644
index 0000000..05a6b70
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Songhuo.cshtml
@@ -0,0 +1,264 @@
+锘緻model DTO.CooperOrderDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+ string Huifangid = ViewData["Huifangid"] 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="Id" name="Id" value="@Huifangid" />
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-2 col-md-2 control-label">閫佽揣鍏徃<i class="red">*</i></label>
+ <div class="col-sm-6 col-md-6">
+ <input id="SonghuoGongsi" class="form-control" label="閫佽揣鍏徃" name="SonghuoGongsi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.SonghuoGongsi">
+
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-2 col-md-2 control-label">閫佽揣鍗曞彿<i class="red">*</i></label>
+ <div class="col-sm-6 col-md-6">
+ <input id="SonghuoDanhao" class="form-control" label="閫佽揣鍗曞彿" name="SonghuoDanhao" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.SonghuoDanhao">
+
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-2 col-md-2 control-label">閫佽揣鏃堕棿<i class="red">*</i></label>
+ <div class="col-sm-6 col-md-6">
+ <input id="SonghuoTime1" class="form-control" label="閫佽揣鏃堕棿" name="SonghuoTime1" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.SonghuoTime1.Value.ToString("yyyy-MM-dd")" readonly="readonly">
+
+ </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.';
+
+ $(document).ready(function () {
+ if ("@Model.ShouliStatus" == "5") {
+ $("input").attr('readonly', true);
+ $("textarea").attr('readonly', true);
+ $(':radio').attr('disabled', true);
+ $(':checkbox').attr('disabled', true);
+ $(':button').attr('disabled', true);
+ $('a').removeAttr('onclick');
+ $('select').attr('disabled', true);
+ $('.btn-success').hide();
+
+ } else {
+ laydate({ elem: "#SonghuoTime1", format: 'YYYY-MM-DD', istime: true, event: "focus" });
+ }
+ });
+
+ // 淇濆瓨宀椾綅淇℃伅
+ var savePosition = function () {
+
+
+
+
+
+ if ($.trim($("#SonghuoGongsi").val()) == '') {
+ toastr.warning("閫佽揣鍏徃涓嶈兘涓虹┖");
+ return;
+ }
+
+ if ($.trim($("#SonghuoDanhao").val()) == '') {
+ toastr.warning("閫佽揣鍗曞彿涓嶈兘涓虹┖");
+ return;
+ }
+
+ if ($.trim($("#SonghuoTime1").val()) == '') {
+ toastr.warning("閫佽揣鏃堕棿涓嶈兘涓虹┖");
+ return;
+ }
+
+ // var data = { Huifangid: $("#Huifangid").val(), Huifangremark: $("#Huifangremark").val()}
+ $.ajax({
+ type: "POST",
+ url: "/CooperOrder/Songhuotuihuan",
+ 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;
+
+
+
+ _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/CooperOrder/printList.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/printList.cshtml
new file mode 100644
index 0000000..fda33a7
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/printList.cshtml
@@ -0,0 +1,133 @@
+锘緻model DTO.CooperOrderDTO
+@using DTO;
+@{
+ ViewBag.Title = "CooperOrder";
+ Layout = null;
+ List<CooperOrderDTO> ListCooperOrderDTO = ViewBag.ListCooperOrderDTO as List<CooperOrderDTO>; //闂绫诲瀷
+}
+
+<!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 (ListCooperOrderDTO != null && ListCooperOrderDTO.Count > 0)
+ {<table>
+ @foreach (var CooperOrderDTO in ListCooperOrderDTO)
+ {
+
+ <tr>
+ <td style="width:10%;"> 璁㈠崟鍙�</td>
+ <td style="width:40%;"> @CooperOrderDTO.OrderNo</td>
+ <td style="width:10%;"> 瀹㈡埛鍗曚綅</td>
+ <td style="width:40%;"> @CooperOrderDTO.KhdwName</td>
+
+ </tr>
+
+
+
+
+ <tr>
+ <td style="width:10%;"> 璁㈠崟绫诲瀷</td>
+ <td style="width:40%;"> @CooperOrderDTO.OrderTypeName</td>
+ <td style="width:10%;"> 璁㈠崟鐘舵�� </td>
+ <td style="width:40%;"> @CooperOrderDTO.ShouliStatusName </td>
+ </tr>
+ <tr>
+ <td style="width:10%;"> 璁㈠崟绫诲瀷1</td>
+ <td style="width:40%;"> @CooperOrderDTO.OrderType1</td>
+ <td style="width:10%;"> 璁㈠崟绫诲瀷2</td>
+ <td style="width:40%;"> @CooperOrderDTO.OrderType2</td>
+ </tr>
+ <tr>
+ <td style="width:10%;"> 璁㈠崟鏁伴噺</td>
+ <td style="width:40%;"> @CooperOrderDTO.OrderNum</td>
+ <td style="width:10%;"> 鍗曚环</td>
+ <td style="width:40%;"> @CooperOrderDTO.Price</td>
+ </tr>
+ <tr>
+ <td style="width:10%;"> 閲戦</td>
+ <td style="width:40%;"> @CooperOrderDTO.Money</td>
+ <td style="width:10%;"> 鏀惰揣浜�</td>
+ <td style="width:40%;"> @CooperOrderDTO.Shr</td>
+ </tr>
+ <tr>
+ <td style="width:10%;"> 鏀惰揣鍦板潃</td>
+ <td style="width:40%;"> @CooperOrderDTO.ShrAddress</td>
+ <td style="width:10%;"> 鑱旂郴鐢佃瘽</td>
+ <td style="width:40%;"> @CooperOrderDTO.ShrTel</td>
+ </tr>
+ <tr>
+ <td style="width:10%;"> 澶囨敞</td>
+ <td style="width:90%;" colspan="3"> @CooperOrderDTO.Remark</td>
+
+ </tr>
+ }
+
+
+
+
+
+</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/\350\241\250\344\277\256\346\224\271.sql" "b/\350\241\250\344\277\256\346\224\271.sql"
index bac131b..7c9aba8 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,71 @@
USE [zhengcaioa]
GO
+ALTER TABLE [dbo].[CooperOrder] ADD [songhuo_gongsi] [nvarchar](100) NULL
+GO
+ALTER TABLE [dbo].[CooperOrder] ADD [songhuo_danhao] [nvarchar](100) NULL
+GO
+
+ALTER TABLE [dbo].[CooperOrder] ADD [songhuo_time] [datetime] NULL
+GO
+
+
+
+ALTER TABLE [dbo].[CooperOrder] ADD [huifang_jdr] [nvarchar](100) NULL
+GO
+
+
+ALTER TABLE [dbo].[CooperOrder] ADD [huifang_kehuyijian] [nvarchar](500) NULL
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
/****** Object: Table [dbo].[Liaotian_shoucang] Script Date: 2021/7/8 8:49:01 ******/
SET ANSI_NULLS ON
GO
--
Gitblit v1.9.1