From 4cd9aca3325b383d834087b67c155f13df00b2c5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 26 六月 2021 14:40:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 16 ++++++++
src/main/webapp/views/matCode/matCode.html | 1
src/main/webapp/static/js/matCode/matCode.js | 37 ++++++++++++++++++
src/main/webapp/views/matCode/matCode_detail.html | 4 +-
src/main/webapp/views/pakStore/matQuery.html | 31 +++++++++++++++
5 files changed, 86 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 6d4c5b2..c983d44 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -41,6 +41,22 @@
@Autowired
private MatCodeService matCodeService;
+ @RequestMapping(value = "/matCode/auto/id/auth")
+ @ManagerAuth
+ public R autoId() {
+ String matnr = "";
+ do {
+ matnr = getNewMatnr();
+ } while (matCodeService.selectById(matnr) != null);
+ return R.ok().add(matnr);
+ }
+
+ private String getNewMatnr(){
+ StringBuilder sb = new StringBuilder("MAT");
+ sb.append(new Date().getTime());
+ return sb.toString();
+ }
+
@RequestMapping(value = "/matCode/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index dfe5d51..0366a20 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -7,7 +7,7 @@
cols.push.apply(cols, matCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120})
return cols;
}
layui.use(['table','laydate', 'form','upload'], function(){
@@ -101,6 +101,21 @@
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"});
+ // 瀛楁娉ㄥ叆鐗╂枡缂栫爜
+ $.ajax({
+ url: baseUrl+"/matCode/auto/id/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ layer.getChildFrame('#matNo', index).val(res.data);
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
}
});
break;
@@ -255,6 +270,26 @@
}
});
break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'matCode_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('#matNo', 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 "btnPrint":
printMatCodeNos = [];
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 87666d6..1584658 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -91,6 +91,7 @@
<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>
<button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
</script>
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index 7335ee0..dde2571 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -30,9 +30,9 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍟嗗搧鍚嶇О锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>鍟嗗搧鍚嶇О锛�</label>
<div class="layui-input-inline">
- <input id="matName" class="layui-input" type="text">
+ <input id="matName" class="layui-input" type="text" lay-verify="required">
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 530de5b..3416727 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -52,6 +52,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
+ <button class="layui-btn layui-btn-normal" id="btn-addMat" lay-event="addMat" style="">鏂板</button>
</div>
</script>
@@ -131,6 +132,36 @@
}
parent.addTableData(data);
break;
+ case 'addMat':
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: '../matCode/matCode_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"});
+ // 瀛楁娉ㄥ叆鐗╂枡缂栫爜
+ $.ajax({
+ url: baseUrl+"/matCode/auto/id/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ layer.getChildFrame('#matNo', index).val(res.data);
+ } else if (res.code === 403){
+ parent.location.href = "/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ break;
}
});
--
Gitblit v1.9.1