src/main/java/com/zy/asrs/controller/DocTypeController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/order/order.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -1,17 +1,16 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.common.DateUtils; import com.zy.asrs.entity.DocType; import com.zy.asrs.service.DocTypeService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.DocType; import com.zy.asrs.service.DocTypeService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -111,7 +110,7 @@ for (DocType docType : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", docType.getDocId()); map.put("value", docType.getDocId()); map.put("value", docType.getDocName()); result.add(map); } return R.ok(result); src/main/webapp/views/order/order.html
@@ -8,7 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> <!-- <link rel="stylesheet" href="../../static/css/cool.css" media="all">--> <link rel="stylesheet" href="../../static/css/cool.css" media="all"> <!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">--> <!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> @@ -31,7 +31,7 @@ </div> <div class="layui-inline" style="width: 300px"> <div class="layui-input-inline"> <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px"> <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px"> </div> </div> <div class="layui-inline">