From 6d8ba343aae2749344b0dd7ae01ef439f9ab529c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 24 二月 2021 16:17:16 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/comb/comb.js | 496 ++++++++++++++++++++ src/main/webapp/views/comb/comb.html | 66 ++ src/main/java/zy/cloud/wms/manager/service/impl/CombServiceImpl.java | 12 src/main/java/zy/cloud/wms/manager/service/CombService.java | 8 src/main/java/zy/cloud/wms/manager/mapper/CombMapper.java | 12 src/main/resources/mapper/CombMapper.xml | 33 + src/main/java/zy/cloud/wms/common/CodeBuilder.java | 2 src/main/java/zy/cloud/wms/manager/controller/CombController.java | 110 ++++ src/main/java/zy/cloud/wms/manager/entity/Comb.java | 468 +++++++++++++++++++ src/main/webapp/views/comb/comb_detail.html | 201 ++++++++ 10 files changed, 1,407 insertions(+), 1 deletions(-) diff --git a/src/main/java/zy/cloud/wms/common/CodeBuilder.java b/src/main/java/zy/cloud/wms/common/CodeBuilder.java index ce2abf0..d4e5afc 100644 --- a/src/main/java/zy/cloud/wms/common/CodeBuilder.java +++ b/src/main/java/zy/cloud/wms/common/CodeBuilder.java @@ -18,7 +18,7 @@ generator.url="192.168.2.250:1433;databasename=htasrs"; generator.username="sa"; generator.password="sa@123"; - generator.table="man_loc_detl"; + generator.table="man_comb"; generator.packagePath="zy.cloud.wms.manager"; // generator.js = false; // generator.html = false; diff --git a/src/main/java/zy/cloud/wms/manager/controller/CombController.java b/src/main/java/zy/cloud/wms/manager/controller/CombController.java new file mode 100644 index 0000000..11a43d5 --- /dev/null +++ b/src/main/java/zy/cloud/wms/manager/controller/CombController.java @@ -0,0 +1,110 @@ +package zy.cloud.wms.manager.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.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 zy.cloud.wms.common.web.BaseController; +import zy.cloud.wms.manager.entity.Comb; +import zy.cloud.wms.manager.service.CombService; + +import java.util.List; +import java.util.Map; + +@RestController +public class CombController extends BaseController { + + @Autowired + private CombService combService; + + @RequestMapping(value = "/comb/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(combService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/comb/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){ + EntityWrapper<Comb> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(combService.selectPage(new Page<>(curr, limit), wrapper)); + } + + private void convert(Map<String, Object> map, EntityWrapper 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 = "/comb/add/auth") + @ManagerAuth + public R add(Comb comb) { + combService.insert(comb); + return R.ok(); + } + + @RequestMapping(value = "/comb/update/auth") + @ManagerAuth + public R update(Comb comb){ + combService.updateById(comb); + return R.ok(); + } + + @RequestMapping(value = "/comb/delete/auth") + @ManagerAuth + public R delete(@RequestParam String param){ + List<Comb> list = JSONArray.parseArray(param, Comb.class); + if (Cools.isEmpty(list)){ + return R.error(); + } + for (Comb entity : list){ + combService.delete(new EntityWrapper<>(entity)); + } + return R.ok(); + } + + @RequestMapping(value = "/comb/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<Comb> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("comb")); + convert(map, wrapper); + List<Comb> list = combService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + + @RequestMapping(value = "/comb/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<Comb> wrapper = new EntityWrapper<Comb>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != combService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(Comb.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/zy/cloud/wms/manager/entity/Comb.java b/src/main/java/zy/cloud/wms/manager/entity/Comb.java new file mode 100644 index 0000000..a6eec19 --- /dev/null +++ b/src/main/java/zy/cloud/wms/manager/entity/Comb.java @@ -0,0 +1,468 @@ +package zy.cloud.wms.manager.entity; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import com.core.common.Cools; +import com.core.common.SpringUtils; +import io.swagger.annotations.ApiModelProperty; +import zy.cloud.wms.system.entity.User; +import zy.cloud.wms.system.service.UserService; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@TableName("man_comb") +public class Comb implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 鎵樼洏鐮� + */ + @ApiModelProperty(value= "鎵樼洏鐮�") + private String zpallet; + + /** + * 璐х墿鏁伴噺 + */ + @ApiModelProperty(value= "璐х墿鏁伴噺") + private Double anfme; + + /** + * 鍟嗗搧缂栧彿 + */ + @ApiModelProperty(value= "鍟嗗搧缂栧彿") + private String matnr; + + /** + * 鍟嗗搧鍚嶇О + */ + @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + private String maktx; + + /** + * 鍚嶇О + */ + @ApiModelProperty(value= "鍚嶇О") + private String name; + + /** + * 瑙勬牸 + */ + @ApiModelProperty(value= "瑙勬牸") + private String specs; + + /** + * 鍨嬪彿 + */ + @ApiModelProperty(value= "鍨嬪彿") + private String model; + + /** + * 鎵瑰彿 + */ + @ApiModelProperty(value= "鎵瑰彿") + private String batch; + + /** + * 鍗曚綅 + */ + @ApiModelProperty(value= "鍗曚綅") + private String unit; + + /** + * 璐х墿鏉$爜 + */ + @ApiModelProperty(value= "璐х墿鏉$爜") + private String barcode; + + /** + * 鍗曟嵁绫诲瀷 + */ + @ApiModelProperty(value= "鍗曟嵁绫诲瀷") + @TableField("doc_id") + private Long docId; + + /** + * 鍗曟嵁缂栧彿 + */ + @ApiModelProperty(value= "鍗曟嵁缂栧彿") + @TableField("doc_num") + private String docNum; + + /** + * 瀹㈡埛鍚嶇О + */ + @ApiModelProperty(value= "瀹㈡埛鍚嶇О") + @TableField("cust_name") + private String custName; + + /** + * 鍝侀」鏁� + */ + @ApiModelProperty(value= "鍝侀」鏁�") + @TableField("item_num") + private Integer itemNum; + + /** + * 鏁伴噺 + */ + @ApiModelProperty(value= "鏁伴噺") + private Integer count; + + /** + * 閲嶉噺 + */ + @ApiModelProperty(value= "閲嶉噺") + private Double weight; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ") + private Integer status; + + /** + * 鎵ц鐘舵�� 0: 鍒濆鍖� 1: 寰呭叆搴� 2: 宸插鐞� 3: 鍙栨秷 4: 宸插畬鎴� + */ + @ApiModelProperty(value= "鎵ц鐘舵�� 0: 鍒濆鍖� 1: 寰呭叆搴� 2: 宸插鐞� 3: 鍙栨秷 4: 宸插畬鎴� ") + @TableField("io_status") + private Integer ioStatus; + + /** + * 娣诲姞浜哄憳 + */ + @ApiModelProperty(value= "娣诲姞浜哄憳") + @TableField("create_by") + private Long createBy; + + /** + * 娣诲姞鏃堕棿 + */ + @ApiModelProperty(value= "娣诲姞鏃堕棿") + @TableField("create_time") + private Date createTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + @TableField("update_by") + private Long updateBy; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + private Date updateTime; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + public Comb() {} + + public Comb(String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Integer ioStatus,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + this.zpallet = zpallet; + this.anfme = anfme; + this.matnr = matnr; + this.maktx = maktx; + this.name = name; + this.specs = specs; + this.model = model; + this.batch = batch; + this.unit = unit; + this.barcode = barcode; + this.docId = docId; + this.docNum = docNum; + this.custName = custName; + this.itemNum = itemNum; + this.count = count; + this.weight = weight; + this.status = status; + this.ioStatus = ioStatus; + this.createBy = createBy; + this.createTime = createTime; + this.updateBy = updateBy; + this.updateTime = updateTime; + this.memo = memo; + } + +// Comb comb = new Comb( +// null, // 鎵樼洏鐮� +// null, // 璐х墿鏁伴噺 +// null, // 鍟嗗搧缂栧彿[闈炵┖] +// null, // 鍟嗗搧鍚嶇О +// null, // 鍚嶇О +// null, // 瑙勬牸 +// null, // 鍨嬪彿 +// null, // 鎵瑰彿 +// null, // 鍗曚綅 +// null, // 璐х墿鏉$爜 +// null, // 鍗曟嵁绫诲瀷 +// null, // 鍗曟嵁缂栧彿 +// null, // 瀹㈡埛鍚嶇О +// null, // 鍝侀」鏁� +// null, // 鏁伴噺 +// null, // 閲嶉噺 +// null, // 鐘舵�� +// null, // 鎵ц鐘舵�� +// null, // 娣诲姞浜哄憳 +// null, // 娣诲姞鏃堕棿 +// null, // 淇敼浜哄憳 +// null, // 淇敼鏃堕棿 +// null // 澶囨敞 +// ); + + public String getZpallet() { + return zpallet; + } + + public void setZpallet(String zpallet) { + this.zpallet = zpallet; + } + + public Double getAnfme() { + return anfme; + } + + public void setAnfme(Double anfme) { + this.anfme = anfme; + } + + public String getMatnr() { + return matnr; + } + + public void setMatnr(String matnr) { + this.matnr = matnr; + } + + public String getMaktx() { + return maktx; + } + + public void setMaktx(String maktx) { + this.maktx = maktx; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSpecs() { + return specs; + } + + public void setSpecs(String specs) { + this.specs = specs; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public String getBatch() { + return batch; + } + + public void setBatch(String batch) { + this.batch = batch; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public String getBarcode() { + return barcode; + } + + public void setBarcode(String barcode) { + this.barcode = barcode; + } + + public Long getDocId() { + return docId; + } + + public void setDocId(Long docId) { + this.docId = docId; + } + + public String getDocNum() { + return docNum; + } + + public void setDocNum(String docNum) { + this.docNum = docNum; + } + + public String getCustName() { + return custName; + } + + public void setCustName(String custName) { + this.custName = custName; + } + + public Integer getItemNum() { + return itemNum; + } + + public void setItemNum(Integer itemNum) { + this.itemNum = itemNum; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Double getWeight() { + return weight; + } + + public void setWeight(Double weight) { + this.weight = weight; + } + + public Integer getStatus() { + return status; + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getIoStatus() { + return ioStatus; + } + + public String getIoStatus$(){ + if (null == this.ioStatus){ return null; } + switch (this.ioStatus){ + case 0: + return "鍒濆鍖�"; + case 1: + return "寰呭叆搴�"; + case 2: + return "宸插鐞�"; + case 3: + return "鍙栨秷"; + case 4: + return "宸插畬鎴�"; + default: + return String.valueOf(this.ioStatus); + } + } + + public void setIoStatus(Integer ioStatus) { + this.ioStatus = ioStatus; + } + + public Long getCreateBy() { + return createBy; + } + + public String getCreateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.createBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + public void setCreateBy(Long createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Long getUpdateBy() { + return updateBy; + } + + public String getUpdateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.updateBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + public void setUpdateBy(Long updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } + + +} diff --git a/src/main/java/zy/cloud/wms/manager/mapper/CombMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/CombMapper.java new file mode 100644 index 0000000..38a2576 --- /dev/null +++ b/src/main/java/zy/cloud/wms/manager/mapper/CombMapper.java @@ -0,0 +1,12 @@ +package zy.cloud.wms.manager.mapper; + +import zy.cloud.wms.manager.entity.Comb; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface CombMapper extends BaseMapper<Comb> { + +} diff --git a/src/main/java/zy/cloud/wms/manager/service/CombService.java b/src/main/java/zy/cloud/wms/manager/service/CombService.java new file mode 100644 index 0000000..2c00fac --- /dev/null +++ b/src/main/java/zy/cloud/wms/manager/service/CombService.java @@ -0,0 +1,8 @@ +package zy.cloud.wms.manager.service; + +import zy.cloud.wms.manager.entity.Comb; +import com.baomidou.mybatisplus.service.IService; + +public interface CombService extends IService<Comb> { + +} diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/CombServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/CombServiceImpl.java new file mode 100644 index 0000000..8b50dba --- /dev/null +++ b/src/main/java/zy/cloud/wms/manager/service/impl/CombServiceImpl.java @@ -0,0 +1,12 @@ +package zy.cloud.wms.manager.service.impl; + +import zy.cloud.wms.manager.mapper.CombMapper; +import zy.cloud.wms.manager.entity.Comb; +import zy.cloud.wms.manager.service.CombService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("combService") +public class CombServiceImpl extends ServiceImpl<CombMapper, Comb> implements CombService { + +} diff --git a/src/main/resources/mapper/CombMapper.xml b/src/main/resources/mapper/CombMapper.xml new file mode 100644 index 0000000..d2e6ca7 --- /dev/null +++ b/src/main/resources/mapper/CombMapper.xml @@ -0,0 +1,33 @@ +<?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="zy.cloud.wms.manager.mapper.CombMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.Comb"> + <result column="zpallet" property="zpallet" /> + <result column="anfme" property="anfme" /> + <result column="matnr" property="matnr" /> + <result column="maktx" property="maktx" /> + <result column="name" property="name" /> + <result column="specs" property="specs" /> + <result column="model" property="model" /> + <result column="batch" property="batch" /> + <result column="unit" property="unit" /> + <result column="barcode" property="barcode" /> + <result column="doc_id" property="docId" /> + <result column="doc_num" property="docNum" /> + <result column="cust_name" property="custName" /> + <result column="item_num" property="itemNum" /> + <result column="count" property="count" /> + <result column="weight" property="weight" /> + <result column="status" property="status" /> + <result column="io_status" property="ioStatus" /> + <result column="create_by" property="createBy" /> + <result column="create_time" property="createTime" /> + <result column="update_by" property="updateBy" /> + <result column="update_time" property="updateTime" /> + <result column="memo" property="memo" /> + + </resultMap> + +</mapper> diff --git a/src/main/webapp/static/js/comb/comb.js b/src/main/webapp/static/js/comb/comb.js new file mode 100644 index 0000000..5b33c51 --- /dev/null +++ b/src/main/webapp/static/js/comb/comb.js @@ -0,0 +1,496 @@ +var pageCurr; +layui.use(['table','laydate', 'form'], function(){ + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + + // 鏁版嵁娓叉煋 + tableIns = table.render({ + elem: '#comb', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/comb/list/auth', + page: true, + limit: 16, + limits: [16, 30, 50, 100, 200, 500], + even: true, + toolbar: '#toolbar', + cellMinWidth: 50, + cols: [[ + {type: 'checkbox'} +// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} + ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'} + ,{field: 'anfme', align: 'center',title: '璐х墿鏁伴噺'} + ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'} + ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} + // ,{field: 'name', align: 'center',title: '鍚嶇О'} + // ,{field: 'specs', align: 'center',title: '瑙勬牸'} + // ,{field: 'model', align: 'center',title: '鍨嬪彿'} + // ,{field: 'batch', align: 'center',title: '鎵瑰彿'} + // ,{field: 'unit', align: 'center',title: '鍗曚綅'} + // ,{field: 'barcode', align: 'center',title: '璐х墿鏉$爜'} + // ,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷'} + // ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿'} + // ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О'} + // ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'} + // ,{field: 'count', align: 'center',title: '鏁伴噺'} + // ,{field: 'weight', align: 'center',title: '閲嶉噺'} + // ,{field: 'status$', align: 'center',title: '鐘舵��'} + ,{field: 'ioStatus$', align: 'center',title: '鎵ц鐘舵��'} + // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'} + // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} + // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'} + // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} + ,{field: 'memo', align: 'center',title: '澶囨敞'} + + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150} + ]], + 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(); + form.on('checkbox(tableCheckbox)', function (data) { + var _index = $(data.elem).attr('table-index')||0; + if(data.elem.checked){ + res.data[_index][data.value] = 'Y'; + }else{ + res.data[_index][data.value] = 'N'; + } + }); + } + }); + + // 鐩戝惉鎺掑簭浜嬩欢 + table.on('sort(locMast)', 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 + }, + done: function (res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + limit(); + } + }); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(comb)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + switch(obj.event) { + case 'addData': + layer.open({ + type: 2, + title: '鏂板', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + content: 'comb_detail.html', + success: function(layero, index){ + layer.getChildFrame('#data-detail-submit-edit', index).hide(); + clearFormVal(layer.getChildFrame('#detail', index)); + layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); + } + }); + break; + case 'deleteData': + var data = checkStatus.data; + if (data.length === 0){ + layer.msg('璇烽�夋嫨鏁版嵁'); + } else { + layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){ + $.ajax({ + url: baseUrl+"/comb/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {param: JSON.stringify(data)}, + method: 'POST', + traditional:true, + success: function (res) { + if (res.code === 200){ + layer.closeAll(); + tableReload(false); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg) + } + } + }) + }); + } + break; + case 'exportData': + layer.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 = { + 'comb': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/comb/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) + } + } + }); + }); + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(comb)', function(obj){ + var data = obj.data; + switch (obj.event) { + // 璇︽儏 + case 'detail': + layer.open({ + type: 2, + title: '璇︽儏', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: 'comb_detail.html', + success: function(layero, index){ + setFormVal(layer.getChildFrame('#detail', index), data, true); + top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); + layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide(); + layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); + layero.find('iframe')[0].contentWindow.layui.form.render('select'); + layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); + } + }); + break; + // 缂栬緫 + case 'edit': + layer.open({ + type: 2, + title: '淇敼', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + content: 'comb_detail.html', + success: function(layero, index){ + layer.getChildFrame('#data-detail-submit-save', index).hide(); + setFormVal(layer.getChildFrame('#detail', index), data, false); + top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false); + top.convertDisabled(layer.getChildFrame('', index), true); + layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); + layero.find('iframe')[0].contentWindow.layui.form.render('select'); + layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); + } + }); + break; + case 'createBy': + var param = top.reObject(data).createBy; + if (param === undefined) { + layer.msg("鏃犳暟鎹�"); + } else { + layer.open({ + type: 2, + title: '娣诲姞浜哄憳璇︽儏', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../user/user_detail.html', + success: function(layero, index){ + $.ajax({ + url: "baseUrl+/user/"+ param +"/auth", + headers: {'token': localStorage.getItem('token')}, + method: 'GET', + success: function (res) { + if (res.code === 200){ + setFormVal(layer.getChildFrame('#detail', index), res.data, true); + top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); + layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide(); + layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); + layero.find('iframe')[0].contentWindow.layui.form.render('select'); + layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg) + } + } + }) + } + }); + } + break; + case 'updateBy': + var param = top.reObject(data).updateBy; + if (param === undefined) { + layer.msg("鏃犳暟鎹�"); + } else { + layer.open({ + type: 2, + title: '淇敼浜哄憳璇︽儏', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: '../user/user_detail.html', + success: function(layero, index){ + $.ajax({ + url: "baseUrl+/user/"+ param +"/auth", + headers: {'token': localStorage.getItem('token')}, + method: 'GET', + success: function (res) { + if (res.code === 200){ + setFormVal(layer.getChildFrame('#detail', index), res.data, true); + top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); + layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide(); + layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); + layero.find('iframe')[0].contentWindow.layui.form.render('select'); + layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg) + } + } + }) + } + }); + } + break; + + } + }); + + // 鏁版嵁淇濆瓨鍔ㄤ綔 + form.on('submit(save)', function () { + if (banMsg != null){ + layer.msg(banMsg); + return; + } + method("add"); + }); + + // 鏁版嵁淇敼鍔ㄤ綔 + form.on('submit(edit)', function () { + method("update") + }); + + function method(name){ + var index = layer.load(1, { + shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙 + }); + var data = { +// id: $('#id').val(), + zpallet: $('#zpallet').val(), + anfme: $('#anfme').val(), + matnr: $('#matnr').val(), + maktx: $('#maktx').val(), + name: $('#name').val(), + specs: $('#specs').val(), + model: $('#model').val(), + batch: $('#batch').val(), + unit: $('#unit').val(), + barcode: $('#barcode').val(), + docId: $('#docId').val(), + docNum: $('#docNum').val(), + custName: $('#custName').val(), + itemNum: $('#itemNum').val(), + count: $('#count').val(), + weight: $('#weight').val(), + status: $('#status').val(), + ioStatus: $('#ioStatus').val(), + createBy: $('#createBy').val(), + createTime: top.strToDate($('#createTime\\$').val()), + updateBy: $('#updateBy').val(), + updateTime: top.strToDate($('#updateTime\\$').val()), + memo: $('#memo').val(), + + }; + $.ajax({ + url: baseUrl+"/comb/"+name+"/auth", + headers: {'token': localStorage.getItem('token')}, + data: top.reObject(data), + method: 'POST', + success: function (res) { + if (res.code === 200){ + parent.layer.closeAll(); + parent.$(".layui-laypage-btn")[0].click(); + $("#data-detail :input").each(function () { + $(this).val(""); + }); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg) + } + layer.close(index); + } + }) + } + + // 澶嶉�夋浜嬩欢 + form.on('checkbox(detailCheckbox)', function (data) { + var el = data.elem; + if (el.checked) { + $(el).val('Y'); + } else { + $(el).val('N'); + } + }); + + // 鎼滅储鏍忔悳绱簨浠� + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(false); + }); + + // 鎼滅储鏍忛噸缃簨浠� + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(false); + }); + + // 鏃堕棿閫夋嫨鍣� + layDate.render({ + elem: '#createTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#updateTime\\$', + type: 'datetime' + }); + + +}); + +// 鍏抽棴鍔ㄤ綔 +$(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; + }); + (child ? parent.tableIns : tableIns).reload({ + where: searchData, + page: { + curr: pageCurr + }, + done: function (res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + if (res.data.length === 0 && count !== 0) { + tableIns.reload({ + where: searchData, + page: { + curr: pageCurr-1 + } + }); + pageCurr -= 1; + } + limit(child); + } + }); +} + +function setFormVal(el, data, showImg) { + for (var val in data) { + var find = el.find(":input[id='" + val + "']"); + if (find[0]!=null){ + if (find[0].type === 'checkbox'){ + if (data[val]==='Y'){ + find.attr("checked","checked"); + find.val('Y'); + } else { + find.remove("checked"); + find.val('N'); + } + continue; + } + } + find.val(data[val]); + if (showImg){ + var next = find.next(); + if (next.get(0)){ + if (next.get(0).localName === "img") { + find.hide(); + next.attr("src", data[val]); + next.show(); + } + } + } + } +} + +function clearFormVal(el) { + $(':input', el) + .val('') + .removeAttr('checked') + .removeAttr('selected'); +} + +function detailScreen(index) { + var detail = layer.getChildFrame('#data-detail', index); + var height = detail.height()+60; + if (height > ($(window).height()*0.9)) { + height = ($(window).height()*0.8); + } + layer.style(index, { +// top: (($(window).height()-height)/3)+"px", + height: height+'px' + }); +} + +$('body').keydown(function () { + if (event.keyCode === 13) { + $("#search").click(); + } +}); diff --git a/src/main/webapp/views/comb/comb.html b/src/main/webapp/views/comb/comb.html new file mode 100644 index 0000000..0c5f508 --- /dev/null +++ b/src/main/webapp/views/comb/comb.html @@ -0,0 +1,66 @@ +<!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/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> +</head> +<body> + +<!-- 鎼滅储鏍� --> +<div id="search-box" class="layui-form layui-card-header"> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off"> + </div> + </div> + <!-- 寰呮坊鍔� --> + <div id="data-search-btn" class="layui-btn-container layui-form-item"> + <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button> + <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button> + </div> +</div> + +<!-- 琛ㄦ牸 --> +<div class="layui-form"> + <table class="layui-hide" id="comb" lay-filter="comb"></table> +</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" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button> + </div> +</script> + +<script type="text/html" id="operate"> + <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a> +<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</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/comb/comb.js" charset="utf-8"></script> + +<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> + +</body> +</html> + diff --git a/src/main/webapp/views/comb/comb_detail.html b/src/main/webapp/views/comb/comb_detail.html new file mode 100644 index 0000000..824a993 --- /dev/null +++ b/src/main/webapp/views/comb/comb_detail.html @@ -0,0 +1,201 @@ +<!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/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> +</head> +<body> + +<!-- 璇︽儏 --> +<div id="data-detail" class="layer_self_wrap"> + <form id="detail" class="layui-form"> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鎵� 鐩� 鐮侊細</label> + <div class="layui-input-inline"> + <input id="zpallet" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">璐х墿鏁伴噺锛�</label> + <div class="layui-input-inline"> + <input id="anfme" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label"><span class="not-null">*</span>鍟嗗搧缂栧彿锛�</label> + <div class="layui-input-inline"> + <input id="matnr" class="layui-input" type="text" lay-verify="required" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍟嗗搧鍚嶇О锛�</label> + <div class="layui-input-inline"> + <input id="maktx" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍚嶃��銆�绉帮細</label> + <div class="layui-input-inline"> + <input id="name" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">瑙勩��銆�鏍硷細</label> + <div class="layui-input-inline"> + <input id="specs" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍨嬨��銆�鍙凤細</label> + <div class="layui-input-inline"> + <input id="model" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鎵广��銆�鍙凤細</label> + <div class="layui-input-inline"> + <input id="batch" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍗曘��銆�浣嶏細</label> + <div class="layui-input-inline"> + <input id="unit" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">璐х墿鏉$爜锛�</label> + <div class="layui-input-inline"> + <input id="barcode" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label> + <div class="layui-input-inline"> + <input id="docId" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label> + <div class="layui-input-inline"> + <input id="docNum" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">瀹㈡埛鍚嶇О锛�</label> + <div class="layui-input-inline"> + <input id="custName" class="layui-input" type="text"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鍝� 椤� 鏁帮細</label> + <div class="layui-input-inline"> + <input id="itemNum" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鏁般��銆�閲忥細</label> + <div class="layui-input-inline"> + <input id="count" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">閲嶃��銆�閲忥細</label> + <div class="layui-input-inline"> + <input id="weight" class="layui-input" type="text" lay-verify="number" > + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鐘躲��銆�鎬侊細</label> + <div class="layui-input-inline"> + <select id="status"> + <option value="" style="display: none"></option> + <option value="1">姝e父</option> + <option value="0">绂佺敤</option> + </select> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">鎵ц鐘舵�侊細</label> + <div class="layui-input-inline"> + <select id="ioStatus"> + <option value="" style="display: none"></option> + <option value="0">鍒濆鍖�</option> + <option value="1">寰呭叆搴�</option> + <option value="2">宸插鐞�</option> + <option value="3">鍙栨秷</option> + <option value="4">宸插畬鎴�</option> + </select> + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">娣诲姞浜哄憳锛�</label> + <div class="layui-input-inline cool-auto-complete"> + <input id="createBy" class="layui-input" type="text" lay-verify="number" style="display: none"> + <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">娣诲姞鏃堕棿锛�</label> + <div class="layui-input-inline"> + <input id="createTime$" class="layui-input" type="text" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">淇敼浜哄憳锛�</label> + <div class="layui-input-inline cool-auto-complete"> + <input id="updateBy" class="layui-input" type="text" lay-verify="number" style="display: none"> + <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-inline" style="width:31%;display: none"> + <label class="layui-form-label">淇敼鏃堕棿锛�</label> + <div class="layui-input-inline"> + <input id="updateTime$" class="layui-input" type="text" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="width:31%;"> + <label class="layui-form-label">澶囥��銆�娉細</label> + <div class="layui-input-inline"> + <input id="memo" class="layui-input" type="text"> + </div> + </div> + + + <hr class="layui-bg-gray"> + + <div id="data-detail-btn" class="layui-btn-container layui-form-item"> + <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div> + <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div> + <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div> + </div> + + <div id="prompt"> + 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span> + </div> + </form> +</div> +</body> +<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/comb/comb.js" charset="utf-8"></script> +</html> + -- Gitblit v1.9.1