wms / wms_henanqingyuan · Commits

Commit 96e4ab1bf05092f8ea2aa84009eda1b86c4ef2ed

Authored by mahuandong
2 parents 7d7e358f 53413b9d
develop

Merge remote-tracking branch 'origin/develop' into develop

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