From 27d854bef2b100d722cb7e84c5966817970f3f05 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 01 三月 2021 14:32:58 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/CustOrder.java | 254 ++++++++++++++
src/main/resources/mapper/CustOrderMapper.xml | 22 +
src/main/java/zy/cloud/wms/manager/service/CustOrderService.java | 8
src/main/webapp/views/custOrder/custOrder.html | 57 +++
src/main/webapp/static/js/custOrder/custOrder.js | 402 +++++++++++++++++++++++
src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java | 12
src/main/webapp/views/custOrder/custOrder_detail.html | 126 +++++++
src/main/java/zy/cloud/wms/manager/controller/CustOrderController.java | 104 ++++++
src/main/java/zy/cloud/wms/common/CodeBuilder.java | 2
src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java | 12
10 files changed, 998 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 5396f47..572b05e 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_pakout";
+ generator.table="man_cust_order";
generator.packagePath="zy.cloud.wms.manager";
// generator.js = false;
// generator.html = false;
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CustOrderController.java b/src/main/java/zy/cloud/wms/manager/controller/CustOrderController.java
new file mode 100644
index 0000000..1ed4535
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/CustOrderController.java
@@ -0,0 +1,104 @@
+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.CustOrder;
+import zy.cloud.wms.manager.service.CustOrderService;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class CustOrderController extends BaseController {
+
+ @Autowired
+ private CustOrderService custOrderService;
+
+ @RequestMapping(value = "/custOrder/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(custOrderService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/custOrder/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<CustOrder> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(custOrderService.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 = "/custOrder/add/auth")
+ @ManagerAuth
+ public R add(CustOrder custOrder) {
+ custOrderService.insert(custOrder);
+ return R.ok();
+ }
+
+
+ @RequestMapping(value = "/custOrder/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam String param){
+ List<CustOrder> list = JSONArray.parseArray(param, CustOrder.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (CustOrder entity : list){
+ custOrderService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/custOrder/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<CustOrder> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("custOrder"));
+ convert(map, wrapper);
+ List<CustOrder> list = custOrderService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+
+ @RequestMapping(value = "/custOrder/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<CustOrder> wrapper = new EntityWrapper<CustOrder>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != custOrderService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(CustOrder.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
new file mode 100644
index 0000000..af7f0e1
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
@@ -0,0 +1,254 @@
+package zy.cloud.wms.manager.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("man_cust_order")
+public class CustOrder implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閿�鍞崟鍙�
+ */
+ @ApiModelProperty(value= "閿�鍞崟鍙�")
+ private String number;
+
+ /**
+ * 鍗曟嵁鏃ユ湡
+ */
+ @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @TableField("bill_date")
+ private String billDate;
+
+ /**
+ * 瀹㈡埛缂栧彿
+ */
+ @ApiModelProperty(value= "瀹㈡埛缂栧彿")
+ @TableField("bType_id")
+ private String bTypeId;
+
+ /**
+ * 缁忔墜浜虹紪鍙�
+ */
+ @ApiModelProperty(value= "缁忔墜浜虹紪鍙�")
+ @TableField("eType_id")
+ private String eTypeId;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @TableField("user_code")
+ private String userCode;
+
+ /**
+ * 鍟嗗搧鏁伴噺
+ */
+ @ApiModelProperty(value= "鍟嗗搧鏁伴噺")
+ private Double qty;
+
+ /**
+ * 鍟嗗搧鍗曚环
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍗曚环")
+ private Double price;
+
+ /**
+ * 鍟嗗搧澶囨敞
+ */
+ @ApiModelProperty(value= "鍟嗗搧澶囨敞")
+ private String comment;
+
+ /**
+ * 鐘舵�� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ private Date createTime;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public CustOrder() {}
+
+ public CustOrder(String number,String billDate,String bTypeId,String eTypeId,String userCode,Double qty,Double price,String comment,Integer status,Date createTime,Date updateTime,String memo) {
+ this.number = number;
+ this.billDate = billDate;
+ this.bTypeId = bTypeId;
+ this.eTypeId = eTypeId;
+ this.userCode = userCode;
+ this.qty = qty;
+ this.price = price;
+ this.comment = comment;
+ this.status = status;
+ this.createTime = createTime;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// CustOrder custOrder = new CustOrder(
+// null, // 閿�鍞崟鍙�
+// null, // 鍗曟嵁鏃ユ湡[闈炵┖]
+// null, // 瀹㈡埛缂栧彿
+// null, // 缁忔墜浜虹紪鍙穂闈炵┖]
+// null, // 鍟嗗搧缂栧彿
+// null, // 鍟嗗搧鏁伴噺
+// null, // 鍟嗗搧鍗曚环
+// null, // 鍟嗗搧澶囨敞[闈炵┖]
+// null, // 鐘舵��
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getNumber() {
+ return number;
+ }
+
+ public void setNumber(String number) {
+ this.number = number;
+ }
+
+ public String getBillDate() {
+ return billDate;
+ }
+
+ public void setBillDate(String billDate) {
+ this.billDate = billDate;
+ }
+
+ public String getBTypeId() {
+ return bTypeId;
+ }
+
+ public void setBTypeId(String bTypeId) {
+ this.bTypeId = bTypeId;
+ }
+
+ public String getETypeId() {
+ return eTypeId;
+ }
+
+ public void setETypeId(String eTypeId) {
+ this.eTypeId = eTypeId;
+ }
+
+ public String getUserCode() {
+ return userCode;
+ }
+
+ public void setUserCode(String userCode) {
+ this.userCode = userCode;
+ }
+
+ public Double getQty() {
+ return qty;
+ }
+
+ public void setQty(Double qty) {
+ this.qty = qty;
+ }
+
+ public Double getPrice() {
+ return price;
+ }
+
+ public void setPrice(Double price) {
+ this.price = price;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "寰呭鐞�";
+ case 2:
+ return "宸插畬鎴�";
+ case 3:
+ return "鍙栨秷";
+ case 4:
+ return "寮傚父";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ 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 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/CustOrderMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
new file mode 100644
index 0000000..0a92709
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.mapper;
+
+import zy.cloud.wms.manager.entity.CustOrder;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface CustOrderMapper extends BaseMapper<CustOrder> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java b/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
new file mode 100644
index 0000000..29e2114
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
@@ -0,0 +1,8 @@
+package zy.cloud.wms.manager.service;
+
+import zy.cloud.wms.manager.entity.CustOrder;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface CustOrderService extends IService<CustOrder> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
new file mode 100644
index 0000000..c4e8638
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.service.impl;
+
+import zy.cloud.wms.manager.mapper.CustOrderMapper;
+import zy.cloud.wms.manager.entity.CustOrder;
+import zy.cloud.wms.manager.service.CustOrderService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("custOrderService")
+public class CustOrderServiceImpl extends ServiceImpl<CustOrderMapper, CustOrder> implements CustOrderService {
+
+}
diff --git a/src/main/resources/mapper/CustOrderMapper.xml b/src/main/resources/mapper/CustOrderMapper.xml
new file mode 100644
index 0000000..a718449
--- /dev/null
+++ b/src/main/resources/mapper/CustOrderMapper.xml
@@ -0,0 +1,22 @@
+<?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.CustOrderMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.CustOrder">
+ <result column="number" property="number" />
+ <result column="bill_date" property="billDate" />
+ <result column="bType_id" property="bTypeId" />
+ <result column="eType_id" property="eTypeId" />
+ <result column="user_code" property="userCode" />
+ <result column="qty" property="qty" />
+ <result column="price" property="price" />
+ <result column="comment" property="comment" />
+ <result column="status" property="status" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
new file mode 100644
index 0000000..11b4b9e
--- /dev/null
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -0,0 +1,402 @@
+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: '#custOrder',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/custOrder/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: 'number', align: 'center',title: '閿�鍞崟鍙�'}
+ ,{field: 'billDate', align: 'center',title: '鍗曟嵁鏃ユ湡'}
+ ,{field: 'bTypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
+ ,{field: 'eTypeId', align: 'center',title: '缁忔墜浜虹紪鍙�'}
+ ,{field: 'userCode', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'qty', align: 'center',title: '鍟嗗搧鏁伴噺'}
+ ,{field: 'price', align: 'center',title: '鍟嗗搧鍗曚环'}
+ ,{field: 'comment', align: 'center',title: '鍟嗗搧澶囨敞'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{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(custOrder)', 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: 'custOrder_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+"/custOrder/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 = {
+ 'custOrder': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/custOrder/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(custOrder)', 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: 'custOrder_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: 'custOrder_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;
+
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ 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(),
+ number: $('#number').val(),
+ billDate: $('#billDate').val(),
+ bTypeId: $('#bTypeId').val(),
+ eTypeId: $('#eTypeId').val(),
+ userCode: $('#userCode').val(),
+ qty: $('#qty').val(),
+ price: $('#price').val(),
+ comment: $('#comment').val(),
+ status: $('#status').val(),
+ createTime: top.strToDate($('#createTime\\$').val()),
+ updateTime: top.strToDate($('#updateTime\\$').val()),
+ memo: $('#memo').val(),
+
+ };
+ $.ajax({
+ url: baseUrl+"/custOrder/"+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/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
new file mode 100644
index 0000000..60c0885
--- /dev/null
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -0,0 +1,57 @@
+<!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="number" 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="custOrder" lay-filter="custOrder"></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/custOrder/custOrder.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/custOrder/custOrder_detail.html b/src/main/webapp/views/custOrder/custOrder_detail.html
new file mode 100644
index 0000000..e970a4e
--- /dev/null
+++ b/src/main/webapp/views/custOrder/custOrder_detail.html
@@ -0,0 +1,126 @@
+<!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="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">閿�鍞崟鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="number" class="layui-input" type="text">
+ </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="billDate" 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="bTypeId" class="layui-input" type="text">
+ </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="eTypeId" 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="userCode" 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="qty" 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="price" 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="comment" 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">
+ <select id="status">
+ <option value="" style="display: none"></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%;">
+ <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%;">
+ <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/custOrder/custOrder.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1