~luxiaotao1123/zy-asrs.git

parent: 294ab3f5 | 补丁 | 提交 | show whitespace

luxiaotao1123

2020-07-02 38aa8e55618752b5ef6bf9de0570a57027a4dbd8

3个文件已修改

	src/main/webapp/static/js/trayCode/trayCode.js	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/trayCode/trayCode.html	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/trayCode/trayCode_detail.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/webapp/static/js/trayCode/trayCode.js

@@ -20,25 +20,25 @@
        cols: [[
            {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'id', align: 'center',title: '编号'}
//             ,{field: 'id', align: 'center',title: '编号'}
            ,{field: 'trayNo', align: 'center',title: '序列号'}
            ,{field: 'start', align: 'center',title: '起始', templet:function(row){
                    var html = "<input value='start' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    var html = "<input value='start' type='checkbox' disabled='disabled' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.start === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'end', align: 'center',title: '终止', templet:function(row){
                    var html = "<input value='end' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.end === 'Y'){html += " checked ";}
            ,{field: 'finish', align: 'center',title: '终止', templet:function(row){
                    var html = "<input value='finish' type='checkbox' disabled='disabled' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.finish === 'Y'){html += " checked ";}
                    html += ">";
                    return html;
                }}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer'}
            ,{field: 'memo', align: 'center',title: '备注', hide:true}
            // ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            // ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer'}
            ,{field: 'appeTime$', align: 'center',title: '添加时间'}
            ,{field: 'appeUser$', align: 'center',title: '添加人员',event: 'appeUser', style: 'cursor:pointer'}
            ,{field: 'appeUser$', align: 'center',title: '添加人员'}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
        ]],
@@ -114,46 +114,6 @@
                    end: function () {
                    }
                });
                break;
            case 'addData':
                layer.open({
                    type: 2,
                    title: '新增',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    content: 'trayCode_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
                        clearFormVal(layer.getChildFrame('#detail', index));
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                    }
                });
                break;
            case 'deleteData':
                var data = checkStatus.data;
                if (data.length === 0){
                    layer.msg('请选择数据');
                } else {
                    layer.confirm('确定删除'+(data.length===1?'此':data.length)+'条数据吗', function(){
                        $.ajax({
                            url: baseUrl+"/trayCode/delete/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: {param: JSON.stringify(data)},
                            method: 'POST',
                            traditional:true,
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                }
                            }
                        })
                    });
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
@@ -337,7 +297,7 @@
            id: $('#id').val(),
            trayNo: $('#trayNo').val(),
            start: $('#start').val(),
            end: $('#end').val(),
            finish: $('#finish').val(),
            memo: $('#memo').val(),
            modiTime: top.strToDate($('#modiTime\\$').val()),
            modiUser: $('#modiUser').val(),

 src/main/webapp/views/trayCode/trayCode.html

@@ -16,29 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="modiUser" class="layui-input" name="modi_user" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="修改人员" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline cool-auto-complete">
            <input id="appeUser" class="layui-input" name="appe_user" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="添加人员" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
            <input class="layui-input" type="text" name="tray_no" placeholder="序列号" autocomplete="off">
        </div>
    </div>


 src/main/webapp/views/trayCode/trayCode_detail.html

@@ -44,7 +44,7 @@
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">终　　止：</label>
            <div class="layui-input-inline">
                <input id="end" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
                <input id="finish" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
@@ -53,13 +53,13 @@
                <input id="memo" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">修改时间：</label>
            <div class="layui-input-inline">
                <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">修改人员：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="modiUser" class="layui-input" type="text" lay-verify="number"  style="display: none">

			@@ -20,25 +20,25 @@
			cols: [[
			{type: 'checkbox'}
			// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
			,{field: 'id', align: 'center',title: '编号'}
			// ,{field: 'id', align: 'center',title: '编号'}
			,{field: 'trayNo', align: 'center',title: '序列号'}
			,{field: 'start', align: 'center',title: '起始', templet:function(row){
			var html = "<input value='start' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
			var html = "<input value='start' type='checkbox' disabled='disabled' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
			if(row.start === 'Y'){html += " checked ";}
			html += ">";
			return html;
			}}
			,{field: 'end', align: 'center',title: '终止', templet:function(row){
			var html = "<input value='end' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
			if(row.end === 'Y'){html += " checked ";}
			,{field: 'finish', align: 'center',title: '终止', templet:function(row){
			var html = "<input value='finish' type='checkbox' disabled='disabled' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
			if(row.finish === 'Y'){html += " checked ";}
			html += ">";
			return html;
			}}
			,{field: 'memo', align: 'center',title: '备注'}
			,{field: 'modiTime$', align: 'center',title: '修改时间'}
			,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer'}
			,{field: 'memo', align: 'center',title: '备注', hide:true}
			// ,{field: 'modiTime$', align: 'center',title: '修改时间'}
			// ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer'}
			,{field: 'appeTime$', align: 'center',title: '添加时间'}
			,{field: 'appeUser$', align: 'center',title: '添加人员',event: 'appeUser', style: 'cursor:pointer'}
			,{field: 'appeUser$', align: 'center',title: '添加人员'}

			,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
			]],
			@@ -114,46 +114,6 @@
			end: function () {
			}
			});
			break;
			case 'addData':
			layer.open({
			type: 2,
			title: '新增',
			maxmin: true,
			area: [top.detailWidth, top.detailHeight],
			content: 'trayCode_detail.html',
			success: function(layero, index){
			layer.getChildFrame('#data-detail-submit-edit', index).hide();
			clearFormVal(layer.getChildFrame('#detail', index));
			layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
			}
			});
			break;
			case 'deleteData':
			var data = checkStatus.data;
			if (data.length === 0){
			layer.msg('请选择数据');
			} else {
			layer.confirm('确定删除'+(data.length===1?'此':data.length)+'条数据吗', function(){
			$.ajax({
			url: baseUrl+"/trayCode/delete/auth",
			headers: {'token': localStorage.getItem('token')},
			data: {param: JSON.stringify(data)},
			method: 'POST',
			traditional:true,
			success: function (res) {
			if (res.code === 200){
			layer.closeAll();
			tableReload(false);
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			} else {
			layer.msg(res.msg)
			}
			}
			})
			});
			}
			break;
			case 'exportData':
			layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
			@@ -337,7 +297,7 @@
			id: $('#id').val(),
			trayNo: $('#trayNo').val(),
			start: $('#start').val(),
			end: $('#end').val(),
			finish: $('#finish').val(),
			memo: $('#memo').val(),
			modiTime: top.strToDate($('#modiTime\\$').val()),
			modiUser: $('#modiUser').val(),

			@@ -16,29 +16,7 @@
			<div id="search-box" class="layui-form layui-card-header">
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline cool-auto-complete">
			<input id="modiUser" class="layui-input" name="modi_user" type="text" placeholder="请输入" autocomplete="off" style="display: none">
			<input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="修改人员" onfocus=this.blur()>
			<div class="cool-auto-complete-window">
			<input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
			<select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
			</select>
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline cool-auto-complete">
			<input id="appeUser" class="layui-input" name="appe_user" type="text" placeholder="请输入" autocomplete="off" style="display: none">
			<input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="添加人员" onfocus=this.blur()>
			<div class="cool-auto-complete-window">
			<input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
			<select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
			</select>
			</div>
			<input class="layui-input" type="text" name="tray_no" placeholder="序列号" autocomplete="off">
			</div>
			</div>

			@@ -44,7 +44,7 @@
			<div class="layui-inline" style="width:31%;">
			<label class="layui-form-label">终　　止：</label>
			<div class="layui-input-inline">
			<input id="end" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
			<input id="finish" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
			</div>
			</div>
			<div class="layui-inline" style="width:31%;">
			@@ -53,13 +53,13 @@
			<input id="memo" class="layui-input" type="text">
			</div>
			</div>
			<div class="layui-inline" style="width:31%;">
			<div class="layui-inline" style="width:31%;display: none">
			<label class="layui-form-label">修改时间：</label>
			<div class="layui-input-inline">
			<input id="modiTime$" class="layui-input" type="text" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline" style="width:31%;">
			<div class="layui-inline" style="width:31%;display: none">
			<label class="layui-form-label">修改人员：</label>
			<div class="layui-input-inline cool-auto-complete">
			<input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">