dkyChenJiang.git

			@@ -11,30 +11,16 @@
			<div class="select-list">
			<ul>
			<li>
			<p>出入库单子号：</p>
			<input type="text" name="code"/>
			</li>
			<li>
			<p>项目名称：</p>
			<input type="text" name="projectName"/>
			</li>
			<li>
			<p>设备名称：</p>
			<p>名称：</p>
			<input type="text" name="deviceName"/>
			</li>
			<li>
			<p>出入库类型：</p>
			<select name="type" th:with="type=${@dict.getType('device_log_type')}">
			<option value="">所有</option>
			<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
			</select>
			</li>

			<li>
			<p>经办人：</p>
			<input type="text" name="optUser"/>
			</li>
			<li>
			<p>使用人：</p>
			<p>负责人：</p>
			<input type="text" name="applyUser"/>
			</li>
			<li>
			@@ -56,9 +42,12 @@
			<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:deviceLog:remove">
			<i class="fa fa-remove"></i> 删除
			</a>
			<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:deviceLog:export">
			<i class="fa fa-download"></i> 导出
			</a>
			<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:deviceLog:export">-->
			<!-- <i class="fa fa-download"></i> 导出-->
			<!-- </a>-->
			<a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="geo:deviceLog:import">
			<i class="fa fa-upload"></i> 导入
			</a>
			</div>
			<div class="col-sm-12 select-table table-striped">
			<table id="bootstrap-table"></table>
			@@ -70,61 +59,68 @@
			var editFlag = [[${@permission.hasPermi('geo:deviceLog:edit')}]];
			var removeFlag = [[${@permission.hasPermi('geo:deviceLog:remove')}]];
			var typeDatas = [[${@dict.getType('device_log_type')}]];
			var projectId=[[${projectId}]];
			var prefix = ctx + "geo/deviceLog";

			$(function() {
			var options = {
			url: prefix + "/list",
			createUrl: prefix + "/add",
			url: prefix + "/list?projectId="+projectId,
			createUrl: prefix + "/add?projectId="+projectId,
			updateUrl: prefix + "/edit/{id}",
			removeUrl: prefix + "/remove",
			exportUrl: prefix + "/export",
			importUrl: prefix + "/importDeviceLog/"+projectId,
			modalName: "设备出入库记录",
			columns: [{
			checkbox: true
			},
			{
			field : 'id',
			field : 'id',
			title : '主键',
			visible: false
			},
			{
			field : 'code',
			title : '出入库单子号'
			field : 'code',
			title : '工单号',
			sortable:true
			},

			{
			field : 'deviceCode',
			title : '编号',
			visible: false
			},
			{
			field : 'deviceName',
			title : '名称'
			},

			{
			field : 'inboundDate',
			title : '入库时间',
			sortable:true
			},
			{
			field : 'outboundDate',
			title : '出库时间',
			sortable:true
			},
			{
			field : 'projectName',
			title : '项目名称'
			field : 'optUser',
			title : '经办人',
			sortable:true
			},
			{
			field : 'deviceName',
			title : '设备名称'
			field : 'applyUser',
			title : '负责人',
			sortable:true
			},
			{
			field : 'type',
			title : '出入库类型',
			formatter: function(value, row, index) {
			return $.table.selectDictLabel(typeDatas, value);
			}
			field : 'number',
			title : '数量'
			},
			{
			field : 'transactionDate',
			title : '出入库时间'
			},
			{
			field : 'optUser',
			title : '经办人'
			},
			{
			field : 'applyUser',
			title : '使用人'
			},
			{
			field : 'number',
			title : '出入库数量'
			},
			{
			field : 'remark',
			field : 'remark',
			title : '备注'
			},
			{
			@@ -140,6 +136,29 @@
			};
			$.table.init(options);
			});

			//下载
			function importTemplate() {
			var filename="设备出入库记录模板.xls";
			window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
			}
			</script>
			</body>

			<!-- 导入区域 -->
			<script id="importTpl" type="text/template">
			<form enctype="multipart/form-data" class="mt20 mb10">
			<div class="col-xs-offset-1">
			<input type="file" id="file" name="file"/>
			<div class="mt10 pt5">
			<input type="checkbox" id="updateSupport" name="updateSupport" title="导入设备出入库信息"> 是否更新已经存在的数据
			<a onclick="importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
			</div>
			<font color="red" class="pull-left mt10">
			提示：仅允许导入“xls”或“xlsx”格式文件！
			</font>
			</div>
			</form>
			</script>

			</html>