Skip to content

W
warehouse
Commit e75597c5 by anxiaohe
Options

各明细修改

parent 3cdab698
Showing with 55 additions and 11 deletions
src/main/webapp/webpage/modules/warehouse/goods/goodsDetail.jsp
......@@ -21,6 +21,7 @@
data = data.map(function(item){
item.delFlag = 0;
item.remarks = jp.escapeHtml(item.remarks);
item.canUse = item.qrCode.state == 0;
return item;
})
}
......@@ -170,7 +171,8 @@
num: null,
amount: null,
remarks: '',
infoSum: ''
infoSum: '',
canUse: true
}
$(selector).bootstrapTable('append', [
......@@ -326,11 +328,23 @@
<input id="goodsInfoList{{idx}}_unit" name="goodsInfoList[{{idx}}].type.unit" type="text" value="{{row.type.unit}}" readonly onchange="onInputChange('{{idx}}', this, 'type.unit')" class="form-control required"/>
</script>
<script id="modelTpl" type="text/html">
{{#row.canUse}}
<input id="goodsInfoList{{idx}}_model" name="goodsInfoList[{{idx}}].model" type="text" value="{{row.model}}" onchange="onInputChange('{{idx}}', this, 'model')" class="form-control required"/>
{{/row.canUse}}
{{^row.canUse}}
<input id="goodsInfoList{{idx}}_model" name="goodsInfoList[{{idx}}].model" type="text" value="{{row.model}}" readonly onchange="onInputChange('{{idx}}', this, 'model')" class="form-control required"/>
{{/row.canUse}}
</script>
<script id="numTpl" type="text/html">
<input id="goodsInfoList{{idx}}_num" name="goodsInfoList[{{idx}}].num" type="text" value="{{row.num}}" onchange="onInputChange('{{idx}}', this, 'num')" class="form-control required"/>
{{#row.canUse}}
<input id="goodsInfoList{{idx}}_num" name="goodsInfoList[{{idx}}].num" type="text" value="{{row.num}}"
onchange="onInputChange('{{idx}}', this, 'num')" class="form-control required"/>
{{/row.canUse}}
{{^row.canUse}}
<input id="goodsInfoList{{idx}}_num" name="goodsInfoList[{{idx}}].num" readonly type="text" value="{{row.num}}"
onchange="onInputChange('{{idx}}', this, 'num')" class="form-control required"/>
{{/row.canUse}}
</script>
<script id="infoSumTpl" type="text/html">
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingDetail.jsp
......@@ -19,13 +19,14 @@
var selector = "#detail_table";
function initTable(){
var data = ${fns:toJson(profitWarehousing.profitWarehousingInfoList)};
console.log(data)
if(data.length){
data = data.map(function(item){
item.delFlag = 0;
item.shelvesNames = item.shelvesList.map(function (e) { return e.name }).join(',') + ',';
item.warehouseNames = item.warehouseList.map(function (e) { return e.name }).join(',') + ',';
item.remarks = jp.escapeHtml(item.remarks);
item.readonly = item.qrCode && item.qrCode.state === '2'
item.readonly = item.qrCode && Number(item.qrCode.state) >= 2
return item;
})
}
......@@ -162,6 +163,7 @@
field: '',
title: '操作',
formatter: function (value,row,index){
if (row.qrCode && Number(row.qrCode.state) >= 2) return '';
var text = row.delFlag == 1 ? '撤销删除' : '删除';
var result = ["<a href='javascript:void(0);' onclick=\"removeRow(" + index + ", '" + row.id + "', '" + row.delFlag + "')\">"+text+"</a>" ]
return result.join('');
......@@ -506,6 +508,9 @@
<script id="hideTpl" type="text/html">
<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="{{row.delFlag}}"/>
{{#row.qrCode}}
<input id="profitWarehousingInfoList{{idx}}_qrCodeId" name="profitWarehousingInfoList[{{idx}}].qrCode.id" type="hidden" value="{{row.qrCode.id}}" readonly class="form-control" />
{{/row.qrCode}}
<input id="profitWarehousingInfoList{{idx}}_warehouseId" name="profitWarehousingInfoList[{{idx}}].warehouse.id" type="hidden" value="{{row.warehouse.id}}" readonly class="form-control" />
</script>
......@@ -546,7 +551,14 @@
<input id="profitWarehousingInfoList{{idx}}_unit" name="profitWarehousingInfoList[{{idx}}].type.unit" type="text" value="{{row.type.unit}}" readonly onchange="onInputChange('{{idx}}', this, 'type.unit')" class="form-control required"/>
</script>
<script id="numTpl" type="text/html">
<input id="profitWarehousingInfoList{{idx}}_num" name="profitWarehousingInfoList[{{idx}}].num" type="text" value="{{row.num}}" onchange="onInputChange('{{idx}}', this, 'num')" class="form-control required"/>
{{#row.readonly}}
<input id="profitWarehousingInfoList{{idx}}_num" readonly name="profitWarehousingInfoList[{{idx}}].num" type="text"
value="{{row.num}}" onchange="onInputChange('{{idx}}', this, 'num')" class="form-control required"/>
{{/row.readonly}}
{{^row.readonly}}
<input id="profitWarehousingInfoList{{idx}}_num" name="profitWarehousingInfoList[{{idx}}].num" type="text"
value="{{row.num}}" onchange="onInputChange('{{idx}}', this, 'num')" class="form-control required"/>
{{/row.readonly}}
</script>
<script id="warehouseTpl" type="text/html">
<input id="profitWarehousingInfoList{{idx}}_warehouseName" type="text" value="{{row.warehouseNames}}" readonly class="form-control "/>
......
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
......@@ -26,7 +26,7 @@
data = data.map(function(item){
item.delFlag = 0;
item.remarks = jp.escapeHtml(item.remarks);
item.readonly = item.qrCode && item.qrCode.state === '2';
item.readonly = item.qrCode && Number(item.qrCode.state) >= 2;
item.infoSum = new Big(item.num).times(item.amount).toNumber();
item.shelvesNames = item.shelvesList.map(function (e) {
return e.name;
......@@ -34,6 +34,7 @@
item.warehouseNames = item.warehouseList.map(function (e) {
return e.name;
}).join(',');
// item.canUse = Number(item.qrCode.state) >= 2;
return item;
})
}
......@@ -48,7 +49,7 @@
//每页的记录行数（*）
pageSize: 10,
sidePagination: "client",
columns:[{checkbox: true, formatter: function(vlaue,row){return {disabled: row.qrCode && row.qrCode.state === '2' }}},
columns:[{checkbox: true, formatter: function(vlaue,row){return {disabled: row.qrCode && Number(row.qrCode.state) >= 2 }}},
{
field: 'no',
title: '序号',
......@@ -177,7 +178,7 @@
field: '',
title: '操作',
formatter: function (value,row,index){
if(row.qrCode && row.qrCode.state === '2') return ' ';
if(row.qrCode && Number(row.qrCode.state) >= 2) return ' ';
var text = row.delFlag == 1 ? '撤销删除' : '删除';
var result = ["<a href='javascript:void(0);' onclick=\"removeRow(" + index + ", '" + row.id + "', '" + row.delFlag + "')\">"+text+"</a>" ]
return result.join('');
......@@ -245,6 +246,7 @@
delFlag: 0,
remarks: '',
...item,
canUse: true,
infoSum: new Big(item.num).times(item.amount).toNumber()
}
});
......@@ -501,7 +503,8 @@
...qrCode.goodsInfo,
id: '',
delFlag: 0,
remarks: ''
remarks: '',
canUse: true,
}
]);
} else {
......
src/main/webapp/webpage/modules/warehouse/storage/storageForm.jsp
......@@ -82,8 +82,10 @@
</td>
<td>
<form:hidden path="batchNum" />
<sys:gridselect url="${ctx}/warehouse/goods/goods/data" id="goods" name="goods.id" value="${storage.batchNum}" labelName="goods.name" labelValue="${storage.batchNum}"
title="选择货品批次" cssClass="form-control required" fieldLabels="批次号" fieldKeys="batchNum" searchLabels="批次号" searchKeys="batchNum" callback="onSelectGoods"></sys:gridselect>
<sys:gridselect url="${ctx}/warehouse/goods/goods/data" id="goods" name="goods.id"
value="${storage.batchNum}" labelName="goods.name" labelValue="${storage.batchNum}"
title="选择货品批次" cssClass="form-control required" fieldLabels="批次号"
fieldKeys="batchNum" searchLabels="批次号" searchKeys="batchNum" callback="onSelectGoods" disabled="${mode == 'add' ? '' : 'disabled'}" />
</td>
</tr>
<tr>
......
src/main/webapp/webpage/modules/warehouse/storage/storageList.js
......@@ -283,6 +283,19 @@ function detailFormatter(index, row) {
item.warehouseNames = item.warehouseList.map(function (e) {
return e.name
}).join(',');
var str = '';
if (item.qrCode.state === '1') {
str = '已入库未入账'
}else if (item.qrCode.state === '2') {
str = '已入账未下账'
} else if (item.qrCode.state === '3'){
str = '已下账'
} else {
str = '未入库'
}
item.stateStr = str;
addRow('#storageChild-'+row.id+'-1-List', storageChild1RowIdx, storageChild1Tpl, data1[i]);
storageChild1RowIdx = storageChild1RowIdx + 1;
}
......@@ -425,7 +438,7 @@ function onStorage(countStorage, goodsInfoId, rowIndex){
{{/row.isNotStorage}}
{{#row.isStorage}}
<td>
已入库
{{row.stateStr}}
</td>
{{/row.isStorage}}
</tr>//-->
......
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