Skip to content

W
warehouse
Commit 94e80124 by zhanglt
Options

Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

parents 4f131da7 02eebaad
Showing with 122 additions and 214 deletions
src/main/webapp/webpage/modules/common/shelvesSelect.jsp
...@@ -44,14 +44,7 @@ ...@@ -44,14 +44,7 @@
// 获取当前节点 // 获取当前节点
var treeNode = e.node; var treeNode = e.node;
var id = treeNode.id == '0' ? '' :treeNode.id; var id = treeNode.id == '0' ? '' :treeNode.id;
if(treeNode.level == 0){//level=0 代表公司 $("#warehouseId").val(id);
$("#companyId").val(id);
$("#officeId").val("");
}else{
$("#companyId").val("");
$("#officeId").val(id);
}
$('#table').bootstrapTable('refresh'); $('#table').bootstrapTable('refresh');
}).on('loaded.jstree', function() { }).on('loaded.jstree', function() {
$("#jstree").jstree('open_all'); $("#jstree").jstree('open_all');
...@@ -177,8 +170,7 @@ ...@@ -177,8 +170,7 @@
<div id="collapseTwo" class="accordion-body"> <div id="collapseTwo" class="accordion-body">
<div class="accordion-inner"> <div class="accordion-inner">
<form id="searchForm" class="form form-horizontal well clearfix" > <form id="searchForm" class="form form-horizontal well clearfix" >
<input type="hidden" id="companyId" name="company.id"/> <input type="hidden" id="warehouseId" name="warehouse.id"/>
<input type="hidden" id="officeId" name="office.id"/>
<div class="col-sm-4"> <div class="col-sm-4">
<label class="label-item single-overflow pull-left" title="货架名称：">货架名称：</label> <label class="label-item single-overflow pull-left" title="货架名称：">货架名称：</label>
<input type="text" name="name" maxlength="100" class=" form-control"/> <input type="text" name="name" maxlength="100" class=" form-control"/>
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingForm.jsp
<%@ 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">
<link rel="stylesheet" href="${ctxStatic}/plugin/bootstrapTable/bootstrap-table.min.css">
$(document).ready(function() { <script type="text/javascript" src="${ctxStatic}/plugin/bootstrapTable/bootstrap-table.min.js"></script>
jp.ajaxForm("#inputForm",function(data){ <script type="text/javascript" src="${ctxStatic}/plugin/bootstrapTable/bootstrap-table-zh-CN.js"></script>
if(data.success){ <script type="text/javascript" src="${ctxStatic}/common/js/big.js"></script>
jp.success(data.msg);
jp.go("${ctx}/warehouse/profitwarehousing/profitWarehousing");
}else{
jp.error(data.msg);
$("#inputForm").find("button:submit").button("reset");
}
});
$('#time').datetimepicker({
format: "YYYY-MM-DD HH:mm:ss"
});
});
function addRow(list, idx, tpl, row){
$(list).append(Mustache.render(tpl, {
idx: idx, delBtn: true, row: row
}));
$(list+idx).find("select").each(function(){
$(this).val($(this).attr("data-value"));
});
$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
var ss = $(this).attr("data-value").split(',');
for (var i=0; i<ss.length; i++){
if($(this).val() == ss[i]){
$(this).attr("checked","checked");
}
}
});
$(list+idx).find(".form_datetime").each(function(){
$(this).datetimepicker({
format: "YYYY-MM-DD HH:mm:ss"
});
});
}
function delRow(obj, prefix){
var id = $(prefix+"_id");
var delFlag = $(prefix+"_delFlag");
if (id.val() == ""){
$(obj).parent().parent().remove();
}else if(delFlag.val() == "0"){
delFlag.val("1");
$(obj).html("&divide;").attr("title", "撤销删除");
$(obj).parent().parent().addClass("error");
}else if(delFlag.val() == "1"){
delFlag.val("0");
$(obj).html("&times;").attr("title", "删除");
$(obj).parent().parent().removeClass("error");
}
}
</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="profitWarehousing"
<a class="panelButton" href="${ctx}/warehouse/profitwarehousing/profitWarehousing"><i class="ti-angle-left"></i> 返回</a> action="${ctx}/warehouse/profitwarehousing/profitWarehousing/save" method="post"
</h3> class="form-horizontal">
</div> <form:hidden path="id"/>
<div class="panel-body"> <h3 class="text-center">盘盈入库单</h3>
<form:form id="inputForm" modelAttribute="profitWarehousing" action="${ctx}/warehouse/profitwarehousing/profitWarehousing/save" method="post" class="form-horizontal"> <table class="table table-bordered main-table">
<form:hidden path="id"/> <tr>
<div class="form-group"> <td> <font color="red">*</font>单号</td>
<label class="col-sm-2 control-label">盘盈入库单号：</label> <td>
<div class="col-sm-10"> <form:input path="number" htmlEscape="false" readonly="true" class="form-control required"/>
<form:input path="number" htmlEscape="false" class="form-control "/> </td>
</div> <td><font color="red">*</font>操作人</td>
</div> <td>
<div class="form-group"> <sys:userselect id="operator" name="operator.id" value="${profitWarehousing.operator.id}"
<label class="col-sm-2 control-label">操作人：</label> labelName="operator.name" labelValue="${profitWarehousing.operator.name}"
<div class="col-sm-10"> cssClass="form-control required" disabled="disabled"/>
<form:input path="operator" htmlEscape="false" class="form-control "/> </td>
</div> </tr>
</div> <tr>
<div class="form-group"> <td><font color="red">*</font>时间</td>
<label class="col-sm-2 control-label">时间：</label> <td>
<div class="col-sm-10"> <div class='input-group form_datetime' id='time'>
<div class='input-group form_datetime' id='time'> <input type='text' name="time" class="form-control required" autocomplete="off"
<input type='text' name="time" class="form-control " value="<fmt:formatDate value="${profitWarehousing.time}" pattern="yyyy-MM-dd HH:mm:ss"/>"/> value="<fmt:formatDate value="${profitWarehousing.time}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </td>
</div> <td>
<div class="form-group"> 总价
<label class="col-sm-2 control-label">备注信息：</label> </td>
<div class="col-sm-10"> <td>
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/> <form:input path="sum" htmlEscape="false" readonly="true" cssClass="form-control"/>
</div> </td>
</div> </tr>
<div class="tabs-container"> <tr>
<ul class="nav nav-tabs"> <td>
<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">盘盈入库单明细表：</a> 备注
</li> </td>
</ul> <td colspan="3">
<div class="tab-content"> <form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
<div id="tab-1" class="tab-pane fade in active"> </td>
<a class="btn btn-white btn-sm" onclick="addRow('#profitWarehousingInfoList', profitWarehousingInfoRowIdx, profitWarehousingInfoTpl);profitWarehousingInfoRowIdx = profitWarehousingInfoRowIdx + 1;" title="新增"><i class="fa fa-plus"></i> 新增</a> </tr>
<table class="table table-striped table-bordered table-condensed"> <tr>
<thead> <td colspan="4">
<tr> <%@ include file="profitWarehousingDetail.jsp"%>
<th class="hide"></th> </td>
<th>盘盈入库主表ID</th> </tr>
<th>名称</th> </table>
<th>类型</th> </form:form>
<th>型号</th> </div>
<th>货架ID</th> </div>
<th>备注信息</th> </div>
<th width="10">&nbsp;</th> </div>
</tr>
</thead>
<tbody id="profitWarehousingInfoList">
</tbody>
</table>
<script type="text/template" id="profitWarehousingInfoTpl">//<!--
<tr id="profitWarehousingInfoList{{idx}}">
<td class="hide">
<input id="profitWarehousingInfoList{{idx}}_id" name="profitWarehousingInfoList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
<input id="profitWarehousingInfoList{{idx}}_delFlag" name="profitWarehousingInfoList[{{idx}}].delFlag" type="hidden" value="0"/>
</td>
<td>
<input id="profitWarehousingInfoList{{idx}}_profitWarehousing" name="profitWarehousingInfoList[{{idx}}].profitWarehousing.id" type="text" value="{{row.profitWarehousing.id}}" class="form-control "/>
</td>
<td>
<input id="profitWarehousingInfoList{{idx}}_name" name="profitWarehousingInfoList[{{idx}}].name" type="text" value="{{row.name}}" class="form-control "/>
</td>
<td>
<input id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type" type="text" value="{{row.type}}" class="form-control "/>
</td>
<td>
<input id="profitWarehousingInfoList{{idx}}_marking" name="profitWarehousingInfoList[{{idx}}].marking" type="text" value="{{row.marking}}" class="form-control "/>
</td>
<td>
<input id="profitWarehousingInfoList{{idx}}_shelves" name="profitWarehousingInfoList[{{idx}}].shelves.id" type="text" value="{{row.shelves.id}}" class="form-control "/>
</td>
<td>
<textarea id="profitWarehousingInfoList{{idx}}_remarks" name="profitWarehousingInfoList[{{idx}}].remarks" rows="4" class="form-control ">{{row.remarks}}</textarea>
</td>
<td class="text-center" width="10">
{{#delBtn}}<span class="close" onclick="delRow(this, '#profitWarehousingInfoList{{idx}}')" title="删除">&times;</span>{{/delBtn}}
</td>
</tr>//-->
</script>
<script type="text/javascript">
var profitWarehousingInfoRowIdx = 0, profitWarehousingInfoTpl = $("#profitWarehousingInfoTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
$(document).ready(function() {
var data = ${fns:toJson(profitWarehousing.profitWarehousingInfoList)};
for (var i=0; i<data.length; i++){
addRow('#profitWarehousingInfoList', profitWarehousingInfoRowIdx, profitWarehousingInfoTpl, data[i]);
profitWarehousingInfoRowIdx = profitWarehousingInfoRowIdx + 1;
}
});
</script>
</div>
</div>
</div>
<c:if test="${mode == 'add' || mode=='edit'}">
<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 type="text/javascript">
$(document).ready(function () {
initTable();
$('#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
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js
...@@ -90,7 +90,7 @@ $(document).ready(function() { ...@@ -90,7 +90,7 @@ $(document).ready(function() {
} }
,{ ,{
field: 'number', field: 'number',
title: '盘盈入库单号', title: '单号',
sortable: true, sortable: true,
sortName: 'number' sortName: 'number'
,formatter:function(value, row , index){ ,formatter:function(value, row , index){
...@@ -110,10 +110,10 @@ $(document).ready(function() { ...@@ -110,10 +110,10 @@ $(document).ready(function() {
} }
,{ ,{
field: 'operator', field: 'operator.name',
title: '操作人', title: '操作人',
sortable: true, sortable: true,
sortName: 'operator' sortName: 'operator.name'
} }
,{ ,{
...@@ -122,6 +122,12 @@ $(document).ready(function() { ...@@ -122,6 +122,12 @@ $(document).ready(function() {
sortable: true, sortable: true,
sortName: 'time' sortName: 'time'
},{
field: 'sum',
title: '总价',
sortable: true,
sortName: 'sum'
} }
,{ ,{
field: 'remarks', field: 'remarks',
...@@ -241,21 +247,21 @@ $(document).ready(function() { ...@@ -241,21 +247,21 @@ $(document).ready(function() {
$('#profitWarehousingTable').bootstrapTable('refresh'); $('#profitWarehousingTable').bootstrapTable('refresh');
} }
function add(){ function add(){
jp.go("${ctx}/warehouse/profitwarehousing/profitWarehousing/form/add"); jp.openSaveDialog("新增盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/add",'1200','800');
} }
function edit(id){ function edit(id){
if(id == undefined){ if(id == undefined){
id = getIdSelections(); id = getIdSelections();
} }
jp.go("${ctx}/warehouse/profitwarehousing/profitWarehousing/form/edit?id=" + id); jp.openSaveDialog("编辑盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/edit?id=" + id,'1200','800');
} }
function view(id){//没有权限时，不显示确定按钮 function view(id){//没有权限时，不显示确定按钮
if(id == undefined){ if(id == undefined){
id = getIdSelections(); id = getIdSelections();
} }
jp.go("${ctx}/warehouse/profitwarehousing/profitWarehousing/form/view?id=" + id); jp.openViewDialog("查看盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/view?id=" + id,'1200','800');
} }
...@@ -299,12 +305,13 @@ $(document).ready(function() { ...@@ -299,12 +305,13 @@ $(document).ready(function() {
<table class="ani table"> <table class="ani table">
<thead> <thead>
<tr> <tr>
<th>盘盈入库主表ID</th>
<th>名称</th> <th>名称</th>
<th>类型</th> <th>类型</th>
<th>型号</th> <th>型号</th>
<th>货架ID</th> <th>仓库</th>
<th>备注信息</th> <th>货架</th>
<th>单价</th>
<th>备注</th>
</tr> </tr>
</thead> </thead>
<tbody id="profitWarehousingChild-{{idx}}-1-List"> <tbody id="profitWarehousingChild-{{idx}}-1-List">
...@@ -316,19 +323,22 @@ $(document).ready(function() { ...@@ -316,19 +323,22 @@ $(document).ready(function() {
<script type="text/template" id="profitWarehousingChild1Tpl">//<!-- <script type="text/template" id="profitWarehousingChild1Tpl">//<!--
<tr> <tr>
<td> <td>
{{row.profitWarehousing.id}}
</td>
<td>
{{row.name}} {{row.name}}
</td> </td>
<td> <td>
{{row.type}} {{row.type.name}}
</td> </td>
<td> <td>
{{row.marking}} {{row.marking}}
</td> </td>
<td> <td>
{{row.shelves.id}} {{row.shelves.name}}
</td>
<td>
{{row.warehouse.name}}
</td>
<td>
{{row.amount}}
</td> </td>
<td> <td>
{{row.remarks}} {{row.remarks}}
......
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