Skip to content

W
warehouse
Commit a86d376d by zhanglt
Options

Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

parents 4efefa92 306e67ac
Showing with 130 additions and 208 deletions
src/main/webapp/static/common/js/LodopFuncs.js
......@@ -98,7 +98,7 @@ function getLodop(oOBJECT, oEMBED) {
var strLodopUpdate = strFontTag + "需要升级!点击这里<a href='install_lodop32.zip' target='_self'>执行升级</a>";
var strLodop64Install = strFontTag + "未安装!点击这里<a href='install_lodop64.zip' target='_self'>执行安装</a>";
var strLodop64Update = strFontTag + "需要升级!点击这里<a href='install_lodop64.zip' target='_self'>执行升级</a>";
var strCLodopInstallA = "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='"+projectName+"/common/file/CLodop_Setup_for_Win64NT_6.571EN.zip' target='_self'>下载执行安装</a>";
var strCLodopInstallA = "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='"+ctxStatic+"/common/file/CLodop_Setup_for_Win64NT_6.571EN.zip' target='_self'>下载执行安装</a>";
var strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>）";
var strCLodopUpdate = "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='CLodop_Setup_for_Win32NT.zip' target='_self'>执行升级</a>";
var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7";
......
src/main/webapp/webpage/include/anihead.jsp
......@@ -61,3 +61,7 @@
<script type="text/javascript">var ctx = '${ctx}', ctxStatic='${ctxStatic}';</script>
<link rel="stylesheet" id="theme" href="${ctxStatic}/common/css/app-${cookie.theme.value==null?'blue':cookie.theme.value}.css" />
<script src="${ctxStatic}/common/js/jeeplus.js"></script>
<script src="${ctxStatic}/common/js/LodopFuncs.js"></script>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0 style="display: none;">
<embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
</object>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/goods/goodsList.jsp
......@@ -8,13 +8,6 @@
<%@ include file="/webpage/include/bootstraptable.jsp" %>
<%@include file="/webpage/include/treeview.jsp" %>
<%@include file="goodsList.js" %>
<script>
var projectName = "${ctxStatic}";
</script>
<script type="text/javascript" src="${ctxStatic}/common/js/LodopFuncs.js"></script>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
<embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
</object>
</head>
<body>
<div class="wrapper wrapper-content">
......@@ -127,6 +120,5 @@
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/materialloss/materialLossList.js
......@@ -241,21 +241,21 @@ $(document).ready(function() {
$('#materialLossTable').bootstrapTable('refresh');
}
function add(){
jp.go("${ctx}/warehouse/materialloss/materialLoss/form/add");
jp.openSaveDialog("新增物资盘亏","${ctx}/warehouse/materialloss/materialLoss/form/add",'1200','800');
}
function edit(id){
if(id == undefined){
id = getIdSelections();
}
jp.go("${ctx}/warehouse/materialloss/materialLoss/form/edit?id=" + id);
jp.openSaveDialog("编辑物资盘亏","${ctx}/warehouse/materialloss/materialLoss/form/edit?id=" + id,'1200','800');
}
function view(id){//没有权限时，不显示确定按钮
if(id == undefined){
id = getIdSelections();
}
jp.go("${ctx}/warehouse/materialloss/materialLoss/form/view?id=" + id);
jp.openViewDialog("查看物资盘亏","${ctx}/warehouse/materialloss/materialLoss/form/view?id=" + id,'1200','800');
}
......@@ -299,9 +299,15 @@ $(document).ready(function() {
<table class="ani table">
<thead>
<tr>
<th>盘亏表主表ID</th>
<th>物资台账明细ID</th>
<th>备注信息</th>
<th>物资名称</th>
<th>物资编号</th>
<th>类型</th>
<th>型号</th>
<th>单价</th>
<th>批次号</th>
<th>货架</th>
<th>仓库</th>
<th>备注</th>
</tr>
</thead>
<tbody id="materialLossChild-{{idx}}-1-List">
......@@ -313,10 +319,28 @@ $(document).ready(function() {
<script type="text/template" id="materialLossChild1Tpl">//<!--
<tr>
<td>
{{row.materialLoss.id}}
{{row.ledgerInfo.name}}
</td>
<td>
{{row.ledgerInfo.id}}
{{row.ledgerInfo.code}}
</td>
<td>
{{row.ledgerInfo.type.name}}
</td>
<td>
{{row.ledgerInfo.model}}
</td>
<td>
{{row.ledgerInfo.amount}}
</td>
<td>
{{row.ledgerInfo.batchNum}}
</td>
<td>
{{row.ledgerInfo.shelves.name}}
</td>
<td>
{{row.ledgerInfo.shelves.warehouse.name}}
</td>
<td>
{{row.remarks}}
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js
......@@ -279,6 +279,7 @@ $(document).ready(function() {
var data1 = profitWarehousing.profitWarehousingInfoList;
for (var i=0; i<data1.length; i++){
data1[i].dict = {};
data1[i].qrCodeStr = data1[1].qrCode && JSON.stringify(data1[1].qrCode);
addRow('#profitWarehousingChild-'+row.id+'-1-List', profitWarehousingChild1RowIdx, profitWarehousingChild1Tpl, data1[i]);
profitWarehousingChild1RowIdx = profitWarehousingChild1RowIdx + 1;
}
......@@ -299,21 +300,24 @@ $(document).ready(function() {
LODOP=getLodop(document.getElementById('LODOP_OB'),document.getElementById('LODOP_EM'));
}
function printQr(id) {
function printQr(id, qrCodeStr) {
jp.loading('loading...');
try{
if(!LODOP){
initLodop();
}
if(LODOP){
jp.get("${ctx}/warehouse/profitwarehousing/profitWarehousing/printQr?profitWarehousingInfoId="+id, function (res) {
var list = res.body.goodsInfo.qrCodeList;
LODOP.PRINT_INIT("打印货品");
LODOP.SET_PRINT_PAGESIZE(1,400,600,0)
createAllPage(list);
LODOP.PREVIEW();
if(qrCodeStr){
var qrCode = JSON.parse(qrCodeStr);
preview_LODOP(qrCode);
jp.close();
})
}else{
jp.get("${ctx}/warehouse/profitwarehousing/profitWarehousing/printQr?profitWarehousingInfoId="+id, function (res) {
var profitWarehousingInfo = res.body.profitWarehousingInfo;
preview_LODOP(profitWarehousingInfo.qrCode);
jp.close();
})
}
}else{
jp.close();
}
......@@ -324,6 +328,18 @@ $(document).ready(function() {
})
}
}
function preview_LODOP(qrCode){
if(qrCode && qrCode.url){
LODOP.PRINT_INIT("打印货品");
LODOP.SET_PRINT_PAGESIZE(1,400,600,0)
var imgUrl = "${ctxPath}/" + qrCode.url;
LODOP.ADD_PRINT_IMAGE('0%',"0%","100%","100%","<img width='150' border='0' src='"+imgUrl+"' />");
LODOP.PREVIEW();
}else{
jp.error('二维码不存在！')
}
}
</script>
<script type="text/template" id="profitWarehousingChildrenTpl">//<!--
......@@ -376,7 +392,7 @@ $(document).ready(function() {
{{row.remarks}}
</td>
<td>
<button class="btn btn-primary btn-sm" onclick="printQr('{{row.id}}')">
<button class="btn btn-primary btn-sm" onclick="printQr('{{row.id}}', '{{row.qrCodeStr}}')">
打印二维码
</button>
<button class="btn btn-danger btn-sm" onclick="cleanQr('{{row.id}}')">
......
src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.jsp
......@@ -8,13 +8,6 @@
<%@ include file="/webpage/include/bootstraptable.jsp"%>
<%@include file="/webpage/include/treeview.jsp" %>
<%@include file="profitWarehousingList.js" %>
<script>
var projectName = "${ctxStatic}";
</script>
<script type="text/javascript" src="${ctxStatic}/common/js/LodopFuncs.js"></script>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
<embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
</object>
</head>
<body>
<div class="wrapper wrapper-content">
......
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