From bd68f46bca31e3ff4a0e406e2ad60b0eaff05a28 Mon Sep 17 00:00:00 2001 From: Xia Kaixiang Date: Fri, 30 Aug 2019 16:10:36 +0800 Subject: [PATCH] =?utf8?q?=E7=8E=B0=E5=9C=BA=E4=B8=80=E4=BA=9Bbug=E9=97=AE?= =?utf8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- payapi/src/main/resources/data.sql | 12 ++++---- .../src/main/resources/static/libs/custom.js | 1 + .../templates/system/dtl/shopdtl.html | 14 ++++----- .../templates/system/report/shopbusiness.html | 29 ++++++++++++------- .../system/report/subjectdetail.html | 12 ++++---- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/payapi/src/main/resources/data.sql b/payapi/src/main/resources/data.sql index 362bc3ca..0e592a69 100644 --- a/payapi/src/main/resources/data.sql +++ b/payapi/src/main/resources/data.sql @@ -568,12 +568,12 @@ VALUES ('DAYENDSETTLETASK', '日终结算', '0', '20190619100600', '{tenantid}') INSERT INTO "tb_shop" ("shopid", "shopname", "shoptype", "fshopid", "status", "opendate", "tenantid") VALUES (1, '支付中心', 'root', 0, 'normal', '20190517', '{tenantid}'); -INSERT INTO "tb_transcode" ("transcode", "transname", "tenantid") -VALUES (3010, '市民卡代扣', '{tenantid}'); -INSERT INTO "tb_transcode" ("transcode", "transname", "tenantid") -VALUES (1002, '支付码聚合付', '{tenantid}'); -INSERT INTO "tb_transcode" ("transcode", "transname", "tenantid") -VALUES (3500, '账户充值', '{tenantid}'); +INSERT INTO "tb_transcode" ("transcode_id", "transcode", "transname", "tenantid") +VALUES (1, 3010, '市民卡代扣', '{tenantid}'); +INSERT INTO "tb_transcode" ("transcode_id", "transcode", "transname", "tenantid") +VALUES (2, 1002, '支付码聚合付', '{tenantid}'); +INSERT INTO "tb_transcode" ("transcode_id", "transcode", "transname", "tenantid") +VALUES (3, 3500, '账户充值', '{tenantid}'); INSERT INTO "tb_dictionary" ("id", "dictval", "dicttype", "dictcaption", "dicttypename", "tenantid") VALUES (1, 'cancel', 'reverseFlagList', '被撤销', '冲正状态', '{tenantid}'); diff --git a/payapi/src/main/resources/static/libs/custom.js b/payapi/src/main/resources/static/libs/custom.js index 12564c23..c2b560aa 100644 --- a/payapi/src/main/resources/static/libs/custom.js +++ b/payapi/src/main/resources/static/libs/custom.js @@ -66,6 +66,7 @@ .addNewDict("sexList") .addNewDict("accountStatusList") .addNewDict("allSubjectList") + .addNewDict("transcodeList") }, getDict: function (dictType) { var dict, that = this; diff --git a/payapi/src/main/resources/templates/system/dtl/shopdtl.html b/payapi/src/main/resources/templates/system/dtl/shopdtl.html index ecebe4e9..57204491 100644 --- a/payapi/src/main/resources/templates/system/dtl/shopdtl.html +++ b/payapi/src/main/resources/templates/system/dtl/shopdtl.html @@ -27,7 +27,7 @@
- @@ -38,7 +38,7 @@
- @@ -182,12 +182,12 @@ endAccdate: $("#shopdtl-search-endAccdate").val(), startTransdate: $("#shopdtl-search-startTransdate").val(), endTransdate: $("#shopdtl-search-endTransdate").val(), - personname: $("#shopdtl-search-personname").val(), + shopname: $("#shopdtl-search-shopname").val(), shopaccno: $("#shopdtl-search-shopaccno").val(), - sourceType: $("#shopdtl-search-sourceType").val(), + sourcetype: $("#shopdtl-search-sourcetype").val(), tradeflag: $("#shopdtl-search-tradeflag").val(), transcode: $("#shopdtl-search-transcode").val(), - transStatus: $("#shopdtl-search-transStatus").val() + status: $("#shopdtl-search-status").val() }, page: {curr: 1} }); }); @@ -200,10 +200,10 @@ "endTransdate": "", "shopname": "", "shopaccno": "", - "sourceType": "", + "sourcetype": "", "tradeflag": "", "transcode": "", - "transStatus": "" + "status": "" }); form.render("select"); treeSelect.revokeNode('shopdtl-search-shopaccno-filter'); diff --git a/payapi/src/main/resources/templates/system/report/shopbusiness.html b/payapi/src/main/resources/templates/system/report/shopbusiness.html index 9638612f..49a512ae 100644 --- a/payapi/src/main/resources/templates/system/report/shopbusiness.html +++ b/payapi/src/main/resources/templates/system/report/shopbusiness.html @@ -8,18 +8,20 @@
- +
-
-
-
@@ -27,14 +29,16 @@
-
- +
@@ -54,7 +58,8 @@ @@ -124,13 +129,17 @@ page: false, where: obj, showicon: false, - toolbar:'#shopbusiness-toolbar', + toolbar: '#shopbusiness-toolbar', cols: [ [ {field: 'shopname', title: '商户名称', align: 'left'}, {field: 'summary', title: '交易摘要', align: 'center'}, {field: 'transcnt', title: '交易次数', align: 'center'}, - {field: 'transamt', title: '交易金额', align: 'center'} + { + field: 'transamt', title: '交易金额', align: 'center', templet: function (e) { + return parseFloat(e.transamt).toFixed(2); + } + } ] ], done: function (res, curr, count) { @@ -167,8 +176,8 @@ }); }); - table.on('toolbar(shopbusinessTable-filter)', function(obj){ - switch(obj.event){ + table.on('toolbar(shopbusinessTable-filter)', function (obj) { + switch (obj.event) { case 'shopbusinessShowFold': treetable.foldAll('#shopbusinessTable'); break; diff --git a/payapi/src/main/resources/templates/system/report/subjectdetail.html b/payapi/src/main/resources/templates/system/report/subjectdetail.html index f1b65e91..ab46d99c 100644 --- a/payapi/src/main/resources/templates/system/report/subjectdetail.html +++ b/payapi/src/main/resources/templates/system/report/subjectdetail.html @@ -26,7 +26,7 @@
-
@@ -72,7 +72,7 @@ }); treeSelect.render({ - elem: '#subjectdetail-search-subjid', + elem: '#subjectdetail-search-subjno', data: '[[@{/report/subjectselecttree}]]', type: 'get', placeholder: '选择科目', @@ -92,7 +92,7 @@ if(treeNode.accno == '0'){ layer.msg("请选择末级科目", {icon: 2, time:1500}); $("#subjectdetail-search-subjid").val(""); - treeSelect.revokeNode('subjectdetail-search-subjid-filter'); + treeSelect.revokeNode('subjectdetail-search-subjno-filter'); return false; } return true; @@ -141,14 +141,14 @@ renderTable({ startdate: $('#subjectdetail-search-startdate').val(), enddate: $('#subjectdetail-search-enddate').val(), - subjid: null + subjno: null }) $('#subjectdetail-search-btn').click(function () { var startdate = $("#subjectdetail-search-startdate").val(); var enddate = $("#subjectdetail-search-enddate").val(); - var subjid = $("#subjectdetail-search-subjid").val(); + var subjid = $("#subjectdetail-search-subjno").val(); if (null == startdate || "" == $.trim(startdate)) { layer.msg('请选择起始日期', {icon: 2, time: 1500}); return; @@ -165,7 +165,7 @@ renderTable({ startdate: startdate, enddate: enddate, - subjid: subjid + subjno: subjid }) }); -- 2.17.1