From 7c0ffec6ee60e5b0f2f9dc8312a7bbce3e20ac11 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 02 十二月 2022 15:59:27 +0800
Subject: [PATCH] #修改合同号
---
src/main/webapp/views/report/locDetl_detail.html | 76 +++++++++++++++++++++++++
src/main/webapp/views/report/locDetl.html | 37 +++++-------
src/main/java/com/zy/asrs/controller/LocDetlController.java | 5 -
src/main/webapp/static/js/locMast/locMast.js | 21 +++++-
4 files changed, 109 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index a078415..87d2cbb 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -163,10 +163,7 @@
if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
return R.error();
}
- locDetl.setModiUser(getUserId());
- locDetl.setModiTime(new Date());
- locDetlService.updateById(locDetl);
- return R.ok();
+ return new R(201,"鍚堝悓鍙蜂慨鏀规垚鍔燂紝璇峰埛鏂伴〉闈紒锛侊紒");
}
@RequestMapping(value = "/locDetl/delete/auth")
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 54454f9..054a10d 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -417,14 +417,17 @@
layer.msg(banMsg);
return;
}
- method("add");
+ method("/locMast/add/auth");
});
// 鏁版嵁淇敼鍔ㄤ綔
form.on('submit(edit)', function () {
- method("update")
+ method("/locMast/update/auth")
});
-
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(pakoutPreview)', function () {
+ method("/locDetl/updateBatch/auth")
+ });
function method(name){
var index = layer.load(1, {
shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
@@ -459,10 +462,16 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
+ batch: $('#batch').val(),
+ anfme: $('#anfme').val(),
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
+ zpallet: $('#zpallet').val(),
+ specs: $('#specs').val(),
};
$.ajax({
- url: baseUrl+"/locMast/"+name+"/auth",
+ url: baseUrl+name,
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
@@ -475,6 +484,10 @@
});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
+ }else if (res.code===201){
+ layer.msg(res.msg);
+ parent.layer.closeAll();
+ parent.parent.layer.closeAll();
}else {
layer.msg(res.msg)
}
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index d81c07c..0da0485 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -101,28 +101,21 @@
switch (obj.event) {
// 淇敼鍚堝悓鍙凤紙鎵瑰彿锛�
case 'pakoutPreview':
-
-
-
- $.ajax({
- url: baseUrl+"/locDetl/updateBatch/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- locNo: data.locNo,
- matnr: data.matnr,
- maktx: data.maktx,
- anfme: data.anfme,
- batch: data.batch
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.msg(res.msg, {icon: 2});
- } else if (res.code === 403){
- layer.msg(res.msg, {icon: 2});
- }else {
- layer.msg(res.msg, {icon: 2});
- }
+ layer.open({
+ type: 2,
+ title: '淇敼鍚堝悓鍙�',
+ maxmin: true,
+ area: ['500px', top.detailHeight],
+ shadeClose: false,
+ content: 'locDetl_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#updateBatch', index), data, false);
+ // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('#locNo', 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;
diff --git a/src/main/webapp/views/report/locDetl_detail.html b/src/main/webapp/views/report/locDetl_detail.html
new file mode 100644
index 0000000..49973ce
--- /dev/null
+++ b/src/main/webapp/views/report/locDetl_detail.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+<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="updateBatch" class="layui-form" style="height: 100%">
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null">*</span>鍚� 鍚� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="batch" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null">*</span>鏁� 閲忥細</label>
+ <div class="layui-input-inline">
+ <input id="anfme" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null"></span>搴� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="locNo" class="layui-input" disabled ="disabled" type="text" onkeyup="check(this.id, 'locDetl')">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null"></span> 鍟嗗搧缂栧彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="matnr" class="layui-input" disabled ="disabled" type="text" onkeyup="check(this.id, 'locDetl')">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null"></span> 鍟嗗搧鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input id="maktx" class="layui-input" disabled ="disabled" type="text" onkeyup="check(this.id, 'locDetl')">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null"></span> 鎵樼洏鐮侊細</label>
+ <div class="layui-input-inline">
+ <input id="zpallet" class="layui-input" disabled ="disabled" type="text" onkeyup="check(this.id, 'locDetl')">
+ </div>
+ </div>
+ <div class="layui-inline" >
+ <label class="layui-form-label"><span class="not-null"></span> 瑙勬牸锛�</label>
+ <div class="layui-input-inline">
+ <input id="specs" class="layui-input" disabled ="disabled" type="text" onkeyup="check(this.id, 'locDetl')">
+ </div>
+ </div>
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="pakoutPreview">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </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/locMast/locMast.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1