Skip to content

W
warehouse
Commit 2faf5f19 by anxiaohe
Options

搜索调整

parent 892477f6
Showing with 229 additions and 203 deletions
src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp
......@@ -16,7 +16,7 @@
rel="stylesheet"/>
<%@ include file="/webpage/include/systemInfoSocket-init.jsp" %>
<%@ include file="/webpage/include/layIM-init.jsp" %>
<%-- <%@ include file="/webpage/include/layIM-init.jsp" %>--%>
<style>
.push-right #sidebar-nav {
display: block;
......@@ -518,4 +518,4 @@
</script>
</body>
</html>
\ No newline at end of file
</html>
src/main/webapp/webpage/modules/sys/login/sysIndex.jsp
......@@ -11,7 +11,7 @@
<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" />
<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
<%@ include file="/webpage/include/layIM-init.jsp"%>
<%-- <%@ include file="/webpage/include/layIM-init.jsp"%>--%>
</head>
<body class="">
......@@ -359,4 +359,4 @@ function changeTheme(theme) {
</script>
</body>
</html>
\ No newline at end of file
</html>
src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
......@@ -314,9 +314,20 @@
<input id="goodsInfoList{{idx}}_name" name="goodsInfoList[{{idx}}].name" type="text" value="{{row.name}}" onchange="onInputChange('{{idx}}', this, 'name')" class="form-control required"/>
</script>
<script id="typeNameTpl" type="text/html">//<!--
<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
<script id="typeNameTpl" type="text/html">
{{#row.canUse}}
//<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
{{/row.canUse}}
{{^row.canUse}}
//<!--<sys:treeselect id="goodsInfoList{{idx}}_typeName" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="goodsInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}" disabled="disabled"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
{{/row.canUse}}
</script>
<script id="typeCodeTpl" type="text/html">
<input id="goodsInfoList{{idx}}_typeCode" name="goodsInfoList[{{idx}}].type.code" type="text" value="{{row.type.code}}" readonly class="form-control required"/>
......@@ -351,5 +362,13 @@
<input id="goodsInfoList{{idx}}_infoSum" name="goodsInfoList[{{idx}}].infoSum" type="text" value="{{row.infoSum}}" readonly onchange="onInputChange('{{idx}}', this, 'infoSum')" class="form-control required"/>
</script>
<script id="remarksTpl" type="text/html">
<textarea id="goodsInfoList{{idx}}_remarks" name="goodsInfoList[{{idx}}].remarks" rows="2" onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea>
{{#row.canUse}}
<textarea id="goodsInfoList{{idx}}_remarks" name="goodsInfoList[{{idx}}].remarks" rows="2"
onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea>
{{/row.canUse}}
{{^row.canUse}}
<textarea id="goodsInfoList{{idx}}_remarks" name="goodsInfoList[{{idx}}].remarks" rows="2" readonly
onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea>
{{/row.canUse}}
</script>
src/main/webapp/webpage/modules/warehouse/goods/goodsForm.jsp
......@@ -37,13 +37,17 @@
</td>
<td><font color="red">*</font>时间</td>
<td>
<div class='input-group form_datetime' id='time'>
<div class='input-group form_datetime' id='time_canEdit'>
<input type='text' name="time" class="form-control required"
value="<fmt:formatDate value="${goods.time}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
<div class="input-group" id='time_canNotEdit' style="display: none">
<input type='text' id="time" name="time" class="form-control required" disabled readonly
value="<fmt:formatDate value="${goods.time}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
</div>
</td>
</tr>
<tr>
......@@ -96,6 +100,19 @@
if ("${mode}" !== 'add') {
$("#remarks").val(jp.escapeHtml($("#remarks").val()));
var list = ${fns:toJson(goods.goodsInfoList)};
var canEdit = !list.some(function (item) {
return item.qrCode && Number(item.qrCode.state) > 0
});
if (!canEdit) {
$("#batchNum").attr('readonly', true);
$("#time_canEdit").hide();
$("#time_canEdit input").attr('disabled', true);
$("#time_canNotEdit").show();
$("#time_canNotEdit input").attr('disabled', false);
}
}
});
function save() {
......
src/main/webapp/webpage/modules/warehouse/goods/goodsList.jsp
......@@ -23,7 +23,7 @@
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="goods" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
<label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="资料编号：">资料编号：</label>
<label class="label-item single-overflow col-md-4 col-lg-3 control-label" title="批次号：">批次号：</label>
<div class="col-lg-9 col-md-8">
<form:input path="batchNum" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
......@@ -47,8 +47,8 @@
<div class='input-group date' id='endTime' style="left: -10px;">
<input type='text' name="endTime" class="form-control"/>
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
......@@ -25,114 +25,100 @@
</style>
</head>
<body>
<div class="wrapper wrapper-content">
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">台账信息列表</h3>
</div>
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="ledger" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="物资名称：">物资名称：</label>
<div class="col-lg-8">
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="品名代码：">品名代码：</label>
<div class="col-lg-8">
<sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name" labelValue="${ledger.type.name}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" extId="${ledger.id}" cssClass="form-control " allowClear="true"/>
</div>
<div class="panel-heading">
<h3 class="panel-title">台账信息列表</h3>
</div>
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse show">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="ledger" class="form form-horizontal well clearfix">
<%-- <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">--%>
<%-- <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="物资名称：">物资名称：</label>--%>
<%-- <div class="col-lg-8">--%>
<%-- <form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="品名代码：">品名代码：</label>
<div class="col-lg-8">
<sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name" labelValue="${ledger.type.name}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" extId="${ledger.id}" cssClass="form-control " allowClear="true"/>
</div>
</div>
<%-- <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">--%>
<%-- <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="数量：">数量：</label>--%>
<%-- <div class="col-lg-8">--%>
<%-- <form:input path="num" htmlEscape="false" class=" form-control"/>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:0px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
<a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div>
</div>
<%-- <div class="col-xs-12 col-sm-6 col-md-4">--%>
<%-- <label class="label-item single-overflow pull-left" title="型号：">型号：</label>--%>
<%-- <form:input path="model" htmlEscape="false" maxlength="64" class=" form-control"/>--%>
<%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="货架id集合：">货架id集合：</label>
<div class="col-lg-8">
<form:input path="shelvesIds" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:add">--%>
<%-- <button id="add" class="btn btn-primary" onclick="add()">--%>
<%-- <i class="glyphicon glyphicon-plus"></i> 新建--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:edit">--%>
<%-- <button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
<%-- <i class="glyphicon glyphicon-edit"></i> 修改--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:del">--%>
<%-- <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">--%>
<%-- <i class="glyphicon glyphicon-remove"></i> 删除--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:view">--%>
<%-- <button id="view" class="btn btn-default" disabled onclick="view()">--%>
<%-- <i class="fa fa-search-plus"></i> 查看--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<button class="btn btn-default" onclick="viewScanData()">
<i class="fa fa-search-plus"></i> 查看二维码数据
</button>
<button id="export" class="btn btn-warning">
<i class="fa fa-file-excel-o"></i> 导出
</button>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="数量：">数量：</label>
<div class="col-lg-8">
<form:input path="num" htmlEscape="false" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<div style="margin-top:0px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
<a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:add">--%>
<%-- <button id="add" class="btn btn-primary" onclick="add()">--%>
<%-- <i class="glyphicon glyphicon-plus"></i> 新建--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:edit">--%>
<%-- <button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
<%-- <i class="glyphicon glyphicon-edit"></i> 修改--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:del">--%>
<%-- <button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">--%>
<%-- <i class="glyphicon glyphicon-remove"></i> 删除--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:import">--%>
<%-- <button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:export">--%>
<%-- <button id="export" class="btn btn-warning">--%>
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:ledger:ledger:view">--%>
<%-- <button id="view" class="btn btn-default" disabled onclick="view()">--%>
<%-- <i class="fa fa-search-plus"></i> 查看--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<button class="btn btn-default" onclick="viewScanData()">
<i class="fa fa-search-plus"></i> 查看二维码数据
</button>
<button id="export" class="btn btn-warning">
<i class="fa fa-file-excel-o"></i> 导出
</button>
</div>
<!-- 表格 -->
<table id="ledgerTable" data-toolbar="#toolbar"></table>
<!-- 表格 -->
<table id="ledgerTable" data-toolbar="#toolbar"></table>
<!-- context menu -->
<ul id="context-menu" class="dropdown-menu">
<shiro:hasPermission name="warehouse:ledger:ledger:view">
<li data-item="view"><a>查看</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:ledger:ledger:edit">
<li data-item="edit"><a>编辑</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:ledger:ledger:del">
<li data-item="delete"><a>删除</a></li>
</shiro:hasPermission>
<li data-item="action1"><a>取消</a></li>
</ul>
</div>
<!-- context menu -->
<ul id="context-menu" class="dropdown-menu">
<shiro:hasPermission name="warehouse:ledger:ledger:view">
<li data-item="view"><a>查看</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:ledger:ledger:edit">
<li data-item="edit"><a>编辑</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:ledger:ledger:del">
<li data-item="delete"><a>删除</a></li>
</shiro:hasPermission>
<li data-item="action1"><a>取消</a></li>
</ul>
</div>
</div>
</div>
<script type="type/template" id="scanTpl">
......@@ -143,7 +129,7 @@
<form:form id="scan-searchForm" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="数量：">编号：</label>
<%-- <form:input path="code" htmlEscape="false" class=" form-control"/>--%>
<%-- <form:input path="code" htmlEscape="false" class=" form-control"/>--%>
<input type="text" id="scan-code" class="form-control" onfocus="scanIptGetFocusStop()" onblur="scanIptGetFocusStart()" />
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.jsp
......@@ -31,7 +31,10 @@
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="操作人：">操作人：</label>
<div class="col-lg-8 col-md-8">
<form:input path="operator" htmlEscape="false" maxlength="64" class=" form-control"/>
<%-- <form:input path="operator" htmlEscape="false" maxlength="64" class=" form-control"/>--%>
<sys:userselect id="operator" name="operator.id" value="${materialRequisition.operator.id}"
labelName="operator.name" labelValue="${materialRequisition.operator.name}"
cssClass="form-control required"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeForm.jsp
......@@ -9,11 +9,11 @@
$(document).ready(function() {
jp.ajaxForm("#inputForm",function(data){
if(data.success){
jp.success(data.msg);
jp.success(data.msg);
jp.go("${ctx}/warehouse/qrcode/qrCode");
}else{
jp.error(data.msg);
$("#inputForm").find("button:submit").button("reset");
jp.error(data.msg);
$("#inputForm").find("button:submit").button("reset");
}
});
......@@ -21,58 +21,59 @@
</script>
</head>
<body>
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-md-12">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">
<a class="panelButton" href="${ctx}/warehouse/qrcode/qrCode"><i class="ti-angle-left"></i> 返回</a>
</h3>
</div>
<div class="panel-body">
<form:form id="inputForm" modelAttribute="qrCode" action="${ctx}/warehouse/qrcode/qrCode/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<div class="form-group">
<label class="col-sm-2 control-label">货品明细外键：</label>
<div class="col-sm-10">
<form:input path="goodsInfo.id" htmlEscape="false" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">物资编码：</label>
<div class="col-sm-10">
<form:input path="code" htmlEscape="false" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">二维码存储路径：</label>
<div class="col-sm-10">
<form:input path="url" htmlEscape="false" class="form-control "/>
</div>
<div class="wrapper wrapper-content">
<div class="row">
<div class="col-md-12">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">
<a class="panelButton" href="${ctx}/warehouse/qrcode/qrCode"><i class="ti-angle-left"></i> 返回</a>
</h3>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">备注信息：</label>
<div class="col-sm-10">
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
</div>
<div class="panel-body">
<form:form id="inputForm" modelAttribute="qrCode" action="${ctx}/warehouse/qrcode/qrCode/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<form:hidden path="goodsInfo.id"/>
<%-- <div class="form-group">--%>
<%-- <label class="col-sm-2 control-label">货品明细外键：</label>--%>
<%-- <div class="col-sm-10">--%>
<%-- <form:input path="goodsInfo.id" htmlEscape="false" class="form-control "/>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="form-group">
<label class="col-sm-2 control-label">物资编码：</label>
<div class="col-sm-10">
<form:input path="code" htmlEscape="false" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">二维码存储路径：</label>
<div class="col-sm-10">
<form:input path="url" htmlEscape="false" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">备注信息：</label>
<div class="col-sm-10">
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
</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>
<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>
</div>
<script>
$(document).ready(function () {
if ("${mode}" !== 'add') {
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.js
......@@ -10,17 +10,17 @@ $(document).ready(function() {
dataType: "json",
contentType: "application/x-www-form-urlencoded",
//显示检索按钮
showSearch: true,
showSearch: false,
//显示刷新按钮
showRefresh: true,
showRefresh: false,
//显示切换手机试图按钮
showToggle: true,
showToggle: false,
//显示 内容列下拉框
showColumns: true,
showColumns: false,
//显示到处按钮
showExport: true,
showExport: false,
//显示切换分页按钮
showPaginationSwitch: true,
showPaginationSwitch: false,
//最低显示2行
minimumCountColumns: 2,
//是否显示行间隔色
......@@ -95,14 +95,16 @@ $(document).ready(function() {
title: '物资编码',
sortable: true,
sortName: 'code'
},{
field: 'goodsInfo.name',
title: '物资名称',
sortable: true,
sortName: 'goodsInfo.name'
},{
},
// {
// field: 'goodsInfo.name',
// title: '物资名称',
// sortable: true,
// sortName: 'goodsInfo.name'
// },
{
field: 'goodsInfo.type.name',
title: '品名代码',
title: '品名',
sortable: true,
sortName: 'goodsInfo.type.name'
},{
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.jsp
......@@ -35,12 +35,12 @@
<form:input path="code" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="物资名称：">物资名称：</label>
<div class="col-lg-8 col-md-8">
<form:input path="goodsInfo.name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
</div>
<%-- <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">--%>
<%-- <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="物资名称：">物资名称：</label>--%>
<%-- <div class="col-lg-8 col-md-8">--%>
<%-- <form:input path="goodsInfo.name" htmlEscape="false" maxlength="64" class=" form-control"/>--%>
<%-- </div>--%>
<%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
<label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="品名代码：">品名代码：</label>
<div class="col-lg-8 col-md-8">
......@@ -74,16 +74,16 @@
<!-- 工具栏 -->
<div id="toolbar">
<shiro:hasPermission name="warehouse:qrcode:qrCode:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:qrcode:qrCode:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:qrcode:qrCode:add">--%>
<%-- <button id="add" class="btn btn-primary" onclick="add()">--%>
<%-- <i class="glyphicon glyphicon-plus"></i> 新建--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <shiro:hasPermission name="warehouse:qrcode:qrCode:edit">--%>
<%-- <button id="edit" class="btn btn-success" disabled onclick="edit()">--%>
<%-- <i class="glyphicon glyphicon-edit"></i> 修改--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:qrcode:qrCode:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
......@@ -97,11 +97,11 @@
<%-- <i class="fa fa-file-excel-o"></i> 导出--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<shiro:hasPermission name="warehouse:qrcode:qrCode:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
<%-- <shiro:hasPermission name="warehouse:qrcode:qrCode:view">--%>
<%-- <button id="view" class="btn btn-default" disabled onclick="view()">--%>
<%-- <i class="fa fa-search-plus"></i> 查看--%>
<%-- </button>--%>
<%-- </shiro:hasPermission>--%>
<%-- <button id="printAll" class="btn btn-primary" disabled onclick="onPrint()">--%>
<%-- <i class="fa fa-search-plus"></i> 批量打印--%>
<%-- </button>--%>
......
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