From 100d5c3be0fe17405a81bf3085c1f36924bbc24b Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期五, 05 六月 2020 09:46:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 11 ++-
src/main/webapp/views/matCode/matCode.html | 29 ---------
src/main/webapp/static/js/matCode/matCode.js | 68 +++++++++++-----------
src/main/webapp/views/matCode/matCode_detail.html | 66 +++++++++++-----------
4 files changed, 76 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 6019326..275a57f 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -16,10 +16,7 @@
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;
+import java.util.*;
@RestController
public class MatCodeController extends BaseController {
@@ -62,6 +59,10 @@
@RequestMapping(value = "/matCode/add/auth")
@ManagerAuth
public R add(MatCode matCode) {
+ matCode.setModiUser(getUserId());
+ matCode.setModiTime(new Date());
+ matCode.setAppeUser(getUserId());
+ matCode.setAppeTime(new Date());
matCodeService.insert(matCode);
return R.ok();
}
@@ -72,6 +73,8 @@
if (Cools.isEmpty(matCode) || null==matCode.getMatNo()){
return R.error();
}
+ matCode.setModiUser(getUserId());
+ matCode.setModiTime(new Date());
matCodeService.updateById(matCode);
return R.ok();
}
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index d516296..866d224 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -24,39 +24,39 @@
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
- ,{field: 'str3', align: 'center',title: ''}
- ,{field: 'str4', align: 'center',title: ''}
- ,{field: 'str5', align: 'center',title: ''}
- ,{field: 'str6', align: 'center',title: ''}
- ,{field: 'str7', align: 'center',title: ''}
- ,{field: 'str8', align: 'center',title: ''}
- ,{field: 'str9', align: 'center',title: ''}
- ,{field: 'str10', align: 'center',title: ''}
- ,{field: 'str11', align: 'center',title: ''}
- ,{field: 'str12', align: 'center',title: ''}
- ,{field: 'str13', align: 'center',title: ''}
- ,{field: 'str14', align: 'center',title: ''}
- ,{field: 'str15', align: 'center',title: ''}
- ,{field: 'str16', align: 'center',title: ''}
- ,{field: 'str17', align: 'center',title: ''}
- ,{field: 'str18', align: 'center',title: ''}
- ,{field: 'str19', align: 'center',title: ''}
- ,{field: 'str20', align: 'center',title: ''}
- ,{field: 'str21', align: 'center',title: ''}
- ,{field: 'str22', align: 'center',title: ''}
- ,{field: 'str23', align: 'center',title: ''}
- ,{field: 'num1', align: 'center',title: ''}
- ,{field: 'num2', align: 'center',title: ''}
- ,{field: 'num3', align: 'center',title: ''}
- ,{field: 'num4', align: 'center',title: ''}
- ,{field: 'num5', align: 'center',title: ''}
- ,{field: 'num6', align: 'center',title: ''}
- ,{field: 'date1$', align: 'center',title: ''}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'status', align: 'center',title: ''}
+ // ,{field: 'str3', align: 'center',title: ''}
+ // ,{field: 'str4', align: 'center',title: ''}
+ // ,{field: 'str5', align: 'center',title: ''}
+ // ,{field: 'str6', align: 'center',title: ''}
+ // ,{field: 'str7', align: 'center',title: ''}
+ // ,{field: 'str8', align: 'center',title: ''}
+ // ,{field: 'str9', align: 'center',title: ''}
+ // ,{field: 'str10', align: 'center',title: ''}
+ // ,{field: 'str11', align: 'center',title: ''}
+ // ,{field: 'str12', align: 'center',title: ''}
+ // ,{field: 'str13', align: 'center',title: ''}
+ // ,{field: 'str14', align: 'center',title: ''}
+ // ,{field: 'str15', align: 'center',title: ''}
+ // ,{field: 'str16', align: 'center',title: ''}
+ // ,{field: 'str17', align: 'center',title: ''}
+ // ,{field: 'str18', align: 'center',title: ''}
+ // ,{field: 'str19', align: 'center',title: ''}
+ // ,{field: 'str20', align: 'center',title: ''}
+ // ,{field: 'str21', align: 'center',title: ''}
+ // ,{field: 'str22', align: 'center',title: ''}
+ // ,{field: 'str23', align: 'center',title: ''}
+ // ,{field: 'num1', align: 'center',title: ''}
+ // ,{field: 'num2', align: 'center',title: ''}
+ // ,{field: 'num3', align: 'center',title: ''}
+ // ,{field: 'num4', align: 'center',title: ''}
+ // ,{field: 'num5', align: 'center',title: ''}
+ // ,{field: 'num6', align: 'center',title: ''}
+ // ,{field: 'date1$', align: 'center',title: ''}
+ // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
+ // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
+ // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ // ,{field: 'status', align: 'center',title: ''}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
@@ -125,7 +125,7 @@
title: '鏂板',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
+ shadeClose: true,
content: 'matCode_detail.html',
success: function(layero, index){
layer.getChildFrame('#data-detail-submit-edit', index).hide();
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 3fcf2e7..8562724 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -15,33 +15,9 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <label class="layui-form-label">缂栥��銆�鍙凤細</label>
+ <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="appeUser" class="layui-input" name="appe_user" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="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-inline">
- <label class="layui-form-label">淇敼浜哄憳锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="modiUser" class="layui-input" name="modi_user" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="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>
+ <input class="layui-input" type="text" name="mat_no" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
@@ -59,7 +35,6 @@
<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-refresh" lay-event="refreshData">鍒锋柊</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>
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index 6f9fce4..ba5638d 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -53,175 +53,175 @@
<input id="str2" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str3" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str4" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str5" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str6" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str7" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str8" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str9" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str10" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str11" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str12" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str13" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str14" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str15" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str16" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str17" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str18" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str19" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str20" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str21" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str22" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str23" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="num1" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="num2" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="num3" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="num4" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="num5" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="num6" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="date1$" class="layui-input" type="text" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <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="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">
@@ -233,13 +233,13 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
<div class="layui-input-inline">
<input id="appeTime$" class="layui-input" type="text" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <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="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
@@ -251,13 +251,13 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">淇敼鏃堕棿锛�</label>
<div class="layui-input-inline">
<input id="modiTime$" class="layui-input" type="text" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="status" class="layui-input" type="text" lay-verify="number" >
--
Gitblit v1.9.1