From 73e00247164939388fe6e88654a5f182dcd08d1b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 06 一月 2023 09:33:54 +0800
Subject: [PATCH] 订单撤单增加填写扯单原因
---
zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml | 2 +-
zhengcaioa/Services/CooperOrderService.cs | 2 +-
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 5 +++--
zhengcaioa/zhengcaioa/Views/CooperOrder/Chedan.cshtml | 17 +++++++++++------
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index 73edec3..2a8d1b0 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -517,7 +517,7 @@
updateproject.ChedanStatus = dto.ChedanStatus;
updateproject.Chedan = dto.Chedan;
updateproject.ShouliStatus = dto.ShouliStatus;
-
+ updateproject.Remark = dto.Remark;
_context.SaveChanges();
resultEntity.ReturnID = dto.Id;
resultEntity.Result = true;
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index de3dbfc..c399e15 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1346,7 +1346,7 @@
return View();
}
[CheckLogin]
- public IActionResult chedantuihuan(string Chedanid, decimal Price=0)
+ public IActionResult chedantuihuan(string Chedanid, decimal Price=0,string Chedanyuany="")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -1413,7 +1413,8 @@
dto.ChedanStatus = "A";
dto.Chedan = Price;
dto.ShouliStatus = "0";
-
+ if (!string.IsNullOrWhiteSpace(Chedanyuany))
+ dto.Remark += " " + Chedanyuany;
resultEntity = _cooperOrderService.chedan(dto);
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Chedan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Chedan.cshtml
index 075baa1..45e6751 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Chedan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Chedan.cshtml
@@ -100,12 +100,17 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
-
- <div class="col-sm-12 col-md-12">
- <input class="form-control" label="瀹㈡埛鍚嶇О" name="Price" id="Price" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Money" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <label class="text-right col-sm-2 col-md-2 control-label">鎾ゅ崟閫�杩橀噾棰�</label>
+ <div class="col-sm-2 col-md-2">
+ <input class="form-control" label="鎾ゅ崟閫�杩橀噾棰�" name="Price" id="Price" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Money" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</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="Chedanyuany" name="Chedanyuany" 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'"></textarea>
+ </div>
+ </div>
@*<input type="hidden" name="Price" id="Price" value="0" />*@
@@ -167,10 +172,10 @@
toastr.warning("鎾ゅ崟閫�杩橀噾棰濅笉鑳戒负绌�");
return;
}
+
-
- var data = { Chedanid: $("#Chedanid").val(), Price: $("#Price").val()}
+ var data = { Chedanid: $("#Chedanid").val(), Price: $("#Price").val(), Chedanyuany: $("#Chedanyuany").val()}
$.ajax({
type: "POST",
url: "/CooperOrder/chedantuihuan",
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
index ee001a8..eddae22 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
@@ -328,7 +328,7 @@
}
function chedan(id) {
- OpenWindow("鎾ゅ崟", "20%", "30%", "/CooperOrder/Chedan?id=" + id);
+ OpenWindow("鎾ゅ崟", "50%", "60%", "/CooperOrder/Chedan?id=" + id);
}
function huifang(id) {
--
Gitblit v1.9.1