Просмотр исходного кода

Merge branch 'feature-dgy-直营团队提现App禁止提现,只能后台提现' into feature-dgy-后台测试

DuGuYang 3 лет назад
Родитель
Сommit
8fe9d56ee6

+ 1 - 0
Areas/Admin/Controllers/MainServer/UserCashRecordForBusinessController.cs

@@ -179,6 +179,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     string CashOrderNo = "T1" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
                     Fields.Add("UserId", userInfo.Id); //创客Id
+                    Fields.Add("CreateMan", SysUserName + "_" + SysRealName); //操作人
                     Fields.Add("TradeAmount", Amount); //提现金额
                     Fields.Add("CashOrderNo", CashOrderNo); //提现单号
                     Fields.Add("SeoKeyword", data.SeoKeyword); //备注

+ 4 - 1
wwwroot/layuiadmin/modules_main/UserCashRecordForBusiness_Admin.js

@@ -79,8 +79,11 @@ layui.config({
             , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
             , { field: 'CashOrderNo', width: 200, title: '提现单号', sort: true }
+            , { field: 'TradeAmount', width: 200, title: '提现金额', sort: true }
+            , { field: 'CreateDate', width: 200, title: '提现时间', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '备注', sort: true }
-            , { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
+            , { field: 'CreateMan', width: 200, title: '操作人', sort: true }
+            // , { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
         ]],
         where: {