Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-20 c6f79f5720c5d4a700b8b759a93393559409fd1c

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

@@ -11,7 +11,7 @@
                    <div class="select-list">
                        <ul>
                            <li>
                                <p>出入库单子号：</p>
                                <p>工单号：</p>
                                <input type="text" name="code"/>
                            </li>
                            <li>
@@ -19,7 +19,7 @@
                                <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>
@@ -91,7 +91,8 @@
                },
                {
                    field : 'code',
                    title : '出入库单子号'
                    title : '工单号',
                    sortable:true
                },
                {
                    field : 'projectName',
@@ -109,26 +110,31 @@
                    },
                {
                    field : 'type',
                    title : '设备/材料类型',
                    title : '设备/材料',
                    sortable:true,
                    formatter: function(value, row, index) {
                       return $.table.selectDictLabel(typeDatas, value);
                    }
                },
                    {
                        field : 'inboundDate',
                        title : '入库时间'
                        title : '入库时间',
                        sortable:true
                    },
                {
                    field : 'outboundDate',
                    title : '出库时间'
                    title : '出库时间',
                    sortable:true
                },
                {
                    field : 'optUser',
                    title : '经办人'
                    title : '经办人',
                    sortable:true
                },
                {
                    field : 'applyUser',
                    title : '负责人'
                    title : '负责人',
                    sortable:true
                },
                {
                    field : 'number',