From 2170c8b15c1b0d7fda884bb5c96bd26207add643 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 17 一月 2022 10:48:49 +0800
Subject: [PATCH] 班次类型
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs | 16 ++++++++++++----
zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml | 2 +-
zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml | 2 +-
zhengcaioa/Services/OrderBanciDtlService.cs | 2 +-
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/OrderBanciDtlService.cs b/zhengcaioa/Services/OrderBanciDtlService.cs
index 2c7158e..50c51ae 100644
--- a/zhengcaioa/Services/OrderBanciDtlService.cs
+++ b/zhengcaioa/Services/OrderBanciDtlService.cs
@@ -121,7 +121,7 @@
var query = (from a in _context.OrderBanciDtls
- join d in listCode.Where(x => x.CodeTable == "order_banci_dtl" && x.CodeField == "shangxiawu")
+ join d in listCode.Where(x => x.CodeTable == "order_banci_order" && x.CodeField == "kechengleixing_id")
on a.Shangxiawu equals d.CodeSn
into dzsssss
from dzzzzz in dzsssss.DefaultIfEmpty()
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
index 7fe4a39..e48f004 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
@@ -214,7 +214,7 @@
- ViewData["shangxiawu"] = _liaotianService.GetSYScode("order_banci_dtl", "shangxiawu");
+ ViewData["shangxiawu"] = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id");
@@ -334,10 +334,18 @@
returnMsg.error = "娌℃湁鏌ヨ鍒扮彮娆�";
returnMsg.count = 0;
}
+ else
+ {
+ OrderBanciDtlDTOSearch searchEntity = new OrderBanciDtlDTOSearch();
+ searchEntity.page = 1;
+ searchEntity.rows = 1000;
+ searchEntity.OrderBanciId = id;
+ orderBanciDTO.orderBanciDtlDTOs = _orderBanciDtlService.SearchByPaging(searchEntity).DataList;
+ returnMsg.code = 1;
+ returnMsg.count = 1;
+ returnMsg.returnObj = orderBanciDTO;
+ }
- returnMsg.code = 1;
- returnMsg.count = 1;
- returnMsg.returnObj = orderBanciDTO;
}
catch (Exception ex)
{
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml
index 7bf5f0d..7fe5021 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/EditDtl.cshtml
@@ -98,7 +98,7 @@
<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>
+ <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>
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
index f2cab0f..c3fc1b2 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
@@ -20,7 +20,7 @@
{ 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,
+ 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>";
}
--
Gitblit v1.9.1