Skip to content

W
warehouse
Commit 1885a7de by 胡懿
Options

Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy

parents f98316e2 115b9d23
Showing with 542 additions and 273 deletions
src/main/java/com/jeeplus/modules/warehouse/qrcode/util/BuildQcUtil.java
...@@ -27,6 +27,10 @@ public class BuildQcUtil { ...@@ -27,6 +27,10 @@ public class BuildQcUtil {
map.put("infoId", goodsInfo.getId()); map.put("infoId", goodsInfo.getId());
TwoDimensionCode.encoderQRCode(JSON.toJSONString(map), qrImgPath, "png", 6); TwoDimensionCode.encoderQRCode(JSON.toJSONString(map), qrImgPath, "png", 6);
File file = new File(qrImgPath); File file = new File(qrImgPath);
File file2 = new File(imgPath);
if (file2.exists()) {
file2.delete();
}
try { try {
BufferedImage image = DrawQrcodeUtil.createAssetImageNew(file, qrCode); BufferedImage image = DrawQrcodeUtil.createAssetImageNew(file, qrCode);
DrawQrcodeUtil drawQrcodeUtil = new DrawQrcodeUtil(); DrawQrcodeUtil drawQrcodeUtil = new DrawQrcodeUtil();
......
src/main/webapp/webpage/include/scan.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<style> <style>
#scanIpt_ { #scanIpt_ {
position: absolute; position: absolute;
...@@ -12,145 +13,145 @@ ...@@ -12,145 +13,145 @@
<script> <script>
// function Scan () { // function Scan () {
// this.scanIptFocusTimer$ = null; // this.scanIptFocusTimer$ = null;
// this.inputMethodCnType$ = false; // this.inputMethodCnType$ = false;
// //
// $(document).ready(function () { // $(document).ready(function () {
// var ipt = getScanIpt(); // var ipt = getScanIpt();
// document.addEventListener('visibilitychange', pageVisible); // document.addEventListener('visibilitychange', pageVisible);
// ipt.addEventListener('change', scanDataChange); // ipt.addEventListener('change', scanDataChange);
// ipt.addEventListener('compositionstart', iptCompositionstart); // ipt.addEventListener('compositionstart', iptCompositionstart);
// ipt.addEventListener('compositionend', iptCompositionend); // ipt.addEventListener('compositionend', iptCompositionend);
// scanIptGetFocusStart(); // scanIptGetFocusStart();
// }) // })
// } // }
var scanIptFocusTimer$ = null; var scanIptFocusTimer$ = null;
var inputMethodCnType$ = false; var inputMethodCnType$ = false;
var focusStop = true; var focusStop = true;
$(document).ready(function () { $(document).ready(function () {
$(document.body).on('focusin', function (e) { $(document.body).on('focusin', function (e) {
var dom = e.target; var dom = e.target;
if (dom.id === 'scanIpt_') return; if (dom.id === 'scanIpt_') return;
scanIptGetFocusStop(); scanIptGetFocusStop();
}) })
$(document.body).on('focusout', function (e) { $(document.body).on('focusout', function (e) {
var dom = e.target; var dom = e.target;
if (dom.id === 'scanIpt_') return; if (dom.id === 'scanIpt_') return;
scanIptGetFocusStart(); scanIptGetFocusStart();
})
}) })
})
function scanStart () {
function scanStart () { var ipt = getScanIpt();
var ipt = getScanIpt(); focusStop = false;
focusStop = false; ipt.focus();
ipt.focus(); document.addEventListener('visibilitychange', pageVisible);
document.addEventListener('visibilitychange', pageVisible); ipt.addEventListener('change', scanDataChange);
ipt.addEventListener('change', scanDataChange); ipt.addEventListener('compositionstart', iptCompositionstart);
ipt.addEventListener('compositionstart', iptCompositionstart); ipt.addEventListener('compositionend', iptCompositionend);
ipt.addEventListener('compositionend', iptCompositionend);
scanIptGetFocusStart();
// var allFormDom = $("input, select, textarea");
// allFormDom.on('focus', function () {
// if (this.id === 'scanIpt_') return;
// scanIptGetFocusStop();
// })
// allFormDom.on('blur', function () {
// if (this.id === 'scanIpt_') return;
// scanIptGetFocusStart();
// })
}
function scanStop () {
focusStop = true;
var ipt = getScanIpt();
ipt.removeEventListener('change', scanDataChange);
ipt.removeEventListener('compositionstart', iptCompositionstart);
scanIptGetFocusStop();
document.removeEventListener('visibilitychange', pageVisible);
}
window.onbeforeunload = function (e) {
scanStop();
}
// $(document).ready(function () {
// var ipt = getScanIpt();
// document.addEventListener('visibilitychange', pageVisible);
// ipt.addEventListener('change', scanDataChange);
// ipt.addEventListener('compositionstart', iptCompositionstart);
// ipt.addEventListener('compositionend', iptCompositionend);
// })
function getScanIpt () {
return document.getElementById("scanIpt_");
}
function pageVisible () {
var state = document.visibilityState;
if (state === 'visible') {
scanIptGetFocusStart(); scanIptGetFocusStart();
} else if (state === 'hidden') { // var allFormDom = $("input, select, textarea");
// allFormDom.on('focus', function () {
// if (this.id === 'scanIpt_') return;
// scanIptGetFocusStop();
// })
// allFormDom.on('blur', function () {
// if (this.id === 'scanIpt_') return;
// scanIptGetFocusStart();
// })
}
function scanStop () {
focusStop = true;
var ipt = getScanIpt();
ipt.removeEventListener('change', scanDataChange);
ipt.removeEventListener('compositionstart', iptCompositionstart);
scanIptGetFocusStop(); scanIptGetFocusStop();
document.removeEventListener('visibilitychange', pageVisible);
}
window.onbeforeunload = function (e) {
scanStop();
}
// $(document).ready(function () {
// var ipt = getScanIpt();
// document.addEventListener('visibilitychange', pageVisible);
// ipt.addEventListener('change', scanDataChange);
// ipt.addEventListener('compositionstart', iptCompositionstart);
// ipt.addEventListener('compositionend', iptCompositionend);
// })
function getScanIpt () {
return document.getElementById("scanIpt_");
}
function pageVisible () {
var state = document.visibilityState;
if (state === 'visible') {
scanIptGetFocusStart();
} else if (state === 'hidden') {
scanIptGetFocusStop();
}
} }
}
function scanIptGetFocusStart () { function scanIptGetFocusStart () {
if (focusStop) return; if (focusStop) return;
var ipt = getScanIpt(); var ipt = getScanIpt();
if (ipt) { if (ipt) {
scanIptFocusTimer$ = iptFocus(ipt); scanIptFocusTimer$ = iptFocus(ipt);
}
} }
}
function scanIptGetFocusStop () { function scanIptGetFocusStop () {
if (scanIptFocusTimer$) { if (scanIptFocusTimer$) {
clearInterval(scanIptFocusTimer$); clearInterval(scanIptFocusTimer$);
scanIptFocusTimer$ = null; scanIptFocusTimer$ = null;
}
} }
}
function iptFocus () { function iptFocus () {
var ipt = getScanIpt(); var ipt = getScanIpt();
var timer = setInterval(function () { var timer = setInterval(function () {
if (ipt !== document.activeElement && scanIptFocusTimer$) { if (ipt !== document.activeElement && scanIptFocusTimer$) {
ipt.focus(); ipt.focus();
}
}, 300);
return timer;
}
function iptCompositionstart () {
inputMethodCnType$ = true;
}
function iptCompositionend () {
var ipt = getScanIpt();
if (inputMethodCnType$) {
jp.alert('请将输入法设置为英文');
inputMethodCnType$ = false;
ipt.value = '';
} }
}, 300);
return timer;
}
function iptCompositionstart () {
inputMethodCnType = true;
}
function iptCompositionend () {
var ipt = getScanIpt();
if (inputMethodCnType$) {
jp.alert('请将输入法设置为英文');
inputMethodCnType$ = false;
ipt.value = '';
} }
}
function scanDataChange () { function scanDataChange () {
var elem = getScanIpt(); var elem = getScanIpt();
var val = $(elem).val(); var val = $(elem).val();
if (!val) { if (!val) {
return; return;
}
try {
window.scanIptChangeCallback && window.scanIptChangeCallback(val);
} catch (e) {}
setTimeout(function () {
$(elem).val('');
$(elem).blur();
}, 100)
} }
try {
window.scanIptChangeCallback && window.scanIptChangeCallback(val);
} catch (e) {}
setTimeout(function () {
$(elem).val('');
$(elem).blur();
}, 100)
}
</script> </script>
src/main/webapp/webpage/modules/warehouse/goods/goodsList.jsp
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<%@ include file="/webpage/include/bootstraptable.jsp" %> <%@ include file="/webpage/include/bootstraptable.jsp" %>
<%@include file="/webpage/include/treeview.jsp" %> <%@include file="/webpage/include/treeview.jsp" %>
<%@include file="goodsList.js" %> <%@include file="goodsList.js" %>
<%@include file="logic.js" %>
</head> </head>
<body> <body>
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
...@@ -121,4 +122,4 @@ ...@@ -121,4 +122,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/goods/logic.js
<%@ page contentType="text/html;charset=UTF-8" %> <%@ page contentType="text/html;charset=UTF-8" %>
<script> <script>
var printerProtocolMap = {
usb: 'usb',
tcp: 'tcp'
}
var printerDirectiveMap = {
_thermal_zpl_draw_print_: '_thermal_zpl_draw_print_',
_thermal_tspl_draw_print_: '_thermal_tspl_draw_print_',
_thermal_escpos_draw_print_: '_thermal_escpos_draw_print_'
}
var defPrintOption = { var defPrintOption = {
// post ws // post ws
linkDeviceType: 'post', linkDeviceType: 'post',
// usb tcp // usb tcp
protocol: 'usb' protocol: printerProtocolMap.usb,
// 打印机指令
printerDirective: printerDirectiveMap._thermal_zpl_draw_print_
} }
var device = '';
var printCallback = null;
var startLink = false;
const __io_lnk = function() { const __io_lnk = function() {
return 'localhost:8008' return 'localhost:8008'
...@@ -23,49 +39,165 @@ const __ws_url = function() { ...@@ -23,49 +39,165 @@ const __ws_url = function() {
* @private * @private
*/ */
function _thermal_enum_printer_ () { function _thermal_enum_printer_ () {
if (startLink) return;
startLink = true;
var onBack = function onBack (isOk, res) { var onBack = function onBack (isOk, res) {
startLink = false;
if (!isOk) { if (!isOk) {
output_control('通讯失败：' + JSON.stringify(res)); jp.warning('通讯失败：' + JSON.stringify(res));
return return
} }
if (res.code !== 0) { if (res.code !== 0) {
output_control(res.msg); jp.warning(res.msg);
return return
} }
let enum_list = document.getElementById('enum_list')
if (enum_list.length > 0) { enum_list.clear() }
if (res.device.length > 0) { if (res.device.length > 0) {
// for (let i = 0; i < res.device.length; i++) { device = res.device[0];
// let opt = document.createElement('option') printCallback && printCallback();
// opt.text = res.device[i]
// enum_list.options.add(opt)
// }
console.log(res);
} else { } else {
output_control(res.message) jp.warning(res.message)
} }
} }
let pack = { let pack = {
command: '_thermal_enum_printer_', command: '_thermal_enum_printer_',
require: require_type(), require: defPrintOption.protocol,
} }
on_link_device(pack, onBack); on_link_device(pack, onBack);
} }
function require_type () { var Image_style_letType = {
return defPrintOption.protocol; '1': '误差扩撒',
'2': '有序抖动',
'3': '阈值'
}
var pageConfig = {
// 纸张宽度
draw_w: '',
// 页长
draw_h: '',
// 横向位置
Image_x: '',
// 纵向位置
Image_y: '',
// 图片宽度
Image_w: '',
// 图片高度
Image_h: '',
// 图片阈值
Image_Threshold: '',
// 图片打印模式
Image_style_let: '1',
}
//绘图打印图片
function _thermal_Image_print_ (url) {
if (!device) {
printCallback = printImage.bind(window, url);
_thermal_enum_printer_();
} else {
printImage(url);
}
}
function printImage (url) {
//直接打印（ 打印:'true' / 预览:'false' ）
var printdirectly = 'true'
//获取预览图为base64数据（ base64:'true' / 路径:'false' ）
var get_base64_img = 'false'
var onBack = function (isok, res) {
if (!isok) {
jp.warning('通讯失败：' + JSON.stringify(res));
return
}
if (res.code !== 0) {
jp.warning(res.msg);
return
}
if (printdirectly === 'true') {
jp.success('绘图打印成功')
} else {
if (get_base64_img === 'true') {
console.log(res.image_base64)
} else {
console.log(res.image_path)
}
}
}
var pack = {
command: defPrintOption.printerDirective,
device : device,
printdirectly : 'true',
measurement_mode: 'mm',
canvas_size : {
width: pageConfig.draw_w,
height: pageConfig.draw_h
},
get_base64_img : 'false',
is_label: 'false',
print: [
{
func: "PDSetAddImageMode",
iMode: pageConfig.Image_style_let,
iValueThreshold: pageConfig.Image_Threshold
},
{
func:"PDDrawImage",
iX: pageConfig.Image_x,
iY: pageConfig.Image_y,
iWidth: pageConfig.Image_w,
iHeight: pageConfig.Image_h,
szImageFile: url
},
]
}
on_link_device(pack, onBack);
} }
function on_link_device (pack, onBack) { function on_link_device (pack, onBack) {
let radio = document.getElementsByName('req_model') if (defPrintOption.linkDeviceType === 'post') {
if (radio != null) { jqPost(__io_url(), pack, onBack);
if (radio.length > 0) { } else if (defPrintOption.linkDeviceType === 'ws') {
if (radio[0].checked) { jqpost(__io_url(), pack, onback) } jqLink(__ws_url(), pack, onBack);
}
}
function jqPost (url, pack, callback) {
$.ajax({
url: url,
type: 'POST',
data: JSON.stringify(pack),
dataType: 'json',
success: function (data) {
callback(true, data)
},
error: function (err) {
callback(false, err)
} }
if (radio.length > 1) { })
if (radio[1].checked) { jqlink(__ws_url(), pack, onback) } }
var ws = null;
function jqLink (url, pack, callback) {
if (ws == null) {
ws = new WebSocket(url);
ws.onback = callback;
ws.onopen = function (evt) {
ws.send(JSON.stringify(pack))
};
ws.onclose = function (evt) {
ws = null
};
ws.onmessage = function (evt) {
ws.onback(true, eval('(' + evt.data + ')'))
};
ws.onerror = function (evt) {
ws.onback(false, evt)
} }
} else {
ws.onback = callback;
ws.send(JSON.stringify(pack))
} }
} }
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js
...@@ -182,22 +182,22 @@ ...@@ -182,22 +182,22 @@
} }
}); });
}); });
$("#export").click(function(){//导出Excel文件 // $("#export").click(function(){//导出Excel文件
var searchParam = $("#searchForm").serializeJSON(); // var searchParam = $("#searchForm").serializeJSON();
searchParam.pageNo = 1; // searchParam.pageNo = 1;
searchParam.pageSize = -1; // searchParam.pageSize = -1;
var sortName = $('#ledgerTable').bootstrapTable("getOptions", "none").sortName; // var sortName = $('#ledgerTable').bootstrapTable("getOptions", "none").sortName;
var sortOrder = $('#ledgerTable').bootstrapTable("getOptions", "none").sortOrder; // var sortOrder = $('#ledgerTable').bootstrapTable("getOptions", "none").sortOrder;
var values = ""; // var values = "";
for(var key in searchParam){ // for(var key in searchParam){
values = values + key + "=" + searchParam[key] + "&"; // values = values + key + "=" + searchParam[key] + "&";
} // }
if(sortName != undefined && sortOrder != undefined){ // if(sortName != undefined && sortOrder != undefined){
values = values + "orderBy=" + sortName + " "+sortOrder; // values = values + "orderBy=" + sortName + " "+sortOrder;
} // }
//
jp.downloadFile('${ctx}/warehouse/ledger/ledger/export?'+values); // jp.downloadFile('${ctx}/warehouse/ledger/ledger/export?'+values);
}) // })
$("#search").click("click", function() {// 绑定查询按扭 $("#search").click("click", function() {// 绑定查询按扭
$('#ledgerTable').bootstrapTable('refresh'); $('#ledgerTable').bootstrapTable('refresh');
...@@ -210,6 +210,46 @@ ...@@ -210,6 +210,46 @@
$('#ledgerTable').bootstrapTable('refresh'); $('#ledgerTable').bootstrapTable('refresh');
}); });
$("#export").click(function () {
jp.open({
type: 1,
title: '导出',
auto: true,
area: ['600', '500'],
content: Mustache.render($("#exportTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""),{}),
btn: ['确定', '关闭'],
success (layeor, i) {
var beginTime = layeor.find('#beginTime');
var endTime = layeor.find('#endTime');
beginTime.datetimepicker({
format: "YYYY-MM-DD"
});
endTime.datetimepicker({
format: "YYYY-MM-DD"
});
},
yes (i, layeor) {
var form = layeor.find("#export-searchForm");
var isValidate = form.validate().form();
if (!isValidate) {
return false;
} else {
var params = form.serializeJSON();
params.beginTime = params.beginTime + ' 00:00:00';
params.endTime = params.endTime + ' 23:59:59';
var str = '';
for (var key in params) {
str += '&' + key + '=' + params[key]
}
window.open("${ctx}/warehouse/ledger/ledger/ledgerStreamWater?" + str.substr(1));
jp.close(i);
}
},
cancel () {
}
})
})
}); });
......
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<%@ include file="/webpage/include/bootstraptable.jsp"%> <%@ include file="/webpage/include/bootstraptable.jsp"%>
<%@include file="/webpage/include/treeview.jsp" %> <%@include file="/webpage/include/treeview.jsp" %>
<link rel="stylesheet" href="${ctxStatic}/plugin/layui/dist/css/layui.css">
<script src="${ctxStatic}/plugin/layui/dist/layui.js"></script>
<%@include file="ledgerList.js" %> <%@include file="ledgerList.js" %>
<%@include file="../../../include/scan.jsp" %> <%@include file="../../../include/scan.jsp" %>
<script type="text/javascript" src="${ctxStatic}/common/js/big.js"></script> <script type="text/javascript" src="${ctxStatic}/common/js/big.js"></script>
...@@ -98,6 +100,9 @@ ...@@ -98,6 +100,9 @@
<button class="btn btn-default" onclick="viewScanData()"> <button class="btn btn-default" onclick="viewScanData()">
<i class="fa fa-search-plus"></i> 查看二维码数据 <i class="fa fa-search-plus"></i> 查看二维码数据
</button> </button>
<button id="export" class="btn btn-warning">
<i class="fa fa-file-excel-o"></i> 导出
</button>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
...@@ -144,5 +149,34 @@ ...@@ -144,5 +149,34 @@
</div> </div>
</div> </div>
</script> </script>
<script type="text/html" id="exportTpl">
<div id="export-searchForm-box" class="collapse show">
<div class="accordion-inner">
<form:form id="export-searchForm" class="form-horizontal">
<div class="form-group">
<label class="col-sm-2 control-label">品名：</label>
<div class="col-sm-10 control-label text-left">
//<!--<sys:treeselect id="type" name="typeId"
title="品名代码" url="/warehouse/materialtype/materialType/treeData" notAllowSelectParent="true"
cssClass="form-control required" allowClear="true" allowSearch="true"/>//-->
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">开始时间：</label>
<div class="col-sm-10 control-label text-left">
<input class="form-control required" name="beginTime" id="beginTime" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">结束时间：</label>
<div class="col-sm-10 control-label text-left">
<input class="form-control required" name="endTime" id="endTime" />
</div>
</div>
</form:form>
</div>
</div>
</script>
</body> </body>
</html> </html>
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionDetail.jsp
...@@ -109,27 +109,27 @@ ...@@ -109,27 +109,27 @@
}) })
} }
}, },
{ // {
field: 'num', // field: 'num',
title: '数量', // title: '数量',
formatter: function (value, row, index) { // formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoNumTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), { // return Mustache.render($("#ledgerInfoNumTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row, // row: row,
idx: index // idx: index
}) // })
} // }
}, // },
{ // {
field: 'infoSum', // field: 'infoSum',
title: '总价', // title: '总价',
sortName: 'infoSum', // sortName: 'infoSum',
formatter: function (value, row, index) { // formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoInfoSumTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), { // return Mustache.render($("#ledgerInfoInfoSumTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row, // row: row,
idx: index // idx: index
}) // })
} // }
}, // },
{ {
field: 'receiver.name', field: 'receiver.name',
title: '领用人', title: '领用人',
...@@ -425,6 +425,7 @@ ...@@ -425,6 +425,7 @@
auto: true, auto: true,
area: ['1200', '600'], area: ['1200', '600'],
content: $("#scanTpl").html(), content: $("#scanTpl").html(),
btn: ['确定', '关闭'],
success: function () { success: function () {
// $("#scanResult").focus(); // $("#scanResult").focus();
scanStart(); scanStart();
...@@ -436,8 +437,14 @@ ...@@ -436,8 +437,14 @@
jp.alert('至少选择一条数据'); jp.alert('至少选择一条数据');
return; return;
} }
selectDetailHandle(getScanTable(), selectTableData); if (selectTableData.some(function (e) {
top.layer.close(index); return !e.selectNum;
})) {
jp.alert('选择的数据必须填写选择数量');
return false;
}
selectDetailHandle($(selector), selectTableData);
layer.close(index);
}, },
cancel () { cancel () {
scanStop(); scanStop();
...@@ -449,32 +456,23 @@ ...@@ -449,32 +456,23 @@
var json = JSON.parse(val); var json = JSON.parse(val);
var qrCodeId = json.code; var qrCodeId = json.code;
// var params = "qrId=" + json.code; // var params = "qrId=" + json.code;
console.log(val) jp.get('${ctx}/warehouse/ledger/ledger/findByQrOrCode?qrId=' + qrCodeId, function (res) {
jp.get('${ctx}/warehouse/ledger/ledger/findByQrOrCode?qrCodeId=' + qrCodeId, function (res) {
var data = res.rows || []; var data = res.rows || [];
if (data.length) { if (data.length) {
// var item = data[0]; var item = data[0];
// //
// /*** // /***
// * 重复的物资编码去重 // * 重复的物资编码去重
// */ // */
// var fined = getTableData().find(function(v){ var fined = getSelectScanTable().find(function(v){
// return v.ledgerInfo.code === item.code return v.ledgerInfo.code === item.code
// }) })
// if(fined){ if(fined){
// jp.warning('有物资重复不能领用'); jp.warning('有物资重复不能领用');
// return; return;
// } }
// $(selector).bootstrapTable('append', [ getScanTable().bootstrapTable('append', item);
// {
// id: '',
// delFlag: 0,
// remarks: '',
// ledgerInfo: item
// }
// ]);
// $(elem).val('').focus(); // $(elem).val('').focus();
debugger
console.log(data) console.log(data)
}else{ }else{
jp.warning('未找到任何数据!'); jp.warning('未找到任何数据!');
...@@ -497,21 +495,25 @@ ...@@ -497,21 +495,25 @@
var keyList = addDetailColumns.key.split('|'); var keyList = addDetailColumns.key.split('|');
table.bootstrapTable('destroy').bootstrapTable({ table.bootstrapTable('destroy').bootstrapTable({
data: [], data: [],
columns: labelList.map(function (el, index) { columns: [
var key = keyList[index]; { checkbox: true }
return { ].concat(
title: el, labelList.map(function (el, index) {
field: keyList[index], var key = keyList[index];
formatter (v, r, i) { return {
var result = v; title: el,
if (top.gridSelectColumnFormatterMap[key]) { field: keyList[index],
result = top.gridSelectColumnFormatterMap[key].formatter(v, r, i) formatter (v, r, i) {
} var result = v;
return result; if (top.gridSelectColumnFormatterMap[key]) {
}, result = top.gridSelectColumnFormatterMap[key].formatter(v, r, i)
events: top.gridSelectColumnFormatterMap[key] ? top.gridSelectColumnFormatterMap[key].events : {} }
} return result;
}) },
events: top.gridSelectColumnFormatterMap[key] ? top.gridSelectColumnFormatterMap[key].events : {}
}
})
)
}) })
} }
...@@ -603,7 +605,7 @@ ...@@ -603,7 +605,7 @@
value="{{row.ledgerInfo.type.code}}"/> value="{{row.ledgerInfo.type.code}}"/>
</script> </script>
<script id="ledgerInfoTypeUnitTpl" type="text/html"> <script id="ledgerInfoTypeUnitTpl" type="text/html">
<input id="materialRequisitionInfoList{{idx}}_ledgerInfoTypeUnit <input id="materialRequisitionInfoList{{idx}}_ledgerInfoTypeUnit"
name="materialRequisitionInfoList[{{idx}}].ledgerInfo.type.unit" type="text" class="form-control" readonly name="materialRequisitionInfoList[{{idx}}].ledgerInfo.type.unit" type="text" class="form-control" readonly
value="{{row.ledgerInfo.type.unit}}"/> value="{{row.ledgerInfo.type.unit}}"/>
</script> </script>
...@@ -632,7 +634,7 @@ ...@@ -632,7 +634,7 @@
{{#row.receiver}} {{#row.receiver}}
<div class="sign-result"> <div class="sign-result">
<img src="{{row.receiver}}" alt="签名" width="100%" /> <img src="{{row.receiver}}" alt="签名" width="100%" />
<span class="del-sign" onclick="delSign(this, {{idx}})">&times;</span> <span class="del-sign" onclick="delSign(this, '{{idx}}')">&times;</span>
</div> </div>
{{/row.receiver}} {{/row.receiver}}
{{^row.receiver}} {{^row.receiver}}
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionForm.jsp
...@@ -154,23 +154,23 @@ ...@@ -154,23 +154,23 @@
<script type="text/template" id="scanTpl"> <script type="text/template" id="scanTpl">
<div class="scan-content"> <div class="scan-content">
<%-- <input type="text" id="scanIpt" />--%> <%-- <input type="text" id="scanIpt" />--%>
<div id="scan-searchForm-box" class="collapse show"> <%-- <div id="scan-searchForm-box" class="collapse show">--%>
<div class="accordion-inner"> <%-- <div class="accordion-inner">--%>
<form:form id="scan-searchForm" class="form form-horizontal well clearfix"> <%-- <form:form id="scan-searchForm" class="form form-horizontal well clearfix">--%>
<div class="col-xs-12 col-sm-6 col-md-4"> <%-- <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>--%>
<%-- <form:input path="code" htmlEscape="false" class=" form-control"/>--%> <%--&lt;%&ndash; <form:input path="code" htmlEscape="false" class=" form-control"/>&ndash;%&gt;--%>
<input type="text" id="scan-code" class="form-control" onfocus="scanIptGetFocusStop()" onblur="scanIptGetFocusStart()" /> <%-- <input type="text" id="scan-code" class="form-control" onfocus="scanIptGetFocusStop()" onblur="scanIptGetFocusStart()" />--%>
</div> <%-- </div>--%>
<div class="col-xs-12 col-sm-6 col-md-4"> <%-- <div class="col-xs-12 col-sm-6 col-md-4">--%>
<div style="margin-top:26px"> <%-- <div style="margin-top:26px">--%>
<a id="scan-search" class="btn btn-primary btn-rounded btn-bordered btn-sm" onclick="searchScanData()"><i class="fa fa-search"></i> 查询</a> <%-- <a id="scan-search" class="btn btn-primary btn-rounded btn-bordered btn-sm" onclick="searchScanData()"><i class="fa fa-search"></i> 查询</a>--%>
<a id="scan-reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" onclick="refreshScanData()"><i class="fa fa-refresh"></i> 重置</a> <%-- <a id="scan-reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" onclick="refreshScanData()"><i class="fa fa-refresh"></i> 重置</a>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
</form:form> <%-- </form:form>--%>
</div> <%-- </div>--%>
</div> <%-- </div>--%>
<div class="scan-data-content"> <div class="scan-data-content">
<table id="scan_detail_table"></table> <table id="scan_detail_table"></table>
</div> </div>
......
src/main/webapp/webpage/modules/warehouse/outbound/outboundDetail.jsp
...@@ -46,30 +46,50 @@ ...@@ -46,30 +46,50 @@
} }
}, },
{ {
field: 'ledgerInfo.name', field: 'ledgerInfo.code',
title: '物资名称', title: '物资编码',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoNameTpl").html(), { return Mustache.render($("#ledgerInfoCodeTpl").html(), {
row: row, row: row,
idx: index idx: index
}) })
} }
}, },
{ {
field: 'ledgerInfo.code', field: 'ledgerInfo.type.name',
title: '物资编码', title: '品名',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoCodeTpl").html(), { return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row, row: row,
idx: index idx: index
}) })
} }
}, },
{ {
field: 'ledgerInfo.type.name', field: 'ledgerInfo.type.code',
title: '品名代码', title: '代码',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoTypeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), { return Mustache.render($("#ledgerInfoTypeCodeTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
idx: index
})
}
},
{
field: 'ledgerInfo.amount',
title: '单价',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoAmountTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row,
idx: index
})
}
},
{
field: "ledgerInfo.type.unit",
title: '单位',
formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoTypeUnitTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row, row: row,
idx: index idx: index
}) })
...@@ -85,11 +105,22 @@ ...@@ -85,11 +105,22 @@
}) })
} }
}, },
// {
// field: 'ledgerInfo.amount',
// title: '单价',
// formatter: function (value, row, index) {
// return Mustache.render($("#ledgerInfoAmountTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
// row: row,
// idx: index
// })
// }
// },
{ {
field: 'ledgerInfo.amount', field: 'receiver.name',
title: '单价', title: '领用人',
align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return Mustache.render($("#ledgerInfoAmountTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), { return Mustache.render($("#receiverTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, ""), {
row: row, row: row,
idx: index idx: index
}) })
...@@ -105,15 +136,15 @@ ...@@ -105,15 +136,15 @@
}) })
} }
}, },
{ // {
field: '', // field: '',
title: '操作', // title: '操作',
formatter: function (value, row, index) { // formatter: function (value, row, index) {
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('');
} // }
} // }
] ]
}); });
} }
...@@ -284,6 +315,16 @@ ...@@ -284,6 +315,16 @@
<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}}" <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>
<script id="ledgerInfoTypeCodeTpl" type="text/html">
<input id="outboundInfoList{{idx}}_ledgerInfoTypeCode"
name="outboundInfoList[{{idx}}].ledgerInfo.type.code" type="text" class="form-control" readonly
value="{{row.ledgerInfo.type.code}}"/>
</script>
<script id="ledgerInfoTypeUnitTpl" type="text/html">
<input id="outboundInfoList{{idx}}_ledgerInfoTypeUnit"
name="outboundInfoList[{{idx}}].ledgerInfo.type.unit" type="text" class="form-control" readonly
value="{{row.ledgerInfo.type.unit}}"/>
</script>
<script id="ledgerInfoModelTpl" type="text/html"> <script id="ledgerInfoModelTpl" type="text/html">
<input id="outboundInfoList{{idx}}_ledgerInfoModel" <input id="outboundInfoList{{idx}}_ledgerInfoModel"
name="outboundInfoList[{{idx}}].ledgerInfo.model" type="text" class="form-control" readonly name="outboundInfoList[{{idx}}].ledgerInfo.model" type="text" class="form-control" readonly
...@@ -294,7 +335,19 @@ ...@@ -294,7 +335,19 @@
name="outboundInfoList[{{idx}}].ledgerInfo.amount" type="text" readonly class="form-control" name="outboundInfoList[{{idx}}].ledgerInfo.amount" type="text" readonly class="form-control"
value="{{row.ledgerInfo.amount}}"/> value="{{row.ledgerInfo.amount}}"/>
</script> </script>
<script id="receiverTpl" type="text/html">
<input type="hidden" name="outboundInfoList[{{idx}}].receiver" value="{{row.receiver}}">
<div class="sign-result">
{{#row.receiver}}
<div class="sign-result">
<img src="{{row.receiver}}" alt="签名" width="100%" />
</div>
{{/row.receiver}}
{{^row.receiver}}
暂无签名
{{/row.receiver}}
</div>
</script>
<script id="remarksTpl" type="text/html"> <script id="remarksTpl" type="text/html">
<textarea id="storageInfoList{{idx}}_remarks" name="storageInfoList[{{idx}}].remarks" rows="2" <textarea id="storageInfoList{{idx}}_remarks" name="storageInfoList[{{idx}}].remarks" rows="2"
onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea> onchange="onInputChange('{{idx}}', this, 'remarks')" class="form-control ">{{row.remarks}}</textarea>
...@@ -314,4 +367,4 @@ ...@@ -314,4 +367,4 @@
</div> </div>
</div> </div>
<br> <br>
</script> </script>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/outbound/outboundList.jsp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<h3 class="panel-title">出库信息列表</h3> <h3 class="panel-title">出库信息列表</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<!-- 搜索 --> <!-- 搜索 -->
<div id="search-collapse" class="collapse"> <div id="search-collapse" class="collapse">
<div class="accordion-inner"> <div class="accordion-inner">
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-1"> <div class="col-xs-12 col-sm-1">
~ ~
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<span class="input-group-addon"> <span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -67,11 +67,11 @@ ...@@ -67,11 +67,11 @@
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a> <a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
<a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a> <a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div> </div>
</div> </div>
</form:form> </form:form>
</div> </div>
</div> </div>
<!-- 工具栏 --> <!-- 工具栏 -->
<div id="toolbar"> <div id="toolbar">
<%-- <shiro:hasPermission name="warehouse:outbound:outbound:add">--%> <%-- <shiro:hasPermission name="warehouse:outbound:outbound:add">--%>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<%-- </button>--%> <%-- </button>--%>
<%-- </shiro:hasPermission>--%> <%-- </shiro:hasPermission>--%>
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<table id="outboundTable" data-toolbar="#toolbar"></table> <table id="outboundTable" data-toolbar="#toolbar"></table>
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
<li data-item="delete"><a>删除</a></li> <li data-item="delete"><a>删除</a></li>
</shiro:hasPermission> </shiro:hasPermission>
<li data-item="action1"><a>取消</a></li> <li data-item="action1"><a>取消</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
...@@ -432,6 +432,11 @@ ...@@ -432,6 +432,11 @@
* 点击扫码显示扫码窗口 * 点击扫码显示扫码窗口
*/ */
function addScan(){ function addScan(){
// 选择该批次号下的货品明细
if(!$("#batchNum").val()){
jp.warning('请选择批次号！');
return;
}
layer.open({ layer.open({
type: 1, type: 1,
title: '扫码', title: '扫码',
......
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