Skip to content

W
warehouse
Commit 8826ddad by anxiaohe
Options

品名代码改为品名

parent dcf93974
Showing with 18 additions and 16 deletions
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeForm.jsp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<h3 class="text-center">物资品名表</h3> <h3 class="text-center">物资品名表</h3>
<table class="table table-bordered main-table"> <table class="table table-bordered main-table">
<tr> <tr>
<td><font color="red">*</font>名称</td> <td><font color="red">*</font>品名</td>
<td> <td>
<form:input path="name" htmlEscape="false" <form:input path="name" htmlEscape="false"
class="form-control required"/> class="form-control required"/>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td><font color="red">*</font>编码</td> <td><font color="red">*</font>代码</td>
<td> <td>
<form:input path="code" htmlEscape="false" <form:input path="code" htmlEscape="false"
class="form-control required"/> class="form-control required"/>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.js
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
}); });
function del(con,id){ function del(con,id){
jp.confirm('确认要删除物资品名吗？', function(){ jp.confirm('确认要删除品名代码吗？', function(){
jp.loading(); jp.loading();
$.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){ $.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){
if(data.success){ if(data.success){
...@@ -49,16 +49,16 @@ ...@@ -49,16 +49,16 @@
} }
function add(){//新增 function add(){//新增
jp.openSaveDialog("新增物资品名",'${ctx}/warehouse/materialtype/materialType/form/add', '800','600'); jp.openSaveDialog("新增品名代码",'${ctx}/warehouse/materialtype/materialType/form/add', '800','600');
} }
function edit(id){//编辑 function edit(id){//编辑
jp.openSaveDialog("编辑物资品名",'${ctx}/warehouse/materialtype/materialType/form/edit?id='+id, '800','600'); jp.openSaveDialog("编辑品名代码",'${ctx}/warehouse/materialtype/materialType/form/edit?id='+id, '800','600');
} }
function view(id){//查看 function view(id){//查看
jp.openViewDialog("查看物资品名",'${ctx}/warehouse/materialtype/materialType/form/view?id='+id, '800','600'); jp.openViewDialog("查看品名代码",'${ctx}/warehouse/materialtype/materialType/form/view?id='+id, '800','600');
} }
function addChild(id){//添加下级机构 function addChild(id){//添加下级机构
jp.openSaveDialog("添加下级物资品名",'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='+id, '800','600'); jp.openSaveDialog("添加下级品名代码",'${ctx}/warehouse/materialtype/materialType/form/add?parent.id='+id, '800','600');
} }
function refresh(){//刷新 function refresh(){//刷新
var index = jp.loading("正在加载，请稍等..."); var index = jp.loading("正在加载，请稍等...");
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li> <li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialtype:materialType:add"> <shiro:hasPermission name="warehouse:materialtype:materialType:add">
<li><a onclick="addChild('{{d.row.id}}')"><i class="fa fa-plus"></i> 添加下级物资品名</a></li> <li><a onclick="addChild('{{d.row.id}}')"><i class="fa fa-plus"></i> 添加下级品名代码</a></li>
</shiro:hasPermission> </shiro:hasPermission>
</ul> </ul>
</div> </div>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.jsp
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%@ 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"/>
<%@include file="materialTypeList.js" %> <%@include file="materialTypeList.js" %>
</head> </head>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">物资品名列表 </h3> <h3 class="panel-title">品名代码列表 </h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<table id="materialTypeTreeTable" class="table table-hover"> <table id="materialTypeTreeTable" class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>名称</th> <th>品名</th>
<th>物资品名编码</th> <th>代码</th>
<th>单价</th> <th>单价</th>
<th>单位</th> <th>单位</th>
<th>备注信息</th> <th>备注信息</th>
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingDetail.jsp
...@@ -144,7 +144,9 @@ ...@@ -144,7 +144,9 @@
formatter: function (value,row,index){ formatter: function (value,row,index){
if(value === '2'){ if(value === '2'){
return '已入库' return '已入库'
}else{ } else if (value === '3') {
return '已出库';
} else {
return '未入库' return '未入库'
} }
} }
......
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
...@@ -447,13 +447,13 @@ ...@@ -447,13 +447,13 @@
area: ['1200', '600'], area: ['1200', '600'],
// content: $("#scanResultTpl").html(), // content: $("#scanResultTpl").html(),
content: $("#scanTpl").html(), content: $("#scanTpl").html(),
success: function () { success: function (layer$) {
// $("#scanResult").focus(); // $("#scanResult").focus();
scanStart(); scanStart();
renderScanTable(); renderScanTable();
setTimeout(function () { setTimeout(function () {
var height = layer.height(); var height = layer$.height();
layer.find('.layui-layer-content').height(height - 97); layer$.find('.layui-layer-content').height(height - 97);
}) })
}, },
yes: function (index, layero) { yes: function (index, layero) {
......
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