@@ -15,7 +15,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// </summary> | /// </summary> | ||||
public class Purchase_Info_ApplyController : MvcControllerBase | public class Purchase_Info_ApplyController : MvcControllerBase | ||||
{ | { | ||||
private Purchase_Info_ApplyIBLL purchase_Edu_ApplyIBLL = new Purchase_Info_ApplyBLL(); | |||||
private Purchase_Info_ApplyIBLL purchase_Info_ApplyIBLL = new Purchase_Info_ApplyBLL(); | |||||
#region 视图功能 | #region 视图功能 | ||||
@@ -70,7 +70,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
public ActionResult GetPageList(string pagination, string queryJson) | public ActionResult GetPageList(string pagination, string queryJson) | ||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | Pagination paginationobj = pagination.ToObject<Pagination>(); | ||||
var data = purchase_Edu_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var data = purchase_Info_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
rows = data, | rows = data, | ||||
@@ -89,9 +89,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var Purchase_Info_applyData = purchase_Edu_ApplyIBLL.GetPurchase_Info_ApplyEntity( keyValue ); | |||||
var Purchase_Info_applydetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Info_ApplydetailsList( Purchase_Info_applyData.Id ); | |||||
//var Purchase_InfoData = purchase_Edu_ApplyIBLL.GetPurchase_InfoEntity( Purchase_Info_applydetailsData.purchaseid ); | |||||
var Purchase_Info_applyData = purchase_Info_ApplyIBLL.GetPurchase_Info_ApplyEntity( keyValue ); | |||||
var Purchase_Info_applydetailsData = purchase_Info_ApplyIBLL.GetPurchase_Info_ApplydetailsList( Purchase_Info_applyData.Id ); | |||||
//var Purchase_InfoData = purchase_Info_ApplyIBLL.GetPurchase_InfoEntity( Purchase_Info_applydetailsData.purchaseid ); | |||||
var jsonData = new { | var jsonData = new { | ||||
Purchase_Info_apply = Purchase_Info_applyData, | Purchase_Info_apply = Purchase_Info_applyData, | ||||
Purchase_Info_applydetails = Purchase_Info_applydetailsData, | Purchase_Info_applydetails = Purchase_Info_applydetailsData, | ||||
@@ -107,8 +107,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormDataByProcessId(string processId) | public ActionResult GetFormDataByProcessId(string processId) | ||||
{ | { | ||||
var Data = purchase_Edu_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Info_DetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Info_ApplydetailsList(Data.Id); | |||||
var Data = purchase_Info_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Info_DetailsData = purchase_Info_ApplyIBLL.GetPurchase_Info_ApplydetailsList(Data.Id); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
Purchase_Info_apply = Data, | Purchase_Info_apply = Data, | ||||
@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult DeleteForm(string keyValue) | public ActionResult DeleteForm(string keyValue) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.DeleteEntity(keyValue); | |||||
purchase_Info_ApplyIBLL.DeleteEntity(keyValue); | |||||
return Success("删除成功!"); | return Success("删除成功!"); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
@@ -141,11 +141,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[HttpPost] | [HttpPost] | ||||
[ValidateAntiForgeryToken] | [ValidateAntiForgeryToken] | ||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Edu_applydetailsList, string strpurchase_EduEntity) | |||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Info_applydetailsList, string strpurchase_InfoEntity) | |||||
{ | { | ||||
Purchase_Info_ApplyEntity entity = strEntity.ToObject<Purchase_Info_ApplyEntity>(); | Purchase_Info_ApplyEntity entity = strEntity.ToObject<Purchase_Info_ApplyEntity>(); | ||||
List<Purchase_Info_ApplydetailsEntity> purchase_Edu_applydetailsList = strpurchase_Edu_applydetailsList.ToObject<List<Purchase_Info_ApplydetailsEntity>>(); | |||||
purchase_Edu_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Edu_applydetailsList); | |||||
List<Purchase_Info_ApplydetailsEntity> purchase_Info_applydetailsList = strpurchase_Info_applydetailsList.ToObject<List<Purchase_Info_ApplydetailsEntity>>(); | |||||
purchase_Info_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Info_applydetailsList); | |||||
if (string.IsNullOrEmpty(keyValue)) | if (string.IsNullOrEmpty(keyValue)) | ||||
{ | { | ||||
} | } | ||||
@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
public ActionResult ModifyStatus(string keyValue, int status, string processId) | public ActionResult ModifyStatus(string keyValue, int status, string processId) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
purchase_Info_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
return Success("提交成功!"); | return Success("提交成功!"); | ||||
} | } | ||||
#endregion | #endregion | ||||
@@ -15,7 +15,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// </summary> | /// </summary> | ||||
public class Purchase_Logistic_ApplyController : MvcControllerBase | public class Purchase_Logistic_ApplyController : MvcControllerBase | ||||
{ | { | ||||
private Purchase_Logistic_ApplyIBLL purchase_Edu_ApplyIBLL = new Purchase_Logistic_ApplyBLL(); | |||||
private Purchase_Logistic_ApplyIBLL purchase_Logistic_ApplyIBLL = new Purchase_Logistic_ApplyBLL(); | |||||
#region 视图功能 | #region 视图功能 | ||||
@@ -70,7 +70,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
public ActionResult GetPageList(string pagination, string queryJson) | public ActionResult GetPageList(string pagination, string queryJson) | ||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | Pagination paginationobj = pagination.ToObject<Pagination>(); | ||||
var data = purchase_Edu_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var data = purchase_Logistic_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
rows = data, | rows = data, | ||||
@@ -89,9 +89,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var Purchase_Logistic_applyData = purchase_Edu_ApplyIBLL.GetPurchase_Logistic_ApplyEntity( keyValue ); | |||||
var Purchase_Logistic_applydetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Logistic_ApplydetailsList( Purchase_Logistic_applyData.Id ); | |||||
//var Purchase_LogisticData = purchase_Edu_ApplyIBLL.GetPurchase_LogisticEntity( Purchase_Logistic_applydetailsData.purchaseid ); | |||||
var Purchase_Logistic_applyData = purchase_Logistic_ApplyIBLL.GetPurchase_Logistic_ApplyEntity( keyValue ); | |||||
var Purchase_Logistic_applydetailsData = purchase_Logistic_ApplyIBLL.GetPurchase_Logistic_ApplydetailsList( Purchase_Logistic_applyData.Id ); | |||||
//var Purchase_LogisticData = purchase_Logistic_ApplyIBLL.GetPurchase_LogisticEntity( Purchase_Logistic_applydetailsData.purchaseid ); | |||||
var jsonData = new { | var jsonData = new { | ||||
Purchase_Logistic_apply = Purchase_Logistic_applyData, | Purchase_Logistic_apply = Purchase_Logistic_applyData, | ||||
Purchase_Logistic_applydetails = Purchase_Logistic_applydetailsData, | Purchase_Logistic_applydetails = Purchase_Logistic_applydetailsData, | ||||
@@ -107,8 +107,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormDataByProcessId(string processId) | public ActionResult GetFormDataByProcessId(string processId) | ||||
{ | { | ||||
var Data = purchase_Edu_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Logistic_DetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Logistic_ApplydetailsList(Data.Id); | |||||
var Data = purchase_Logistic_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Logistic_DetailsData = purchase_Logistic_ApplyIBLL.GetPurchase_Logistic_ApplydetailsList(Data.Id); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
Purchase_Logistic_apply = Data, | Purchase_Logistic_apply = Data, | ||||
@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult DeleteForm(string keyValue) | public ActionResult DeleteForm(string keyValue) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.DeleteEntity(keyValue); | |||||
purchase_Logistic_ApplyIBLL.DeleteEntity(keyValue); | |||||
return Success("删除成功!"); | return Success("删除成功!"); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
@@ -141,11 +141,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[HttpPost] | [HttpPost] | ||||
[ValidateAntiForgeryToken] | [ValidateAntiForgeryToken] | ||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Edu_applydetailsList, string strpurchase_EduEntity) | |||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Logistic_applydetailsList, string strpurchase_LogisticEntity) | |||||
{ | { | ||||
Purchase_Logistic_ApplyEntity entity = strEntity.ToObject<Purchase_Logistic_ApplyEntity>(); | Purchase_Logistic_ApplyEntity entity = strEntity.ToObject<Purchase_Logistic_ApplyEntity>(); | ||||
List<Purchase_Logistic_ApplydetailsEntity> purchase_Edu_applydetailsList = strpurchase_Edu_applydetailsList.ToObject<List<Purchase_Logistic_ApplydetailsEntity>>(); | |||||
purchase_Edu_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Edu_applydetailsList); | |||||
List<Purchase_Logistic_ApplydetailsEntity> purchase_Logistic_applydetailsList = strpurchase_Logistic_applydetailsList.ToObject<List<Purchase_Logistic_ApplydetailsEntity>>(); | |||||
purchase_Logistic_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Logistic_applydetailsList); | |||||
if (string.IsNullOrEmpty(keyValue)) | if (string.IsNullOrEmpty(keyValue)) | ||||
{ | { | ||||
} | } | ||||
@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
public ActionResult ModifyStatus(string keyValue, int status, string processId) | public ActionResult ModifyStatus(string keyValue, int status, string processId) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
purchase_Logistic_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
return Success("提交成功!"); | return Success("提交成功!"); | ||||
} | } | ||||
#endregion | #endregion | ||||
@@ -15,7 +15,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// </summary> | /// </summary> | ||||
public class Purchase_Other_ApplyController : MvcControllerBase | public class Purchase_Other_ApplyController : MvcControllerBase | ||||
{ | { | ||||
private Purchase_Other_ApplyIBLL purchase_Edu_ApplyIBLL = new Purchase_Other_ApplyBLL(); | |||||
private Purchase_Other_ApplyIBLL purchase_Other_ApplyIBLL = new Purchase_Other_ApplyBLL(); | |||||
#region 视图功能 | #region 视图功能 | ||||
@@ -70,7 +70,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
public ActionResult GetPageList(string pagination, string queryJson) | public ActionResult GetPageList(string pagination, string queryJson) | ||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | Pagination paginationobj = pagination.ToObject<Pagination>(); | ||||
var data = purchase_Edu_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var data = purchase_Other_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
rows = data, | rows = data, | ||||
@@ -89,9 +89,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var Purchase_Other_applyData = purchase_Edu_ApplyIBLL.GetPurchase_Other_ApplyEntity( keyValue ); | |||||
var Purchase_Other_applydetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Other_ApplydetailsList( Purchase_Other_applyData.Id ); | |||||
//var Purchase_OtherData = purchase_Edu_ApplyIBLL.GetPurchase_OtherEntity( Purchase_Other_applydetailsData.purchaseid ); | |||||
var Purchase_Other_applyData = purchase_Other_ApplyIBLL.GetPurchase_Other_ApplyEntity( keyValue ); | |||||
var Purchase_Other_applydetailsData = purchase_Other_ApplyIBLL.GetPurchase_Other_ApplydetailsList( Purchase_Other_applyData.Id ); | |||||
//var Purchase_OtherData = purchase_Other_ApplyIBLL.GetPurchase_OtherEntity( Purchase_Other_applydetailsData.purchaseid ); | |||||
var jsonData = new { | var jsonData = new { | ||||
Purchase_Other_apply = Purchase_Other_applyData, | Purchase_Other_apply = Purchase_Other_applyData, | ||||
Purchase_Other_applydetails = Purchase_Other_applydetailsData, | Purchase_Other_applydetails = Purchase_Other_applydetailsData, | ||||
@@ -107,8 +107,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormDataByProcessId(string processId) | public ActionResult GetFormDataByProcessId(string processId) | ||||
{ | { | ||||
var Data = purchase_Edu_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Other_DetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Other_ApplydetailsList(Data.Id); | |||||
var Data = purchase_Other_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Other_DetailsData = purchase_Other_ApplyIBLL.GetPurchase_Other_ApplydetailsList(Data.Id); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
Purchase_Other_apply = Data, | Purchase_Other_apply = Data, | ||||
@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult DeleteForm(string keyValue) | public ActionResult DeleteForm(string keyValue) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.DeleteEntity(keyValue); | |||||
purchase_Other_ApplyIBLL.DeleteEntity(keyValue); | |||||
return Success("删除成功!"); | return Success("删除成功!"); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
@@ -141,11 +141,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[HttpPost] | [HttpPost] | ||||
[ValidateAntiForgeryToken] | [ValidateAntiForgeryToken] | ||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Edu_applydetailsList, string strpurchase_EduEntity) | |||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Other_applydetailsList, string strpurchase_OtherEntity) | |||||
{ | { | ||||
Purchase_Other_ApplyEntity entity = strEntity.ToObject<Purchase_Other_ApplyEntity>(); | Purchase_Other_ApplyEntity entity = strEntity.ToObject<Purchase_Other_ApplyEntity>(); | ||||
List<Purchase_Other_ApplydetailsEntity> purchase_Edu_applydetailsList = strpurchase_Edu_applydetailsList.ToObject<List<Purchase_Other_ApplydetailsEntity>>(); | |||||
purchase_Edu_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Edu_applydetailsList); | |||||
List<Purchase_Other_ApplydetailsEntity> purchase_Other_applydetailsList = strpurchase_Other_applydetailsList.ToObject<List<Purchase_Other_ApplydetailsEntity>>(); | |||||
purchase_Other_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Other_applydetailsList); | |||||
if (string.IsNullOrEmpty(keyValue)) | if (string.IsNullOrEmpty(keyValue)) | ||||
{ | { | ||||
} | } | ||||
@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
public ActionResult ModifyStatus(string keyValue, int status, string processId) | public ActionResult ModifyStatus(string keyValue, int status, string processId) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
purchase_Other_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
return Success("提交成功!"); | return Success("提交成功!"); | ||||
} | } | ||||
#endregion | #endregion | ||||
@@ -15,7 +15,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// </summary> | /// </summary> | ||||
public class Purchase_Print_ApplyController : MvcControllerBase | public class Purchase_Print_ApplyController : MvcControllerBase | ||||
{ | { | ||||
private Purchase_Print_ApplyIBLL purchase_Edu_ApplyIBLL = new Purchase_Print_ApplyBLL(); | |||||
private Purchase_Print_ApplyIBLL purchase_Print_ApplyIBLL = new Purchase_Print_ApplyBLL(); | |||||
#region 视图功能 | #region 视图功能 | ||||
@@ -70,7 +70,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
public ActionResult GetPageList(string pagination, string queryJson) | public ActionResult GetPageList(string pagination, string queryJson) | ||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | Pagination paginationobj = pagination.ToObject<Pagination>(); | ||||
var data = purchase_Edu_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var data = purchase_Print_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
rows = data, | rows = data, | ||||
@@ -89,9 +89,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var Purchase_Print_applyData = purchase_Edu_ApplyIBLL.GetPurchase_Print_ApplyEntity( keyValue ); | |||||
var Purchase_Print_applydetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Print_ApplydetailsList( Purchase_Print_applyData.Id ); | |||||
//var Purchase_PrintData = purchase_Edu_ApplyIBLL.GetPurchase_PrintEntity( Purchase_Print_applydetailsData.purchaseid ); | |||||
var Purchase_Print_applyData = purchase_Print_ApplyIBLL.GetPurchase_Print_ApplyEntity( keyValue ); | |||||
var Purchase_Print_applydetailsData = purchase_Print_ApplyIBLL.GetPurchase_Print_ApplydetailsList( Purchase_Print_applyData.Id ); | |||||
//var Purchase_PrintData = purchase_Print_ApplyIBLL.GetPurchase_PrintEntity( Purchase_Print_applydetailsData.purchaseid ); | |||||
var jsonData = new { | var jsonData = new { | ||||
Purchase_Print_apply = Purchase_Print_applyData, | Purchase_Print_apply = Purchase_Print_applyData, | ||||
Purchase_Print_applydetails = Purchase_Print_applydetailsData, | Purchase_Print_applydetails = Purchase_Print_applydetailsData, | ||||
@@ -107,8 +107,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormDataByProcessId(string processId) | public ActionResult GetFormDataByProcessId(string processId) | ||||
{ | { | ||||
var Data = purchase_Edu_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Print_DetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Print_ApplydetailsList(Data.Id); | |||||
var Data = purchase_Print_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Print_DetailsData = purchase_Print_ApplyIBLL.GetPurchase_Print_ApplydetailsList(Data.Id); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
Purchase_Print_apply = Data, | Purchase_Print_apply = Data, | ||||
@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult DeleteForm(string keyValue) | public ActionResult DeleteForm(string keyValue) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.DeleteEntity(keyValue); | |||||
purchase_Print_ApplyIBLL.DeleteEntity(keyValue); | |||||
return Success("删除成功!"); | return Success("删除成功!"); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
@@ -141,11 +141,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[HttpPost] | [HttpPost] | ||||
[ValidateAntiForgeryToken] | [ValidateAntiForgeryToken] | ||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Edu_applydetailsList, string strpurchase_EduEntity) | |||||
public ActionResult SaveForm(string keyValue, string strEntity, string strPurchase_Print_applydetailsList, string strpurchase_PrintEntity) | |||||
{ | { | ||||
Purchase_Print_ApplyEntity entity = strEntity.ToObject<Purchase_Print_ApplyEntity>(); | Purchase_Print_ApplyEntity entity = strEntity.ToObject<Purchase_Print_ApplyEntity>(); | ||||
List<Purchase_Print_ApplydetailsEntity> purchase_Edu_applydetailsList = strpurchase_Edu_applydetailsList.ToObject<List<Purchase_Print_ApplydetailsEntity>>(); | |||||
purchase_Edu_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Edu_applydetailsList); | |||||
List<Purchase_Print_ApplydetailsEntity> purchase_Print_applydetailsList = strPurchase_Print_applydetailsList.ToObject<List<Purchase_Print_ApplydetailsEntity>>(); | |||||
purchase_Print_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Print_applydetailsList); | |||||
if (string.IsNullOrEmpty(keyValue)) | if (string.IsNullOrEmpty(keyValue)) | ||||
{ | { | ||||
} | } | ||||
@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
public ActionResult ModifyStatus(string keyValue, int status, string processId) | public ActionResult ModifyStatus(string keyValue, int status, string processId) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
purchase_Print_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
return Success("提交成功!"); | return Success("提交成功!"); | ||||
} | } | ||||
#endregion | #endregion | ||||
@@ -15,7 +15,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// </summary> | /// </summary> | ||||
public class Purchase_Student_ApplyController : MvcControllerBase | public class Purchase_Student_ApplyController : MvcControllerBase | ||||
{ | { | ||||
private Purchase_Student_ApplyIBLL purchase_Edu_ApplyIBLL = new Purchase_Student_ApplyBLL(); | |||||
private Purchase_Student_ApplyIBLL purchase_Student_ApplyIBLL = new Purchase_Student_ApplyBLL(); | |||||
#region 视图功能 | #region 视图功能 | ||||
@@ -70,7 +70,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
public ActionResult GetPageList(string pagination, string queryJson) | public ActionResult GetPageList(string pagination, string queryJson) | ||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | Pagination paginationobj = pagination.ToObject<Pagination>(); | ||||
var data = purchase_Edu_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var data = purchase_Student_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
rows = data, | rows = data, | ||||
@@ -89,9 +89,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var Purchase_Student_applyData = purchase_Edu_ApplyIBLL.GetPurchase_Student_ApplyEntity( keyValue ); | |||||
var Purchase_Student_applydetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Student_ApplydetailsList( Purchase_Student_applyData.Id ); | |||||
//var Purchase_StudentData = purchase_Edu_ApplyIBLL.GetPurchase_StudentEntity( Purchase_Student_applydetailsData.purchaseid ); | |||||
var Purchase_Student_applyData = purchase_Student_ApplyIBLL.GetPurchase_Student_ApplyEntity( keyValue ); | |||||
var Purchase_Student_applydetailsData = purchase_Student_ApplyIBLL.GetPurchase_Student_ApplydetailsList( Purchase_Student_applyData.Id ); | |||||
//var Purchase_StudentData = purchase_Student_ApplyIBLL.GetPurchase_StudentEntity( Purchase_Student_applydetailsData.purchaseid ); | |||||
var jsonData = new { | var jsonData = new { | ||||
Purchase_Student_apply = Purchase_Student_applyData, | Purchase_Student_apply = Purchase_Student_applyData, | ||||
Purchase_Student_applydetails = Purchase_Student_applydetailsData, | Purchase_Student_applydetails = Purchase_Student_applydetailsData, | ||||
@@ -107,8 +107,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormDataByProcessId(string processId) | public ActionResult GetFormDataByProcessId(string processId) | ||||
{ | { | ||||
var Data = purchase_Edu_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Student_DetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Student_ApplydetailsList(Data.Id); | |||||
var Data = purchase_Student_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Student_DetailsData = purchase_Student_ApplyIBLL.GetPurchase_Student_ApplydetailsList(Data.Id); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
Purchase_Student_apply = Data, | Purchase_Student_apply = Data, | ||||
@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult DeleteForm(string keyValue) | public ActionResult DeleteForm(string keyValue) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.DeleteEntity(keyValue); | |||||
purchase_Student_ApplyIBLL.DeleteEntity(keyValue); | |||||
return Success("删除成功!"); | return Success("删除成功!"); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
@@ -141,11 +141,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[HttpPost] | [HttpPost] | ||||
[ValidateAntiForgeryToken] | [ValidateAntiForgeryToken] | ||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Edu_applydetailsList, string strpurchase_EduEntity) | |||||
public ActionResult SaveForm(string keyValue, string strEntity, string strPurchase_Student_applydetailsList, string strpurchase_StudentEntity) | |||||
{ | { | ||||
Purchase_Student_ApplyEntity entity = strEntity.ToObject<Purchase_Student_ApplyEntity>(); | Purchase_Student_ApplyEntity entity = strEntity.ToObject<Purchase_Student_ApplyEntity>(); | ||||
List<Purchase_Student_ApplydetailsEntity> purchase_Edu_applydetailsList = strpurchase_Edu_applydetailsList.ToObject<List<Purchase_Student_ApplydetailsEntity>>(); | |||||
purchase_Edu_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Edu_applydetailsList); | |||||
List<Purchase_Student_ApplydetailsEntity> purchase_Student_applydetailsList = strPurchase_Student_applydetailsList.ToObject<List<Purchase_Student_ApplydetailsEntity>>(); | |||||
purchase_Student_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Student_applydetailsList); | |||||
if (string.IsNullOrEmpty(keyValue)) | if (string.IsNullOrEmpty(keyValue)) | ||||
{ | { | ||||
} | } | ||||
@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
public ActionResult ModifyStatus(string keyValue, int status, string processId) | public ActionResult ModifyStatus(string keyValue, int status, string processId) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
purchase_Student_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
return Success("提交成功!"); | return Success("提交成功!"); | ||||
} | } | ||||
#endregion | #endregion | ||||
@@ -15,7 +15,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// </summary> | /// </summary> | ||||
public class Purchase_Work_ApplyController : MvcControllerBase | public class Purchase_Work_ApplyController : MvcControllerBase | ||||
{ | { | ||||
private Purchase_Work_ApplyIBLL purchase_Edu_ApplyIBLL = new Purchase_Work_ApplyBLL(); | |||||
private Purchase_Work_ApplyIBLL purchase_Work_ApplyIBLL = new Purchase_Work_ApplyBLL(); | |||||
#region 视图功能 | #region 视图功能 | ||||
@@ -70,7 +70,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
public ActionResult GetPageList(string pagination, string queryJson) | public ActionResult GetPageList(string pagination, string queryJson) | ||||
{ | { | ||||
Pagination paginationobj = pagination.ToObject<Pagination>(); | Pagination paginationobj = pagination.ToObject<Pagination>(); | ||||
var data = purchase_Edu_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var data = purchase_Work_ApplyIBLL.GetPageList(paginationobj, queryJson); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
rows = data, | rows = data, | ||||
@@ -89,9 +89,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var Purchase_Work_applyData = purchase_Edu_ApplyIBLL.GetPurchase_Work_ApplyEntity( keyValue ); | |||||
var Purchase_Work_applydetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Work_ApplydetailsList( Purchase_Work_applyData.Id ); | |||||
//var Purchase_WorkData = purchase_Edu_ApplyIBLL.GetPurchase_WorkEntity( Purchase_Work_applydetailsData.purchaseid ); | |||||
var Purchase_Work_applyData = purchase_Work_ApplyIBLL.GetPurchase_Work_ApplyEntity( keyValue ); | |||||
var Purchase_Work_applydetailsData = purchase_Work_ApplyIBLL.GetPurchase_Work_ApplydetailsList( Purchase_Work_applyData.Id ); | |||||
//var Purchase_WorkData = purchase_Work_ApplyIBLL.GetPurchase_WorkEntity( Purchase_Work_applydetailsData.purchaseid ); | |||||
var jsonData = new { | var jsonData = new { | ||||
Purchase_Work_apply = Purchase_Work_applyData, | Purchase_Work_apply = Purchase_Work_applyData, | ||||
Purchase_Work_applydetails = Purchase_Work_applydetailsData, | Purchase_Work_applydetails = Purchase_Work_applydetailsData, | ||||
@@ -107,8 +107,8 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormDataByProcessId(string processId) | public ActionResult GetFormDataByProcessId(string processId) | ||||
{ | { | ||||
var Data = purchase_Edu_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Work_DetailsData = purchase_Edu_ApplyIBLL.GetPurchase_Work_ApplydetailsList(Data.Id); | |||||
var Data = purchase_Work_ApplyIBLL.GetEntityByProcessId(processId); | |||||
var Purchase_Work_DetailsData = purchase_Work_ApplyIBLL.GetPurchase_Work_ApplydetailsList(Data.Id); | |||||
var jsonData = new | var jsonData = new | ||||
{ | { | ||||
Purchase_Work_apply = Data, | Purchase_Work_apply = Data, | ||||
@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult DeleteForm(string keyValue) | public ActionResult DeleteForm(string keyValue) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.DeleteEntity(keyValue); | |||||
purchase_Work_ApplyIBLL.DeleteEntity(keyValue); | |||||
return Success("删除成功!"); | return Success("删除成功!"); | ||||
} | } | ||||
/// <summary> | /// <summary> | ||||
@@ -141,11 +141,11 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
[HttpPost] | [HttpPost] | ||||
[ValidateAntiForgeryToken] | [ValidateAntiForgeryToken] | ||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult SaveForm(string keyValue, string strEntity, string strpurchase_Edu_applydetailsList, string strpurchase_EduEntity) | |||||
public ActionResult SaveForm(string keyValue, string strEntity, string strPurchase_Work_applydetailsList, string strpurchase_WorkEntity) | |||||
{ | { | ||||
Purchase_Work_ApplyEntity entity = strEntity.ToObject<Purchase_Work_ApplyEntity>(); | Purchase_Work_ApplyEntity entity = strEntity.ToObject<Purchase_Work_ApplyEntity>(); | ||||
List<Purchase_Work_ApplydetailsEntity> purchase_Edu_applydetailsList = strpurchase_Edu_applydetailsList.ToObject<List<Purchase_Work_ApplydetailsEntity>>(); | |||||
purchase_Edu_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Edu_applydetailsList); | |||||
List<Purchase_Work_ApplydetailsEntity> purchase_Work_applydetailsList = strPurchase_Work_applydetailsList.ToObject<List<Purchase_Work_ApplydetailsEntity>>(); | |||||
purchase_Work_ApplyIBLL.SaveEntity(keyValue,entity,purchase_Work_applydetailsList); | |||||
if (string.IsNullOrEmpty(keyValue)) | if (string.IsNullOrEmpty(keyValue)) | ||||
{ | { | ||||
} | } | ||||
@@ -163,7 +163,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers | |||||
/// <returns></returns> | /// <returns></returns> | ||||
public ActionResult ModifyStatus(string keyValue, int status, string processId) | public ActionResult ModifyStatus(string keyValue, int status, string processId) | ||||
{ | { | ||||
purchase_Edu_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
purchase_Work_ApplyIBLL.ModifyStatus(keyValue, status, processId); | |||||
return Success("提交成功!"); | return Success("提交成功!"); | ||||
} | } | ||||
#endregion | #endregion | ||||
@@ -16,12 +16,12 @@ export default { | |||||
// "http://localhost:8088/" | // "http://localhost:8088/" | ||||
// ], | // ], | ||||
"apiHost": [ | "apiHost": [ | ||||
"http://fwh.ldyesz.edu.cn:9000/",//H5打包 | |||||
// "http://fwh.ldyesz.edu.cn:9000/",//H5打包 | |||||
// "http://10.10.4.45:9000/"//app打包, | // "http://10.10.4.45:9000/"//app打包, | ||||
// "http://192.168.10.122:8002/", | |||||
"http://localhost:31173/", | |||||
], | ], | ||||
"webHost": "http://fwh.ldyesz.edu.cn:8000/", | |||||
// "webHost": "http://192.168.10.122:8001/", | |||||
// "webHost": "http://fwh.ldyesz.edu.cn:8000/", | |||||
"webHost": "http://localhost:20472/", | |||||
// 开发环境下自动填充登录账号密码,与接口地址一一对应,只在开发环境下显示 | // 开发环境下自动填充登录账号密码,与接口地址一一对应,只在开发环境下显示 | ||||
"devAccount": [{ | "devAccount": [{ | ||||
username: "system", | username: "system", | ||||