Skip to content

W
warehouse
Commit dcf93974 by anxiaohe
Options

品名代码改为品名

parent 47fbe06b
Showing with 31 additions and 32 deletions
src/main/webapp/static/common/js/jeeplus.js
......@@ -327,7 +327,7 @@ function delRow(obj, prefix){
var url = ctx+"/warehouse/storage/storage/findByPcTypeModel?goodsInfo.goods.batchNum="+params.batchNum+"&qrCode.state="+params.state;
var fieldLabels = "物资编码|品名|代码|单价|单位|数量|总价|型号";
var fieldKeys = "qrCode.code|type.name|type.code|type.amount|type.unit|num|infoSum|model";
var searchLabels = "品名代码|型号";
var searchLabels = "品名|型号";
var searchKeys = "goodsInfo.type|goodsInfo.model";
top.layer.open({
type: 2,
......
src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
......@@ -318,13 +318,13 @@
{{#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"
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"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />//-->
{{/row.canUse}}
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
......@@ -40,7 +40,7 @@
},
{
field: 'code',
title: '入库单'
title: '物资编码'
},
{
field: 'batchNum',
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerForm.jsp
......@@ -26,14 +26,14 @@
<td>
<sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name"
labelValue="${ledger.type.name}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData"
title="品名" url="/warehouse/materialtype/materialType/treeData"
extId="${ledger.id}" cssClass="form-control " allowClear="true"/>
</td>
<td>品名代码</td>
<td>品名</td>
<td>
<%-- <sys:treeselect id="type" name="type.id" value="${ledger.type.id}" labelName="type.name"--%>
<%-- labelValue="${ledger.type.name}"--%>
<%-- title="品名代码" url="/warehouse/materialtype/materialType/treeData"--%>
<%-- title="品名" url="/warehouse/materialtype/materialType/treeData"--%>
<%-- extId="${ledger.id}" cssClass="form-control " allowClear="true"/>--%>
<form:input path="type.code" htmlEscape="false" class="form-control "/>
</td>
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
......@@ -155,7 +155,7 @@
<label class="col-sm-2 control-label">品名：</label>
<div class="col-sm-10 control-label text-left">
//<!--<sys:treeselect id="type" name="typeId"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true"/>//-->
</div>
</div>
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp
......@@ -172,7 +172,7 @@
title: '选择物资台账明细',
isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|品名|品名代码|型号|批次号|单价|数量|单位",
fieldLabels: "物资编码|品名|品名|型号|批次号|单价|数量|单位",
fieldKeys: "code|type.name|type.code|model|batchNum|amount|num|type.unit",
searchLabels: "物资编码",
searchKeys: "code",
......@@ -270,7 +270,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="materialLossInfoList{{idx}}_ledgerInfoType" name="materialLossInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialLossInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="materialLossInfoList{{idx}}_ledgerInfoTypeCode"
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp
......@@ -628,7 +628,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="materialRequisitionInfoList{{idx}}_ledgerInfoType" name="materialRequisitionInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="materialRequisitionInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="materialRequisitionInfoList{{idx}}_ledgerInfoTypeCode"
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeForm.jsp
......@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp" %>
<html>
<head>
<title>物资品名代码管理</title>
<title>物资品名管理</title>
<meta name="decorator" content="ani"/>
<link rel="stylesheet" href="${ctxStatic}/common/css/form.css">
</head>
......@@ -17,7 +17,7 @@
class="form-horizontal">
<form:hidden path="id"/>
<form:hidden path="parentIds" />
<h3 class="text-center">物资品名代码表</h3>
<h3 class="text-center">物资品名表</h3>
<table class="table table-bordered main-table">
<tr>
<td><font color="red">*</font>名称</td>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.js
......@@ -33,7 +33,7 @@
});
function del(con,id){
jp.confirm('确认要删除物资品名代码吗？', function(){
jp.confirm('确认要删除物资品名吗？', function(){
jp.loading();
$.get("${ctx}/warehouse/materialtype/materialType/delete?id="+id, function(data){
if(data.success){
......@@ -49,16 +49,16 @@
}
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){//编辑
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){//查看
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){//添加下级机构
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(){//刷新
var index = jp.loading("正在加载，请稍等...");
......@@ -116,7 +116,7 @@
<li><a onclick="return del(this, '{{d.row.id}}')"><i class="fa fa-trash"></i> 删除</a></li>
</shiro:hasPermission>
<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>
</ul>
</div>
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.jsp
......@@ -2,7 +2,7 @@
<%@ include file="/webpage/include/taglib.jsp"%>
<html>
<head>
<title>物资品名代码管理</title>
<title>物资品名管理</title>
<meta name="decorator" content="ani"/>
<%@include file="materialTypeList.js" %>
</head>
......@@ -11,7 +11,7 @@
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">物资品名代码列表 </h3>
<h3 class="panel-title">物资品名列表 </h3>
</div>
<div class="panel-body">
......@@ -32,7 +32,7 @@
<thead>
<tr>
<th>名称</th>
<th>物资品名代码编码</th>
<th>物资品名编码</th>
<th>单价</th>
<th>单位</th>
<th>备注信息</th>
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp
......@@ -164,7 +164,7 @@
title: '选择物资台账明细',
isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|物资名称|品名代码|型号|批次号|单价",
fieldLabels: "物资编码|物资名称|品名|型号|批次号|单价",
fieldKeys: "code|name|type.name|model|batchNum|amount",
searchLabels: "物资编码",
searchKeys: "code",
......@@ -315,7 +315,7 @@
<script id="ledgerInfoTypeTpl" type="text/html">//<!--
<sys:treeselect id="outboundInfoList{{idx}}_ledgerInfoType" name="outboundInfoList[{{idx}}].ledgerInfo.type.id" value="{{row.ledgerInfo.type.id}}" labelName="outboundInfoList{{idx}}.ledgerInfo.type.name" labelValue="{{row.ledgerInfo.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true"/>//-->
</script>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="outboundInfoList{{idx}}_ledgerInfoTypeCode"
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingDetail.jsp
......@@ -528,11 +528,11 @@
<script id="typeTpl" type="text/html">//<!--
{{#row.readonly}}
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" disabled="disabled" />
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" disabled="disabled" />
{{/row.readonly}}
{{^row.readonly}}
<sys:treeselect id="profitWarehousingInfoList{{idx}}_type" name="profitWarehousingInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="profitWarehousingInfoList{{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" />
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" delCallback="delType" />
{{/row.readonly}}//-->
</script>
<script id="typeCodeTpl" type="text/html">
......
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
......@@ -624,13 +624,13 @@
{{#row.readonly}}
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" disabled="disabled" allowClear="false" allowSearch="true" callback="onSelectType" />
{{/row.readonly}}
{{^row.readonly}}
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_typeName" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}"
labelName="storageInfoList[{{idx}}].type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
title="品名" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="false" allowSearch="true" callback="onSelectType" />
{{/row.readonly}}
//-->
......@@ -640,7 +640,7 @@
</script>
<script id="typeTpl" type="text/html">//<!--
<sys:treeselectNotNameProperty id="storageInfoList{{idx}}_type" name="storageInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="storageInfoList{{idx}}.type.name" labelValue="{{row.type.name}}"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control " disabled="disabled" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
</script>
<script id="amountTpl" type="text/html">
<input id="storageInfoList{{idx}}_amount" name="storageInfoList[{{idx}}].amount" type="text" value="{{row.amount}}" readonly onchange="onInputChange('{{idx}}', this, 'amount')" class="form-control required"/>
......
src/main/webapp/webpage/modules/warehouse/storage/storageStatistic.jsp
......@@ -19,7 +19,7 @@
data: [],
columns:[
{field: 'name', title: '名称', align: 'center'},
{field: 'type.name', title: '品名代码',align: 'center'},
{field: 'type.name', title: '品名',align: 'center'},
{field: 'model', title: '型号',align: 'center'},
{field: 'warehouseNames', title: '仓库',align: 'center'},
{field: 'shelvesNames', title: '货架',align: 'center'},
......@@ -35,4 +35,4 @@
$("#statisticTable").bootstrapTable('append', data);
})
}
</script>
\ No newline at end of file
</script>
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