From c32b5055bf1c71faab49325d513a927cba2cbc59 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 20:13:51 +0800
Subject: [PATCH] # 动态库位类型
---
src/main/java/com/zy/asrs/mapper/BasLocType1Mapper.java | 12 +
src/main/java/com/zy/asrs/service/impl/BasLocType1ServiceImpl.java | 12 +
src/main/java/com/zy/asrs/controller/BasLocType1Controller.java | 131 ++++++++++
src/main/resources/mapper/BasLocType1Mapper.xml | 16 +
src/main/java/com/zy/asrs/entity/BasLocType1.java | 127 ++++++++++
src/main/java/com/zy/asrs/entity/AgvLocMast.java | 18 -
src/main/webapp/static/js/agvLocMast/locMast.js | 2
src/main/webapp/static/js/basLocType1/basLocType1.js | 260 +++++++++++++++++++++
src/main/java/com/zy/asrs/service/BasLocType1Service.java | 8
src/main/java/com/zy/asrs/entity/BasLocSts.java | 4
src/main/webapp/views/basLocType1/basLocType1.html | 98 ++++++++
src/main/webapp/views/agvLocMast/locMast_detail.html | 4
12 files changed, 677 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLocType1Controller.java b/src/main/java/com/zy/asrs/controller/BasLocType1Controller.java
new file mode 100644
index 0000000..8f69995
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasLocType1Controller.java
@@ -0,0 +1,131 @@
+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.BasLocType1;
+import com.zy.asrs.service.BasLocType1Service;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasLocType1Controller extends BaseController {
+
+ @Autowired
+ private BasLocType1Service basLocType1Service;
+
+ @RequestMapping(value = "/basLocType1/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basLocType1Service.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basLocType1/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(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasLocType1> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasLocType1.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basLocType1Service.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 = "/basLocType1/add/auth")
+ @ManagerAuth
+ public R add(BasLocType1 basLocType1) {
+ basLocType1.setModiUser(getUserId());
+ basLocType1.setModiTime(new Date());
+ basLocType1.setAppeUser(getUserId());
+ basLocType1.setAppeTime(new Date());
+ basLocType1Service.insert(basLocType1);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basLocType1/update/auth")
+ @ManagerAuth
+ public R update(BasLocType1 basLocType1){
+ if (Cools.isEmpty(basLocType1) || null==basLocType1.getLocType()){
+ return R.error();
+ }
+ basLocType1.setModiUser(getUserId());
+ basLocType1.setModiTime(new Date());
+ basLocType1Service.updateById(basLocType1);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basLocType1/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basLocType1Service.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basLocType1/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasLocType1> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basLocType1"));
+ convert(map, wrapper);
+ List<BasLocType1> list = basLocType1Service.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basLocType1Query/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasLocType1> wrapper = new EntityWrapper<>();
+ wrapper.like("loc_desc", condition);
+ Page<BasLocType1> page = basLocType1Service.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasLocType1 basLocType1 : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basLocType1.getLocType());
+ map.put("value", basLocType1.getLocDesc());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basLocType1/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasLocType1> wrapper = new EntityWrapper<BasLocType1>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basLocType1Service.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasLocType1.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/AgvLocMast.java b/src/main/java/com/zy/asrs/entity/AgvLocMast.java
index 11bc094..ec6e2a7 100644
--- a/src/main/java/com/zy/asrs/entity/AgvLocMast.java
+++ b/src/main/java/com/zy/asrs/entity/AgvLocMast.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.BasLocSts;
import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.service.BasLocStsService;
+import com.zy.asrs.service.BasLocType1Service;
import com.zy.asrs.service.BasWhsService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -218,19 +219,12 @@
}
public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
- case 0:
- return "鏈煡";
- case 1:
- return "寰呭寘瑁�";
- case 2:
- return "鍘熸潗鏂�";
- case 3:
- return "绠卞３";
- default:
- return String.valueOf(this.locType1);
+ BasLocType1Service service = SpringUtils.getBean(BasLocType1Service.class);
+ BasLocType1 basLocType1 = service.selectById(this.locType1);
+ if (!Cools.isEmpty(basLocType1)){
+ return String.valueOf(basLocType1.getLocDesc());
}
+ return null;
}
public String getLocType2$() {
diff --git a/src/main/java/com/zy/asrs/entity/BasLocSts.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java
index f426cea..e88705d 100644
--- a/src/main/java/com/zy/asrs/entity/BasLocSts.java
+++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java
@@ -9,6 +9,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -46,6 +47,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
@@ -53,6 +55,7 @@
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
@TableField("appe_user")
+
private Long appeUser;
/**
@@ -60,6 +63,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
public BasLocSts() {}
diff --git a/src/main/java/com/zy/asrs/entity/BasLocType1.java b/src/main/java/com/zy/asrs/entity/BasLocType1.java
new file mode 100644
index 0000000..02647db
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasLocType1.java
@@ -0,0 +1,127 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_loc_type1")
+public class BasLocType1 implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 搴撲綅绫诲瀷浠ｅ彿
+ */
+ @ApiModelProperty(value= "搴撲綅绫诲瀷浠ｅ彿")
+ @TableId(value = "loc_type", type = IdType.INPUT)
+ @TableField("loc_type")
+ private Long locType;
+
+ /**
+ * 搴撲綅绫诲瀷鎻忚堪
+ */
+ @ApiModelProperty(value= "搴撲綅绫诲瀷鎻忚堪")
+ @TableField("loc_desc")
+ private String locDesc;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modiTime;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ @ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("appe_user")
+ private Long appeUser;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("appe_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date appeTime;
+
+ public BasLocType1() {}
+
+ public BasLocType1(Long locType,String locDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ this.locType = locType;
+ this.locDesc = locDesc;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.appeUser = appeUser;
+ this.appeTime = appeTime;
+ }
+
+// BasLocType1 basLocType1 = new BasLocType1(
+// null, // 搴撲綅绫诲瀷浠ｅ彿[闈炵┖]
+// null, // 搴撲綅绫诲瀷鎻忚堪
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 鍒涘缓鑰�
+// null // 娣诲姞鏃堕棿
+// );
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasLocType1Mapper.java b/src/main/java/com/zy/asrs/mapper/BasLocType1Mapper.java
new file mode 100644
index 0000000..109b552
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasLocType1Mapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasLocType1;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasLocType1Mapper extends BaseMapper<BasLocType1> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasLocType1Service.java b/src/main/java/com/zy/asrs/service/BasLocType1Service.java
new file mode 100644
index 0000000..ee71799
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasLocType1Service.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasLocType1;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasLocType1Service extends IService<BasLocType1> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasLocType1ServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasLocType1ServiceImpl.java
new file mode 100644
index 0000000..395feb7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasLocType1ServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasLocType1Mapper;
+import com.zy.asrs.entity.BasLocType1;
+import com.zy.asrs.service.BasLocType1Service;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basLocType1Service")
+public class BasLocType1ServiceImpl extends ServiceImpl<BasLocType1Mapper, BasLocType1> implements BasLocType1Service {
+
+}
diff --git a/src/main/resources/mapper/BasLocType1Mapper.xml b/src/main/resources/mapper/BasLocType1Mapper.xml
new file mode 100644
index 0000000..adff905
--- /dev/null
+++ b/src/main/resources/mapper/BasLocType1Mapper.xml
@@ -0,0 +1,16 @@
+<?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.BasLocType1Mapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLocType1">
+ <result column="loc_type" property="locType" />
+ <result column="loc_desc" property="locDesc" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="appe_user" property="appeUser" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/agvLocMast/locMast.js b/src/main/webapp/static/js/agvLocMast/locMast.js
index bd50d63..b23e676 100644
--- a/src/main/webapp/static/js/agvLocMast/locMast.js
+++ b/src/main/webapp/static/js/agvLocMast/locMast.js
@@ -464,7 +464,7 @@
lev1: $('#lev1').val(),
floor: $('#floor').val(),
fullPlt: $('#fullPlt').val(),
- locType: $('#locType').val(),
+ locType1: $('#locType1').val(),
outEnable: $('#outEnable').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
firstTime: top.strToDate($('#firstTime\\$').val()),
diff --git a/src/main/webapp/static/js/basLocType1/basLocType1.js b/src/main/webapp/static/js/basLocType1/basLocType1.js
new file mode 100644
index 0000000..c2f7962
--- /dev/null
+++ b/src/main/webapp/static/js/basLocType1/basLocType1.js
@@ -0,0 +1,260 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basLocType1',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basLocType1/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'locType', align: 'center',title: '搴撲綅绫诲瀷浠ｅ彿'}
+ ,{field: 'locDesc', align: 'center',title: '搴撲綅绫诲瀷鎻忚堪'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basLocType1)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basLocType1)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.locType;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basLocType1': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basLocType1/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basLocType1)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.locType]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basLocType1/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basLocType1/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modiTime\\$']:null
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['appeTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/agvLocMast/locMast_detail.html b/src/main/webapp/views/agvLocMast/locMast_detail.html
index 7c273a9..14187d0 100644
--- a/src/main/webapp/views/agvLocMast/locMast_detail.html
+++ b/src/main/webapp/views/agvLocMast/locMast_detail.html
@@ -77,8 +77,8 @@
<input id="locType1" class="layui-input" type="text" style="display: none">
<input id="locType1$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basLocStsQueryBylocSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="basLocType1QueryBylocType1" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basLocType1QueryBylocType1Select" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
diff --git a/src/main/webapp/views/basLocType1/basLocType1.html b/src/main/webapp/views/basLocType1/basLocType1.html
new file mode 100644
index 0000000..1f7fcd4
--- /dev/null
+++ b/src/main/webapp/views/basLocType1/basLocType1.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <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">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basLocType1" lay-filter="basLocType1"></table>
+ </div>
+ </div>
+</div>
+
+<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>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<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/basLocType1/basLocType1.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">搴撲綅绫诲瀷浠ｅ彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locType" placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬩唬鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撲綅绫诲瀷鎻忚堪: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="locDesc" placeholder="璇疯緭鍏ュ簱浣嶇被鍨嬫弿杩�" lay-verify="required">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1