Browse Source

【修改】缴费订单管理:增加人工核验功能;缴费模块列表金额显示两位小数;

西昌分支
dyy 5 months ago
parent
commit
97e8852a45
16 changed files with 325 additions and 54 deletions
  1. +34
    -6
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuOrderController.cs
  2. +5
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js
  3. +35
    -7
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuBalance/Index.js
  4. +10
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml
  5. +46
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js
  6. +19
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/ResultForm.cshtml
  7. +37
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/ResultForm.js
  8. +20
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrderDetail/Index.js
  9. +20
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.js
  10. +20
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.js
  11. +20
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js
  12. +20
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.js
  13. +24
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForTeacher.js
  14. +10
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStudent/Index.js
  15. +4
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  16. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

+ 34
- 6
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuOrderController.cs View File

@@ -5,6 +5,7 @@ using System.Web.Mvc;
using System.Collections.Generic;
using Learun.Application.Base.SystemModule;
using Learun.Util.Operat;
using System.Threading.Tasks;

namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
@@ -29,7 +30,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
[HttpGet]
public ActionResult Index()
{
return View();
return View();
}
/// <summary>
/// 表单页
@@ -38,13 +39,18 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
[HttpGet]
public ActionResult Form()
{
return View();
return View();
}
[HttpGet]
public ActionResult ResultForm()
{
return View();
}

[HttpGet]
public ActionResult Import()
{
return View();
return View();
}
#endregion

@@ -80,8 +86,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var FinaChargeStuOrderData = finaChargeStuOrderIBLL.GetFinaChargeStuOrderEntity( keyValue );
var jsonData = new {
var FinaChargeStuOrderData = finaChargeStuOrderIBLL.GetFinaChargeStuOrderEntity(keyValue);
var jsonData = new
{
FinaChargeStuOrder = FinaChargeStuOrderData,
};
return Success(jsonData);
@@ -114,12 +121,33 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
public ActionResult SaveForm(string keyValue, string strEntity)
{
FinaChargeStuOrderEntity entity = strEntity.ToObject<FinaChargeStuOrderEntity>();
finaChargeStuOrderIBLL.SaveEntity(keyValue,entity);
finaChargeStuOrderIBLL.SaveEntity(keyValue, entity);
if (string.IsNullOrEmpty(keyValue))
{
}
return Success("保存成功!");
}
/// <summary>
/// 保存实体数据(新增、修改)
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="strEntity">实体</param>
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
[AjaxOnly]
public ActionResult SaveResultForm(string keyValue, string strEntity)
{
if (!string.IsNullOrEmpty(keyValue))
{
FinaChargeStuOrderEntity entity = strEntity.ToObject<FinaChargeStuOrderEntity>();
finaChargeStuOrderIBLL.SaveEntity(keyValue, entity);

string excelInvoice = Config.GetValue("HandPayResult");
Task.Run(() => HttpMethods.Post(excelInvoice + "?FCSOId=" + keyValue));
}
return Success("操作成功!");
}

/// <summary>
/// 导入


+ 5
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js View File

@@ -71,7 +71,11 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "退费金额", name: "Amount", width: 100, align: "left" },
{
label: "退费金额", name: "Amount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{ label: "退费时间", name: "F_CreateDate", width: 150, align: "left" },
{
label: "退费方式", name: "RType", width: 100, align: "left",


+ 35
- 7
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuBalance/Index.js View File

@@ -109,13 +109,41 @@ var bootstrap = function ($, learun) {
{ label: "缴费年度", name: "FSYear", width: 100, align: "left" },
{ label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" },
{ label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left" },
{ label: "收费标准", name: "Standard", width: 100, align: "left" },
{ label: "本次应缴余额", name: "DJAmount", width: 100, align: "left" },
{ label: "缴费金额", name: "PaymentAmount", width: 100, align: "left" },
{ label: "剩余应缴余额", name: "QJAmount", width: 100, align: "left" },
{ label: "当前超出应收额", name: "OldBalance", width: 100, align: "left" },
{ label: "本次变动金额", name: "ChangeAmount", width: 100, align: "left" },
{ label: "超出应收额", name: "NowBalance", width: 100, align: "left" },
{
label: "收费标准", name: "Standard", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "本次应缴余额", name: "DJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "PaymentAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "剩余应缴余额", name: "QJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "当前超出应收额", name: "OldBalance", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "本次变动金额", name: "ChangeAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "NowBalance", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{ label: "变动时间", name: "ChangeDate", width: 150, align: "left" },
{
label: "变动原因", name: "ChangeType", width: 100, align: "left", formatter: function (cellvalue, row) {


+ 10
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml View File

@@ -1,8 +1,10 @@
@{
ViewBag.Title = "缴费订单管理";
Layout = "~/Views/Shared/_Index.cshtml";
/**/

ViewBag.Title = "缴费订单管理";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout " >
<div class="lr-layout ">
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle ">
<div class="lr-layout-tool">
@@ -46,8 +48,11 @@
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_import" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 导入线下缴费记录</a>
<a id="lr_detail" class="btn btn-default"><i class="fa fa-reorder"></i>&nbsp; 查看明细</a>
<a id="lr_import" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 导入线下缴费记录</a>
<a id="lr_detail" class="btn btn-default"><i class="fa fa-reorder"></i>&nbsp; 查看明细</a>
</div>
<div class=" btn-group btn-group-sm">
<a id="lr_handCheck" class="btn btn-default"><i class="fa fa-edit"></i>&nbsp; 人工核验</a>
</div>
</div>
</div>


+ 46
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js View File

@@ -84,6 +84,32 @@ var bootstrap = function ($, learun) {
});
}
});
//人工核验
$('#lr_handCheck').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != 0) {
learun.alert.warning("选中订单缴费状态已完成!");
return false;
}
var OrderType = $('#gridtable').jfGridValue('OrderType');
if (OrderType != 1) {
learun.alert.warning("人工核验只针对二维码缴费的订单!");
return false;
}
learun.layerForm({
id: 'resultForm',
title: "登记缴费信息",
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuOrder/ResultForm?keyValue=' + keyValue,
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
},
// 初始化列表
initGird: function () {
@@ -141,10 +167,26 @@ var bootstrap = function ($, learun) {
{ label: "年级", name: "Grade", width: 80, align: "left" },
{ label: "缴费年度", name: "YearNo", width: 80, align: "left" },
{ label: "订单编号", name: "orderid", width: 150, align: "left"},
{ label: "收费标准", name: "YJAmount", width: 100, align: "left"},
{ label: "缴费金额", name: "SJAmount", width: 100, align: "left"},
{ label: "应缴余额", name: "DJAmount", width: 100, align: "left"},
{ label: "超出应收额", name: "NowBlance", width: 100, align: "left"},
{
label: "收费标准", name: "YJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "SJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "应缴余额", name: "DJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "NowBlance", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{ label: "缴费状态", name: "Status", width: 100, align: "left",
formatterAsync: function (callback, value, row, op,$cell) {
learun.clientdata.getAsync('dataItem', {


+ 19
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/ResultForm.cshtml View File

@@ -0,0 +1,19 @@
@{
ViewBag.Title = "缴费订单管理";
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-12 lr-form-item" data-table="FinaChargeStuOrder">
<div class="lr-form-item-title">付款时间<font face="宋体">*</font></div>
<input id="PayTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="FinaChargeStuOrder">
<div class="lr-form-item-title">支付方式<font face="宋体">*</font></div>
<input id="PayMode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-12 lr-form-item" data-table="FinaChargeStuOrder">
<div class="lr-form-item-title">银行订单号<font face="宋体">*</font></div>
<input id="BankOrder" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
</div>
@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/ResultForm.js")

+ 37
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/ResultForm.js View File

@@ -0,0 +1,37 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术(苏州)有限公司
* 创建人:超级管理员
* 日 期:2023-08-12 22:06
* 描 述:缴费订单管理
*/
var acceptClick;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
$('.lr-form-wrap').lrscroll();
page.bind();
page.initData();
},
bind: function () {
//$('#PayMode').lrDataItemSelect({ code: 'PayMode' });
}
};
// 保存数据
acceptClick = function (callBack) {
if (!$('body').lrValidform()) {
return false;
}
var postData = {
strEntity: JSON.stringify($('body').lrGetFormData())
};
$.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuOrder/SaveResultForm?keyValue=' + keyValue, postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack();
}
});
};
page.init();
}

+ 20
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrderDetail/Index.js View File

@@ -26,10 +26,26 @@ var bootstrap = function ($, learun) {
headData: [
{ label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left"},
{ label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left"},
{ label: "收费标准", name: "YJAmount", width: 100, align: "left"},
{ label: "缴费金额", name: "SJAmount", width: 100, align: "left"},
{ label: "应缴余额", name: "DJAmount", width: 100, align: "left"},
{ label: "超出应收额", name: "NowBlance", width: 100, align: "left"},
{
label: "收费标准", name: "YJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "SJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "应缴余额", name: "DJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "NowBlance", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
],
mainId:'Id',
isPage: true,


+ 20
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForStudent.js View File

@@ -143,10 +143,26 @@ var bootstrap = function ($, learun) {
},
{ label: "年级", name: "Grade", width: 100, align: "left" },
{ label: "缴费年度", name: "FSYear", width: 100, align: "left" },
{ label: "收费标准", name: "YJAmount", width: 80, align: "left" },
{ label: "缴费金额", name: "SJAmount", width: 80, align: "left" },
{ label: "应缴余额", name: "NeedToPay", width: 80, align: "left" },
{ label: "超出应收额", name: "FSBlance", width: 80, align: "left" },
{
label: "收费标准", name: "YJAmount", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "SJAmount", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "应缴余额", name: "NeedToPay", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "FSBlance", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatter: function (cellvalue, row) {


+ 20
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.js View File

@@ -118,10 +118,26 @@ var bootstrap = function ($, learun) {
},
{ label: "年级", name: "Grade", width: 80, align: "left" },
{ label: "缴费年度", name: "FSYear", width: 100, align: "left" },
{ label: "收费标准", name: "YJAmount", width: 80, align: "left" },
{ label: "缴费金额", name: "SJAmount", width: 80, align: "left" },
{ label: "应缴余额", name: "NeedToPay", width: 80, align: "left" },
{ label: "超出应收额", name: "FSBlance", width: 80, align: "left" },
{
label: "收费标准", name: "YJAmount", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "SJAmount", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "应缴余额", name: "NeedToPay", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "FSBlance", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatter: function (cellvalue, row) {


+ 20
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js View File

@@ -142,10 +142,26 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "收费标准", name: "Standard", width: 100, align: "left" },
{ label: "缴费金额", name: "SJAmount", width: 100, align: "left" },
{ label: "应缴余额", name: "NeedToPay", width: 100, align: "left" },
{ label: "超出应收额", name: "FSBlance", width: 100, align: "left" },
{
label: "收费标准", name: "Standard", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "SJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "应缴余额", name: "NeedToPay", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "FSBlance", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {


+ 20
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.js View File

@@ -130,10 +130,26 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "收费标准", name: "Standard", width: 100, align: "left" },
{ label: "缴费金额", name: "SJAmount", width: 100, align: "left" },
{ label: "应缴余额", name: "NeedToPay", width: 100, align: "left" },
{ label: "超出应收额", name: "FSBlance", width: 100, align: "left" },
{
label: "收费标准", name: "Standard", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "SJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "应缴余额", name: "NeedToPay", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "FSBlance", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {


+ 24
- 8
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForTeacher.js View File

@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
$('#lr_refresh').on('click', function () {
location.reload();
});
},
// 初始化列表
initGird: function () {
@@ -87,10 +87,26 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "收费标准", name: "Standard", width: 100, align: "left" },
{ label: "缴费金额", name: "SJAmount", width: 100, align: "left" },
{ label: "应缴余额", name: "NeedToPay", width: 100, align: "left" },
{ label: "超出应收额", name: "FSBlance", width: 100, align: "left" },
{
label: "收费标准", name: "Standard", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费金额", name: "SJAmount", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "应缴余额", name: "NeedToPay", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "FSBlance", width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -106,9 +122,9 @@ var bootstrap = function ($, learun) {
{
label: "是否作废", name: "F_DeleteMark", width: 100, align: "left",
formatter: function (cellvalue, row) {
if (cellvalue ===true) {
if (cellvalue === true) {
return '<span class=\"label label-warning\">作废</span>';
} else{
} else {
return '<span class=\"label label-success\">正常</span>';
}
}
@@ -117,7 +133,7 @@ var bootstrap = function ($, learun) {
mainId: 'FSYIId',
isPage: true,
isMultiselect: true,
sidx:'MajorNo,ClassNo,StuNo,ChargeItemCode'
sidx: 'MajorNo,ClassNo,StuNo,ChargeItemCode'
});
page.search();
},


+ 10
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStudent/Index.js View File

@@ -157,8 +157,16 @@ var bootstrap = function ($, learun) {
},
{ label: "年级", name: "Grade", width: 80, align: "left" },
{ label: "手机号", name: "Mobile", width: 100, align: "left" },
{ label: "应缴余额", name: "NeedToPay", width: 80, align: "left" },
{ label: "超出应收额", name: "FSBlance", width: 80, align: "left" },
{
label: "应缴余额", name: "NeedToPay", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "超出应收额", name: "FSBlance", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue.toFixed(2);
}
},
{
label: "审核标志", name: "F_CheckMark", width: 80, align: "left", formatter: function (cellvalue, rowObject) {
return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";


+ 4
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj View File

@@ -23,7 +23,8 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<UseGlobalApplicationHostFile />
<Use64BitIISExpress>false</Use64BitIISExpress>
<Use64BitIISExpress>
</Use64BitIISExpress>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
@@ -1639,6 +1640,7 @@
<Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Index.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeRefund\FormView.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargesStandard\Import.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuOrder\ResultForm.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuOrder\Import.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\Import.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\IndexForRefund.js" />
@@ -8019,6 +8021,7 @@
<Content Include="Content\elementui\fonts\element-icons.ttf" />
<Content Include="Content\elementui\fonts\element-icons.woff" />
<Content Include="Areas\PersonnelManagement\Views\Gz_Amounts\MyAmount.cshtml" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuOrder\ResultForm.cshtml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Views\Login\Default-beifen.cshtml" />


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config View File

@@ -180,6 +180,7 @@
<!--触发excel开票任务的url-->
<add key="ExcelInvoice" value="http://localhost:60037/api/PayFeeResult/SetUnInvoiceHandle"/>
<add key="ExcelInvoiceTwo" value="http://localhost:60037/api/PayFeeResultTwo/SetUnInvoiceHandleByFSYID"/>
<add key="HandPayResult" value="http://localhost:8020/api/PayFeeResultTwo/SetPayResultHandleByFCSOId"/>
<!--工资导入EXCEL列忽略项-->
<add key="GzColumn" value="发放年份,发放月份,职员代码,发放次数"/>
</appSettings>

Loading…
Cancel
Save