潘钊 / bsth_control · Commits

Commit 59088a697b24193c55598c4dba53efe7efcd8f39

Authored by 潘钊
1 parent ee217951

update...

Inline Side-by-side
Showing 3 changed files with 4 additions and 3 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @59088a6
@@ -853,6 +853,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -853,6 +853,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
853 rs.put("msg", "未烂班，无法撤销！"); 853 rs.put("msg", "未烂班，无法撤销！");
854 } else { 854 } else {
855 sch.setStatus(0); 855 sch.setStatus(0);
  856 + sch.setRemarks("");//清空备注
856 rs.put("status", ResponseCode.SUCCESS); 857 rs.put("status", ResponseCode.SUCCESS);
857 rs.put("t", sch); 858 rs.put("t", sch);
858 859
@@ -1058,7 +1059,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -1058,7 +1059,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
1058 //修改班次里程 1059 //修改班次里程
1059 String jhlc = map.get("jhlc"); 1060 String jhlc = map.get("jhlc");
1060 if (StringUtils.isNotEmpty(jhlc) 1061 if (StringUtils.isNotEmpty(jhlc)
1061 - && Double.parseDouble(jhlc) != sch.getJhlc()) { 1062 + /*&& Double.parseDouble(jhlc) != sch.getJhlc()*/) {
1062 sch.setJhlc(Double.parseDouble(jhlc)); 1063 sch.setJhlc(Double.parseDouble(jhlc));
1063 } 1064 }
1064 } 1065 }
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
  View file @59088a6
@@ -141,7 +141,7 @@ @@ -141,7 +141,7 @@
141 <div class="uk-form-row"> 141 <div class="uk-form-row">
142 <label class="uk-form-label" >里程</label> 142 <label class="uk-form-label" >里程</label>
143 <div class="uk-form-controls"> 143 <div class="uk-form-controls">
144 - <input type="text" value="{{if sch.status==-1}}0{{else}}{{sch.jhlc}}{{/if}}" name="jhlc" > 144 + <input type="text" value="{{if sch.status==-1}}0{{else}}{{sch.jhlc}}{{/if}}" name="jhlc" required>
145 </div> 145 </div>
146 </div> 146 </div>
147 </div> 147 </div>
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
  View file @59088a6
@@ -132,7 +132,7 @@ var gb_schedule_context_menu = (function () { @@ -132,7 +132,7 @@ var gb_schedule_context_menu = (function () {
132 }, modal_opts); 132 }, modal_opts);
133 }, 133 },
134 cxzx: function (sch) { 134 cxzx: function (sch) {
135 - if (!sch.zdsjActual) 135 + if (!sch.zdsjActual && !sch.fcsjActual)
136 return notify_err('车辆未执行，无法撤销执行！'); 136 return notify_err('车辆未执行，无法撤销执行！');
137 137
138 var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>的实达时间?</h3>' 138 var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>的实达时间?</h3>'