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