Browse Source

修改出库申请审批页面

lwx_dev
erdanergou 3 years ago
parent
commit
507d2a7ac2
  1. 16
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 5
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java
  3. 174
      src/main/resources/templates/pages/application/application-review.html
  4. 4
      src/main/resources/templates/pages/application/form-step-look_back.html
  5. 174
      target/classes/templates/pages/application/application-review.html
  6. 4
      target/classes/templates/pages/application/form-step-look_back.html

16
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -1241,10 +1241,6 @@ public class PageController {
// 获取所有子订单 // 获取所有子订单
List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordService.findApplicationOutRecordMinByParent(recordP.getId()); List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordService.findApplicationOutRecordMinByParent(recordP.getId());
// 展示物料名
StringBuilder mname = new StringBuilder();
// 展示物料编码
StringBuilder mcode = new StringBuilder();
// 展示出库的仓库名 // 展示出库的仓库名
StringBuilder depositoryName = new StringBuilder(); StringBuilder depositoryName = new StringBuilder();
// 展示出库的库位编码 // 展示出库的库位编码
@ -1265,10 +1261,13 @@ public class PageController {
// 获取出库库位 // 获取出库库位
Place placeById = placeService.findPlaceById(applicationOutRecordMin.getPlaceId()); Place placeById = placeService.findPlaceById(applicationOutRecordMin.getPlaceId());
if (placeById != null) { if (placeById != null) {
placeCode.append(placeById.getCode()).append(","); if ("0000".equals(placeById.getCode())) {
placeCode.append("默认库位").append(",");
} else {
placeCode.append(placeById.getCode()).append(",");
}
} }
mname.append(inventoryById.getMname()).append(","); applicationOutRecordMin.setMname(inventoryById.getMname());
mcode.append(inventoryById.getCode()).append(",");
depositoryName.append(depository.getDname()).append(","); depositoryName.append(depository.getDname()).append(",");
sumQuantity += applicationOutRecordMin.getQuantity(); sumQuantity += applicationOutRecordMin.getQuantity();
@ -1320,13 +1319,12 @@ public class PageController {
recordP.setDepositoryManagerName(depositoryManagerNames.toString()); recordP.setDepositoryManagerName(depositoryManagerNames.toString());
recordP.setApplicantName(userByPort.getName()); recordP.setApplicantName(userByPort.getName());
recordP.setDepartmentheadName(departmentHeadName.toString()); recordP.setDepartmentheadName(departmentHeadName.toString());
recordP.setMcode(mcode.toString());
recordP.setMname(mname.toString());
recordP.setDepositoryName(depositoryName.toString()); recordP.setDepositoryName(depositoryName.toString());
recordP.setQuantity(sumQuantity); recordP.setQuantity(sumQuantity);
recordP.setPrice(sumPrice); recordP.setPrice(sumPrice);
recordP.setUnit(sumUnit.toString()); recordP.setUnit(sumUnit.toString());
mv.addObject("record", recordP); mv.addObject("record", recordP);
mv.addObject("recordMinList", applicationOutRecordMinByParent);
return mv; return mv;
} }

5
src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java

@ -64,4 +64,9 @@ public class ApplicationOutRecordMin {
*/ */
private String unit; private String unit;
/**
* 出库物料名称
*/
private String mname;
} }

174
src/main/resources/templates/pages/application/application-review.html

@ -34,7 +34,10 @@
</tr> </tr>
<tr> <tr>
<td>物料名称</td> <td>物料名称</td>
<td id="materialName" th:text="${record.getMname()}">骁龙888芯片</td> <td>
<button th:each="recordMin,iterStar: ${recordMinList}" th:text="${recordMin.getMname()}" th:value="${recordMin.getId()}"
onclick="selectThisMinRecord(this)"></button>
</td>
</tr> </tr>
<tr> <tr>
<td>仓库名称</td> <td>仓库名称</td>
@ -67,9 +70,11 @@
</tr> </tr>
<tr> <tr>
<td>请求提交时间</td> <td>请求提交时间</td>
<td id="applicantTime" th:text="${record.getApplicantTime() }">1970-01-01 08:00:00</td> <td id="applicantTime" th:text="${record.getApplicantTime() }">1970-01-01 08:00:00
</td>
</tr> </tr>
<tr>
<tr> <tr>
<td>申请备注</td> <td>申请备注</td>
<td id="applyRemarks" th:text="${record.getApplyRemark()}">申请备注</td> <td id="applyRemarks" th:text="${record.getApplyRemark()}">申请备注</td>
@ -80,15 +85,21 @@
</tr> </tr>
<tr id="departmentheadMessageT" style="display: none"> <tr id="departmentheadMessageT" style="display: none">
<td>审核意见</td> <td>审核意见</td>
<td id="departmentheadMessage" th:text="${record.getDepartmentheadMessage()}">审核意见</td> <td id="departmentheadMessage" th:text="${record.getDepartmentheadMessage()}">审核意见
</td>
</tr> </tr>
<tr id="departmentheadTimeT" style="display: none"> <tr id="departmentheadTimeT" style="display: none">
<td>审核时间</td> <td>审核时间</td>
<td id="departmentheadTime" th:text="${record.getDepartmentheadTime().equals('1970-01-01 08:00:00')?'':record.getDepartmentheadTime()}">1970-01-01 08:00:00</td> <td id="departmentheadTime"
th:text="${record.getDepartmentheadTime().equals('1970-01-01 08:00:00')?'':record.getDepartmentheadTime()}">
1970-01-01 08:00:00
</td>
</tr> </tr>
<tr id="depositoryManagerNameT" style="display: none"> <tr id="depositoryManagerNameT" style="display: none">
<td>仓储负责人</td> <td>仓储负责人</td>
<td id="depositoryManagerName" th:text="${record.getDepositoryManagerName()}">仓储负责人</td> <td id="depositoryManagerName" th:text="${record.getDepositoryManagerName()}">
仓储负责人
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -100,7 +111,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">审核备注:</label> <label class="layui-form-label">审核备注:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="departmentheadMessageF" name="departmentheadMessage" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/> <input id="departmentheadMessageF" name="departmentheadMessage"
placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
</div> </div>
</div> </div>
@ -128,7 +140,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">审核备注:</label> <label class="layui-form-label">审核备注:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="depositoryManagerMessageF" name="depositoryManagerMessage" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/> <input id="depositoryManagerMessageF" name="depositoryManagerMessage"
placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
</div> </div>
</div> </div>
@ -152,7 +165,6 @@
</div> </div>
</div> </div>
</div> </div>
@ -163,114 +175,140 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
function check(){} function check() {
function review(){} }
function review() {
}
function selectThisMinRecord(obj){
}
layui.use(['form', 'step'], function () { layui.use(['form', 'step'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
step = layui.step; step = layui.step;
/* var state=$("#state").text(); /* var state=$("#state").text();
var pass = $("#pass").text(); var pass = $("#pass").text();
//当前处于的状态 //当前处于的状态
var position=0,states={},number = 1; var position=0,states={},number = 1;
if (state === "待部门负责人审核" || state === "部门负责人审核未通过") { if (state === "待部门负责人审核" || state === "部门负责人审核未通过") {
// , {title: "未入库"} // , {title: "未入库"}
states = [ {title: state}]; states = [ {title: state}];
number = 2; number = 2;
} else { } else {
if(state === "待仓储中心负责人审核"|| state === "仓储中心负责人审核未通过"){ if(state === "待仓储中心负责人审核"|| state === "仓储中心负责人审核未通过"){
states = [ {title: state}]; states = [ {title: state}];
number = 3; number = 3;
}else{ }else{
if(pass === 1 || pass === "1"){ if(pass === 1 || pass === "1"){
number = 4; number = 4;
states = [{title:"已出库"}] states = [{title:"已出库"}]
}else if(pass === 3 || pass === "3"){ }else if(pass === 3 || pass === "3"){
number = 4; number = 4;
states = [{title:"出库中"}] states = [{title:"出库中"}]
}else if(pass === 2 || pass === "2"){ }else if(pass === 2 || pass === "2"){
number = 4; number = 4;
states = [{title:"未出库"}] states = [{title:"未出库"}]
} }
} }
}*/ }*/
step.render({ step.render({
elem: '#stepForm', elem: '#stepForm',
filter: 'stepForm', filter: 'stepForm',
width: '100%', //设置容器宽度 width: '100%', //设置容器宽度
stepWidth: '750px', stepWidth: '750px',
height: '100%', height: '100%',
// position: position, // position: position,
// number:number, // number:number,
stepItems: [] stepItems: []
}); });
let departmentheadTime=$("#departmentheadTime").text(); let departmentheadTime = $("#departmentheadTime").text();
if (departmentheadTime!=null&&departmentheadTime!==""){ if (departmentheadTime != null && departmentheadTime !== "") {
$("#departmentheadTimeT").show(); $("#departmentheadTimeT").show();
$("#departmentheadMessageT").show(); $("#departmentheadMessageT").show();
$("#depositoryManagerNameT").show(); $("#depositoryManagerNameT").show();
$("#review").hide(); $("#review").hide();
$("#check").show(); $("#check").show();
} }
review=function (pass) { review = function (pass) {
let data={}; let data = {};
data.id=$("#id").text(); data.id = $("#id").text();
if (pass == 1){ if (pass == 1) {
data.departmentheadPass=1; data.departmentheadPass = 1;
}else { } else {
data.departmentheadPass=2; data.departmentheadPass = 2;
} }
data.departmentheadMessage=$("#departmentheadMessageF").val(); data.departmentheadMessage = $("#departmentheadMessageF").val();
send(data); send(data);
}; };
check=function(pass) { check = function (pass) {
let data={}; let data = {};
data.id=$("#id").text(); data.id = $("#id").text();
if (pass == 1){ if (pass == 1) {
data.depositoryManagerPass=1; data.depositoryManagerPass = 1;
}else { } else {
data.depositoryManagerPass=2; data.depositoryManagerPass = 2;
} }
data.depositoryManagerMessage=$("#depositoryManagerMessageF").val(); data.depositoryManagerMessage = $("#depositoryManagerMessageF").val();
send(data); send(data);
}; };
function send(req) { function send(req) {
$.ajax({ $.ajax({
url:"/depositoryRecord/review", url: "/depositoryRecord/review",
type:'put', type: 'put',
dataType:'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
data:JSON.stringify(req), data: JSON.stringify(req),
beforeSend:function () { beforeSend: function () {
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] }); this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
}, },
success:function(data){ success: function (data) {
layer.close(this.layerIndex); layer.close(this.layerIndex);
if(data.status >= 300){ if (data.status >= 300) {
layer.msg(data.statusInfo.detail, layer.msg(data.statusInfo.detail,
{ {
icon: 2, icon: 2,
time:300 time: 300
}, },
function () { function () {
window.location = '/ApplicationOutView?id='+req.id; window.location = '/ApplicationOutView?id=' + req.id;
});//失败的表情 });//失败的表情
return; return;
}else{ } else {
layer.msg("提交成功", { layer.msg("提交成功", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function(){ }, function () {
window.location = '/ApplicationOutView?id='+req.id; window.location = '/ApplicationOutView?id=' + req.id;
}); });
} }
}, },
}) })
} }
selectThisMinRecord = function (obj) {
// console.log(obj)
var minId = obj.value;
layer.open({
type: 2,
title: '详情',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['100%', '100%'],
move : '.layui-layer-title',
fixed:false,
content: '/form_step_lookByminRecordOut?id='+minId,
});
}
}) })
</script> </script>
</body> </body>

4
src/main/resources/templates/pages/application/form-step-look_back.html

@ -113,7 +113,9 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
function selectThisMinRecord(obj){}; function selectThisMinRecord(obj){
}
layui.use(['form', 'step'], function () { layui.use(['form', 'step'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,

174
target/classes/templates/pages/application/application-review.html

@ -34,7 +34,10 @@
</tr> </tr>
<tr> <tr>
<td>物料名称</td> <td>物料名称</td>
<td id="materialName" th:text="${record.getMname()}">骁龙888芯片</td> <td>
<button th:each="recordMin,iterStar: ${recordMinList}" th:text="${recordMin.getMname()}" th:value="${recordMin.getId()}"
onclick="selectThisMinRecord(this)"></button>
</td>
</tr> </tr>
<tr> <tr>
<td>仓库名称</td> <td>仓库名称</td>
@ -67,9 +70,11 @@
</tr> </tr>
<tr> <tr>
<td>请求提交时间</td> <td>请求提交时间</td>
<td id="applicantTime" th:text="${record.getApplicantTime() }">1970-01-01 08:00:00</td> <td id="applicantTime" th:text="${record.getApplicantTime() }">1970-01-01 08:00:00
</td>
</tr> </tr>
<tr>
<tr> <tr>
<td>申请备注</td> <td>申请备注</td>
<td id="applyRemarks" th:text="${record.getApplyRemark()}">申请备注</td> <td id="applyRemarks" th:text="${record.getApplyRemark()}">申请备注</td>
@ -80,15 +85,21 @@
</tr> </tr>
<tr id="departmentheadMessageT" style="display: none"> <tr id="departmentheadMessageT" style="display: none">
<td>审核意见</td> <td>审核意见</td>
<td id="departmentheadMessage" th:text="${record.getDepartmentheadMessage()}">审核意见</td> <td id="departmentheadMessage" th:text="${record.getDepartmentheadMessage()}">审核意见
</td>
</tr> </tr>
<tr id="departmentheadTimeT" style="display: none"> <tr id="departmentheadTimeT" style="display: none">
<td>审核时间</td> <td>审核时间</td>
<td id="departmentheadTime" th:text="${record.getDepartmentheadTime().equals('1970-01-01 08:00:00')?'':record.getDepartmentheadTime()}">1970-01-01 08:00:00</td> <td id="departmentheadTime"
th:text="${record.getDepartmentheadTime().equals('1970-01-01 08:00:00')?'':record.getDepartmentheadTime()}">
1970-01-01 08:00:00
</td>
</tr> </tr>
<tr id="depositoryManagerNameT" style="display: none"> <tr id="depositoryManagerNameT" style="display: none">
<td>仓储负责人</td> <td>仓储负责人</td>
<td id="depositoryManagerName" th:text="${record.getDepositoryManagerName()}">仓储负责人</td> <td id="depositoryManagerName" th:text="${record.getDepositoryManagerName()}">
仓储负责人
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -100,7 +111,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">审核备注:</label> <label class="layui-form-label">审核备注:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="departmentheadMessageF" name="departmentheadMessage" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/> <input id="departmentheadMessageF" name="departmentheadMessage"
placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
</div> </div>
</div> </div>
@ -128,7 +140,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">审核备注:</label> <label class="layui-form-label">审核备注:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input id="depositoryManagerMessageF" name="depositoryManagerMessage" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/> <input id="depositoryManagerMessageF" name="depositoryManagerMessage"
placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
</div> </div>
</div> </div>
@ -152,7 +165,6 @@
</div> </div>
</div> </div>
</div> </div>
@ -163,114 +175,140 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
function check(){} function check() {
function review(){} }
function review() {
}
function selectThisMinRecord(obj){
}
layui.use(['form', 'step'], function () { layui.use(['form', 'step'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
step = layui.step; step = layui.step;
/* var state=$("#state").text(); /* var state=$("#state").text();
var pass = $("#pass").text(); var pass = $("#pass").text();
//当前处于的状态 //当前处于的状态
var position=0,states={},number = 1; var position=0,states={},number = 1;
if (state === "待部门负责人审核" || state === "部门负责人审核未通过") { if (state === "待部门负责人审核" || state === "部门负责人审核未通过") {
// , {title: "未入库"} // , {title: "未入库"}
states = [ {title: state}]; states = [ {title: state}];
number = 2; number = 2;
} else { } else {
if(state === "待仓储中心负责人审核"|| state === "仓储中心负责人审核未通过"){ if(state === "待仓储中心负责人审核"|| state === "仓储中心负责人审核未通过"){
states = [ {title: state}]; states = [ {title: state}];
number = 3; number = 3;
}else{ }else{
if(pass === 1 || pass === "1"){ if(pass === 1 || pass === "1"){
number = 4; number = 4;
states = [{title:"已出库"}] states = [{title:"已出库"}]
}else if(pass === 3 || pass === "3"){ }else if(pass === 3 || pass === "3"){
number = 4; number = 4;
states = [{title:"出库中"}] states = [{title:"出库中"}]
}else if(pass === 2 || pass === "2"){ }else if(pass === 2 || pass === "2"){
number = 4; number = 4;
states = [{title:"未出库"}] states = [{title:"未出库"}]
} }
} }
}*/ }*/
step.render({ step.render({
elem: '#stepForm', elem: '#stepForm',
filter: 'stepForm', filter: 'stepForm',
width: '100%', //设置容器宽度 width: '100%', //设置容器宽度
stepWidth: '750px', stepWidth: '750px',
height: '100%', height: '100%',
// position: position, // position: position,
// number:number, // number:number,
stepItems: [] stepItems: []
}); });
let departmentheadTime=$("#departmentheadTime").text(); let departmentheadTime = $("#departmentheadTime").text();
if (departmentheadTime!=null&&departmentheadTime!==""){ if (departmentheadTime != null && departmentheadTime !== "") {
$("#departmentheadTimeT").show(); $("#departmentheadTimeT").show();
$("#departmentheadMessageT").show(); $("#departmentheadMessageT").show();
$("#depositoryManagerNameT").show(); $("#depositoryManagerNameT").show();
$("#review").hide(); $("#review").hide();
$("#check").show(); $("#check").show();
} }
review=function (pass) { review = function (pass) {
let data={}; let data = {};
data.id=$("#id").text(); data.id = $("#id").text();
if (pass == 1){ if (pass == 1) {
data.departmentheadPass=1; data.departmentheadPass = 1;
}else { } else {
data.departmentheadPass=2; data.departmentheadPass = 2;
} }
data.departmentheadMessage=$("#departmentheadMessageF").val(); data.departmentheadMessage = $("#departmentheadMessageF").val();
send(data); send(data);
}; };
check=function(pass) { check = function (pass) {
let data={}; let data = {};
data.id=$("#id").text(); data.id = $("#id").text();
if (pass == 1){ if (pass == 1) {
data.depositoryManagerPass=1; data.depositoryManagerPass = 1;
}else { } else {
data.depositoryManagerPass=2; data.depositoryManagerPass = 2;
} }
data.depositoryManagerMessage=$("#depositoryManagerMessageF").val(); data.depositoryManagerMessage = $("#depositoryManagerMessageF").val();
send(data); send(data);
}; };
function send(req) { function send(req) {
$.ajax({ $.ajax({
url:"/depositoryRecord/review", url: "/depositoryRecord/review",
type:'put', type: 'put',
dataType:'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
data:JSON.stringify(req), data: JSON.stringify(req),
beforeSend:function () { beforeSend: function () {
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] }); this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
}, },
success:function(data){ success: function (data) {
layer.close(this.layerIndex); layer.close(this.layerIndex);
if(data.status >= 300){ if (data.status >= 300) {
layer.msg(data.statusInfo.detail, layer.msg(data.statusInfo.detail,
{ {
icon: 2, icon: 2,
time:300 time: 300
}, },
function () { function () {
window.location = '/ApplicationOutView?id='+req.id; window.location = '/ApplicationOutView?id=' + req.id;
});//失败的表情 });//失败的表情
return; return;
}else{ } else {
layer.msg("提交成功", { layer.msg("提交成功", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function(){ }, function () {
window.location = '/ApplicationOutView?id='+req.id; window.location = '/ApplicationOutView?id=' + req.id;
}); });
} }
}, },
}) })
} }
selectThisMinRecord = function (obj) {
// console.log(obj)
var minId = obj.value;
layer.open({
type: 2,
title: '详情',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['100%', '100%'],
move : '.layui-layer-title',
fixed:false,
content: '/form_step_lookByminRecordOut?id='+minId,
});
}
}) })
</script> </script>
</body> </body>

4
target/classes/templates/pages/application/form-step-look_back.html

@ -113,7 +113,9 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
function selectThisMinRecord(obj){}; function selectThisMinRecord(obj){
}
layui.use(['form', 'step'], function () { layui.use(['form', 'step'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,

Loading…
Cancel
Save