Commit ef912b0b by yyq1988

调整入库表单

parent fd9608ce
...@@ -323,12 +323,12 @@ function delRow(obj, prefix){ ...@@ -323,12 +323,12 @@ function delRow(obj, prefix){
} }
}); });
}, },
openStorageSelectDialog:function(isMultiSelect,yesFuc){ openStorageSelectDialog:function(isMultiSelect, batchNum, yesFuc){
var url = ctx+"/warehouse/storage/storage/findByPcTypeModel"; var url = ctx+"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="+batchNum;
var fieldLabels = "名称|类型"; var fieldLabels = "名称|类型";
var fieldKeys = "name|type.name"; var fieldKeys = "name|type.name";
var searchLabels = "名称|类型"; var searchLabels = "型号|类型";
var searchKeys = "goodsInfo.name|goodsInfo.type"; var searchKeys = "goodsInfo.model|goodsInfo.type";
top.layer.open({ top.layer.open({
type: 2, type: 2,
area: ['800px', '500px'], area: ['800px', '500px'],
......
...@@ -103,7 +103,12 @@ ...@@ -103,7 +103,12 @@
function addDetail(selector){ function addDetail(selector){
jp.openStorageSelectDialog(true,function (){ if(!$("#batchNum").val()){
jp.warning('请选择批次号!');
return;
}
jp.openStorageSelectDialog(true,$("#batchNum").val(),function (){
}) })
......
<%@ page contentType="text/html;charset=UTF-8" %> <%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/webpage/include/taglib.jsp"%> <%@ include file="/webpage/include/taglib.jsp" %>
<html> <html>
<head> <head>
<title>仓库信息管理</title> <title>仓库信息管理</title>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<script type="text/javascript"> <link rel="stylesheet" href="${ctxStatic}/common/css/form.css">
$(document).ready(function() {
jp.ajaxForm("#inputForm",function(data){
if(data.success){
jp.success(data.msg);
jp.go("${ctx}/warehouse/warehouse/warehouse");
}else{
jp.error(data.msg);
$("#inputForm").find("button:submit").button("reset");
}
});
});
</script>
</head> </head>
<body> <body>
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-body">
<h3 class="panel-title"> <form:form id="inputForm" modelAttribute="warehouse"
<a class="panelButton" href="${ctx}/warehouse/warehouse/warehouse"><i class="ti-angle-left"></i> 返回</a> action="${ctx}/warehouse/warehouse/warehouse/save" method="post" class="form-horizontal">
</h3> <form:hidden path="id"/>
</div> <h3 class="text-center">仓库表</h3>
<div class="panel-body"> <table class="table table-bordered main-table">
<form:form id="inputForm" modelAttribute="warehouse" action="${ctx}/warehouse/warehouse/warehouse/save" method="post" class="form-horizontal"> <tr>
<form:hidden path="id"/> <td><font color="red">*</font>仓库名称</td>
<div class="form-group"> <td>
<label class="col-sm-2 control-label">仓库名称:</label> <form:input path="name" htmlEscape="false" class="form-control required"/>
<div class="col-sm-10"> </td>
<form:input path="name" htmlEscape="false" class="form-control "/> <td><font color="red">*</font>仓库编号</td>
</div> <td>
</div> <form:input path="code" htmlEscape="false" class="form-control required"/>
<div class="form-group"> </td>
<label class="col-sm-2 control-label">仓库编号:</label> </tr>
<div class="col-sm-10"> <tr>
<form:input path="code" htmlEscape="false" class="form-control "/> <td>备注</td>
</div> <td colspan="3">
</div> <form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
<div class="form-group"> </td>
<label class="col-sm-2 control-label">备注信息:</label> </tr>
<div class="col-sm-10"> </table>
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/> </form:form>
</div> </div>
</div> </div>
</div>
<c:if test="${mode == 'add' || mode=='edit'}"> </div>
<div class="col-lg-3"></div>
<div class="col-lg-6">
<div class="form-group text-center">
<div>
<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
</div>
</div>
</div>
</c:if>
</form:form>
</div>
</div>
</div>
</div>
</div> </div>
<script>
$(document).ready(function () {
jp.ajaxForm("#inputForm", function (data) {
if (data.success) {
jp.success(data.msg);
jp.go("${ctx}/warehouse/storage/storage");
} else {
jp.error(data.msg);
$("#inputForm").find("button:submit").button("reset");
}
});
$('#time').datetimepicker({
format: "YYYY-MM-DD HH:mm:ss"
});
});
function save() {
var isValidate = jp.validateForm('#inputForm');//校验表单
if(!isValidate){
return false;
}else{
jp.loading();
jp.post($("#inputForm").attr('action'),$('#inputForm').serialize(),function(data){
if(data.success){
jp.getParent().refresh();
var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
parent.layer.close(dialogIndex);
jp.success(data.msg)
}else{
jp.error(data.msg);
}
})
}
}
</script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -226,7 +226,7 @@ $(document).ready(function() { ...@@ -226,7 +226,7 @@ $(document).ready(function() {
$('#warehouseTable').bootstrapTable('refresh'); $('#warehouseTable').bootstrapTable('refresh');
} }
function add(){ function add(){
jp.go("${ctx}/warehouse/warehouse/warehouse/form/add"); jp.openSaveDialog("新增仓库","${ctx}/warehouse/warehouse/warehouse/form/add", '800', '600');
} }
function edit(id){ function edit(id){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment