|
|
@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// 待扣款明细列表
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string CreateDateData, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
|
|
|
+ public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string PosSn, string CreateDateData, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
|
|
|
{
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
@@ -72,6 +72,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
|
|
|
}
|
|
|
+ if (!string.IsNullOrEmpty(PosSn))
|
|
|
+ {
|
|
|
+ condition += " and Remark=" + PosSn;
|
|
|
+ }
|
|
|
//待扣类型
|
|
|
if (!string.IsNullOrEmpty(ChargeTypeSelect))
|
|
|
{
|
DuGuYang