Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-17 8722d2bb39c6c0697647e77a879d14b28d3ef0f5

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html

@@ -15,15 +15,11 @@
                                <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>
                                <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>
@@ -34,7 +30,7 @@
                                <input type="text" name="optUser"/>
                            </li>
                            <li>
                                <p>使用人：</p>
                                <p>负责人：</p>
                                <input type="text" name="applyUser"/>
                            </li>
                            <li>
@@ -99,26 +95,32 @@
                },
                {
                    field : 'projectName',
                    title : '项目名称'
                    title : '场地名称',
                    visible: false
                },
                    {
                        field : 'deviceCode',
                        title : '设备编码'
                        title : '编号',
                        visible: false
                    },
                    {
                        field : 'deviceName',
                        title : '名称'
                    },
                {
                    field : 'deviceName',
                    title : '设备名称'
                },
                {
                    field : 'type',
                    title : '出入库类型',
                    title : '设备/材料类型',
                    formatter: function(value, row, index) {
                       return $.table.selectDictLabel(typeDatas, value);
                    }
                },
                    {
                        field : 'inboundDate',
                        title : '入库时间'
                    },
                {
                    field : 'transactionDate',
                    title : '出入库时间'
                    field : 'outboundDate',
                    title : '出库时间'
                },
                {
                    field : 'optUser',
@@ -126,11 +128,11 @@
                },
                {
                    field : 'applyUser',
                    title : '使用人'
                    title : '负责人'
                },
                {
                    field : 'number',
                    title : '出入库数量'
                    title : '数量'
                },
                {
                    field : 'remark',
@@ -164,7 +166,7 @@
        <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="导入设备出入库信息信息"> 是否更新已经存在的数据
                <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">