From e4c9dd6c520fb6ca0161d16adbdbf77266e938b3 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 10:01:38 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=AC=A1=E6=95=B0=E6=B6=88=E8=B4=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/consume/consume.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/consume/consume.html b/sino-activity/src/main/resources/templates/activity/consume/consume.html index 352c7241e..ec0d62cff 100644 --- a/sino-activity/src/main/resources/templates/activity/consume/consume.html +++ b/sino-activity/src/main/resources/templates/activity/consume/consume.html @@ -18,13 +18,13 @@ - - - - +
  • + + +
  • - @@ -43,7 +43,7 @@
  • - @@ -102,7 +102,8 @@ }, { field: 'tasknotifyid', - title: '活动次数记录主键' + title: '活动次数记录主键', + visible: false }, { field: 'drawcode', From a5e9810ab69d95ff28fb1562336558e4856e23d4 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 10:06:21 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/DrawTaskNotify/DrawTaskNotify.html | 4 ++-- .../templates/activity/awardRecord/record.html | 4 ++-- .../resources/templates/activity/prizeInfo/info.html | 12 ++++++------ .../resources/templates/activity/record/record.html | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html index 46a7cf3c1..968d59395 100644 --- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html +++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html @@ -20,7 +20,7 @@
  • - @@ -31,7 +31,7 @@
  • - diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html index e4bdfd4d0..455c23f2d 100644 --- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html +++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html @@ -60,14 +60,14 @@
  • -
  • - diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html index 92ea7690b..9c3ab91e9 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html @@ -18,17 +18,17 @@
    • +
  • + + +
  • -
    • -
  • - - -
    • @@ -39,7 +39,7 @@
  • - diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html index 4d3f1adbb..1a044eec8 100644 --- a/sino-activity/src/main/resources/templates/activity/record/record.html +++ b/sino-activity/src/main/resources/templates/activity/record/record.html @@ -34,9 +34,13 @@
    • +
  • + + +
  • - @@ -57,13 +61,9 @@ -
  • - - -
  • - From 4784b6e74a49ebbcae4119223fe8521cb2b576ef Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 10:17:39 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E4=BD=8D=E7=BD=AE=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawTaskNotify/DrawTaskNotify.html | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html index 968d59395..4746f2192 100644 --- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html +++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html @@ -18,24 +18,7 @@
    • -
  • - - -
    • - - - - -
  • - - -
    • + @@ -52,6 +35,24 @@ +
  • + + +
    • + + + + +
  • + + +
    • From 84699a94126db9fa3faf66613276d591b0b65a98 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 11:45:42 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=AC=A1=E6=95=B0=E6=B6=88=E8=B4=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/js/ry-ui.js | 15 ++ .../activity/mapper/DrawInfoMapper.java | 2 + .../activity/service/IDrawInfoService.java | 6 + .../service/impl/DrawInfoServiceImpl.java | 7 +- .../mapper/activity/DrawInfoMapper.xml | 4 + .../templates/activity/consume/consume.html | 231 ++++++++++-------- 6 files changed, 156 insertions(+), 109 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 9de3eba0a..e7dbce753 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -510,6 +510,21 @@ var table = { }); return actions.join(''); }, + // 回显活动名称 + selectDrawname: function(datas, value) { + if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { + return ''; + } + var actions = []; + $.each(datas, function(index, draw) { + if (draw.drawcode == ('' + value)) { + var listClass = $.common.equals("default", draw.listClass) || $.common.isEmpty(draw.listClass) ? "" : "badge badge-" + draw.listClass; + actions.push($.common.sprintf("%s", listClass, draw.drawname)); + return false; + } + }); + return actions.join(''); + }, // 回显数据字典（字符串数组） selectDictLabels: function(datas, value, separator) { if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java index 3962dd31a..a8cecb22d 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java @@ -29,6 +29,8 @@ public interface DrawInfoMapper */ public List selectDrawInfoList(DrawInfo drawInfo); + List findDrawInfoList(); + /** * 新增抽奖活动管理对象 * diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java index 29ea2bf75..1435171f3 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java @@ -29,6 +29,12 @@ public interface IDrawInfoService */ public List selectDrawInfoList(DrawInfo drawInfo); + /** + * 查询活动列表-下拉用 + * @return + */ + public List findDrawInfoList(); + /** * 新增抽奖活动管理对象 * diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java index 8a2c2a4a8..948480cc0 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java @@ -16,7 +16,7 @@ import com.ruoyi.common.core.text.Convert; * @author xlh * @date 2021-03-25 */ -@Service +@Service("drawInfo") public class DrawInfoServiceImpl implements IDrawInfoService { @Autowired @@ -46,6 +46,11 @@ public class DrawInfoServiceImpl implements IDrawInfoService return drawInfoMapper.selectDrawInfoList(drawInfo); } + @Override + public List findDrawInfoList() { + return drawInfoMapper.findDrawInfoList(); + } + /** * 新增抽奖活动管理对象 * diff --git a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml index d67c7da8f..126ce3df1 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml @@ -56,6 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and VALIDATETYPE = #{VALIDATETYPE} + + - -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • - - - - - - - - - - - - -
  • - - -
    • -
  • -  搜索 -  重置 -
    • - - - - +
    +
    +
    +
    +
    +
      +
    • + + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • + + + + + + + + + + + + +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    -
    - - - - - - - - - - - 导出 - -
    -
    -
    -
    +
    + + + + + + + + + + + 导出 + +
    +
    +
    - - + ] + }; + $.table.init(options); + }); + \ No newline at end of file From bc954dbea1759952b8c24be04871a8432f1d740d Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 11:51:32 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=AC=A1=E6=95=B0=E8=AE=B0=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawTaskNotify/DrawTaskNotify.html | 291 +++++++++--------- 1 file changed, 154 insertions(+), 137 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html index 4746f2192..4f1349e08 100644 --- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html +++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html @@ -1,151 +1,167 @@ - + -
    -
    -
    -
    -
    -
      -
    • - - -
      • -
    • - - -
      • +
      +
      +
      + +
      +
        +
      • + + +
        • +
      • + + +
        • - - - - -
      • - - -
        • - - - - -
      • - - -
        • -
      • - - -
        • - - - - -
      • - - -
        • - - - - - - - - -
      • -  搜索 -  重置 -
        • -
      -
      - -
      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    • + + +
      • + + + + + + + + +
    • +  搜索 +  重置 +
      • +
    +
    + +
    -
    - - - - - - - - - - - 导出 - -
    -
    -
    -
    +
    + + + + + + + + + + + 导出 + +
    +
    +
    - - + ] + }; + $.table.init(options); + }); + \ No newline at end of file From 6e3a0f4b8f813c53dfd9ce4f45a35226c8974ce8 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 11:52:47 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=A5=96=E5=93=81=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/prizeInfo/info.html | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html index 9c3ab91e9..73b3004b7 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html @@ -142,16 +142,17 @@ field: 'integralprojectcode', title: '积分项目编码' }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); - } - }] + // { + // title: '操作', + // align: 'center', + // formatter: function(value, row, index) { + // var actions = []; + // actions.push('编辑 '); + // actions.push('删除'); + // return actions.join(''); + // } + // } + ] }; $.table.init(options); }); From cd5f52c1b5616bccbbd25c8a5e0ac0b6c80006a5 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 13:45:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/ruoyi/js/ry-ui.js | 15 + .../activity/mapper/DrawPrizeInfoMapper.java | 2 + .../service/IDrawPrizeInfoService.java | 6 + .../impl/DrawPrizeInfoServiceImpl.java | 7 +- .../mapper/activity/DrawPrizeInfoMapper.xml | 4 + .../templates/activity/record/record.html | 339 ++++++++++-------- 6 files changed, 218 insertions(+), 155 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index e7dbce753..5e62e755c 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -525,6 +525,21 @@ var table = { }); return actions.join(''); }, + // 回显奖品名称 + selectprivename: function(datas, value) { + if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { + return ''; + } + var actions = []; + $.each(datas, function(index, draw) { + if (draw.prizecode == ('' + value)) { + var listClass = $.common.equals("default", draw.listClass) || $.common.isEmpty(draw.listClass) ? "" : "badge badge-" + draw.listClass; + actions.push($.common.sprintf("%s", listClass, draw.prizename)); + return false; + } + }); + return actions.join(''); + }, // 回显数据字典（字符串数组） selectDictLabels: function(datas, value, separator) { if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java index b0f16ce55..567c6b0a1 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java @@ -33,6 +33,8 @@ public interface DrawPrizeInfoMapper */ public List selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo); + List findDrawPrizeInfoList(); + /** * 新增存储奖品的基础信息 * diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java index 9de3daee9..81be02b7d 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java @@ -27,6 +27,12 @@ public interface IDrawPrizeInfoService */ public List selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo); + /** + * 奖品列表-下拉框 + * @return + */ + List findDrawPrizeInfoList(); + /** * 新增存储奖品的基础信息 * diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java index 70831ff96..d30523a76 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java @@ -15,7 +15,7 @@ import com.ruoyi.common.core.text.Convert; * @author dy * @date 2021-03-25 */ -@Service +@Service("drawPrize") public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService { @Autowired @@ -45,6 +45,11 @@ public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService return drawPrizeInfoMapper.selectDrawPrizeInfoList(drawPrizeInfo); } + @Override + public List findDrawPrizeInfoList() { + return drawPrizeInfoMapper.findDrawPrizeInfoList(); + } + /** * 新增存储奖品的基础信息 * diff --git a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml index 76ba67042..b9127e000 100644 --- a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml @@ -35,6 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and INTEGRALPROJECTCODE = #{INTEGRALPROJECTCODE} + + - -
  • - - -
    • - - - - - - - - -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • - - - - - - - - - - - - - - - - -
  • - - -
    • - - - - - - - - -
  • - - -
    • -
  • -  搜索 -  重置 -
    • - -
    - -
    +
    +
    +
    +
    +
    +
      + + + + +
    • + + +
      • +
    • + + +
      • + + + + +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    -
    - - - - - - - - - - - 导出 - -
    -
    -
    -
    +
    + + + + + + + + + + + 导出 + +
    +
    +
    - - + ] + }; + $.table.init(options); + }); + \ No newline at end of file From afa0db58c478da275f9205993880687b83b5d5e0 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 13:53:45 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8F=91=E5=A5=96=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/awardRecord/add.html | 2 +- .../templates/activity/awardRecord/edit.html | 2 +- .../activity/awardRecord/record.html | 415 ++++++++++-------- .../templates/activity/prizeInfo/info.html | 4 +- .../templates/activity/record/add.html | 2 +- .../templates/activity/record/edit.html | 2 +- .../templates/activity/record/record.html | 4 +- 7 files changed, 233 insertions(+), 198 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/add.html b/sino-activity/src/main/resources/templates/activity/awardRecord/add.html index fd8b563db..7296a9083 100644 --- a/sino-activity/src/main/resources/templates/activity/awardRecord/add.html +++ b/sino-activity/src/main/resources/templates/activity/awardRecord/add.html @@ -14,7 +14,7 @@
    - +
    diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html b/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html index f3e0dbd64..469875523 100644 --- a/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html +++ b/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html @@ -15,7 +15,7 @@
    - +
    diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html index 455c23f2d..ca08dcef3 100644 --- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html +++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html @@ -1,184 +1,203 @@ - + -
    -
    -
    -
    -
    -
      -
    • - - -
      • - - - - - - - - - - - - -
    • - - -
      • - - - - - - - - - - - - -
    • - - -
      • -
    • - - -
      • - - - - - - - - -
    • - - -
      • -
    • - - -
      • - - - - - - - - - - - - - - - - - - - - - - - - -
    • -  搜索 -  重置 -
      • -
    -
    -
    -
    +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • + + + + + + + + +
    • + + +
      • + + + + + + + + +
    • + + +
      • +
    • + + +
      • + + + + + + + + +
    • + + +
      • +
    • + + +
      • + + + + + + + + + + + + + + + + + + + + + + + + +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    -
    - - - - - - - - - - - 导出 - -
    -
    -
    -
    +
    + + + + + + + + + + + 导出 + +
    +
    +
    - - + ] + }; + $.table.init(options); + }); + \ No newline at end of file diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html index 73b3004b7..bfce2a8d7 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html @@ -11,7 +11,7 @@
    • - +
    • @@ -101,7 +101,7 @@ }, { field: 'prizecode', - title: '奖品代码' + title: '奖品名称' }, { field: 'prizename', diff --git a/sino-activity/src/main/resources/templates/activity/record/add.html b/sino-activity/src/main/resources/templates/activity/record/add.html index 987ea0b78..9481bc051 100644 --- a/sino-activity/src/main/resources/templates/activity/record/add.html +++ b/sino-activity/src/main/resources/templates/activity/record/add.html @@ -41,7 +41,7 @@
    - +
    diff --git a/sino-activity/src/main/resources/templates/activity/record/edit.html b/sino-activity/src/main/resources/templates/activity/record/edit.html index 336407fac..181e090e6 100644 --- a/sino-activity/src/main/resources/templates/activity/record/edit.html +++ b/sino-activity/src/main/resources/templates/activity/record/edit.html @@ -42,7 +42,7 @@
    - +
    diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html index 7a7d2fe10..4e7455ede 100644 --- a/sino-activity/src/main/resources/templates/activity/record/record.html +++ b/sino-activity/src/main/resources/templates/activity/record/record.html @@ -35,7 +35,7 @@
  • - +
    • - - - - +
  • + + +
    • diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html index ca08dcef3..bdd0e2901 100644 --- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html +++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html @@ -40,7 +40,11 @@
  • - +
    • @@ -143,6 +147,7 @@ var prefix = ctx + "activity/award/record"; var datas = [[${@dict.getType('prizeLevel')}]]; var prizetypes = [[${@dict.getType('prizeType')}]]; + var drawResults = [[${@dict.getType('drawResult')}]]; var drawInfoList = [[${@drawInfo.findDrawInfoList()}]]; var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]]; @@ -193,7 +198,10 @@ }, { field: 'awardresult', - title: '发奖结果' + title: '发奖结果', + formatter: function (value, row, index) { + return $.table.selectDictLabel(drawResults, value); + } }, { field: 'awardtime', diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html index 4e7455ede..d84105c45 100644 --- a/sino-activity/src/main/resources/templates/activity/record/record.html +++ b/sino-activity/src/main/resources/templates/activity/record/record.html @@ -32,7 +32,11 @@
  • - +
  • @@ -127,6 +131,7 @@ var prefix = ctx + "activity/record"; var datas = [[${@dict.getType('prizeLevel')}]]; var prizetypes = [[${@dict.getType('prizeType')}]]; + var drawResults = [[${@dict.getType('drawResult')}]]; var drawInfoList = [[${@drawInfo.findDrawInfoList()}]]; var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]]; @@ -167,7 +172,10 @@ }, { field: 'drawresult', - title: '抽奖结果' + title: '抽奖结果', + formatter: function (value, row, index) { + return $.table.selectDictLabel(drawResults, value); + } }, { field: 'prizecode', From 2a2080d4a5c3b396bcc26b67e6a28f0482584664 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 14:15:44 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/DrawTaskNotify/DrawTaskNotify.html | 4 ++-- .../main/resources/templates/activity/awardRecord/record.html | 2 +- .../main/resources/templates/activity/consume/consume.html | 4 ++-- .../src/main/resources/templates/activity/record/record.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html index 0eac32e16..71cd8efb1 100644 --- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html +++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html @@ -11,7 +11,7 @@
    • - +