fanxw %!s(int64=5) %!d(string=hai) anos
pai
achega
4320d39ace

+ 1 - 1
src/main/resources/static/app/system/controller/orgCtrl.js

@@ -244,7 +244,7 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
244 244
     },"纬度格式不正确或者范围在中国之外!");
245 245
     
246 246
     $.validator.addMethod("validPhone",function(value,element, params) {
247
-    	var checkNumber = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/;  
247
+    	var checkNumber = /^((0\d{2,3}-\d{7,8})|(1\d{10}))$/;  
248 248
     	return this.optional(element)||(checkNumber.test(value));  
249 249
     },"手机号或座机号不正确!");
250 250
     

+ 13 - 4
src/main/resources/static/app/system/views/org-edit.html

@@ -244,7 +244,7 @@
244 244
                                                 <multi-select-tree
245 245
                                                     data-input-model="grainAttributeTreeData" 
246 246
                                                     data-output-model="orgInfo.depotClass"
247
-                                                    data-default-label="--粮食性质--" 
247
+                                                    data-default-label="--库点类别--" 
248 248
                                                     select-only-leafs="true"
249 249
                                                     name="depotClass" 
250 250
                                                     multi-select="false" >
@@ -275,19 +275,28 @@
275 275
 										<section class="col col-4">
276 276
 											<label class="label">设计仓容(T)<span style="color: red;">*</span></label> 
277 277
 											<label class="input"> 
278
-												<input type="text" name="designCapacity" ng-model="orgInfo.designCapacity" maxlength="8" validNumber=true required>
278
+												<input type="text" name="designCapacity" ng-model="orgInfo.designCapacity" maxlength="9" 
279
+												oninput="if(value.length>9) value=value.slice(0,9)"  
280
+                                                onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
281
+												required>
279 282
 											</label>
280 283
 										</section>
281 284
 										<section class="col col-4">
282 285
 											<label class="label">有效仓容(T)<span style="color: red;">*</span></label> 
283 286
 											<label class="input"> 
284
-												<input type="text" name="effectiveCapacity" ng-model="orgInfo.effectiveCapacity" maxlength="8" validNumber=true required>
287
+												<input type="text" name="effectiveCapacity" ng-model="orgInfo.effectiveCapacity" maxlength="9" 
288
+												oninput="if(value.length>9) value=value.slice(0,9)"  
289
+                                                onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
290
+												required>
285 291
 											</label>
286 292
 										</section>
287 293
 										<section class="col col-4">
288 294
 											<label class="label">有效罐容(T)<span style="color: red;">*</span></label> 
289 295
 											<label class="input"> 
290
-												<input type="text" name="yxgr" ng-model="orgInfo.yxgr" maxlength="8" required>
296
+												<input type="text" name="yxgr" ng-model="orgInfo.yxgr" maxlength="9" 
297
+												oninput="if(value.length>9) value=value.slice(0,9)"  
298
+                                                onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
299
+												required>
291 300
 											</label>
292 301
 										</section>
293 302
 									</div>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 133955 - 133955
src/main/resources/static/build/app.js