|
|
@@ -9,7 +9,6 @@
|
|
9
|
9
|
<h2 class="page-title">[[${title}]]</h2>
|
|
10
|
10
|
</div>
|
|
11
|
11
|
</div>
|
|
12
|
|
-<<<<<<< HEAD
|
|
13
|
12
|
<div class="panel" style="position: relative; z-index: 20;">
|
|
14
|
13
|
<div class="panel-body search-bar">
|
|
15
|
14
|
<!--<span id="schSpan"
|
|
|
@@ -32,44 +31,6 @@
|
|
32
|
31
|
<input type="hidden" id="searchCols" />
|
|
33
|
32
|
<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
|
|
34
|
33
|
id="ordinary">搜索</a></span>
|
|
35
|
|
-=======
|
|
36
|
|
- </div>
|
|
37
|
|
- <div class="panel" style="position: relative; z-index: 20;">
|
|
38
|
|
- <div class="panel-body search-bar">
|
|
39
|
|
- <!--<span id="schSpan"
|
|
40
|
|
- class="input-group"> <span class="input-group-addon">
|
|
41
|
|
- <span class="pull-right" id="schCol_span">
|
|
42
|
|
- </span> </span> <input type="text" name="schVal" id="schVal" value=""
|
|
43
|
|
- class="form-control "><input type="hidden" id="searchCols" />
|
|
44
|
|
- <span class="input-group-btn"> <a class="btn btn-primary"
|
|
45
|
|
- onclick="queryDatas()" id="ordinary"><i class="icon icon-search"></i>搜索</a>
|
|
46
|
|
- </span>
|
|
47
|
|
- </span>-->
|
|
48
|
|
- <span id="schSpan" class="input-group">
|
|
49
|
|
- <span class="input-group-addon" id="selSapn" style="display:none"></span>
|
|
50
|
|
- <select data-placeholder="请选择查询项..." class="chosen-select form-control" tabindex="2" multiple="" id="schSel"
|
|
51
|
|
- style="display:none">
|
|
52
|
|
-
|
|
53
|
|
- </select>
|
|
54
|
|
- <span class="input-group-addon" id="schCol_span"></span>
|
|
55
|
|
- <input type="text" name="schVal" id="schVal" value="" class="form-control ">
|
|
56
|
|
- <input type="hidden" id="searchCols" />
|
|
57
|
|
- <span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
|
|
58
|
|
- id="ordinary">搜索</a></span>
|
|
59
|
|
- </span>
|
|
60
|
|
- </div>
|
|
61
|
|
- </div>
|
|
62
|
|
- <div class="panel">
|
|
63
|
|
- <div class="panel-body">
|
|
64
|
|
- <div class="editBar" id="schBar">
|
|
65
|
|
- <span class="btn-group" id="btnSpan">
|
|
66
|
|
- <!-- th:if="${haveAuth != null && haveAuth == '1'}" -->
|
|
67
|
|
- <a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
|
|
68
|
|
- <a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
|
|
69
|
|
- <a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a>
|
|
70
|
|
-<<<<<<< HEAD
|
|
71
|
|
->>>>>>> 65812a86a026ec058d29ed8cafd8100ff63f9bbe
|
|
72
|
|
-=======
|
|
73
|
34
|
</span>
|
|
74
|
35
|
|
|
75
|
36
|
</div>
|
