update...

潘钊
1 parent 8acd915c
Showing 5 changed files with 41 additions and 20 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_custom.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_in_out.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/editor.html
@@ -3308,6 +3308,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         boolean dest2 = sch.getStatus() == -1;
         if (!dest1 && dest2) {
             oldSch.destroy();
+            oldSch.setAdjustExps(sch.getAdjustExps());
             aflog.log("烂班");
         }
         else if(dest1 && !dest2){
@@ -3315,6 +3316,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             oldSch.setJhlc(oldSch.getJhlcOrig());
             oldSch.setStatus(0);
             oldSch.calcStatus();
+            oldSch.setAdjustExps(null);
             aflog.log("撤销烂班");
         }
  
@@ -1695,4 +1695,8 @@ dl.active&gt;dd.disabled{
 #change_user_options-modal .user_info{
     width: 360px;
     margin: auto;
+}
+
+.display_hide{
+    display: none;
 }
 \ No newline at end of file
@@ -92,8 +92,8 @@
                             return;
                         }
                         var data = dataArray[i];
-                        //里程为0的不保存
-                        if(data.mileage==0){
+                        //营运里程为0的不保存
+                        if(data.mileageType == 'service' && data.mileage==0){
                             i++;
                             f();
                         }
@@ -293,7 +293,7 @@
                         }
                         var data = dataArray[i];
                         //里程为0的不保存
-                        if(data.mileage==0){
+                        if(data.mileageType == 'service' && data.mileage==0){
                             i++;
                             f();
                         }
@@ -34,14 +34,14 @@
     </div>
  
     <script id="history-sch-edit-form-temp" type="text/html">
-        <input type="hidden" name="id" value="{{id}}"/>
+        <input type="hidden" name="id" value="{{sch.id}}"/>
  
         <div class="uk-grid">
             <div class="uk-width-1-3">
                 <div class="uk-form-row">
                     <label class="uk-form-label" >班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" data-code="{{bcType}}" name="bcType" data-group=ScheduleType></select>
+                        <select class="form-control nt-dictionary" data-code="{{sch.bcType}}" name="bcType" data-group=ScheduleType></select>
                     </div>
                 </div>
             </div>
@@ -69,7 +69,7 @@
                     <label class="uk-form-label" >车辆</label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete uk-form car-autocom">
-                            <input type="text" value="{{clZbh}}" name="clZbh" required>
+                            <input type="text" value="{{sch.clZbh}}" name="clZbh" required>
                         </div>
                     </div>
                 </div>
@@ -79,7 +79,7 @@
                     <label class="uk-form-label" >驾驶员</label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete uk-form jsy-autocom">
-                            <input type="text" value="{{jGh}}/{{jName}}" name="jsy" required>
+                            <input type="text" value="{{sch.jGh}}/{{sch.jName}}" name="jsy" required>
                         </div>
                     </div>
                 </div>
@@ -89,7 +89,7 @@
                     <label class="uk-form-label" >售票员</label>
                     <div class="uk-form-controls">
                         <div class="uk-autocomplete uk-form spy-autocom">
-                            <input type="text" value="{{sGh}}/{{sName}}" name="spy">
+                            <input type="text" value="{{sch.sGh}}/{{sch.sName}}" name="spy">
                         </div>
                     </div>
                 </div>
@@ -101,7 +101,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >计发</label>
                     <div class="uk-form-controls">
-                        <input type="time"  value="{{fcsj}}" disabled>
+                        <input type="time"  value="{{sch.fcsj}}" disabled>
                     </div>
                 </div>
             </div>
@@ -109,7 +109,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >待发</label>
                     <div class="uk-form-controls">
-                        <input type="time" name="dfsj"  value="{{dfsj}}" required>
+                        <input type="time" name="dfsj"  value="{{sch.dfsj}}" required>
                     </div>
                 </div>
             </div>
@@ -117,7 +117,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >实发</label>
                     <div class="uk-form-controls">
-                        <input type="time" name="fcsjActual"  value="{{fcsjActual}}" >
+                        <input type="time" name="fcsjActual"  value="{{sch.fcsjActual}}" >
                     </div>
                 </div>
             </div>
@@ -128,7 +128,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >里程</label>
                     <div class="uk-form-controls">
-                        <input type="text" name="jhlc" value="{{jhlc}}" max=222 data-fv-lessthan-inclusive="false"
+                        <input type="text" name="jhlc" value="{{sch.jhlc}}" max=222 data-fv-lessthan-inclusive="false"
                                required>
                     </div>
                 </div>
@@ -137,7 +137,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >计达</label>
                     <div class="uk-form-controls">
-                        <input type="time"  value="{{zdsj}}" disabled>
+                        <input type="time"  value="{{sch.zdsj}}" disabled>
                     </div>
                 </div>
             </div>
@@ -145,7 +145,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >实达</label>
                     <div class="uk-form-controls">
-                        <input type="time" name="zdsjActual" value="{{zdsjActual}}" >
+                        <input type="time" name="zdsjActual" value="{{sch.zdsjActual}}" >
                     </div>
                 </div>
             </div>
@@ -155,17 +155,28 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" ></label>
                     <label>
-                        &nbsp;<input class="i-cbox destroy-box" type="checkbox" name="status" value="-1" {{if status==-1}}checked{{/if}}>
+                        &nbsp;<input class="i-cbox destroy-box" type="checkbox" name="status" value="-1" {{if sch.status==-1}}checked{{/if}}>
                         是否烂班
                     </label>
                 </div>
+
+                <div class="uk-form-row adjust_exps_select_wrap {{if sch.status!=-1}}display_hide{{/if}}" >
+                    <label class="uk-form-label" >烂班原因</label>
+                    <div class="uk-form-controls">
+                        <select name="adjustExps">
+                            {{each adjustExps as exp i}}
+                            <option value="{{exp}}" {{if sch.adjustExps==exp}}selected{{/if}}>{{exp}}</option>
+                            {{/each}}
+                        </select>
+                    </div>
+                </div>
             </div>
  
             <div class="uk-width-2-3">
                 <div class="uk-form-row ct-stacked">
                     <label class="uk-form-label" >备注</label>
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="20" rows="3" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="100" placeholder="备注">{{remarks}}</textarea>
+                        <textarea id="form-s-t" cols="20" rows="3" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="100" placeholder="备注">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -214,7 +225,7 @@
             var modal = '#history-sch-edit-modal'
                     ,gb_sch,parentModal;
             var stationRoutes, parks, information;
-
+            var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 var id = data.id;
@@ -223,7 +234,7 @@
                 $.get('/realSchedule/'+id, function (sch) {
                     gb_sch = sch;
  
-                    var htmlStr = template('history-sch-edit-form-temp', sch);
+                    var htmlStr = template('history-sch-edit-form-temp', {sch: sch, adjustExps: adjustExps});
                     $('form.sch_form', modal).html(htmlStr);
                     //子任务列表
                     sch.cTasks.sort(sub_task_sort);
@@ -239,10 +250,14 @@
                     var f = $('form.sch_form', modal).formValidation(gb_form_validation_opts);
                     //是否烂班
                     $('[name=status]', f).on('click', function () {
-                        if(this.checked)
+                        if(this.checked){
                             $('[name=jhlc]', f).val(0);
-                        else
+                            $('.adjust_exps_select_wrap', f).show();
+                        }
+                        else{
                             $('[name=jhlc]', f).val(gb_sch.jhlcOrig);
+                            $('.adjust_exps_select_wrap', f).hide();
+                        }
                     });
                     f.on('success.form.fv', function(e) {
                         e.preventDefault();