From 29e419e8c829adc98e3c6dc79b9dda9ce3e02be6 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 21 九月 2022 10:14:05 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/WrkChargeService.java | 8 src/main/webapp/static/js/wrkCharge/wrkCharge.js | 291 +++++++++++++++ src/main/java/com/zy/asrs/controller/WrkChargeController.java | 127 ++++++ src/main/webapp/views/wrkCharge/wrkCharge.html | 278 ++++++++++++++ src/main/java/com/zy/asrs/entity/WrkCharge.java | 361 +++++++++++++++++++ src/main/resources/mapper/WrkChargeMapper.xml | 32 + src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java | 12 src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java | 12 src/main/java/com/zy/common/CodeBuilder.java | 4 9 files changed, 1,123 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WrkChargeController.java b/src/main/java/com/zy/asrs/controller/WrkChargeController.java new file mode 100644 index 0000000..84f7003 --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/WrkChargeController.java @@ -0,0 +1,127 @@ +package com.zy.asrs.controller; + +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 com.zy.asrs.entity.WrkCharge; +import com.zy.asrs.service.WrkChargeService; +import com.zy.common.web.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +public class WrkChargeController extends BaseController { + + @Autowired + private WrkChargeService wrkChargeService; + + @RequestMapping(value = "/wrkCharge/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(wrkChargeService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/wrkCharge/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<WrkCharge> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + allLike(WrkCharge.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(wrkChargeService.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 = "/wrkCharge/add/auth") + @ManagerAuth + public R add(WrkCharge wrkCharge) { + wrkChargeService.insert(wrkCharge); + return R.ok(); + } + + @RequestMapping(value = "/wrkCharge/update/auth") + @ManagerAuth + public R update(WrkCharge wrkCharge){ + if (Cools.isEmpty(wrkCharge) || null==wrkCharge.getWrkNo()){ + return R.error(); + } + wrkChargeService.updateById(wrkCharge); + return R.ok(); + } + + @RequestMapping(value = "/wrkCharge/delete/auth") + @ManagerAuth + public R delete(@RequestParam(value="ids[]") Long[] ids){ + for (Long id : ids){ + wrkChargeService.deleteById(id); + } + return R.ok(); + } + + @RequestMapping(value = "/wrkCharge/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<WrkCharge> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("wrkCharge")); + convert(map, wrapper); + List<WrkCharge> list = wrkChargeService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/wrkChargeQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<WrkCharge> wrapper = new EntityWrapper<>(); + wrapper.like("wrk_no", condition); + Page<WrkCharge> page = wrkChargeService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (WrkCharge wrkCharge : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", wrkCharge.getWrkNo()); + map.put("value", wrkCharge.getWrkNo()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/wrkCharge/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<WrkCharge> wrapper = new EntityWrapper<WrkCharge>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != wrkChargeService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(WrkCharge.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/asrs/entity/WrkCharge.java b/src/main/java/com/zy/asrs/entity/WrkCharge.java new file mode 100644 index 0000000..287839d --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/WrkCharge.java @@ -0,0 +1,361 @@ +package com.zy.asrs.entity; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.core.common.Cools; +import com.core.common.SpringUtils; +import com.zy.asrs.service.*; +import com.zy.system.entity.User; +import com.zy.system.service.UserService; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@TableName("asr_wrk_charge") +public class WrkCharge implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 宸ヤ綔鍙� + */ + @ApiModelProperty(value= "宸ヤ綔鍙�") + @TableId(value = "wrk_no", type = IdType.INPUT) + @TableField("wrk_no") + private Integer wrkNo; + + /** + * 鏍囪 + */ + @ApiModelProperty(value= "鏍囪") + private String mk; + + /** + * 宸ヤ綔鐘舵�� + */ + @ApiModelProperty(value= "宸ヤ綔鐘舵��") + @TableField("wrk_sts") + private Long wrkSts; + + /** + * 鍏ュ嚭搴撶被鍨� + */ + @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�") + @TableField("io_type") + private Integer ioType; + + /** + * 鍫嗗灈鏈� + */ + @ApiModelProperty(value= "鍫嗗灈鏈�") + @TableField("crn_no") + private Integer crnNo; + + /** + * 绌挎杞� + */ + @ApiModelProperty(value= "绌挎杞�") + @TableField("ste_no") + private Integer steNo; + + /** + * 宸烽亾鍙� + */ + @ApiModelProperty(value= "宸烽亾鍙�") + @TableField("out_most") + private Integer outMost; + + /** + * 浼樺厛绾� + */ + @ApiModelProperty(value= "浼樺厛绾�") + @TableField("io_pri") + private Double ioPri; + + /** + * 鐩爣搴撲綅 + */ + @ApiModelProperty(value= "鐩爣搴撲綅") + @TableField("loc_no") + private String locNo; + + /** + * 鐩爣绔� + */ + @ApiModelProperty(value= "鐩爣绔�") + @TableField("sta_no") + private Integer staNo; + + /** + * 婧愮珯 + */ + @ApiModelProperty(value= "婧愮珯") + @TableField("source_sta_no") + private Integer sourceStaNo; + + /** + * 婧愬簱浣� + */ + @ApiModelProperty(value= "婧愬簱浣�") + @TableField("source_loc_no") + private String sourceLocNo; + + /** + * 绌烘澘(checkBox) + */ + @ApiModelProperty(value= "绌烘澘(checkBox)") + @TableField("empty_mk") + private String emptyMk; + + /** + * 宸ヤ綔鏃堕棿 + */ + @ApiModelProperty(value= "宸ヤ綔鏃堕棿") + @TableField("io_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date ioTime; + + /** + * 鍫嗗灈鏈哄惎鍔ㄦ椂闂� + */ + @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�") + @TableField("crn_str_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date crnStrTime; + + /** + * 鍫嗗灈鏈哄仠姝㈡椂闂� + */ + @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�") + @TableField("crn_end_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date crnEndTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + @TableField("modi_user") + private String modiUser; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("modi_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modiTime; + + /** + * 鍒涘缓鑰� + */ + @ApiModelProperty(value= "鍒涘缓鑰�") + @TableField("appe_user") + private String appeUser; + + /** + * 娣诲姞鏃堕棿 + */ + @ApiModelProperty(value= "娣诲姞鏃堕棿") + @TableField("appe_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date appeTime; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + /** + * 鏉$爜 + */ + @ApiModelProperty(value= "鏉$爜") + private String barcode; + + public WrkCharge() {} + + public WrkCharge(Integer wrkNo,String mk,Long wrkSts,Integer ioType,Integer crnNo,Integer steNo,Integer outMost,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String emptyMk,Date ioTime,Date crnStrTime,Date crnEndTime,String modiUser,Date modiTime,String appeUser,Date appeTime,String memo,String barcode) { + this.wrkNo = wrkNo; + this.mk = mk; + this.wrkSts = wrkSts; + this.ioType = ioType; + this.crnNo = crnNo; + this.steNo = steNo; + this.outMost = outMost; + this.ioPri = ioPri; + this.locNo = locNo; + this.staNo = staNo; + this.sourceStaNo = sourceStaNo; + this.sourceLocNo = sourceLocNo; + this.emptyMk = emptyMk; + this.ioTime = ioTime; + this.crnStrTime = crnStrTime; + this.crnEndTime = crnEndTime; + this.modiUser = modiUser; + this.modiTime = modiTime; + this.appeUser = appeUser; + this.appeTime = appeTime; + this.memo = memo; + this.barcode = barcode; + } + +// WrkCharge wrkCharge = new WrkCharge( +// null, // 宸ヤ綔鍙穂闈炵┖] +// null, // 鏍囪 +// null, // 宸ヤ綔鐘舵�� +// null, // 鍏ュ嚭搴撶被鍨� +// null, // 鍫嗗灈鏈� +// null, // 绌挎杞� +// null, // 宸烽亾鍙� +// null, // 浼樺厛绾� +// null, // 鐩爣搴撲綅 +// null, // 鐩爣绔� +// null, // 婧愮珯 +// null, // 婧愬簱浣� +// null, // 绌烘澘(checkBox) +// null, // 宸ヤ綔鏃堕棿 +// null, // 鍫嗗灈鏈哄惎鍔ㄦ椂闂� +// null, // 鍫嗗灈鏈哄仠姝㈡椂闂� +// null, // 淇敼浜哄憳 +// null, // 淇敼鏃堕棿 +// null, // 鍒涘缓鑰� +// null, // 娣诲姞鏃堕棿 +// null, // 澶囨敞 +// null // 鏉$爜 +// ); + + public String getWrkSts$(){ + BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class); + BasWrkStatus basWrkStatus = service.selectById(this.wrkSts); + if (!Cools.isEmpty(basWrkStatus)){ + return String.valueOf(basWrkStatus.getWrkDesc()); + } + return null; + } + + public String getIoType$(){ + BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class); + BasWrkIotype basWrkIotype = service.selectById(this.ioType); + if (!Cools.isEmpty(basWrkIotype)){ + return String.valueOf(basWrkIotype.getIoDesc()); + } + return null; + } + + public String getCrnNo$(){ + BasCrnpService service = SpringUtils.getBean(BasCrnpService.class); + BasCrnp basCrnp = service.selectById(this.crnNo); + if (!Cools.isEmpty(basCrnp)){ + return String.valueOf(basCrnp.getCrnNo()); + } + return null; + } + + public String getSteNo$(){ + BasSteService service = SpringUtils.getBean(BasSteService.class); + BasSte basSte = service.selectById(this.steNo); + if (!Cools.isEmpty(basSte)){ + return String.valueOf(basSte.getSteNo()); + } + return null; + } + + public String getLocNo$(){ + LocMastService service = SpringUtils.getBean(LocMastService.class); + LocMast locMast = service.selectById(this.locNo); + if (!Cools.isEmpty(locMast)){ + return String.valueOf(locMast.getLocNo()); + } + return null; + } + + public String getStaNo$(){ + BasDevpService service = SpringUtils.getBean(BasDevpService.class); + BasDevp basDevp = service.selectById(this.staNo); + if (!Cools.isEmpty(basDevp)){ + return String.valueOf(basDevp.getDevNo()); + } + return null; + } + + public String getSourceStaNo$(){ + BasDevpService service = SpringUtils.getBean(BasDevpService.class); + BasDevp basDevp = service.selectById(this.sourceStaNo); + if (!Cools.isEmpty(basDevp)){ + return String.valueOf(basDevp.getDevNo()); + } + return null; + } + + public String getSourceLocNo$(){ + LocMastService service = SpringUtils.getBean(LocMastService.class); + LocMast locMast = service.selectById(this.sourceLocNo); + if (!Cools.isEmpty(locMast)){ + return String.valueOf(locMast.getLocNo()); + } + return null; + } + + public String getIoTime$(){ + if (Cools.isEmpty(this.ioTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); + } + + public String getCrnStrTime$(){ + if (Cools.isEmpty(this.crnStrTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime); + } + + public String getCrnEndTime$(){ + if (Cools.isEmpty(this.crnEndTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime); + } + + 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/WrkChargeMapper.java b/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java new file mode 100644 index 0000000..88d6451 --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/WrkChargeMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.mapper; + +import com.zy.asrs.entity.WrkCharge; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface WrkChargeMapper extends BaseMapper<WrkCharge> { + +} diff --git a/src/main/java/com/zy/asrs/service/WrkChargeService.java b/src/main/java/com/zy/asrs/service/WrkChargeService.java new file mode 100644 index 0000000..43c9a52 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/WrkChargeService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.service; + +import com.zy.asrs.entity.WrkCharge; +import com.baomidou.mybatisplus.service.IService; + +public interface WrkChargeService extends IService<WrkCharge> { + +} diff --git a/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java new file mode 100644 index 0000000..3e23acc --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/WrkChargeServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.service.impl; + +import com.zy.asrs.mapper.WrkChargeMapper; +import com.zy.asrs.entity.WrkCharge; +import com.zy.asrs.service.WrkChargeService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("wrkChargeService") +public class WrkChargeServiceImpl extends ServiceImpl<WrkChargeMapper, WrkCharge> implements WrkChargeService { + +} diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java index 7e7df4a..25bdfe4 100644 --- a/src/main/java/com/zy/common/CodeBuilder.java +++ b/src/main/java/com/zy/common/CodeBuilder.java @@ -17,10 +17,10 @@ // generator.table="sys_host"; // sqlserver generator.sqlOsType = SqlOsType.SQL_SERVER; - generator.url="localhost:1433;databasename=ynasrs"; + generator.url="localhost:1433;databasename=bfasrs"; generator.username="sa"; generator.password="sa@123"; - generator.table="asr_bas_ste_opt"; + generator.table="asr_wrk_charge"; generator.packagePath="com.zy.asrs"; generator.build(); } diff --git a/src/main/resources/mapper/WrkChargeMapper.xml b/src/main/resources/mapper/WrkChargeMapper.xml new file mode 100644 index 0000000..5499e2a --- /dev/null +++ b/src/main/resources/mapper/WrkChargeMapper.xml @@ -0,0 +1,32 @@ +<?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.WrkChargeMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkCharge"> + <id column="wrk_no" property="wrkNo" /> + <result column="mk" property="mk" /> + <result column="wrk_sts" property="wrkSts" /> + <result column="io_type" property="ioType" /> + <result column="crn_no" property="crnNo" /> + <result column="ste_no" property="steNo" /> + <result column="out_most" property="outMost" /> + <result column="io_pri" property="ioPri" /> + <result column="loc_no" property="locNo" /> + <result column="sta_no" property="staNo" /> + <result column="source_sta_no" property="sourceStaNo" /> + <result column="source_loc_no" property="sourceLocNo" /> + <result column="empty_mk" property="emptyMk" /> + <result column="io_time" property="ioTime" /> + <result column="crn_str_time" property="crnStrTime" /> + <result column="crn_end_time" property="crnEndTime" /> + <result column="modi_user" property="modiUser" /> + <result column="modi_time" property="modiTime" /> + <result column="appe_user" property="appeUser" /> + <result column="appe_time" property="appeTime" /> + <result column="memo" property="memo" /> + <result column="barcode" property="barcode" /> + + </resultMap> + +</mapper> diff --git a/src/main/webapp/static/js/wrkCharge/wrkCharge.js b/src/main/webapp/static/js/wrkCharge/wrkCharge.js new file mode 100644 index 0000000..7508e72 --- /dev/null +++ b/src/main/webapp/static/js/wrkCharge/wrkCharge.js @@ -0,0 +1,291 @@ +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: '#wrkCharge', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/wrkCharge/list/auth', + page: true, + limit: 15, + limits: [15, 30, 50, 100, 200, 500], + toolbar: '#toolbar', + cellMinWidth: 50, + height: 'full-120', + cols: [[ + {type: 'checkbox'} + ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} + ,{field: 'mk', align: 'center',title: '鏍囪'} + ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'} + ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'} + ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'} + ,{field: 'steNo$', align: 'center',title: '绌挎杞�'} + ,{field: 'outMost', align: 'center',title: '宸烽亾鍙�'} + ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'} + ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'} + ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'} + ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'} + ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'} + ,{field: 'emptyMk', align: 'center',title: '绌烘澘(checkBox)'} + ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'} + ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'} + ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'} + ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'} + ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'} + ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'} + ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'} + ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'barcode', 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(wrkCharge)', 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(wrkCharge)', 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.id; + })); + 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 = { + 'wrkCharge': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/wrkCharge/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(wrkCharge)', function(obj){ + var data = obj.data; + switch (obj.event) { + case 'edit': + showEditModel(data); + break; + case "del": + del([data.id]); + 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+"/wrkCharge/"+(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+"/wrkCharge/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: '#ioTime\\$', + type: 'datetime', + value: data!==undefined?data['ioTime\\$']:null + }); + layDate.render({ + elem: '#crnStrTime\\$', + type: 'datetime', + value: data!==undefined?data['crnStrTime\\$']:null + }); + layDate.render({ + elem: '#crnEndTime\\$', + type: 'datetime', + value: data!==undefined?data['crnEndTime\\$']:null + }); + 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/wrkCharge/wrkCharge.html b/src/main/webapp/views/wrkCharge/wrkCharge.html new file mode 100644 index 0000000..5c0dfa8 --- /dev/null +++ b/src/main/webapp/views/wrkCharge/wrkCharge.html @@ -0,0 +1,278 @@ +<!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="wrkCharge" lay-filter="wrkCharge"></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/wrkCharge/wrkCharge.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="wrkNo" 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="mk" placeholder="璇疯緭鍏ユ爣璁�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">宸ヤ綔鐘舵��: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" style="display: none"> + <input id="wrkSts$" name="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍏ュ嚭搴撶被鍨�: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="ioType" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" style="display: none"> + <input id="ioType$" name="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍫嗗灈鏈�: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満" style="display: none"> + <input id="crnNo$" name="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">绌挎杞�: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="steNo" placeholder="璇疯緭鍏ョ┛姊溅" style="display: none"> + <input id="steNo$" name="steNo$" 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="basSteQueryBysteNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basSteQueryBysteNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">宸烽亾鍙�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="outMost" placeholder="璇疯緭鍏ュ贩閬撳彛"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">浼樺厛绾�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="ioPri" placeholder="璇疯緭鍏ヤ紭鍏堢骇"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐩爣搴撲綅: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�" style="display: none"> + <input id="locNo$" name="locNo$" 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="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐩爣绔�: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ洰鏍囩珯" style="display: none"> + <input id="staNo$" name="staNo$" 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="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愮珯: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔�" style="display: none"> + <input id="sourceStaNo$" name="sourceStaNo$" 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="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">婧愬簱浣�: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="sourceLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅" style="display: none"> + <input id="sourceLocNo$" name="sourceLocNo$" 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="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">绌烘澘(checkBox): </label> + <div class="layui-input-block"> + <input class="layui-input" name="emptyMk" placeholder="璇疯緭鍏ョ┖鏉�(checkBox)"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">宸ヤ綔鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="ioTime" id="ioTime$" placeholder="璇疯緭鍏ュ伐浣滄椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍫嗗灈鏈哄惎鍔ㄦ椂闂�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="crnStrTime" id="crnStrTime$" placeholder="璇疯緭鍏ュ爢鍨涙満鍚姩鏃堕棿"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍫嗗灈鏈哄仠姝㈡椂闂�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="crnEndTime" id="crnEndTime$" placeholder="璇疯緭鍏ュ爢鍨涙満鍋滄鏃堕棿"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">淇敼浜哄憳: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="modiUser" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none"> + <input id="modiUser$" name="modiUser$" 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="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">淇敼鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="modiTime" id="modiTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍒涘缓鑰�: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="appeUser" placeholder="璇疯緭鍏ュ垱寤鸿��" style="display: none"> + <input id="appeUser$" name="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">娣诲姞鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="appeTime" id="appeTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">澶囨敞: </label> + <div class="layui-input-block"> + <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鏉$爜: </label> + <div class="layui-input-block"> + <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�"> + </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