Skip to content

W
warehouse
Commit da3c02e5 by anxiaohe
Options

盘盈盘亏

parent 91cf88d6
Showing with 120 additions and 60 deletions
src/main/webapp/webpage/modules/warehouse/goods/logic.js
......@@ -85,7 +85,7 @@ var pageConfig = {
// 图片高度
Image_h: 63,
// 图片阈值
Image_Threshold: 170,
Image_Threshold: 220,
// 图片打印模式
Image_style_let: 3,
}
......@@ -154,6 +154,18 @@ function printImage (url) {
]
}
console.log(pack)
var str = JSON.stringify(pack, null, 2);
var blob = new Blob([str], {
type: "application/json"
});
var url = URL.createObjectURL(blob);
var a = document.createElement('a');
a.href = url;
a.download = 'a.json';
a.click();
a.remove();
on_link_device(pack, onBack);
})
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossDetail.jsp
......@@ -44,30 +44,30 @@
}
},
{
field: 'ledgerInfo.name',
title: '物资名称',
field: 'ledgerInfo.code',
title: '物资编码',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoNameTpl").html(), {
return Mustache.render($("#ledgerInfoCodeTpl").html(), {
row: row,
idx: index
})
}
},
{
field: 'ledgerInfo.code',
title: '物资编码',
field: 'ledgerInfo.type.name',
title: '品名',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoCodeTpl").html(), {
return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
idx: index
})
}
},
{
field: 'ledgerInfo.type.name',
title: '品名代码',
field: 'ledgerInfo.type.code',
title: '代码',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
return Mustache.render($("#ledgerInfoTypeCodeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
idx: index
})
......@@ -94,6 +94,16 @@
}
},
{
field: 'ledgerInfo.type.unit',
title: '单位',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoTypeUnitTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
idx: index
})
}
},
{
field: 'ledgerInfo.batchNum',
title: '批次号',
formatter: function (value, row, index) {
......@@ -246,6 +256,16 @@
<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"/>//-->
</script>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="materialLossInfoList{{idx}}_ledgerInfoTypeCode"
name="materialLossInfoList[{{idx}}].ledgerInfo.type.code" type="text" class="form-control" readonly
value="{{row.ledgerInfo.type.code}}"/>
</script>
<script id="ledgerInfoTypeUnitTpl" type="text/html">
<input id="materialLossInfoList{{idx}}_ledgerInfoTypeUnit"
name="materialLossInfoList[{{idx}}].ledgerInfo.type.unit" type="text" class="form-control" readonly
value="{{row.ledgerInfo.type.unit}}"/>
</script>
<script id="ledgerInfoModelTpl" type="text/html">
<input id="materialLossInfoList{{idx}}_ledgerInfoModel"
name="materialLossInfoList[{{idx}}].ledgerInfo.model" type="text" class="form-control" readonly
......
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.js
......@@ -289,11 +289,13 @@ $(document).ready(function() {
<table class="ani table">
<thead>
<tr>
<th>物资名称</th>
<th>物资编号</th>
<th>品名代码</th>
<th>品名</th>
<th>代码</th>
<th>型号</th>
<th>单价</th>
<th>单位</th>
<th>批次号</th>
<th>货架</th>
<th>仓库</th>
......@@ -308,9 +310,7 @@ $(document).ready(function() {
</script>
<script type="text/template" id="materialLossChild1Tpl">//<!--
<tr>
<td>
{{row.ledgerInfo.name}}
</td>
<td>
{{row.ledgerInfo.code}}
</td>
......@@ -318,12 +318,18 @@ $(document).ready(function() {
{{row.ledgerInfo.type.name}}
</td>
<td>
{{row.ledgerInfo.type.code}}
</td>
<td>
{{row.ledgerInfo.model}}
</td>
<td>
{{row.ledgerInfo.amount}}
</td>
<td>
{{row.ledgerInfo.type.unit}}
</td>
<td>
{{row.ledgerInfo.batchNum}}
</td>
<td>
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.js
......@@ -321,16 +321,16 @@ function addRow(list, idx, tpl, row){
</script>
<script type="text/template" id="outboundChild1Tpl">//<!--
<tr>
<td>
{{row.ledgerInfo.code}}
</td>
<td>
{{row.ledgerInfo.type.name}}
</td>
<td>
{{row.ledgerInfo.type.code}}
</td>
<td>
{{row.ledgerInfo.code}}
</td>
<td>
{{row.ledgerInfo.type.unit}}
</td>
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js
<%@ page contentType="text/html;charset=UTF-8" %>
<script>
var LODOP;
<script>
var LODOP;
$(document).ready(function() {
$('#profitWarehousingTable').bootstrapTable({
......@@ -209,15 +209,15 @@ $(document).ready(function() {
format: "YYYY-MM-DD HH:mm:ss"
});
});
});
function getIdSelections() {
function getIdSelections() {
return $.map($("#profitWarehousingTable").bootstrapTable('getSelections'), function (row) {
return row.id
});
}
}
function deleteAll(){
function deleteAll(){
jp.confirm('确认要删除该盘盈入库单记录吗？', function(){
jp.loading();
......@@ -231,35 +231,35 @@ $(document).ready(function() {
})
})
}
}
//刷新列表
function refresh(){
//刷新列表
function refresh(){
$('#profitWarehousingTable').bootstrapTable('refresh');
}
function add(){
}
function add(){
jp.openSaveDialog("新增盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/add",'1200','800');
}
}
function edit(id){
function edit(id){
if(id == undefined){
id = getIdSelections();
}
jp.openSaveDialog("编辑盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/edit?id=" + id,'1200','800');
}
}
function view(id){//没有权限时，不显示确定按钮
function view(id){//没有权限时，不显示确定按钮
if(id == undefined){
id = getIdSelections();
}
jp.openViewDialog("查看盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/view?id=" + id,'1200','800');
}
}
function detailFormatter(index, row) {
function detailFormatter(index, row) {
var htmltpl = $("#profitWarehousingChildrenTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
var html = Mustache.render(htmltpl, {
idx:row.id
......@@ -281,19 +281,19 @@ $(document).ready(function() {
})
return html;
}
}
function addRow(list, idx, tpl, row){
function addRow(list, idx, tpl, row){
$(list).append(Mustache.render(tpl, {
idx: idx, delBtn: true, row: row
}));
}
}
function initLodop(){
function initLodop(){
LODOP=getLodop(document.getElementById('LODOP_OB'),document.getElementById('LODOP_EM'));
}
}
function printQr(id, qrCodeStr, rowIndex) {
function printQr_(id, qrCodeStr, rowIndex) {
try{
if(!LODOP){
initLodop();
......@@ -325,9 +325,22 @@ $(document).ready(function() {
}catch (e){
console.error('异常!')
}
}
function printQr (id) {
jp.loading('loading...');
jp.get("${ctx}/warehouse/profitwarehousing/profitWarehousing/printQr?profitWarehousingInfoId="+id, function (res) {
if (res.success) {
var row = res.body.goodsInfo.qrCode;
var imgUrl = "${ctxPath}/" + row.url;
// jp.showPic(imgUrl);
_thermal_Image_print_(imgUrl);
}
jp.close();
})
}
function preview_LODOP(qrCode){
function preview_LODOP(qrCode){
if(qrCode && qrCode.url){
LODOP.PRINT_INIT("打印货品");
LODOP.SET_PRINT_PAGESIZE(1,400,600,0)
......@@ -337,13 +350,13 @@ $(document).ready(function() {
}else{
jp.error('二维码不存在！')
}
}
}
/**
* 清除二维码
* @param id 明细id
*/
function cleanQr(id,rowIndex) {
function cleanQr(id,rowIndex) {
jp.confirm('确认清除二维码吗？', function (){
jp.get("${ctx}/warehouse/profitwarehousing/profitWarehousing/cleanQr?profitWarehousingInfoId="+id, function (res) {
res.success && jp.success('清除二维码成功！');
......@@ -353,14 +366,14 @@ $(document).ready(function() {
},0)
})
})
}
}
/**
* 入库
* @param id 明细id
* @param rowIndex 主表下标
*/
function inLedgerInfo(id, rowIndex ){
function inLedgerInfo(id, rowIndex ){
jp.get("${ctx}/warehouse/profitwarehousing/profitWarehousing/inLedgerInfo?profitWarehousingInfoId="+ id, function (res){
if(res.success){
jp.success(res.msg);
......@@ -372,7 +385,7 @@ $(document).ready(function() {
jp.error(res.msg);
}
})
}
}
</script>
<script type="text/template" id="profitWarehousingChildrenTpl">//<!--
<div class="tabs-container">
......@@ -384,12 +397,14 @@ $(document).ready(function() {
<table class="ani table">
<thead>
<tr>
<th>名称</th>
<th>品名代码</th>
<th>品名</th>
<th>代码</th>
<th>型号</th>
<th>数量</th>
<th>单价</th>
<th>单位</th>
<th>仓库</th>
<th>货架</th>
<th>单价</th>
<th>备注</th>
<th>操作</th>
</tr>
......@@ -399,28 +414,34 @@ $(document).ready(function() {
</table>
</div>
</div>//-->
</script>
<script type="text/template" id="profitWarehousingChild1Tpl">//<!--
</script>
<script type="text/template" id="profitWarehousingChild1Tpl">//<!--
<tr>
<td>
{{row.name}}
</td>
<td>
{{row.type.name}}
</td>
<td>
{{row.marking}}
{{row.type.code}}
</td>
<td>
{{row.shelves.name}}
{{row.model}}
</td>
<td>
{{row.warehouse.name}}
{{row.num}}
</td>
<td>
{{row.amount}}
</td>
<td>
{{row.type.unit}}
</td>
<td>
{{row.shelves.name}}
</td>
<td>
{{row.warehouse.name}}
</td>
<td>
{{row.remarks}}
</td>
<td>
......@@ -445,4 +466,4 @@ $(document).ready(function() {
{{/row.status3}}
</td>
</tr>//-->
</script>
</script>
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.jsp
......@@ -7,6 +7,7 @@
<meta name="decorator" content="ani"/>
<%@ include file="/webpage/include/bootstraptable.jsp"%>
<%@include file="/webpage/include/treeview.jsp" %>
<%@include file="./../goods/logic.js"%>
<%@include file="profitWarehousingList.js" %>
</head>
<body>
......
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