From 68778311e8f9b71a2b1111bd5c8fc11b1fa74951 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Mon, 21 Dec 2020 13:51:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FtOrderDaoController.java | 2 +- ruoyi-ui/src/views/fantang/order/index.vue | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java index 612ec12c9..9bbadc262 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java @@ -40,7 +40,7 @@ public class FtOrderDaoController extends BaseController { public TableDataInfo list(FtOrderDao ftOrderDao) { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(ftOrderDao); - if (StringUtils.isNotBlank(ftOrderDao.getOrderType().toString())) { + if (ftOrderDao.getOrderType() != null) { lqw.eq(FtOrderDao::getOrderType, ftOrderDao.getOrderType()); } if (ftOrderDao.getTotalPrice() != null) { diff --git a/ruoyi-ui/src/views/fantang/order/index.vue b/ruoyi-ui/src/views/fantang/order/index.vue index 59db8fc0e..b89397230 100644 --- a/ruoyi-ui/src/views/fantang/order/index.vue +++ b/ruoyi-ui/src/views/fantang/order/index.vue @@ -2,8 +2,14 @@
- - + + + @@ -127,7 +133,7 @@ - + @@ -229,6 +235,7 @@ export default { components: {}, data() { return { + orderTypeOptions: [], // 遮罩层 loading: true, // 选中数组 @@ -294,6 +301,9 @@ export default { }, created() { this.getList(); + this.getDicts("ft_book_type").then(response => { + this.orderTypeOptions = response.data; + }); }, methods: { /** 查询订单管理列表 */ @@ -334,6 +344,10 @@ export default { }; this.resetForm("form"); }, + /** 订单类型回显**/ + orderTypeFormat(row, column) { + return this.selectDictLabel(this.orderTypeOptions, row.orderType); + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; From de0117271ddf3622cb8fe28ec8153594d45d2a1f Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Mon, 21 Dec 2020 13:53:45 +0800 Subject: [PATCH 2/2] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2c0e049aa..19c1a8f04 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ nbdist/ !*/build/*.java !*/build/*.html !*/build/*.xml + +ruoyi/uploadPath/