From eb89350c3d558cf64d320ac3363fe7a9ee2dc0d0 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 24 七月 2020 09:19:38 +0800 Subject: [PATCH] # --- /dev/null | 12 --- src/main/java/com/zy/asrs/controller/BasLocStsController.java | 147 ++++++++++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java | 4 src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java | 12 +++ src/main/webapp/views/basLocSts/basLocSts_detail.html | 4 src/main/webapp/static/js/basLocSts/basLocSts.js | 24 +++--- src/main/webapp/views/basLocSts/basLocSts.html | 4 src/main/java/com/zy/asrs/entity/LocMast.java | 10 +- src/main/java/com/zy/asrs/service/BasLocStsService.java | 8 ++ src/main/resources/mapper/BasLocStsMapper.xml | 4 src/main/java/com/zy/asrs/entity/BasLocSts.java | 10 +- 11 files changed, 197 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java new file mode 100644 index 0000000..400f2e7 --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java @@ -0,0 +1,147 @@ +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.zy.asrs.entity.BasLocSts; +import com.zy.asrs.service.BasLocStsService; +import com.zy.common.web.BaseController; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +@RestController +public class BasLocStsController extends BaseController { + + @Autowired + private BasLocStsService basLocStsService; + + @RequestMapping(value = "/basLocSts/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(basLocStsService.selectById(id)); + } + + @RequestMapping(value = "/basLocSts/list/auth") + @ManagerAuth + public R list(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam(required = false)String orderByField, + @RequestParam(required = false)String orderByType, + @RequestParam Map<String, Object> param){ + excludeTrash(param); + EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>(); + convert(param, wrapper); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(basLocStsService.selectPage(new Page<>(curr, limit), wrapper)); + } + + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ + for (Map.Entry<String, Object> entry : map.entrySet()){ + String val = String.valueOf(entry.getValue()); + if (val.contains(RANGE_TIME_LINK)){ + String[] dates = val.split(RANGE_TIME_LINK); + wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); + wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); + } else { + wrapper.like(entry.getKey(), val); + } + } + } + + @RequestMapping(value = "/basLocSts/edit/auth") + @ManagerAuth + public R edit(BasLocSts basLocSts) { + if (Cools.isEmpty(basLocSts)){ + return R.error(); + } + if (null == basLocSts.getLocSts()){ + basLocStsService.insert(basLocSts); + } else { + basLocStsService.updateById(basLocSts); + } + return R.ok(); + } + + @RequestMapping(value = "/basLocSts/add/auth") + @ManagerAuth(memo = "搴撲綅鐘舵�佹坊鍔�") + public R add(BasLocSts basLocSts) { + basLocSts.setModiUser(getUserId()); + basLocSts.setModiTime(new Date()); + basLocSts.setAppeUser(getUserId()); + basLocSts.setAppeTime(new Date()); + basLocStsService.insert(basLocSts); + return R.ok(); + } + + @RequestMapping(value = "/basLocSts/update/auth") + @ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�") + public R update(BasLocSts basLocSts){ + if (Cools.isEmpty(basLocSts) || null==basLocSts.getLocSts()){ + return R.error(); + } + basLocSts.setModiUser(getUserId()); + basLocSts.setModiTime(new Date()); + basLocStsService.updateById(basLocSts); + return R.ok(); + } + + @RequestMapping(value = "/basLocSts/delete/auth") + @ManagerAuth(memo = "搴撲綅鐘舵�佸垹闄�") + public R delete(@RequestParam String param){ + List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class); + if (Cools.isEmpty(list)){ + return R.error(); + } + for (BasLocSts entity : list){ + basLocStsService.delete(new EntityWrapper<>(entity)); + } + return R.ok(); + } + + @RequestMapping(value = "/basLocSts/export/auth") + @ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�") + public R export(@RequestBody JSONObject param){ + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>(); + Map<String, Object> map = excludeTrash(param.getJSONObject("basLocSts")); + convert(map, wrapper); + List<BasLocSts> list = basLocStsService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/basLocStsQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>(); + wrapper.like("loc_desc", condition); + Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (BasLocSts basLocSts : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", basLocSts.getLocSts()); + map.put("value", basLocSts.getLocDesc()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/basLocSts/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<BasLocSts> wrapper = new EntityWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != basLocStsService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(BasLocSts.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/asrs/controller/BasLocTypeController.java b/src/main/java/com/zy/asrs/controller/BasLocTypeController.java deleted file mode 100644 index c32c0a6..0000000 --- a/src/main/java/com/zy/asrs/controller/BasLocTypeController.java +++ /dev/null @@ -1,147 +0,0 @@ -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.zy.asrs.entity.BasLocType; -import com.zy.asrs.service.BasLocTypeService; -import com.zy.common.web.BaseController; -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 org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.*; - -@RestController -public class BasLocTypeController extends BaseController { - - @Autowired - private BasLocTypeService basLocTypeService; - - @RequestMapping(value = "/basLocType/{id}/auth") - @ManagerAuth - public R get(@PathVariable("id") String id) { - return R.ok(basLocTypeService.selectById(id)); - } - - @RequestMapping(value = "/basLocType/list/auth") - @ManagerAuth - public R list(@RequestParam(defaultValue = "1")Integer curr, - @RequestParam(defaultValue = "10")Integer limit, - @RequestParam(required = false)String orderByField, - @RequestParam(required = false)String orderByType, - @RequestParam Map<String, Object> param){ - excludeTrash(param); - EntityWrapper<BasLocType> wrapper = new EntityWrapper<>(); - convert(param, wrapper); - if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} - return R.ok(basLocTypeService.selectPage(new Page<>(curr, limit), wrapper)); - } - - private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ - for (Map.Entry<String, Object> entry : map.entrySet()){ - String val = String.valueOf(entry.getValue()); - if (val.contains(RANGE_TIME_LINK)){ - String[] dates = val.split(RANGE_TIME_LINK); - wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); - wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); - } else { - wrapper.like(entry.getKey(), val); - } - } - } - - @RequestMapping(value = "/basLocType/edit/auth") - @ManagerAuth - public R edit(BasLocType basLocType) { - if (Cools.isEmpty(basLocType)){ - return R.error(); - } - if (null == basLocType.getLocSts()){ - basLocTypeService.insert(basLocType); - } else { - basLocTypeService.updateById(basLocType); - } - return R.ok(); - } - - @RequestMapping(value = "/basLocType/add/auth") - @ManagerAuth(memo = "搴撲綅鐘舵�佹坊鍔�") - public R add(BasLocType basLocType) { - basLocType.setModiUser(getUserId()); - basLocType.setModiTime(new Date()); - basLocType.setAppeUser(getUserId()); - basLocType.setAppeTime(new Date()); - basLocTypeService.insert(basLocType); - return R.ok(); - } - - @RequestMapping(value = "/basLocType/update/auth") - @ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�") - public R update(BasLocType basLocType){ - if (Cools.isEmpty(basLocType) || null==basLocType.getLocSts()){ - return R.error(); - } - basLocType.setModiUser(getUserId()); - basLocType.setModiTime(new Date()); - basLocTypeService.updateById(basLocType); - return R.ok(); - } - - @RequestMapping(value = "/basLocType/delete/auth") - @ManagerAuth(memo = "搴撲綅鐘舵�佸垹闄�") - public R delete(@RequestParam String param){ - List<BasLocType> list = JSONArray.parseArray(param, BasLocType.class); - if (Cools.isEmpty(list)){ - return R.error(); - } - for (BasLocType entity : list){ - basLocTypeService.delete(new EntityWrapper<>(entity)); - } - return R.ok(); - } - - @RequestMapping(value = "/basLocType/export/auth") - @ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�") - public R export(@RequestBody JSONObject param){ - List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); - EntityWrapper<BasLocType> wrapper = new EntityWrapper<>(); - Map<String, Object> map = excludeTrash(param.getJSONObject("basLocType")); - convert(map, wrapper); - List<BasLocType> list = basLocTypeService.selectList(wrapper); - return R.ok(exportSupport(list, fields)); - } - - @RequestMapping(value = "/basLocTypeQuery/auth") - @ManagerAuth - public R query(String condition) { - EntityWrapper<BasLocType> wrapper = new EntityWrapper<>(); - wrapper.like("loc_desc", condition); - Page<BasLocType> page = basLocTypeService.selectPage(new Page<>(0, 10), wrapper); - List<Map<String, Object>> result = new ArrayList<>(); - for (BasLocType basLocType : page.getRecords()){ - Map<String, Object> map = new HashMap<>(); - map.put("id", basLocType.getLocSts()); - map.put("value", basLocType.getLocDesc()); - result.add(map); - } - return R.ok(result); - } - - @RequestMapping(value = "/basLocType/check/column/auth") - @ManagerAuth - public R query(@RequestBody JSONObject param) { - Wrapper<BasLocType> wrapper = new EntityWrapper<BasLocType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); - if (null != basLocTypeService.selectOne(wrapper)){ - return R.parse(BaseRes.REPEAT).add(getComment(BasLocType.class, String.valueOf(param.get("key")))); - } - return R.ok(); - } - -} diff --git a/src/main/java/com/zy/asrs/entity/BasLocType.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java similarity index 93% rename from src/main/java/com/zy/asrs/entity/BasLocType.java rename to src/main/java/com/zy/asrs/entity/BasLocSts.java index 54616d7..f426cea 100644 --- a/src/main/java/com/zy/asrs/entity/BasLocType.java +++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java @@ -14,8 +14,8 @@ import java.text.SimpleDateFormat; import java.util.Date; -@TableName("asr_bas_loc_type") -public class BasLocType implements Serializable { +@TableName("asr_bas_loc_sts") +public class BasLocSts implements Serializable { private static final long serialVersionUID = 1L; @@ -62,9 +62,9 @@ @TableField("appe_time") private Date appeTime; - public BasLocType() {} + public BasLocSts() {} - public BasLocType(String locDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) { + public BasLocSts(String locDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) { this.locDesc = locDesc; this.modiUser = modiUser; this.modiTime = modiTime; @@ -72,7 +72,7 @@ this.appeTime = appeTime; } -// BasLocType basLocType = new BasLocType( +// BasLocSts basLocSts = new BasLocSts( // null, // 搴撲綅鐘舵�佹弿杩� // null, // 淇敼浜哄憳 // null, // 淇敼鏃堕棿 diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java index 711fda7..058a853 100644 --- a/src/main/java/com/zy/asrs/entity/LocMast.java +++ b/src/main/java/com/zy/asrs/entity/LocMast.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; -import com.zy.asrs.service.BasLocTypeService; +import com.zy.asrs.service.BasLocStsService; import com.zy.asrs.service.BasWhsService; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -326,10 +326,10 @@ } public String getLocSts$(){ - BasLocTypeService service = SpringUtils.getBean(BasLocTypeService.class); - BasLocType basLocType = service.selectById(this.locSts); - if (!Cools.isEmpty(basLocType)){ - return String.valueOf(basLocType.getLocDesc()); + BasLocStsService service = SpringUtils.getBean(BasLocStsService.class); + BasLocSts basLocSts = service.selectById(this.locSts); + if (!Cools.isEmpty(basLocSts)){ + return String.valueOf(basLocSts.getLocDesc()); } return null; } diff --git a/src/main/java/com/zy/asrs/mapper/BasLocTypeMapper.java b/src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java similarity index 65% rename from src/main/java/com/zy/asrs/mapper/BasLocTypeMapper.java rename to src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java index 00ab156..6b4fbce 100644 --- a/src/main/java/com/zy/asrs/mapper/BasLocTypeMapper.java +++ b/src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java @@ -1,12 +1,12 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.zy.asrs.entity.BasLocType; +import com.zy.asrs.entity.BasLocSts; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository -public interface BasLocTypeMapper extends BaseMapper<BasLocType> { +public interface BasLocStsMapper extends BaseMapper<BasLocSts> { } diff --git a/src/main/java/com/zy/asrs/service/BasLocStsService.java b/src/main/java/com/zy/asrs/service/BasLocStsService.java new file mode 100644 index 0000000..85f68fb --- /dev/null +++ b/src/main/java/com/zy/asrs/service/BasLocStsService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.service; + +import com.baomidou.mybatisplus.service.IService; +import com.zy.asrs.entity.BasLocSts; + +public interface BasLocStsService extends IService<BasLocSts> { + +} diff --git a/src/main/java/com/zy/asrs/service/BasLocTypeService.java b/src/main/java/com/zy/asrs/service/BasLocTypeService.java deleted file mode 100644 index 5219976..0000000 --- a/src/main/java/com/zy/asrs/service/BasLocTypeService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.zy.asrs.service; - -import com.baomidou.mybatisplus.service.IService; -import com.zy.asrs.entity.BasLocType; - -public interface BasLocTypeService extends IService<BasLocType> { - -} diff --git a/src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java new file mode 100644 index 0000000..59a5106 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.zy.asrs.entity.BasLocSts; +import com.zy.asrs.mapper.BasLocStsMapper; +import com.zy.asrs.service.BasLocStsService; +import org.springframework.stereotype.Service; + +@Service("basLocStsService") +public class BasLocStsServiceImpl extends ServiceImpl<BasLocStsMapper, BasLocSts> implements BasLocStsService { + +} diff --git a/src/main/java/com/zy/asrs/service/impl/BasLocTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasLocTypeServiceImpl.java deleted file mode 100644 index 6b6b4b8..0000000 --- a/src/main/java/com/zy/asrs/service/impl/BasLocTypeServiceImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.zy.asrs.service.impl; - -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.zy.asrs.entity.BasLocType; -import com.zy.asrs.mapper.BasLocTypeMapper; -import com.zy.asrs.service.BasLocTypeService; -import org.springframework.stereotype.Service; - -@Service("basLocTypeService") -public class BasLocTypeServiceImpl extends ServiceImpl<BasLocTypeMapper, BasLocType> implements BasLocTypeService { - -} diff --git a/src/main/resources/mapper/BasLocTypeMapper.xml b/src/main/resources/mapper/BasLocStsMapper.xml similarity index 90% rename from src/main/resources/mapper/BasLocTypeMapper.xml rename to src/main/resources/mapper/BasLocStsMapper.xml index 690322f..1933fd0 100644 --- a/src/main/resources/mapper/BasLocTypeMapper.xml +++ b/src/main/resources/mapper/BasLocStsMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.zy.asrs.mapper.BasLocTypeMapper"> +<mapper namespace="com.zy.asrs.mapper.BasLocStsMapper"> <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> - <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLocType"> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLocSts"> <id column="loc_sts" property="locSts" /> <result column="loc_desc" property="locDesc" /> <result column="modi_user" property="modiUser" /> diff --git a/src/main/webapp/static/js/basLocType/basLocType.js b/src/main/webapp/static/js/basLocSts/basLocSts.js similarity index 95% rename from src/main/webapp/static/js/basLocType/basLocType.js rename to src/main/webapp/static/js/basLocSts/basLocSts.js index 77ccbd3..47ac4ca 100644 --- a/src/main/webapp/static/js/basLocType/basLocType.js +++ b/src/main/webapp/static/js/basLocSts/basLocSts.js @@ -8,9 +8,9 @@ // 鏁版嵁娓叉煋 tableIns = table.render({ - elem: '#basLocType', + elem: '#basLocSts', headers: {token: localStorage.getItem('token')}, - url: baseUrl+'/basLocType/list/auth', + url: baseUrl+'/basLocSts/list/auth', page: true, limit: 16, limits: [16, 30, 50, 100, 200, 500], @@ -54,7 +54,7 @@ }); // 鐩戝惉鎺掑簭浜嬩欢 - table.on('sort(basLocType)', function (obj) { + table.on('sort(basLocSts)', function (obj) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; @@ -77,7 +77,7 @@ }); // 鐩戝惉澶村伐鍏锋爮浜嬩欢 - table.on('toolbar(basLocType)', function (obj) { + table.on('toolbar(basLocSts)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); switch(obj.event) { case 'addData': @@ -87,7 +87,7 @@ maxmin: true, area: ['500px', top.detailHeight], shadeClose: false, - content: 'basLocType_detail.html', + content: 'basLocSts_detail.html', success: function(layero, index){ layer.getChildFrame('#data-detail-submit-edit', index).hide(); clearFormVal(layer.getChildFrame('#detail', index)); @@ -110,7 +110,7 @@ } else { layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){ $.ajax({ - url: baseUrl+"/basLocType/delete/auth", + url: baseUrl+"/basLocSts/delete/auth", headers: {'token': localStorage.getItem('token')}, data: {param: JSON.stringify(data)}, method: 'POST', @@ -144,11 +144,11 @@ exportData[this.name] = this.value; }); var param = { - 'basLocType': exportData, + 'basLocSts': exportData, 'fields': fields }; $.ajax({ - url: baseUrl+"/basLocType/export/auth", + url: baseUrl+"/basLocSts/export/auth", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify(param), dataType:'json', @@ -171,7 +171,7 @@ }); // 鐩戝惉琛屽伐鍏蜂簨浠� - table.on('tool(basLocType)', function(obj){ + table.on('tool(basLocSts)', function(obj){ var data = obj.data; switch (obj.event) { // 璇︽儏 @@ -182,7 +182,7 @@ maxmin: true, area: [top.detailWidth, top.detailHeight], shadeClose: false, - content: 'basLocType_detail.html', + content: 'basLocSts_detail.html', success: function(layero, index){ setFormVal(layer.getChildFrame('#detail', index), data, true); top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); @@ -201,7 +201,7 @@ maxmin: true, area: ['500px', top.detailHeight], shadeClose: false, - content: 'basLocType_detail.html', + content: 'basLocSts_detail.html', success: function(layero, index){ layer.getChildFrame('#data-detail-submit-save', index).hide(); setFormVal(layer.getChildFrame('#detail', index), data, false); @@ -316,7 +316,7 @@ }; $.ajax({ - url: baseUrl+"/basLocType/"+name+"/auth", + url: baseUrl+"/basLocSts/"+name+"/auth", headers: {'token': localStorage.getItem('token')}, data: top.reObject(data), method: 'POST', diff --git a/src/main/webapp/views/basLocType/basLocType.html b/src/main/webapp/views/basLocSts/basLocSts.html similarity index 92% rename from src/main/webapp/views/basLocType/basLocType.html rename to src/main/webapp/views/basLocSts/basLocSts.html index 7b9356d..7958465 100644 --- a/src/main/webapp/views/basLocType/basLocType.html +++ b/src/main/webapp/views/basLocSts/basLocSts.html @@ -28,7 +28,7 @@ </div> <!-- 琛ㄦ牸 --> -<table class="layui-hide" id="basLocType" lay-filter="basLocType"></table> +<table class="layui-hide" id="basLocSts" lay-filter="basLocSts"></table> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button> @@ -45,7 +45,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/basLocType/basLocType.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/basLocSts/basLocSts.js" charset="utf-8"></script> <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> diff --git a/src/main/webapp/views/basLocType/basLocType_detail.html b/src/main/webapp/views/basLocSts/basLocSts_detail.html similarity index 96% rename from src/main/webapp/views/basLocType/basLocType_detail.html rename to src/main/webapp/views/basLocSts/basLocSts_detail.html index 265f7ef..e486d84 100644 --- a/src/main/webapp/views/basLocType/basLocType_detail.html +++ b/src/main/webapp/views/basLocSts/basLocSts_detail.html @@ -18,7 +18,7 @@ <div class="layui-inline" style="width:80%;"> <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>搴撲綅鐘舵�佷唬鍙凤細</label> <div class="layui-input-inline"> - <input id="locSts" class="layui-input" type="text" onkeyup="check(this.id, 'basLocType')" lay-verify="required"> + <input id="locSts" class="layui-input" type="text" onkeyup="check(this.id, 'basLocSts')" lay-verify="required"> </div> </div> <div class="layui-inline" style="width:80%;"> @@ -83,6 +83,6 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> -<script type="text/javascript" src="../../static/js/basLocType/basLocType.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/basLocSts/basLocSts.js" charset="utf-8"></script> </html> -- Gitblit v1.9.1