潘钊 / bsth_control · Commits

Commit 3540b11940222f2083195c5dbf188e7b8ad9d702

Authored by 徐烜
1 parent bbc0f7f7

Update

Inline Side-by-side
Showing 3 changed files with 44 additions and 8 deletions
src/main/resources/static/pages/scheduleApp/module/common/main.js
  View file @3540b11
@@ -62,8 +62,25 @@ ScheduleApp.factory('DataStore', [ @@ -62,8 +62,25 @@ ScheduleApp.factory('DataStore', [
62 function($http, $q) { 62 function($http, $q) {
63 // 本地数据存储，如车辆数据，人员数据 63 // 本地数据存储，如车辆数据，人员数据
64 var dataMap = { 64 var dataMap = {
65 - "cl": [],  
66 - "ry": [] 65 + "cl": [], // 车辆信息
  66 + "ry": [], // 人员信息
  67 + "ddreasons": [ // 调度原因（调度执勤日报里的）
  68 + {code: "0", name: "营运"},
  69 + {code: "1", name: "缺车"},
  70 + {code: "2", name: "气候"},
  71 + {code: "3", name: "肇事"},
  72 + {code: "4", name: "纠纷"},
  73 + {code: "5", name: "抽减"},
  74 + {code: "6", name: "配车"},
  75 + {code: "7", name: "故障"},
  76 + {code: "8", name: "路阻"},
  77 + {code: "9", name: "客稀"},
  78 + {code: "10", name: "吊慢"},
  79 + {code: "11", name: "其他"},
  80 + {code: "12", name: "保养"},
  81 + {code: "13", name: "缺人"},
  82 + {code: "14", name: "援外"}
  83 + ]
67 }; 84 };
68 85
69 var dataPromise_cars = function() { 86 var dataPromise_cars = function() {
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html
  View file @3540b11
@@ -46,6 +46,23 @@ @@ -46,6 +46,23 @@
46 <div class="form-body"> 46 <div class="form-body">
47 <div class="form-group"> 47 <div class="form-group">
48 <div class="col-md-5"> 48 <div class="col-md-5">
  49 + <div class="form-group">
  50 + <label class="col-md-5 control-label">营运状态：</label>
  51 + <div class="col-md-7">
  52 + <sa-Select5 name="cl2"
  53 + model="ctrl.formData"
  54 + cmaps="{'ddr': 'code'}"
  55 + dcname="ddr"
  56 + icname="code"
  57 + dsparams="{{ {type: 'local', param: 'ddreasons' } | json }}"
  58 + iterobjname="item"
  59 + iterobjexp="item.name"
  60 + searchph="请输拼音..."
  61 + searchexp="this.name"
  62 + >
  63 + </sa-Select5>
  64 + </div>
  65 + </div>
49 <div class="form-group has-success has-feedback"> 66 <div class="form-group has-success has-feedback">
50 <label class="col-md-5 control-label">车辆1*：</label> 67 <label class="col-md-5 control-label">车辆1*：</label>
51 <div class="col-md-7"> 68 <div class="col-md-7">
@@ -68,7 +85,7 @@ @@ -68,7 +85,7 @@
68 车辆1必须选择 85 车辆1必须选择
69 </div> 86 </div>
70 </div> 87 </div>
71 - <div class="form-group has-success has-feedback"> 88 + <div class="form-group">
72 <label class="col-md-5 control-label">车辆2：</label> 89 <label class="col-md-5 control-label">车辆2：</label>
73 <div class="col-md-7"> 90 <div class="col-md-7">
74 <sa-Select5 name="cl2" 91 <sa-Select5 name="cl2"
@@ -109,7 +126,7 @@ @@ -109,7 +126,7 @@
109 </div> 126 </div>
110 </div> 127 </div>
111 128
112 - <div class="form-group has-success has-feedback"> 129 + <div class="form-group">
113 <label class="col-md-5 control-label">售票员1：</label> 130 <label class="col-md-5 control-label">售票员1：</label>
114 <div class="col-md-7"> 131 <div class="col-md-7">
115 <sa-Select5 name="s1" 132 <sa-Select5 name="s1"
@@ -127,7 +144,7 @@ @@ -127,7 +144,7 @@
127 </div> 144 </div>
128 </div> 145 </div>
129 146
130 - <div class="form-group has-success has-feedback"> 147 + <div class="form-group">
131 <label class="col-md-5 control-label">驾驶员2：</label> 148 <label class="col-md-5 control-label">驾驶员2：</label>
132 <div class="col-md-7"> 149 <div class="col-md-7">
133 <sa-Select5 name="j2" 150 <sa-Select5 name="j2"
@@ -145,7 +162,7 @@ @@ -145,7 +162,7 @@
145 </div> 162 </div>
146 </div> 163 </div>
147 164
148 - <div class="form-group has-success has-feedback"> 165 + <div class="form-group">
149 <label class="col-md-5 control-label">售票员2：</label> 166 <label class="col-md-5 control-label">售票员2：</label>
150 <div class="col-md-7"> 167 <div class="col-md-7">
151 <sa-Select5 name="s2" 168 <sa-Select5 name="s2"
@@ -163,7 +180,7 @@ @@ -163,7 +180,7 @@
163 </div> 180 </div>
164 </div> 181 </div>
165 182
166 - <div class="form-group has-success has-feedback"> 183 + <div class="form-group">
167 <label class="col-md-5 control-label">驾驶员3：</label> 184 <label class="col-md-5 control-label">驾驶员3：</label>
168 <div class="col-md-7"> 185 <div class="col-md-7">
169 <sa-Select5 name="j3" 186 <sa-Select5 name="j3"
@@ -181,7 +198,7 @@ @@ -181,7 +198,7 @@
181 </div> 198 </div>
182 </div> 199 </div>
183 200
184 - <div class="form-group has-success has-feedback"> 201 + <div class="form-group">
185 <label class="col-md-5 control-label">售票员3：</label> 202 <label class="col-md-5 control-label">售票员3：</label>
186 <div class="col-md-7"> 203 <div class="col-md-7">
187 <sa-Select5 name="s3" 204 <sa-Select5 name="s3"
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js
  View file @3540b11
@@ -264,6 +264,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -264,6 +264,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
264 self.formData.j3 = {}; // 驾驶员3 264 self.formData.j3 = {}; // 驾驶员3
265 self.formData.s3 = {}; // 售票员3 265 self.formData.s3 = {}; // 售票员3
266 266
  267 + self.formData.ddr = "0"; // 调度原因，默认0-营运
  268 +
267 self.planInfos = undefined; // 排班明细 269 self.planInfos = undefined; // 排班明细
268 270
269 var sdd = new Date(); 271 var sdd = new Date();