Commit 88e1d815 by anxiaohe

盘盈入库修改

parent bccdbe91
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
item.shelvesNames = item.shelvesList.map(function (e) { return e.name }).join(',') + ','; item.shelvesNames = item.shelvesList.map(function (e) { return e.name }).join(',') + ',';
item.warehouseNames = item.warehouseList.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.remarks = jp.escapeHtml(item.remarks);
item.readonly = item.qrCode && Number(item.qrCode.state) >= 2 item.readonly = item.qrCode && Number(item.qrCode.state) > 0
return item; return item;
}) })
} }
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
field: '', field: '',
title: '操作', title: '操作',
formatter: function (value,row,index){ formatter: function (value,row,index){
if (row.qrCode && Number(row.qrCode.state) >= 2) return ''; if (row.qrCode && Number(row.qrCode.state) > 0) return '';
var text = row.delFlag == 1 ? '撤销删除' : '删除'; var text = row.delFlag == 1 ? '撤销删除' : '删除';
var result = ["<a href='javascript:void(0);' onclick=\"removeRow(" + index + ", '" + row.id + "', '" + row.delFlag + "')\">"+text+"</a>" ] var result = ["<a href='javascript:void(0);' onclick=\"removeRow(" + index + ", '" + row.id + "', '" + row.delFlag + "')\">"+text+"</a>" ]
return result.join(''); return result.join('');
...@@ -210,7 +210,9 @@ ...@@ -210,7 +210,9 @@
function updateRow(index, row){ function updateRow(index, row){
$(selector).bootstrapTable('updateRow', { $(selector).bootstrapTable('updateRow', {
index: index, index: index,
row: row row: Object.assign(row, {
updateFlag: 1
})
}) })
} }
...@@ -238,7 +240,6 @@ ...@@ -238,7 +240,6 @@
function onInputChange(rowIndex, elem , field){ function onInputChange(rowIndex, elem , field){
var obj = {}; var obj = {};
obj[field] = $(elem).val(); obj[field] = $(elem).val();
debugger
// 校验数量与单价 // 校验数量与单价
if(field === 'num' && obj[field]){ if(field === 'num' && obj[field]){
...@@ -512,6 +513,7 @@ ...@@ -512,6 +513,7 @@
<input id="profitWarehousingInfoList{{idx}}_qrCodeId" name="profitWarehousingInfoList[{{idx}}].qrCode.id" type="hidden" value="{{row.qrCode.id}}" readonly class="form-control" /> <input id="profitWarehousingInfoList{{idx}}_qrCodeId" name="profitWarehousingInfoList[{{idx}}].qrCode.id" type="hidden" value="{{row.qrCode.id}}" readonly class="form-control" />
{{/row.qrCode}} {{/row.qrCode}}
<input id="profitWarehousingInfoList{{idx}}_warehouseId" name="profitWarehousingInfoList[{{idx}}].warehouse.id" type="hidden" value="{{row.warehouse.id}}" readonly class="form-control" /> <input id="profitWarehousingInfoList{{idx}}_warehouseId" name="profitWarehousingInfoList[{{idx}}].warehouse.id" type="hidden" value="{{row.warehouse.id}}" readonly class="form-control" />
<input id="profitWarehousingInfoList{{idx}}_updateFlag" name="profitWarehousingInfoList[{{idx}}].updateFlag" type="hidden" value="{{row.updateFlag}}" readonly class="form-control" />
</script> </script>
<script id="nameTpl" type="text/html"> <script id="nameTpl" type="text/html">
......
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