wms / wms_hainanxinyi · Commits

Commit 927652c560c66843ab5671a8b8447de70cac60ec

Authored by DESKTOP-AO0VKC8\mahua
2 parents 2ffef74a c7ab236a

Merge branch 'WMSV2-HH' of http://www.huahengrobot.com:90/wms/wms2 into develop 

 Conflicts:
	.idea/workspace.xml
	src/main/resources/static/css/style.css
	src/main/resources/templates/config/receiptPreference/edit.html
	src/main/resources/templates/task/taskHeader/taskHeader.html
Inline Side-by-side
Showing 9 changed files with 821 additions and 113 deletions
src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java
  View file @927652c
... ... @@ -179,4 +179,5 @@ public class WareHouseController extends BaseController {
179 179 public AjaxResult copySave(String newWarehouseCode) {
180 180 return toAjax(warehouseService.warehouseCopy(ShiroUtils.getWarehouseCode(), newWarehouseCode));
181 181 }
  182 +
182 183 }
... ...
src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java
  View file @927652c
... ... @@ -209,4 +209,9 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
209 209 public List<Warehouse> selectListEntityByEqual(Warehouse condition) {
210 210 return warehouseMapper.selectListEntityByEqual(condition);
211 211 }
  212 +
  213 +
  214 + public List<Warehouse> getWarehouse(){
  215 + return this.list();
  216 + }
212 217 }
... ...
src/main/resources/static/css/style.css
  View file @927652c
... ... @@ -163,7 +163,11 @@ body.body-small .navbar-top-links li:last-child {
163 163 }
164 164  
165 165 .dropdown-messages, .dropdown-alerts {
166   - padding: 10px 10px 10px 10px;
  166 + padding: 20px;
  167 + position: relative;
  168 + width: 300px;
  169 + top: 0px;
  170 + left: -100px;
167 171 }
168 172  
169 173 .dropdown-messages li a, .dropdown-alerts li a {
... ... @@ -1313,6 +1317,7 @@ button.dim:active:before {
1313 1317 .media-body {
1314 1318 display: block;
1315 1319 width: auto;
  1320 + height:60px; overflow:hidden;position: relative;top: -8px;padding-left: 20px;/*border-bottom: 1px dotted #e5e5e5;*/
1316 1321 }
1317 1322  
1318 1323 .chat-element>.pull-left {
... ... @@ -3329,11 +3334,21 @@ nav.page-tabs .page-tabs-content {
3329 3334 /*.content-tabs.xx{
3330 3335 width: 50px;
3331 3336 }*/
  3337 +.xx_box{
  3338 + position: absolute;right: 203px;top:0;width: 40px;height: 40px; text-align:center;background: #fff;border-left: solid 1px #eee;
  3339 +}
  3340 +.xx_box a.xx{
  3341 + color: #999;
  3342 + display: block;
  3343 +}
  3344 +.xx_box a:hover{
  3345 + background: #f2f2f2;
  3346 +}
3332 3347 .xx sup{
3333 3348 /*line-height: 12px;
3334 3349 padding: 2px 5px;*/
3335 3350 position: absolute;
3336   - right:6px;
  3351 + /*right:6px;*/
3337 3352 top: 5px;
3338 3353 background-color: #ed5565;
3339 3354 color: #FFFFFF;
... ... @@ -3620,15 +3635,6 @@ code {
3620 3635 }
3621 3636  
3622 3637 .ibox.collapsed .ibox-content {
3623   - background-color: #ffffff;
3624   - color: inherit;
3625   - padding: 15px 20px 20px 20px;
3626   - border-color: #e7eaec;
3627   - -webkit-border-image: none;
3628   - -o-border-image: none;
3629   - border-image: none;
3630   - border-style: solid solid none;
3631   - border-width: 1px 0px;
3632 3638 display: none;
3633 3639 }
3634 3640  
... ... @@ -7440,24 +7446,18 @@ body.skin-yellow {
7440 7446  
7441 7447 .boxdown{
7442 7448 cursor:pointer;
7443   - border:1px solid #EEEEEE;
  7449 + /*border:1px solid #EEEEEE;*/
7444 7450 width:60px;
7445 7451 height:14px;
7446 7452 background: #FFFFFF url(../img/down.png) no-repeat 20px;
7447   - margin-left:150px;
7448   - margin-top:-2px;
7449   - border-top: none;
7450 7453 margin:0 auto;
7451 7454  
7452 7455 }
7453 7456 .up{
7454 7457 cursor:pointer;
7455   - border:1px solid #EEEEEE;
  7458 + /*border:1px solid #EEEEEE;*/
7456 7459 width:60px;
7457 7460 height:14px;
7458 7461 background: #FFFFFF url(../img/up.png) no-repeat 20px;
7459   - margin-left:150px;
7460   - margin-top:-2px;
7461   - border-top: none;
7462 7462 margin:0 auto;
7463 7463 }
... ...
src/main/resources/templates/config/receiptPreference/add.html
  View file @927652c
... ... @@ -6,13 +6,21 @@
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 7 <form class="form-horizontal m" id="form-receiptPreference-add">
8 8 <div class="form-group">
9   - <label class="col-sm-3 control-label">编码：</label>
  9 + <label class="col-sm-3 control-label">仓库：</label>
  10 + <div class="col-sm-8">
  11 + <select name="warehousecode" id="warehouse" class="form-control" th:with="warehouseList=${@WarehouseService.getWarehouse()}">
  12 + <option th:each="warehouse : ${warehouseList}" th:text="${warehouse['name']}" th:value="${warehouse['code']}"></option>
  13 + </select>
  14 + </div>
  15 + </div>
  16 + <div class="form-group">
  17 + <label class="col-sm-3 control-label">首选项代码：</label>
10 18 <div class="col-sm-8">
11 19 <input id="code" name="code" class="form-control" type="text">
12 20 </div>
13 21 </div>
14 22 <div class="form-group">
15   - <label class="col-sm-3 control-label">名称：</label>
  23 + <label class="col-sm-3 control-label">首选项名字：</label>
16 24 <div class="col-sm-8">
17 25 <input id="name" name="name" class="form-control" type="text">
18 26 </div>
... ... @@ -20,9 +28,10 @@
20 28 <div class="form-group">
21 29 <label class="col-sm-3 control-label">入库流程：</label>
22 30 <div class="col-sm-8">
23   - <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}">
  31 + <select id="receiptFlow" name="receivingflow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}">
24 32 <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
25 33 </select>
  34 +
26 35 </div>
27 36 </div>
28 37 <div class="form-group">
... ... @@ -101,43 +110,59 @@
101 110 <div class="form-group">
102 111 <label class="col-sm-3 control-label">RF逐件收货：</label>
103 112 <div class="col-sm-8">
104   - <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">
  113 +<!-- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">-->
  114 + <select name="checkinByPiece" class="form-control" type="text" id="checkinByPiece">
  115 + <option value="0">否</option>
  116 + <option value="-1">是</option>
  117 + </select>
105 118 </div>
106 119 </div>
107 120 <div class="form-group">
108 121 <label class="col-sm-3 control-label">RF自动提交收货：</label>
109 122 <div class="col-sm-8">
110   - <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">
  123 +<!-- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">-->
  124 + <select id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">
  125 + <option value="0">否</option>
  126 + <option value="-1">是</option>
  127 + </select>
111 128 </div>
112 129 </div>
113 130 <div class="form-group">
114 131 <label class="col-sm-3 control-label">abc分类：</label>
115 132 <div class="col-sm-8">
116   - <input id="abcClass" name="abcClass" class="form-control" type="text">
  133 +<!-- <input id="abcClass" name="allowoverreceiving" class="form-control" type="text">-->
  134 + <select id="abcClass" name="allowoverreceiving" class="form-control" type="text">
  135 + <option value="0">否</option>
  136 + <option value="-1">是</option>
  137 + </select>
117 138 </div>
118 139 </div>
119 140 <div class="form-group">
120 141 <label class="col-sm-3 control-label">保质期（天）：</label>
121 142 <div class="col-sm-8">
122   - <input id="daysToExpire" name="daysToExpire" class="form-control" type="text">
  143 + <input id="daysToExpire" name="daystoexpire" class="form-control" type="number">
123 144 </div>
124 145 </div>
125 146 <div class="form-group">
126   - <label class="col-sm-3 control-label">临期预警（天）：</label>
  147 + <label class="col-sm-3 control-label">临期预警：</label>
127 148 <div class="col-sm-8">
128   - <input id="expiringDays" name="expiringDays" class="form-control" type="text">
  149 +<!-- <input id="expiringDays" name="expiringdays" class="form-control" type="text">-->
  150 + <select id="expiringDays" name="expiringdays" class="form-control" type="text">
  151 + <option value="0">否</option>
  152 + <option value="-1">是</option>
  153 + </select>
129 154 </div>
130 155 </div>
131 156 <div class="form-group">
132 157 <label class="col-sm-3 control-label">收货预警(天)：</label>
133 158 <div class="col-sm-8">
134   - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
  159 + <input id="minShelfLifeDays" name="minshelflifedays" class="form-control" type="number">
135 160 </div>
136 161 </div>
137 162 <div class="form-group">
138 163 <label class="col-sm-3 control-label">RF快速上架：</label>
139 164 <div class="col-sm-8">
140   - <select id="allowQuickPutaway" name="allowQuickPutaway" class="form-control">
  165 + <select id="allowQuickPutaway" name="allowquickputaway" class="form-control">
141 166 <option value="0">是</option>
142 167 <option value="1">否</option>
143 168 </select>
... ... @@ -146,13 +171,13 @@
146 171 <div class="form-group">
147 172 <label class="col-sm-3 control-label">属性模板：</label>
148 173 <div class="col-sm-8">
149   - <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">
  174 + <input id="attributeTemplateCode" name="attributetemplatecode" class="form-control" type="text">
150 175 </div>
151 176 </div>
152 177 <div class="form-group">
153 178 <label class="col-sm-3 control-label">快速入库：</label>
154 179 <div class="col-sm-8">
155   - <select id="useQuickCheckIn" name="useQuickCheckIn" class="form-control">
  180 + <select id="usequickcheckin" name="useQuickCheckIn" class="form-control">
156 181 <option value="0">是</option>
157 182 <option value="1">否</option>
158 183 </select>
... ... @@ -298,8 +323,29 @@
298 323 tableValue = formValueReplace(tableValue, "emptyLocRule", $("#emptyLocRule option:selected").val());
299 324 tableValue = formValueReplace(tableValue, "useQuickCheckIn", $("#useQuickCheckIn option:selected").val());
300 325 tableValue = formValueReplace(tableValue, "allowQuickPutaway", $("#allowQuickPutaway option:selected").val());
  326 + tableValue = formValueReplace(tableValue, "warehousecode", $("#allowQuickPutaway option:selected").val());
301 327 $.operate.save(prefix + "/add", tableValue);
302 328 }
  329 +
  330 +
  331 + });
  332 + $(function () {
  333 + $.ajax({
  334 + url: "../getWarehouseByUserCode",
  335 + type: 'post',
  336 + dataType: "json",
  337 + data: {
  338 + username: "fxh"
  339 + },
  340 + success: function (value) {
  341 + // console.log(value.data);
  342 + $("#warehouse").contents().remove();
  343 + if (value != null && value.data.length >= 1)
  344 + for (var i = 0; i < value.data.length; i++) {
  345 + $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');
  346 + }
  347 + }
  348 + })
303 349 });
304 350 </script>
305 351 </body>
... ...
src/main/resources/templates/config/receiptPreference/edit.html
  View file @927652c
... ... @@ -7,13 +7,13 @@
7 7 <form class="form-horizontal m" id="form-receiptPreference-edit" th:object="${receiptPreference}">
8 8 <input id="id" name="id" th:field="*{id}" type="hidden">
9 9 <div class="form-group">
10   - <label class="col-sm-3 control-label">编码：</label>
  10 + <label class="col-sm-3 control-label">首选项代码：</label>
11 11 <div class="col-sm-8">
12 12 <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
13 13 </div>
14 14 </div>
15 15 <div class="form-group">
16   - <label class="col-sm-3 control-label">名称：</label>
  16 + <label class="col-sm-3 control-label">首选项名字:</label>
17 17 <div class="col-sm-8">
18 18 <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
19 19 </div>
... ... @@ -103,40 +103,53 @@
103 103 <div class="form-group">
104 104 <label class="col-sm-3 control-label">RF逐件收货：</label>
105 105 <div class="col-sm-8">
106   - <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">
  106 +<!-- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">-->
  107 + <select id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">
  108 + <option value="0">否</option>
  109 + <option value="-1">是</option>
  110 + </select>
107 111 </div>
108 112 </div>
109 113 <div class="form-group">
110 114 <label class="col-sm-3 control-label">RF自动提交收货：</label>
111 115 <div class="col-sm-8">
112   - <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}">
  116 +<!-- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}">-->
  117 + <select id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}">
  118 + <option value="0">否</option>
  119 + <option value="-1">是</option>
  120 + </select>
113 121 </div>
114 122 </div>
115 123 <div class="form-group">
116 124 <label class="col-sm-3 control-label">abc分类：</label>
117 125 <div class="col-sm-8">
118   - <select id="abcClass" name="abcClass" class="form-control" th:field="*{abcClass}">
119   - <option value="0">是</option>
120   - <option value="1">否</option>
  126 +<!-- <input id="abcClass" name="allowoverreceiving" class="form-control" type="text" th:field="*{abcClass}">-->
  127 + <select id="abcClass" name="allowoverreceiving" class="form-control" type="text" th:field="*{abcClass}">
  128 + <option value="0">否</option>
  129 + <option value="-1">是</option>
121 130 </select>
122 131 </div>
123 132 </div>
124 133 <div class="form-group">
125 134 <label class="col-sm-3 control-label">保质期（天）：</label>
126 135 <div class="col-sm-8">
127   - <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}">
  136 + <input id="daysToExpire" name="daysToExpire" class="form-control" type="number" th:field="*{daysToExpire}">
128 137 </div>
129 138 </div>
130 139 <div class="form-group">
131   - <label class="col-sm-3 control-label">临期预警（天）：</label>
  140 + <label class="col-sm-3 control-label">临期预警：</label>
132 141 <div class="col-sm-8">
133   - <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
  142 +<!-- <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">-->
  143 + <select id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
  144 + <option value="0">否</option>
  145 + <option value="-1">是</option>
  146 + </select>
134 147 </div>
135 148 </div>
136 149 <div class="form-group">
137 150 <label class="col-sm-3 control-label">收货预警(天)：</label>
138 151 <div class="col-sm-8">
139   - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">
  152 + <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="number" th:field="*{minShelfLifeDays}">
140 153 </div>
141 154 </div>
142 155 <div class="form-group">
... ...
src/main/resources/templates/config/receiptPreference/list.html
  View file @927652c
1 1 <!DOCTYPE HTML>
2 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
3 3 <meta charset="utf-8">
4   -<head th:include="include :: header"></head>
  4 +<head th:include="include :: header">
  5 +
  6 +</head>
5 7 <body class="gray-bg">
6 8 <div class="container-div">
7 9 <div class="row">
... ... @@ -12,7 +14,8 @@
12 14 <ul>
13 15 <li>
14 16 <label>仓库：</label>
15   - <input type="text" name="warehousecode"/>
  17 + <select name="warehousecode" id="warehouse" >
  18 + </select>
16 19 </li>
17 20 <li>
18 21 <label>首选项代码：</label>
... ... @@ -26,13 +29,13 @@
26 29 <label>入库流程：</label>
27 30 <input type="text" name="receivingflow"/>
28 31 </li>
29   - <li class="select-time">
  32 + <li class="time">
30 33 <label>创建时间：</label>
31 34 <input type="text" class="time-input" id="startTime" placeholder="开始时间"
32   - name="params[beginCreated]"/>
  35 + name="beginCreated" />
33 36 <span>-</span>
34 37 <input type="text" class="time-input" id="endTime" placeholder="结束时间"
35   - name="params[endCreated]"/>
  38 + name="endCreated"/>
36 39 </li>
37 40  
38 41 <li>
... ... @@ -52,7 +55,10 @@
52 55 </li>
53 56 <li>
54 57 <label>自动定位：</label>
55   - <input type="text" name="autolocate"/>
  58 + <select name="autolocate">
  59 + <option value="0">否</option>
  60 + <option value="-1">是</option>
  61 + </select>
56 62 </li>
57 63 <li>
58 64 <label>RF显示未收数量：</label>
... ... @@ -76,34 +82,46 @@
76 82 </li>
77 83 <li>
78 84 <label>RF逐件收货：</label>
79   - <input type="text" name="checkinbypiece"/>
  85 + <select name="checkinbypiece">
  86 + <option value="0">否</option>
  87 + <option value="-1">是</option>
  88 + </select>
80 89 </li>
81 90 <li>
82 91 <label>RF自动提交收货：</label>
83   - <input type="text" name="piececonfirm"/>
  92 + <select name="piececonfirm">
  93 + <option value="0">否</option>
  94 + <option value="-1">是</option>
  95 + </select>
84 96 </li>
85 97 <li>
86 98 <label>abc分类：</label>
87 99 <select name="allowoverreceiving">
88   - <option value="">0否</option>
89   - <option value="-1">1是</option>
  100 + <option value="0">否</option>
  101 + <option value="-1">是</option>
90 102 </select>
91 103 </li>
92 104 <li>
93   - <label>保质期：</label>
94   - <input type="text" name="daystoexpire"/>
  105 + <label>保质期(天)：</label>
  106 + <input type="number" name="daystoexpire"/>
95 107 </li>
96 108 <li>
97 109 <label>临期预警：</label>
98   - <input type="text" name="expiringdays"/>
  110 + <select name="expiringdays">
  111 + <option value="0">否</option>
  112 + <option value="-1">是</option>
  113 + </select>
99 114 </li>
100 115 <li>
101 116 <label>收货预警(天)：</label>
102   - <input type="text" name="minshelflifedays"/>
  117 + <input type="number" name="minshelflifedays"/>
103 118 </li>
104 119 <li>
105 120 <label>RF快速上架：</label>
106   - <input type="text" name="allowquickputaway"/>
  121 + <select name="allowquickputaway">
  122 + <option value="0">否</option>
  123 + <option value="-1">是</option>
  124 + </select>
107 125 </li>
108 126 <li>
109 127 <label>属性模板：</label>
... ... @@ -111,7 +129,10 @@
111 129 </li>
112 130 <li>
113 131 <label>快速入库：</label>
114   - <input type="text" name="usequickcheckin"/>
  132 + <select name="usequickcheckin">
  133 + <option value="0">否</option>
  134 + <option value="-1">是</option>
  135 + </select>
115 136 </li>
116 137 <li>
117 138 <label>创建用户：</label>
... ... @@ -119,7 +140,10 @@
119 140 </li>
120 141 <li>
121 142 <label>更新用户：</label>
122   - <input type="text" name="lastupdatedby"/>
  143 + <select name="lastupdatedby">
  144 + <option value="0">否</option>
  145 + <option value="-1">是</option>
  146 + </select>
123 147 </li>
124 148  
125 149 <p style=" float:right;text-align: right; padding:10px 50px 0 0">
... ... @@ -281,6 +305,7 @@
281 305  
282 306 </div>
283 307 <div th:include="include :: footer"></div>
  308 +
284 309 <script th:inline="javascript">
285 310 var editFlag = [[${@permission.hasPermi('task:receiptPreference:edit')}]];
286 311 var removeFlag = [[${@permission.hasPermi('task:receiptPreference:remove')}]];
... ... @@ -305,105 +330,321 @@
305 330 field: 'warehousecode',
306 331 title: '仓库'
307 332 },
  333 + // {
  334 + // field: 'warehousecode',
  335 + // title: '仓库',
  336 + // width: "10%",
  337 + // formatter: function (value, row, index) {
  338 + // var data = [{ index: index, warehousecode: value }];
  339 + // return $("#javaTypeTpl").tmpl(data).html();
  340 + // }
  341 + // },
308 342 {
309 343 field: 'code',
310 344 title: '首选项代码'
311 345 },
  346 + // {
  347 + // field: 'name',
  348 + // title: '首选项名字'
  349 + // },
312 350 {
313 351 field: 'name',
314   - title: '首选项名字'
  352 + title: '首选项名字',
  353 + width: "10%",
  354 + formatter: function (value, row, index) {
  355 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  356 + return html;
  357 + }
315 358 },
  359 + // {
  360 + // field: 'receivingflow',
  361 + // title: '入库流程'
  362 + // },
316 363 {
317 364 field: 'receivingflow',
318   - title: '入库流程'
  365 + title: '入库流程',
  366 + width: "10%",
  367 + formatter: function (value, row, index) {
  368 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  369 + return html;
  370 + }
319 371 },
  372 + // {
  373 + // field: 'autoassignlpn',
  374 + // title: '自动生成托盘号'
  375 + // },
320 376 {
321 377 field: 'autoassignlpn',
322   - title: '自动生成托盘号'
  378 + title: '自动生成托盘号',
  379 + width: "10%",
  380 + formatter: function (value, row, index) {
  381 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  382 + return html;
  383 + }
323 384 },
  385 + // {
  386 + // field: 'allowoverreceiving',
  387 + // title: '允许超收'
  388 + // },
324 389 {
325 390 field: 'allowoverreceiving',
326   - title: '允许超收'
  391 + title: '允许超收',
  392 + width: "10%",
  393 + formatter: function (value, row, index) {
  394 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  395 + return html;
  396 + }
327 397 },
  398 + // {
  399 + // field: 'allowoverreceivingqty',
  400 + // title: '允许超收范围'
  401 + // },
328 402 {
329 403 field: 'allowoverreceivingqty',
330   - title: '允许超收范围'
  404 + title: '允许超收范围',
  405 + width: "10%",
  406 + formatter: function (value, row, index) {
  407 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  408 + return html;
  409 + }
331 410 },
  411 + // {
  412 + // field: 'autolocate',
  413 + // title: '自动定位'
  414 + // },
332 415 {
333 416 field: 'autolocate',
334   - title: '自动定位'
  417 + title: '自动定位',
  418 + width: "5%",
  419 + formatter: function (value, row, index) {
  420 + var isCheck = value == 1 ? 'checked' : '';
  421 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  422 + return html;
  423 + }
335 424 },
  425 + // {
  426 + // field: 'showopenqty',
  427 + // title: 'RF显示未收数量'
  428 + // },
336 429 {
337 430 field: 'showopenqty',
338   - title: 'RF显示未收数量'
  431 + title: 'RF显示未收数量',
  432 + width: "10%",
  433 + formatter: function (value, row, index) {
  434 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  435 + return html;
  436 + }
339 437 },
  438 +
  439 + // {
  440 + // field: 'groupputaway',
  441 + // title: 'RF组车收货'
  442 + // },
340 443 {
341 444 field: 'groupputaway',
342   - title: 'RF组车收货'
  445 + title: 'RF组车收货',
  446 + width: "5%",
  447 + formatter: function (value, row, index) {
  448 + var isCheck = value == 1 ? 'checked' : '';
  449 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  450 + return html;
  451 + }
343 452 },
  453 + // {
  454 + // field: 'manuallybuildlpn',
  455 + // title: '人工组盘'
  456 + // },
344 457 {
345 458 field: 'manuallybuildlpn',
346   - title: '人工组盘'
  459 + title: '人工组盘',
  460 + width: "10%",
  461 + formatter: function (value, row, index) {
  462 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  463 + return html;
  464 + }
347 465 },
  466 + // {
  467 + // field: 'locationrule',
  468 + // title: '定位规则'
  469 + // },
348 470 {
349 471 field: 'locationrule',
350   - title: '定位规则'
  472 + title: '定位规则',
  473 + width: "10%",
  474 + formatter: function (value, row, index) {
  475 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  476 + return html;
  477 + }
351 478 },
  479 + // {
  480 + // field: 'emptylocrule',
  481 + // title: '空库位规则'
  482 + // },
352 483 {
353 484 field: 'emptylocrule',
354   - title: '空库位规则'
  485 + title: '空库位规则',
  486 + width: "10%",
  487 + formatter: function (value, row, index) {
  488 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  489 + return html;
  490 + }
355 491 },
  492 + // {
  493 + // field: 'checkinbypiece',
  494 + // title: 'RF逐件收货'
  495 + // },
356 496 {
357 497 field: 'checkinbypiece',
358   - title: 'RF逐件收货'
  498 + title: 'RF逐件收货',
  499 + width: "5%",
  500 + formatter: function (value, row, index) {
  501 + var isCheck = value == 1 ? 'checked' : '';
  502 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  503 + return html;
  504 + }
359 505 },
  506 + // {
  507 + // field: 'piececonfirm',
  508 + // title: 'RF自动提交收货'
  509 + // },
360 510 {
361 511 field: 'piececonfirm',
362   - title: 'RF自动提交收货'
  512 + title: 'RF自动提交收货',
  513 + width: "5%",
  514 + formatter: function (value, row, index) {
  515 + var isCheck = value == 1 ? 'checked' : '';
  516 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  517 + return html;
  518 + }
363 519 },
  520 + // {
  521 + // field: 'abcclass',
  522 + // title: 'abc分类 0 否 1是'
  523 + // },
364 524 {
365 525 field: 'abcclass',
366   - title: 'abc分类 0 否 1是'
  526 + title: 'abc分类',
  527 + width: "5%",
  528 + formatter: function (value, row, index) {
  529 + var isCheck = value == 1 ? 'checked' : '';
  530 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  531 + return html;
  532 + }
367 533 },
  534 + // {
  535 + // field: 'daystoexpire',
  536 + // title: '保质期'
  537 + // },
368 538 {
369 539 field: 'daystoexpire',
370   - title: '保质期'
  540 + title: '保质期',
  541 + width: "10%",
  542 + formatter: function (value, row, index) {
  543 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  544 + return html;
  545 + }
371 546 },
  547 + // {
  548 + // field: 'expiringdays',
  549 + // title: '临期预警'
  550 + // },
372 551 {
373 552 field: 'expiringdays',
374   - title: '临期预警'
  553 + title: '临期预警',
  554 + width: "5%",
  555 + formatter: function (value, row, index) {
  556 + var isCheck = value == 1 ? 'checked' : '';
  557 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  558 + return html;
  559 + }
375 560 },
  561 + // {
  562 + // field: 'minshelflifedays',
  563 + // title: '收货预警(天)'
  564 + // },
376 565 {
377 566 field: 'minshelflifedays',
378   - title: '收货预警(天)'
  567 + title: '收货预警(天)',
  568 + width: "10%",
  569 + formatter: function (value, row, index) {
  570 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  571 + return html;
  572 + }
379 573 },
  574 + // {
  575 + // field: 'allowquickputaway',
  576 + // title: 'RF快速上架'
  577 + // },
380 578 {
381 579 field: 'allowquickputaway',
382   - title: 'RF快速上架'
  580 + title: 'RF快速上架',
  581 + width: "5%",
  582 + formatter: function (value, row, index) {
  583 + var isCheck = value == 1 ? 'checked' : '';
  584 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  585 + return html;
  586 + }
383 587 },
  588 + // {
  589 + // field: 'attributetemplatecode',
  590 + // title: '属性模板'
  591 + // },
384 592 {
385 593 field: 'attributetemplatecode',
386   - title: '属性模板'
  594 + title: '属性模板',
  595 + width: "10%",
  596 + formatter: function (value, row, index) {
  597 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  598 + return html;
  599 + }
387 600 },
  601 + // {
  602 + // field: 'usequickcheckin',
  603 + // title: '快速入库'
  604 + // },
388 605 {
389 606 field: 'usequickcheckin',
390   - title: '快速入库'
  607 + title: '快速入库',
  608 + width: "10%",
  609 + formatter: function (value, row, index) {
  610 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  611 + return html;
  612 + }
391 613 },
392 614 {
393 615 field: 'created',
394 616 title: '创建时间'
395 617 },
  618 + // {
  619 + // field: 'createdby',
  620 + // title: '创建用户'
  621 + // },
396 622 {
397 623 field: 'createdby',
398   - title: '创建用户'
399   - },
400   - {
401   - field: 'lastupdated',
402   - title: '创建时间'
  624 + title: '创建用户',
  625 + width: "10%",
  626 + formatter: function (value, row, index) {
  627 + var html = $.common.sprintf("<input class='form-control' type='text' name='columns[%s].columnComment' value='%s'>", index, $.common.nullToStr(value));
  628 + return html;
  629 + }
403 630 },
  631 + // {
  632 + // field: 'lastupdated',
  633 + // title: '创建时间'
  634 + // },
  635 + // {
  636 + // field: 'lastupdatedby',
  637 + // title: '更新用户'
  638 + // },
404 639 {
405 640 field: 'lastupdatedby',
406   - title: '更新用户'
  641 + title: '更新用户',
  642 + width: "5%",
  643 + formatter: function (value, row, index) {
  644 + var isCheck = value == 1 ? 'checked' : '';
  645 + var html = $.common.sprintf("<label class='check-box'><input type='checkbox' name='columns[%s].isInsert' value='1' %s></label>", index, isCheck);
  646 + return html;
  647 + }
407 648 },
408 649  
409 650 {
... ... @@ -417,11 +658,7 @@
417 658 }]
418 659 };
419 660 $.table.init(options);
420   - });
421   -</script>
422   -<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
423   -<script>
424   - $(document).ready(function(){
  661 +
425 662 var a =$(".box2 ul li:gt(3):not(:last)");
426 663 a.hide();
427 664 $(".boxdown").click(function(){
... ... @@ -433,7 +670,28 @@
433 670 $(this).addClass('up');
434 671 }
435 672 });
  673 +
  674 +
  675 + $.ajax({
  676 + url: "../getWarehouseByUserCode",
  677 + type: 'post',
  678 + dataType: "json",
  679 + data: {
  680 + username: "fxh"
  681 + },
  682 + success: function (value) {
  683 + // console.log(value.data);
  684 + $("#warehouse").contents().remove();
  685 + if (value != null && value.data.length >= 1)
  686 + for (var i = 0; i < value.data.length; i++) {
  687 + $('<option value=' + value.data[i].id + ' code=' + value.data[i].code + '>' + value.data[i].name + '</option>').appendTo('#warehouse');
  688 + }
  689 + }
  690 + })
  691 +
436 692 });
  693 +
  694 +
437 695 </script>
438 696 </body>
439 697 </html>
440 698 \ No newline at end of file
... ...
src/main/resources/templates/index.html
  View file @927652c
... ... @@ -18,6 +18,14 @@
18 18 <link th:href="@{/css/animate.css}" rel="stylesheet"/>
19 19 <link th:href="@{/css/style.css}" rel="stylesheet"/>
20 20 <link th:href="@{/huaheng/css/huahengUI.min.css?v=2.3.0}" rel="stylesheet"/>
  21 + <style type="text/css">
  22 + .dropdown-menu .divider {
  23 + height: 1px;
  24 + margin: 0px 0 10px 0;
  25 + overflow: hidden;
  26 + background-color: #e5e5e5;
  27 + }
  28 + </style>
21 29 </head>
22 30 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden" th:classappend="${@config.getKey('sys.index.skinName')}">
23 31 <div id="wrapper">
... ... @@ -102,10 +110,65 @@
102 110 <button class="roll-nav roll-right tabRight0">
103 111 <i class="fa fa-forward"></i>
104 112 </button>
105   - <button class="roll-nav roll-right tabRight xx">
106   - <i class="fa fa-envelope"></i><sup></sup>
107   - <!--<span class="label label-primary">8</span>-->
108   - </button>
  113 + <!--<button class="roll-nav roll-right tabRight xx">
  114 + <a href="#" data-toggle="dropdown"> <i class="fa fa-envelope"></i><sup></sup></a>
  115 + &lt;!&ndash;<span class="label label-primary">8</span>&ndash;&gt;
  116 + </button>-->
  117 + <!--消息-->
  118 + <div class="xx_box">
  119 + <a class="dropdown-toggle count-info xx" data-toggle="dropdown" href="#">
  120 + <i class="fa fa-envelope"></i> <sup></sup> <!--<span class="label label-warning">16</span>-->
  121 + </a>
  122 + <ul class="dropdown-menu dropdown-messages">
  123 + <li>
  124 + <div class="dropdown-messages-box">
  125 + <a href="profile.html" class="pull-left">
  126 + <img alt="image" class="img-circle" src="http://cn.inspinia.cn/html/inspiniaen/img/a7.jpg">
  127 + </a>
  128 + <div class="media-body" style="">
  129 + <small class="pull-right">46小时前</small>
  130 + <strong>小明</strong> 评论了 <strong>小红</strong>. <br>
  131 + <small class="text-muted" style="position: relative;top:-20px">2017.10.06 7:58</small>
  132 + </div>
  133 + </div>
  134 + </li>
  135 + <li class="divider"></li>
  136 + <li>
  137 + <div class="dropdown-messages-box">
  138 + <a href="profile.html" class="pull-left">
  139 + <img alt="image" class="img-circle" src="http://cn.inspinia.cn/html/inspiniaen/img/a4.jpg">
  140 + </a>
  141 + <div class="media-body ">
  142 + <small class="pull-right text-navy">5小时前</small>
  143 + <strong>小红</strong> 打电话给了 <strong>小黑</strong>. <br>
  144 + <small class="text-muted" style="position: relative;top:-20px">2017.10.06 7:58</small>
  145 + </div>
  146 + </div>
  147 + </li>
  148 + <li class="divider"></li>
  149 + <li>
  150 + <div class="dropdown-messages-box">
  151 + <a href="profile.html" class="pull-left">
  152 + <img alt="image" class="img-circle" src="http://cn.inspinia.cn/html/inspiniaen/img/profile.jpg">
  153 + </a>
  154 + <div class="media-body ">
  155 + <small class="pull-right">23小时前</small>
  156 + <strong>小黑</strong> 点赞了 <strong>小红</strong>. <br>
  157 + <small class="text-muted" style="position: relative;top:-20px">2017.10.06 7:58</small>
  158 + </div>
  159 + </div>
  160 + </li>
  161 + <li class="divider"></li>
  162 + <li>
  163 + <div class="text-center link-block">
  164 + <a href="mailbox.html">
  165 + <i class="fa fa-envelope"></i> <strong>阅读所有消息</strong>
  166 + </a>
  167 + </div>
  168 + </li>
  169 + </ul>
  170 + </div>
  171 + <!--消息-->
109 172 <div class="btn-group roll-nav roll-right">
110 173 <button class="dropdown J_tabClose" data-toggle="dropdown">
111 174 页签操作<span class="caret"></span>
... ...
src/main/resources/templates/inventory/cycleCountHeader/cyclecountHeader.html 0 → 100644
  View file @927652c
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="col-sm-12 select-info">
  9 + <ul id="myTab" class="nav nav-tabs">
  10 + <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
  11 + <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
  12 + </ul>
  13 + <div id="myTabContent" class="tab-content">
  14 + <div class="tab-pane fade in active" id="tabHeader">
  15 + <div class="col-sm-12 select-info">
  16 + <form id="cycleHeader-form">
  17 + <div class="select-list">
  18 + <ul>
  19 + <li>
  20 + 盘点主单ID：<input type="text" name="id"/>
  21 + </li>
  22 + <li>
  23 + 源盘点单号：<input type="text" name="sourceCode"/>
  24 + </li>
  25 + <li>
  26 + 盘点单编码：<input type="text" name="code"/>
  27 + </li>
  28 + <li>
  29 + 原始盘点ID：<input type="text" name="countOrderId"/>
  30 + </li>
  31 + <li>
  32 + 盘点单类型：<select name="countType"
  33 + th:with="firstStatus=${@dict.getType('cyclecountType')}">
  34 + <option value="">所有</option>
  35 + <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}"
  36 + th:value="${e['dictValue']}"></option>
  37 + </select>
  38 + </li>
  39 + <li>
  40 + 盘点单状态：<select name="statusCyc"
  41 + th:with="lastStatus=${@dict.getType('cyclecountStatus')}">
  42 + <option value="">所有</option>
  43 + <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
  44 + th:value="${e['dictValue']}"></option>
  45 + </select>
  46 + </li>
  47 + <li class="time">
  48 + <label>创建时间： </label>
  49 + <input type="text" class="time-input" id="startTime" placeholder="开始时间"
  50 + name="createdBegin"/>
  51 + <span>-</span>
  52 + <input type="text" class="time-input" id="endTime" placeholder="结束时间"
  53 + name="createdEnd"/>
  54 + </li>
  55 + <li>
  56 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
  57 + class="fa fa-search"></i>&nbsp;搜索</a>
  58 + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('cycleHeader-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
  59 + </li>
  60 + </ul>
  61 + </div>
  62 + </form>
  63 + </div>
  64 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  65 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
  66 + shiro:hasPermission="inventory:cycleCountHeader:add">
  67 + <i class="fa fa-plus"></i> 新增
  68 + </a>
  69 + <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
  70 + shiro:hasPermission="inventory:cycleCountHeader:remove">
  71 + <i class="fa fa-trash-o"></i> 删除
  72 + </a>-->
  73 + </div>
  74 + <table id="bootstrap-table" data-mobile-responsive="true"
  75 + class="table table-bordered table-hover"></table>
  76 + </div>
  77 + <div class="tab-pane fade" id="tabDetail"></div>
  78 + </div>
  79 + </div>
  80 +
  81 + </div>
  82 +</div>
  83 +<div th:include="include :: footer"></div>
  84 +<script th:inline="javascript">
  85 + var reportFlag = [[${@permission.hasPermi('inventory:cycleCountHeader:report')}]];
  86 + //var editFlag = [[${@permission.hasPermi('inventory:cycleCountHeader:edit')}]];
  87 + var addAdjust = [[${@permission.hasPermi('inventory:cyclecountHead:addAdjust')}]];
  88 + var removeFlag = [[${@permission.hasPermi('inventory:cycleCount:remove')}]];
  89 + var prefix = ctx + "inventory/cycleCountHeader";
  90 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  91 + var types = [[${@dict.getType('cyclecountType')}]];
  92 + var cyclecountStatus = [[${@dict.getType('cyclecountStatus')}]];
  93 + var ifs = [[${@dict.getType('false_and_true')}]];
  94 + $(function () {
  95 + var options = {
  96 + url: prefix + "/list",
  97 + createUrl: prefix + "/add",
  98 + updateUrl: prefix + "/edit/{id}",
  99 + removeUrl: prefix + "/remove",
  100 + modalName: "盘点单主",
  101 + sortName: "created",
  102 + sortOrder: "desc",
  103 + search: false,
  104 + onDblClickRow:function(row){
  105 + detail(row.id,row.masterCode);
  106 + },
  107 + columns: [{
  108 + checkbox: true
  109 + },
  110 + {
  111 + field: 'id',
  112 + title: 'ID',
  113 + sortable: true
  114 + },
  115 + {
  116 + field: 'code',
  117 + title: '盘点单编码'
  118 + },
  119 + {
  120 + field: 'warehouseCode',
  121 + title: '仓库',
  122 + visible: false
  123 + },
  124 + {
  125 + field: 'companyCode',
  126 + title: '货主编码'
  127 + },
  128 + {
  129 + field: 'round',
  130 + title: ' 盘点轮次',
  131 + visible: false
  132 + },
  133 + {
  134 + field: 'sourceCode',
  135 + title: '源盘点单'
  136 + },
  137 +
  138 + {
  139 + field: 'countOrderId',
  140 + title: '原始盘点内部号'
  141 + },
  142 +
  143 + {
  144 + field: 'totalLocs',
  145 + title: '总货位数'
  146 + },
  147 + {
  148 + field: 'totalItems',
  149 + title: '总物料数'
  150 + },
  151 + {
  152 + field: 'zoneCode',
  153 + title: '指定区域'
  154 + },
  155 + {
  156 + field: 'locationFilter',
  157 + title: '库位条件(模糊)',
  158 + visible: false
  159 + },
  160 + {
  161 + field: 'releasedBy',
  162 + title: '释放人',
  163 + visible: false
  164 + },
  165 + {
  166 + field: 'releasedAt',
  167 + title: '释放时间',
  168 + visible: false
  169 + },
  170 + {
  171 + field: 'closedBy',
  172 + title: '关闭人',
  173 + visible: false
  174 + },
  175 + {
  176 + field: 'closedAt',
  177 + title: '关闭时间',
  178 + visible: false
  179 + },
  180 + {
  181 + field: 'countType',
  182 + title: '盘点单类型',
  183 + align: 'center',
  184 + formatter: function (value, row, index) {
  185 + return $.table.selectDictLabel(types, value);
  186 + },
  187 + sortable: true
  188 + },
  189 + {
  190 + field: 'statusCyc',
  191 + title: '盘点主单状态',
  192 + formatter: function(value, row, index) {
  193 + return $.table.selectDictLabel(cyclecountStatus, value);
  194 + },
  195 + visible: true
  196 + },
  197 + {
  198 + field: 'verifyBy',
  199 + title: '审核人'
  200 + },
  201 + {
  202 + field: 'uploadTime',
  203 + title: '上传时间',
  204 + visible: false
  205 + },
  206 + {
  207 + field: 'uploadStatus',
  208 + title: '上传状态',
  209 + align: 'center',
  210 + formatter: function (value, row, index) {
  211 + return $.table.selectDictLabel(ifs, value);
  212 + }
  213 + },
  214 + {
  215 + field: 'version',
  216 + title: '数据版本',
  217 + visible: false
  218 + },
  219 + {
  220 + field: 'created',
  221 + title: '创建时间',
  222 + formatter: function (created, row, index) { //去除时间中间的T
  223 + return created.replace("T", " ");
  224 + }
  225 + },
  226 + {
  227 + field: 'createdBy',
  228 + title: '创建用户'
  229 + },
  230 + {
  231 + field: 'lastUpdated',
  232 + title: '更新时间',
  233 + formatter: function (lastUpdated, row, index) { //去除时间中间的T
  234 + return lastUpdated.replace("T", " ");
  235 + }
  236 + },
  237 + {
  238 + field: 'lastUpdatedBy',
  239 + title: '更新用户'
  240 + },
  241 + {
  242 + field: 'enable',
  243 + title: '是否有效',
  244 + align: 'center',
  245 + formatter: function (value, row, index) {
  246 + return $.table.selectDictLabel(datas, value);
  247 + }
  248 + },
  249 + {
  250 + field: 'remark',
  251 + title: '备注',
  252 + visible: true
  253 + },
  254 + // {
  255 + // field : 'userDef1',
  256 + // title : '自定义字段1'
  257 + // },
  258 + // {
  259 + // field : 'userDef2',
  260 + // title : '自定义字段2'
  261 + // },
  262 + // {
  263 + // field : 'userDef3',
  264 + // title : '自定义字段3'
  265 + // },
  266 + {
  267 + title: '操作',
  268 + align: 'center',
  269 + formatter: function (value, row, index) {
  270 + var actions = [];
  271 + actions.push('<a class="btn btn-success btn-xs ' + reportFlag + '" href="#" onclick="cyclecountPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
  272 + if(row.statusCyc === 100){
  273 + actions.push('<a class="btn btn-warning btn-xs ' + addAdjust + '" href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成调整单</a> ');
  274 + }
  275 + //actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  276 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
  277 + return actions.join('');
  278 + }
  279 + }]
  280 + };
  281 + $.table.init(options);
  282 + $("#myTab li:eq(1)").click(function () {
  283 + // var cyc_id = $("#bootstrap-table tr:eq(1) td:eq(1)").text();
  284 + // var cyc_code = $("#bootstrap-table tr:eq(1) td:eq(2)").text();
  285 + detail();
  286 + });
  287 + });
  288 +
  289 + function detail(id,code) {
  290 + let url = ctx + "inventory/cycleCountDetail";
  291 + if (code) {
  292 + url = ctx + "inventory/cycleCountDetail?cycleCountHeadCode=" + code;
  293 + }
  294 + $("#tabDetail").children().remove();
  295 + $("#myTab li").removeClass("active");
  296 + var height = $(document).height() - 100 + 'px';
  297 + var str = '<iframe class="huaheng_iframe" name="iframe" width="100%" height="' + height + '" src="' + url + '" frameborder="0" data-id="' + url + '" seamless></iframe>';
  298 + $("#tabDetail").empty();
  299 + $("#tabDetail").append(str);
  300 + $(".tab-pane").removeClass("in active");
  301 + $("#myTab li:eq(1)").addClass("active");
  302 + $("#tabDetail").addClass("in active");
  303 + }
  304 +
  305 + //盘点单打印
  306 + function cyclecountPrint(id) {
  307 + var url = prefix + "/report/" + id;
  308 + $.modal.open("盘点单打印", url);
  309 + }
  310 +
  311 + //生成差异调整单
  312 + function goAdjust(id) {
  313 + var url = prefix + "/goAdjust";
  314 + var data = {"id": id};
  315 + postInner(url, data);
  316 + }
  317 +
  318 + function postInner(url, data) {
  319 + $.modal.loading("正在处理中，请稍后...");
  320 + $.ajax({
  321 + url: url,
  322 + type: "post",
  323 + data: data,
  324 + success: function (result) {
  325 + if (result.code == web_status.SUCCESS) {
  326 + $.modal.msgSuccess(result.msg);
  327 + //update();
  328 + $("button [name = 'refresh']").click(); //点击事件成功后刷新
  329 + } else {
  330 + $.modal.alertError(result.msg);
  331 + }
  332 + $.modal.closeLoading();
  333 + }
  334 + })
  335 + }
  336 +</script>
  337 +</body>
  338 +</html>
0 339 \ No newline at end of file
... ...
src/main/resources/templates/task/taskHeader/taskHeader.html
  View file @927652c
... ... @@ -152,7 +152,6 @@
152 152 sortName: "lastUpdated",
153 153 sortOrder: "desc",
154 154 search: false,
155   - uniqueId: "id",
156 155 clickToSelect:true,
157 156 queryParams: queryParams,
158 157 columns: [{
... ... @@ -183,7 +182,7 @@
183 182 {
184 183 field : 'companyCode',
185 184 title : '货主编码',
186   - visible: false
  185 + visible:false
187 186 },
188 187 {
189 188 field : 'taskType',
... ... @@ -522,22 +521,7 @@
522 521 orderByColumn: params.sort,
523 522 isAsc: params.order
524 523 };
525   - }
526   -
527   - function print() {
528   - let rows = $("#bootstrap-table").bootstrapTable('getSelections');
529   - if ($.common.isEmpty(rows)) {
530   - $.modal.alertWarning("请至少选择一条记录");
531   - return;
532   - }
533   - let ids = rows[0].id;
534   - for(let i = 1; i < rows.length; i++) {
535   - ids = ids + "," + rows[i].id;
536   - }
537   -
538   - let url = ctx + 'task/taskDetail/report/' + ids;
539   - $.modal.open("入库铭牌打印" , url);
540   - }
  524 + };
541 525 </script>
542 526 </body>
543 527 </html>
544 528 \ No newline at end of file
... ...