Commit bdbbb68223823554f7e670d98c1d6949dc296b2c
1 parent
13e341ee
update...
Showing
2 changed files
with
3 additions
and
3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| ... | ... | @@ -3391,7 +3391,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf |
| 3391 | 3391 | boolean dest2 = sch.getStatus() == -1; |
| 3392 | 3392 | if (!dest1 && dest2) { |
| 3393 | 3393 | oldSch.destroy(); |
| 3394 | - oldSch.setAdjustExps(sch.getAdjustExps()); | |
| 3395 | 3394 | aflog.log("烂班"); |
| 3396 | 3395 | } |
| 3397 | 3396 | else if(dest1 && !dest2){ |
| ... | ... | @@ -3403,6 +3402,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf |
| 3403 | 3402 | aflog.log("撤销烂班"); |
| 3404 | 3403 | } |
| 3405 | 3404 | |
| 3405 | + oldSch.setAdjustExps(sch.getAdjustExps()); | |
| 3406 | 3406 | |
| 3407 | 3407 | /** |
| 3408 | 3408 | * 修改班次里程 | ... | ... |
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/editor.html
| ... | ... | @@ -89,7 +89,7 @@ |
| 89 | 89 | <label class="uk-form-label" >售票员</label> |
| 90 | 90 | <div class="uk-form-controls"> |
| 91 | 91 | <div class="uk-autocomplete uk-form spy-autocom"> |
| 92 | - <input type="text" value="{{sch.sGh}}/{{sch.sName}}" name="spy"> | |
| 92 | + <input type="text" name="spy" value="{{sch.sGh}}/{{sch.sName}}" name="spy"> | |
| 93 | 93 | </div> |
| 94 | 94 | </div> |
| 95 | 95 | </div> |
| ... | ... | @@ -268,7 +268,7 @@ |
| 268 | 268 | data.jName = data.jsy.split('/')[1]; |
| 269 | 269 | delete data.jsy; |
| 270 | 270 | //拆分售票员工号和姓名 |
| 271 | - if(data.sGh != null){ | |
| 271 | + if(data.spy != null){ | |
| 272 | 272 | data.sGh = data.spy.split('/')[0]; |
| 273 | 273 | data.sName = data.spy.split('/')[1]; |
| 274 | 274 | delete data.spy; | ... | ... |