Commit 67523b78a074c9950a1fca59a3959613a7a35002

Authored by xu
1 parent b60f5eda
Exists in master

1. 录入序列号数量必须是大于0的整数

app-ht/modules/device/views/device/createDevice.php
@@ -224,10 +224,14 @@ $(function() { @@ -224,10 +224,14 @@ $(function() {
224 } 224 }
225 production = production.split('_'); 225 production = production.split('_');
226 var num = $('#num').val(); 226 var num = $('#num').val();
227 - if ('' == num || 0 == num) {  
228 - alert('请录入生成数量'); 227 + var par = /^[0-9]+$/;
  228 + if (par.test(num) && (num > 0)) {
  229 + // 合法的
  230 + } else {
  231 + alert('请录入大于0的整数');
229 return false; 232 return false;
230 } 233 }
  234 +
231 var params = { 235 var params = {
232 manufactureId: manufacture[0], 236 manufactureId: manufacture[0],
233 manufactureNo: manufacture[1], 237 manufactureNo: manufacture[1],
@@ -259,14 +263,15 @@ $(function() { @@ -259,14 +263,15 @@ $(function() {
259 alert('请选择批次'); 263 alert('请选择批次');
260 return false; 264 return false;
261 } 265 }
262 - if ('' == append_num || 0 == append_num) {  
263 - alert('请录入数量');  
264 - return false;  
265 - }  
266 - if (append_num *1 <=0) {  
267 - alert('请录入大于0的数量'); 266 + var par = /^[0-9]+$/;
  267 + if (par.test(append_num) && (append_num > 0)) {
  268 + // 合法的
  269 + } else {
  270 + alert('请录入大于0的整数');
268 return false; 271 return false;
269 } 272 }
  273 +
  274 + return false;
270 if (append_num*1 > 3000) { 275 if (append_num*1 > 3000) {
271 alert('追加数量不要超过3000'); 276 alert('追加数量不要超过3000');
272 return false; 277 return false;
app-ht/modules/device/views/device/index.php
@@ -170,7 +170,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -170,7 +170,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
170 </tbody> 170 </tbody>
171 </table> 171 </table>
172 <div class="action-box"> 172 <div class="action-box">
173 - <label><input type="checkbox" class="check-all" value="all" /> 本页全选 </label> <button class="btn btn-primary btn-sm btn_batch_auth" >批量授权</button> <button class="btn btn-danger btn-sm btn_batch_del" >批量删除</button> 173 + <label><input type="checkbox" class="check-all" value="all" /> 本页选中<span class="select-txt"></span> </label> <button class="btn btn-primary btn-sm btn_batch_auth" >批量授权</button> <button class="btn btn-danger btn-sm btn_batch_del" >批量删除</button>
174 </div> 174 </div>
175 </div> 175 </div>
176 176
@@ -264,7 +264,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -264,7 +264,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
264 $('.check-all').click(function(e) { 264 $('.check-all').click(function(e) {
265 var checkVal = $(this).prop('checked'); 265 var checkVal = $(this).prop('checked');
266 $('.check-item').prop('checked', checkVal) 266 $('.check-item').prop('checked', checkVal)
267 - 267 + var checkedItems = $('.check-item:checked');
  268 + $('.select-txt').html(checkedItems.length +'个');
  269 + })
  270 + $('.check-item').click(function(e){
  271 + var checkedItems = $('.check-item:checked');
  272 + $('.select-txt').html(checkedItems.length +'个');
268 }) 273 })
269 $('.btn_batch_auth').click(function() { 274 $('.btn_batch_auth').click(function() {
270 var checkItems = $('.check-item:checked'); 275 var checkItems = $('.check-item:checked');