update

徐烜
1 parent 975edcaa
Showing 2 changed files with 17 additions and 4 deletions
src/main/java/com/bsth/service/schedule/impl/CarDeviceServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
@@ -47,6 +47,7 @@ public class CarDeviceServiceImpl extends BServiceImpl&lt;CarDevice, Long&gt; implemen
         }
         param.put("xl_eq", carDevice.getXl());
         param.put("cl_eq", carDevice.getCl());
+        param.put("isCancel_eq", false); // 未标记作废删除的
         param.put("qyrq_ge", carDevice.getQyrq());
         if (!CollectionUtils.isEmpty(list(param))) {
             throw new ScheduleException("启用日期必须比历史的启用日期大");
@@ -167,11 +167,23 @@
                 <!--</div>-->
  
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">启用日期*：</label>
+                    <label class="col-md-2 control-label">启用日期：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control"
-                               name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
-                               ng-model="ctrl.deviceInfoForSave.qyrq" readonly/>
+                        <div class="input-group">
+                            <input type="datetime-local" class="form-control" name="qyrq"
+                                   ng-model="ctrl.deviceInfoForSave.qyrq" required
+                                   remote-Validation
+                                   remotevtype="cde1"
+                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
+
+                        </div>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
+                        启用日期必须选择，精确到具体时间
+                    </div>
+                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
+                        {{$remote_msg}}
                     </div>
                 </div>