Commit 96e4ab1bf05092f8ea2aa84009eda1b86c4ef2ed
Merge remote-tracking branch 'origin/develop' into develop
Showing
24 changed files
with
27 additions
and
4 deletions
src/main/resources/mybatis/task/TaskHeaderMapper.xml
src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
| ... | ... | @@ -62,6 +62,7 @@ |
| 62 | 62 | <li> |
| 63 | 63 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i |
| 64 | 64 | class="fa fa-search"></i> 搜索</a> |
| 65 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('cycleHeader-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 65 | 66 | </li> |
| 66 | 67 | </ul> |
| 67 | 68 | </div> |
| ... | ... |
src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
| ... | ... | @@ -63,6 +63,7 @@ |
| 63 | 63 | <li> |
| 64 | 64 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i |
| 65 | 65 | class="fa fa-search"></i> 搜索</a> |
| 66 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('cycleHeader-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 66 | 67 | </li> |
| 67 | 68 | </ul> |
| 68 | 69 | </div> |
| ... | ... |
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
| ... | ... | @@ -47,6 +47,7 @@ |
| 47 | 47 | <li> |
| 48 | 48 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i |
| 49 | 49 | class="fa fa-search"></i> 搜索</a> |
| 50 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('inventoryHeader-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 50 | 51 | </li> |
| 51 | 52 | </ul> |
| 52 | 53 | </div> |
| ... | ... |
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
| ... | ... | @@ -73,6 +73,7 @@ |
| 73 | 73 | </li> |
| 74 | 74 | <li> |
| 75 | 75 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 76 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('inventory-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 76 | 77 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="general:inventoryHeader:export"><i class="fa fa-download"></i> 导出</a>--> |
| 77 | 78 | </li> |
| 78 | 79 | </ul> |
| ... | ... |
src/main/resources/templates/monitor/errorlog/errorlog.html
| ... | ... | @@ -22,6 +22,7 @@ |
| 22 | 22 | </li> |
| 23 | 23 | <li> |
| 24 | 24 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 25 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('logininfor-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 25 | 26 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:logininfor:export"><i class="fa fa-download"></i> 导出</a>--> |
| 26 | 27 | </li> |
| 27 | 28 | </ul> |
| ... | ... |
src/main/resources/templates/monitor/job/job.html
| ... | ... | @@ -25,6 +25,7 @@ |
| 25 | 25 | </li> |
| 26 | 26 | <li> |
| 27 | 27 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 28 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('job-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 28 | 29 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:job:export"><i class="fa fa-download"></i> 导出</a>--> |
| 29 | 30 | </li> |
| 30 | 31 | </ul> |
| ... | ... |
src/main/resources/templates/monitor/logininfor/logininfor.html
| ... | ... | @@ -31,6 +31,7 @@ |
| 31 | 31 | </li> |
| 32 | 32 | <li> |
| 33 | 33 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 34 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('logininfor-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 34 | 35 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:logininfor:export"><i class="fa fa-download"></i> 导出</a>--> |
| 35 | 36 | </li> |
| 36 | 37 | </ul> |
| ... | ... |
src/main/resources/templates/monitor/online/online.html
| ... | ... | @@ -19,6 +19,7 @@ |
| 19 | 19 | </li> |
| 20 | 20 | <li> |
| 21 | 21 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 22 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('online-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 22 | 23 | </li> |
| 23 | 24 | </ul> |
| 24 | 25 | </div> |
| ... | ... |
src/main/resources/templates/monitor/operlog/operlog.html
| ... | ... | @@ -34,6 +34,7 @@ |
| 34 | 34 | </li> |
| 35 | 35 | <li> |
| 36 | 36 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 37 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('operlog-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 37 | 38 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="monitor:logininfor:export"><i class="fa fa-download"></i> 导出</a>--> |
| 38 | 39 | </li> |
| 39 | 40 | </ul> |
| ... | ... |
src/main/resources/templates/receipt/receiptHeaderHistory/receiptHeaderHistory.html
| ... | ... | @@ -49,6 +49,7 @@ |
| 49 | 49 | </li> |
| 50 | 50 | <li> |
| 51 | 51 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 52 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('receiptHeader-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 52 | 53 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i> 导出</a>--> |
| 53 | 54 | </li> |
| 54 | 55 | </ul> |
| ... | ... |
src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html
| ... | ... | @@ -29,6 +29,7 @@ |
| 29 | 29 | </li> |
| 30 | 30 | <li> |
| 31 | 31 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 32 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('containerType-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 32 | 33 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>--> |
| 33 | 34 | </li> |
| 34 | 35 | </ul> |
| ... | ... |
src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html
| ... | ... | @@ -50,6 +50,7 @@ |
| 50 | 50 | </li> |
| 51 | 51 | <li> |
| 52 | 52 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 53 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('shipmentContainerHeader-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 53 | 54 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i> 导出</a>--> |
| 54 | 55 | </li> |
| 55 | 56 | </ul> |
| ... | ... |
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
| ... | ... | @@ -72,6 +72,7 @@ |
| 72 | 72 | <li> |
| 73 | 73 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i |
| 74 | 74 | class="fa fa-search"></i> 搜索</a> |
| 75 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('receiptHeader-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 75 | 76 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i> 导出</a>--> |
| 76 | 77 | </li> |
| 77 | 78 | </ul> |
| ... | ... |
src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
| ... | ... | @@ -72,6 +72,7 @@ |
| 72 | 72 | <li> |
| 73 | 73 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i |
| 74 | 74 | class="fa fa-search"></i> 搜索</a> |
| 75 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('shipmentHeaderHistory-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 75 | 76 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i> 导出</a>--> |
| 76 | 77 | </li> |
| 77 | 78 | </ul> |
| ... | ... |
src/main/resources/templates/shipment/wave/wave.html
| ... | ... | @@ -23,6 +23,7 @@ |
| 23 | 23 | </li> |
| 24 | 24 | <li> |
| 25 | 25 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 26 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('wave-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 26 | 27 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>--> |
| 27 | 28 | </li> |
| 28 | 29 | </ul> |
| ... | ... |
src/main/resources/templates/system/config/config.html
| ... | ... | @@ -30,7 +30,8 @@ |
| 30 | 30 | <!--</li>--> |
| 31 | 31 | <li> |
| 32 | 32 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 33 | - <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:config:export"><i class="fa fa-download"></i> 导出</a>--> | |
| 33 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('config-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 34 | + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:config:export"><i class="fa fa-download"></i> 导出</a>--> | |
| 34 | 35 | </li> |
| 35 | 36 | </ul> |
| 36 | 37 | </div> |
| ... | ... |
src/main/resources/templates/system/dept/dept.html
| ... | ... | @@ -21,6 +21,7 @@ |
| 21 | 21 | </li> |
| 22 | 22 | <li> |
| 23 | 23 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.treeTable.search()"><i class="fa fa-search"></i> 搜索</a> |
| 24 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('dept-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 24 | 25 | </li> |
| 25 | 26 | </ul> |
| 26 | 27 | </div> |
| ... | ... |
src/main/resources/templates/system/dict/type/type.html
| ... | ... | @@ -44,6 +44,7 @@ |
| 44 | 44 | <!--</li>--> |
| 45 | 45 | <li> |
| 46 | 46 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 47 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('type-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 47 | 48 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:dict:export"><i class="fa fa-download"></i> 导出</a>--> |
| 48 | 49 | </li> |
| 49 | 50 | </ul> |
| ... | ... |
src/main/resources/templates/system/menu/menu.html
| ... | ... | @@ -21,6 +21,7 @@ |
| 21 | 21 | </li> |
| 22 | 22 | <li> |
| 23 | 23 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.treeTable.search()"><i class="fa fa-search"></i> 搜索</a> |
| 24 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('menu-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 24 | 25 | </li> |
| 25 | 26 | </ul> |
| 26 | 27 | </div> |
| ... | ... |
src/main/resources/templates/system/notice/notice.html
| ... | ... | @@ -24,6 +24,7 @@ |
| 24 | 24 | </li> |
| 25 | 25 | <li> |
| 26 | 26 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 27 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('notice-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 27 | 28 | </li> |
| 28 | 29 | </ul> |
| 29 | 30 | </div> |
| ... | ... |
src/main/resources/templates/system/role/role.html
| ... | ... | @@ -31,7 +31,8 @@ |
| 31 | 31 | <!--</li>--> |
| 32 | 32 | <li> |
| 33 | 33 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 34 | - <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>--> | |
| 34 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('role-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 35 | + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>--> | |
| 35 | 36 | </li> |
| 36 | 37 | </ul> |
| 37 | 38 | </div> |
| ... | ... |
src/main/resources/templates/system/user/user.html
| ... | ... | @@ -58,7 +58,8 @@ |
| 58 | 58 | <!--</li>--> |
| 59 | 59 | <li> |
| 60 | 60 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 61 | - <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export"><i class="fa fa-download"></i> 导出</a>--> | |
| 61 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('user-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 62 | + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export"><i class="fa fa-download"></i> 导出</a>--> | |
| 62 | 63 | </li> |
| 63 | 64 | </ul> |
| 64 | 65 | </div> |
| ... | ... |
src/main/resources/templates/task/taskHeader/taskHeader.html
| ... | ... | @@ -79,6 +79,7 @@ |
| 79 | 79 | |
| 80 | 80 | <li> |
| 81 | 81 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
| 82 | + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('task-form')"><i class="fa fa-refresh"></i> 重置</a> | |
| 82 | 83 | <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i> 导出</a>--> |
| 83 | 84 | </li> |
| 84 | 85 | </ul> |
| ... | ... |