Skip to content

W
warehouse
Commit a38bd005 by yyq1988
Options

优化样式

parent 8aa5d1b1
Showing with 30 additions and 130 deletions
src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
......@@ -45,7 +45,7 @@
},
{
field: 'type.name',
title: '类型',
title: '品名代码',
formatter: function (value,row,index){
return Mustache.render($("#typeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""),{
row: row,
......@@ -216,7 +216,7 @@
<script id="typeTpl" type="text/html">//<!--
<sys:treeselect id="goodsInfoList{{idx}}_type" name="goodsInfoList[{{idx}}].type.id" value="{{row.type.id}}" labelName="goodsInfoList{{idx}}.type.code" labelValue="{{row.type.name}}"
title="类型" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
</script>
<script id="modelTpl" type="text/html">
......
src/main/webapp/webpage/modules/warehouse/goods/goodsList.js
......@@ -96,17 +96,7 @@ $(document).ready(function() {
sortName: 'batchNum'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:goods:goods:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:goods:goods:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......@@ -352,7 +342,7 @@ $(document).ready(function() {
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>品名代码</th>
<th>类型编码</th>
<th>型号</th>
<th>数量</th>
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerDetail.jsp
......@@ -27,7 +27,7 @@
},
{
field: 'type.name',
title: '类型',
title: '品名代码',
align: 'center'
},
{
......@@ -71,7 +71,7 @@
page: true,
columns: [
{field: 'name', title: '物资名称'},
{field: 'type.name', title: '类型'},
{field: 'type.name', title: '品名代码'},
{field: 'model', title: '型号'},
{field: 'batchNum', title: '批次号'},
{field: 'shelves.name', title: '货架'},
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerForm.jsp
......@@ -25,11 +25,11 @@
<td>
<form:input path="name" htmlEscape="false" class="form-control "/>
</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"/>
</td>
<td>型号</td>
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js
......@@ -95,23 +95,13 @@ $(document).ready(function() {
sortName: 'name'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:ledger:ledger:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:ledger:ledger:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
,{
field: 'type.name',
title: '类型',
title: '品名代码',
sortable: true,
sortName: 'type.name'
......@@ -307,7 +297,7 @@ $(document).ready(function() {
<table class="ani table">
<thead>
<tr>
<th>类型</th>
<th>品名代码</th>
<th>型号</th>
<th>批次号</th>
<th>货架</th>
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
......@@ -26,9 +26,9 @@
<form:input path="name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="类型：">类型：</label>
<label class="label-item single-overflow pull-left" title="品名代码：">品名代码：</label>
<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"/>
title="品名代码" url="/warehouse/materialtype/materialType/treeData" extId="${ledger.id}" cssClass="form-control " allowClear="true"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="型号：">型号：</label>
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp
......@@ -59,7 +59,7 @@
},
{
field: 'ledgerInfo.type.name',
title: '类型',
title: '品名代码',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
......@@ -143,7 +143,7 @@
title: '选择物资台账明细',
isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|物资名称|类型|型号|批次号|单价",
fieldLabels: "物资编码|物资名称|品名代码|型号|批次号|单价",
fieldKeys: "code|name|type.name|model|batchNum|amount",
searchLabels: "物资编码",
searchKeys: "code",
......@@ -224,7 +224,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="ledgerInfoModelTpl" type="text/html">
<input id="materialLossInfoList{{idx}}_ledgerInfoModel"
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.js
......@@ -95,17 +95,7 @@ $(document).ready(function() {
sortName: 'number'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:materialloss:materialLoss:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:materialloss:materialLoss:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......@@ -301,7 +291,7 @@ $(document).ready(function() {
<tr>
<th>物资名称</th>
<th>物资编号</th>
<th>类型</th>
<th>品名代码</th>
<th>型号</th>
<th>单价</th>
<th>批次号</th>
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.js
......@@ -95,17 +95,7 @@ $(document).ready(function() {
sortName: 'number'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:materialrequisition:materialRequisition:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:materialrequisition:materialRequisition:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......@@ -303,7 +293,7 @@ $(document).ready(function() {
<th>物资编码</th>
<th>物资名称</th>
<th>型号</th>
<th>类型</th>
<th>品名代码</th>
<th>单价</th>
<th>领用人</th>
<th>备注</th>
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp
......@@ -61,7 +61,7 @@
},
{
field: 'ledgerInfo.type.name',
title: '类型',
title: '品名代码',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
......@@ -125,7 +125,7 @@
title: '选择物资台账明细',
isMultiSelect: true,
url: "${ctx}/warehouse/ledger/ledger/findByQrOrCode",
fieldLabels: "物资编码|物资名称|类型|型号|批次号|单价",
fieldLabels: "物资编码|物资名称|品名代码|型号|批次号|单价",
fieldKeys: "code|name|type.name|model|batchNum|amount",
searchLabels: "物资编码",
searchKeys: "code",
......@@ -276,7 +276,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="ledgerInfoModelTpl" type="text/html">
<input id="outboundInfoList{{idx}}_ledgerInfoModel"
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.js
......@@ -95,17 +95,7 @@ $(document).ready(function() {
sortName: 'number'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:outbound:outbound:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:outbound:outbound:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......@@ -311,7 +301,7 @@ $(document).ready(function() {
<tr>
<th>物资编码</th>
<th>物资名称</th>
<th>类型</th>
<th>品名代码</th>
<th>型号</th>
<th>单价</th>
</tr>
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingDetail.jsp
......@@ -49,7 +49,7 @@
},
{
field: 'type.name',
title: '类型',
title: '品名代码',
formatter: function (value,row,index){
return Mustache.render($("#typeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""),{
row: row,
......@@ -279,7 +279,7 @@
<script id="typeTpl" type="text/html">//<!--
<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" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control required" allowClear="true" allowSearch="true" callback="onSelectType" />//-->
</script>
<script id="modelTpl" type="text/html">
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js
......@@ -96,17 +96,7 @@ $(document).ready(function() {
sortName: 'number'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:profitwarehousing:profitWarehousing:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:profitwarehousing:profitWarehousing:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......@@ -358,7 +348,7 @@ $(document).ready(function() {
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>品名代码</th>
<th>型号</th>
<th>仓库</th>
<th>货架</th>
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.js
......@@ -102,7 +102,7 @@ $(document).ready(function() {
sortName: 'goodsInfo.name'
},{
field: 'goodsInfo.type.name',
title: '类型',
title: '品名代码',
sortable: true,
sortName: 'goodsInfo.type.name'
},{
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.jsp
......@@ -37,9 +37,9 @@
<form:input path="goodsInfo.name" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="类型：">类型：</label>
<label class="label-item single-overflow pull-left" title="品名代码：">品名代码：</label>
<sys:treeselect id="type" name="goodsInfo.type.id" value="${qrCode.goodsInfo.type.id}" labelName="goodsInfo.type.name" labelValue="${qrCode.goodsInfo.type.name}"
title="类型" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" />
title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" />
</div>
<div class="col-xs-12 col-sm-6 col-md-2">
<label class="label-item single-overflow pull-left" title="型号：">型号：</label>
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesList.js
......@@ -91,17 +91,7 @@ $(document).ready(function() {
sortName: 'name'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:shelves:shelves:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:shelves:shelves:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
......@@ -49,7 +49,7 @@
},
{
field: 'type.name',
title: '类型',
title: '品名代码',
formatter: function (value,row,index){
return Mustache.render($("#typeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""),{
row: row,
......@@ -316,7 +316,7 @@
<script id="typeTpl" type="text/html">//<!--
<sys:treeselect 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="modelTpl" type="text/html">
......
src/main/webapp/webpage/modules/warehouse/storage/storageList.js
......@@ -95,17 +95,7 @@ $(document).ready(function() {
sortName: 'code'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:storage:storage:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:storage:storage:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......@@ -362,7 +352,7 @@ $(document).ready(function() {
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>品名代码</th>
<th>型号</th>
<th>仓库</th>
<th>货架</th>
......
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'},
......
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseList.js
......@@ -91,17 +91,7 @@ $(document).ready(function() {
sortName: 'name'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:warehouse:warehouse:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:warehouse:warehouse:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
,{
......
src/main/webapp/webpage/modules/warehouse/wzcode/wzcodeList.js
......@@ -91,17 +91,7 @@ $(document).ready(function() {
sortName: 'code'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
<c:when test="${fns:hasPermission('warehouse:wzcode:wzcode:edit')}">
return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:when test="${fns:hasPermission('warehouse:wzcode:wzcode:view')}">
return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
</c:when>
<c:otherwise>
return value;
</c:otherwise>
</c:choose>
}
}
......
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