潘钊 / bsth_control · Commits

Commit 6b20be58a5581fd3c581b111500b2dee6561ccc2

Authored by 徐烜
1 parent ee3705a0
build: skipped

QPBS-2020-0002 更新 

1、调度执勤日报修改人员，车辆时，初始会修改已有车辆人员配置（如套跑某个班次的车辆不一样，初始时会修改），修改saPlanInfoEdit2指令
2、调度执勤日报显示中ngRepeat的问题，修改指定track by
3、排班明细修改班次时，修改去除工号的前缀
Inline Side-by-side
Showing 4 changed files with 95 additions and 44 deletions
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoEdit2.js
  View file @6b20be5
... ... @@ -58,14 +58,14 @@ angular.module('ScheduleApp').directive(
58 58  
59 59 // 表单值，被赋值的次数
60 60 var form_data_assign_count = {
61   - cl1 : 1,
62   - cl2 : 1,
63   - j1 : 1,
64   - j2 : 1,
65   - j3 : 1,
66   - s1 : 1,
67   - s2 : 1,
68   - s3 : 1
  61 + cl1 : -1,
  62 + cl2 : -1,
  63 + j1 : -1,
  64 + j2 : -1,
  65 + j3 : -1,
  66 + s1 : -1,
  67 + s2 : -1,
  68 + s3 : -1
69 69 };
70 70  
71 71 return {
... ... @@ -359,7 +359,10 @@ angular.module('ScheduleApp').directive(
359 359 new_cl1 = undefined;
360 360 }
361 361  
362   - scope[ctrlAs].$$internal_refresh_dsdata_cl();
  362 + form_data_assign_count.cl1 ++;
  363 + if (form_data_assign_count.cl1 > 1) {
  364 + scope[ctrlAs].$$internal_refresh_dsdata_cl();
  365 + }
363 366 },
364 367 true
365 368 );
... ... @@ -381,7 +384,10 @@ angular.module('ScheduleApp').directive(
381 384 new_cl2 = undefined;
382 385 }
383 386  
384   - scope[ctrlAs].$$internal_refresh_dsdata_cl();
  387 + form_data_assign_count.cl2 ++;
  388 + if (form_data_assign_count.cl2 > 1) {
  389 + scope[ctrlAs].$$internal_refresh_dsdata_cl();
  390 + }
385 391 },
386 392 true
387 393 );
... ... @@ -403,8 +409,11 @@ angular.module('ScheduleApp').directive(
403 409 new_j1 = undefined;
404 410 }
405 411  
406   - scope[ctrlAs].$$internal_refresh_dsdata_j();
407   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  412 + form_data_assign_count.j1 ++;
  413 + if (form_data_assign_count.j1 > 1) {
  414 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  415 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  416 + }
408 417 },
409 418 true
410 419 );
... ... @@ -425,8 +434,12 @@ angular.module('ScheduleApp').directive(
425 434 } else {
426 435 new_s1 = undefined;
427 436 }
428   - scope[ctrlAs].$$internal_refresh_dsdata_j();
429   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  437 +
  438 + form_data_assign_count.s1 ++;
  439 + if (form_data_assign_count.s1 > 1) {
  440 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  441 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  442 + }
430 443 },
431 444 true
432 445 );
... ... @@ -448,8 +461,11 @@ angular.module('ScheduleApp').directive(
448 461 new_j2 = undefined;
449 462 }
450 463  
451   - scope[ctrlAs].$$internal_refresh_dsdata_j();
452   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  464 + form_data_assign_count.j2 ++;
  465 + if (form_data_assign_count.j2 > 1) {
  466 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  467 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  468 + }
453 469 },
454 470 true
455 471 );
... ... @@ -471,8 +487,11 @@ angular.module('ScheduleApp').directive(
471 487 new_s2 = undefined;
472 488 }
473 489  
474   - scope[ctrlAs].$$internal_refresh_dsdata_j();
475   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  490 + form_data_assign_count.s2 ++;
  491 + if (form_data_assign_count.s2 > 1) {
  492 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  493 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  494 + }
476 495 },
477 496 true
478 497 );
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @6b20be5
... ... @@ -5940,14 +5940,14 @@ angular.module('ScheduleApp').directive(
5940 5940  
5941 5941 // 表单值，被赋值的次数
5942 5942 var form_data_assign_count = {
5943   - cl1 : 1,
5944   - cl2 : 1,
5945   - j1 : 1,
5946   - j2 : 1,
5947   - j3 : 1,
5948   - s1 : 1,
5949   - s2 : 1,
5950   - s3 : 1
  5943 + cl1 : -1,
  5944 + cl2 : -1,
  5945 + j1 : -1,
  5946 + j2 : -1,
  5947 + j3 : -1,
  5948 + s1 : -1,
  5949 + s2 : -1,
  5950 + s3 : -1
5951 5951 };
5952 5952  
5953 5953 return {
... ... @@ -6241,7 +6241,10 @@ angular.module('ScheduleApp').directive(
6241 6241 new_cl1 = undefined;
6242 6242 }
6243 6243  
6244   - scope[ctrlAs].$$internal_refresh_dsdata_cl();
  6244 + form_data_assign_count.cl1 ++;
  6245 + if (form_data_assign_count.cl1 > 1) {
  6246 + scope[ctrlAs].$$internal_refresh_dsdata_cl();
  6247 + }
6245 6248 },
6246 6249 true
6247 6250 );
... ... @@ -6263,7 +6266,10 @@ angular.module('ScheduleApp').directive(
6263 6266 new_cl2 = undefined;
6264 6267 }
6265 6268  
6266   - scope[ctrlAs].$$internal_refresh_dsdata_cl();
  6269 + form_data_assign_count.cl2 ++;
  6270 + if (form_data_assign_count.cl2 > 1) {
  6271 + scope[ctrlAs].$$internal_refresh_dsdata_cl();
  6272 + }
6267 6273 },
6268 6274 true
6269 6275 );
... ... @@ -6285,8 +6291,11 @@ angular.module('ScheduleApp').directive(
6285 6291 new_j1 = undefined;
6286 6292 }
6287 6293  
6288   - scope[ctrlAs].$$internal_refresh_dsdata_j();
6289   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  6294 + form_data_assign_count.j1 ++;
  6295 + if (form_data_assign_count.j1 > 1) {
  6296 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  6297 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  6298 + }
6290 6299 },
6291 6300 true
6292 6301 );
... ... @@ -6307,8 +6316,12 @@ angular.module('ScheduleApp').directive(
6307 6316 } else {
6308 6317 new_s1 = undefined;
6309 6318 }
6310   - scope[ctrlAs].$$internal_refresh_dsdata_j();
6311   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  6319 +
  6320 + form_data_assign_count.s1 ++;
  6321 + if (form_data_assign_count.s1 > 1) {
  6322 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  6323 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  6324 + }
6312 6325 },
6313 6326 true
6314 6327 );
... ... @@ -6330,8 +6343,11 @@ angular.module('ScheduleApp').directive(
6330 6343 new_j2 = undefined;
6331 6344 }
6332 6345  
6333   - scope[ctrlAs].$$internal_refresh_dsdata_j();
6334   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  6346 + form_data_assign_count.j2 ++;
  6347 + if (form_data_assign_count.j2 > 1) {
  6348 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  6349 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  6350 + }
6335 6351 },
6336 6352 true
6337 6353 );
... ... @@ -6353,8 +6369,11 @@ angular.module('ScheduleApp').directive(
6353 6369 new_s2 = undefined;
6354 6370 }
6355 6371  
6356   - scope[ctrlAs].$$internal_refresh_dsdata_j();
6357   - scope[ctrlAs].$$internal_refresh_dsdata_s();
  6372 + form_data_assign_count.s2 ++;
  6373 + if (form_data_assign_count.s2 > 1) {
  6374 + scope[ctrlAs].$$internal_refresh_dsdata_j();
  6375 + scope[ctrlAs].$$internal_refresh_dsdata_s();
  6376 + }
6358 6377 },
6359 6378 true
6360 6379 );
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/module.js
  View file @6b20be5
... ... @@ -251,6 +251,19 @@ angular.module("ScheduleApp").controller(
251 251 // 提交方法
252 252 self.submit = function() {
253 253 // 保存或者更新
  254 +
  255 + // 修正工号，去除前缀（如：05-001122，05就是前缀，用 - 分割）
  256 + var _jGh = self.schedulePlanInfoForSave.jGh;
  257 + if (_jGh) {
  258 + _jGh = _jGh.indexOf("-") != -1 ? _jGh.split("-")[1] : _jGh;
  259 + self.schedulePlanInfoForSave.jGh = _jGh;
  260 + }
  261 + var _sGh = self.schedulePlanInfoForSave.sGh;
  262 + if (_sGh) {
  263 + _sGh = _sGh.indexOf("-") != -1 ? _sGh.split("-")[1] : _sGh;
  264 + self.schedulePlanInfoForSave.sGh = _sGh;
  265 + }
  266 +
254 267 self.schedulePlanInfoForSave.$save(function() {
255 268 self.toPlanInfoListPage();
256 269 });
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
  View file @6b20be5
... ... @@ -71,7 +71,7 @@
71 71 </tr>
72 72 </thead>
73 73 <tbody>
74   - <tr ng-repeat="info in ctrl.pageInfo.infos"
  74 + <tr ng-repeat="info in ctrl.pageInfo.infos track by info.lpName"
75 75 ng-class="{odd: true, gradeX: true, info: ctrl.isModify(info), 'row-active': ctrl.isModify(info)}" >
76 76 <td>
77 77 <div>
... ... @@ -128,21 +128,21 @@
128 128 </div>
129 129 </td>
130 130 <td>
131   - <div ng-repeat="clzbh in info.clZbhs">
  131 + <div ng-repeat="clzbh in info.clZbhs track by $index">
132 132 <a href="#">
133 133 {{clzbh}}
134 134 </a>
135 135 </div>
136 136 </td>
137 137 <td>
138   - <div ng-repeat="ccsj in info.ccsjs">
  138 + <div ng-repeat="ccsj in info.ccsjs track by $index">
139 139 <a href="#">
140 140 {{ccsj}}
141 141 </a>
142 142 </div>
143 143 </td>
144 144 <td>
145   - <div ng-repeat="jcsj in info.jcsjs">
  145 + <div ng-repeat="jcsj in info.jcsjs track by $index">
146 146 <a href="#">
147 147 {{jcsj}}
148 148 </a>
... ... @@ -151,7 +151,7 @@
151 151 <td class="container-fluid">
152 152 <div class="row">
153 153 <div style="padding-right: 0px;" class="col-md-6">
154   - <div ng-repeat="jsyname in info.jsyNames">
  154 + <div ng-repeat="jsyname in info.jsyNames track by $index">
155 155 <a href="#">
156 156 <i class="fa fa-bus" aria-hidden="true"></i>
157 157 {{jsyname}}
... ... @@ -159,7 +159,7 @@
159 159 </div>
160 160 </div>
161 161 <div style="padding-left: 0px;" class="col-md-6">
162   - <div ng-repeat="jsygh in info.jsyGhs">
  162 + <div ng-repeat="jsygh in info.jsyGhs track by $index">
163 163 <a href="#">
164 164 {{jsygh}}
165 165 </a>
... ... @@ -170,7 +170,7 @@
170 170 <td class="container-fluid">
171 171 <div class="row">
172 172 <div style="padding-right: 0px;" class="col-md-6">
173   - <div ng-repeat="spyname in info.spyNames">
  173 + <div ng-repeat="spyname in info.spyNames track by $index">
174 174 <a href="#">
175 175 <i class="fa fa-ticket" aria-hidden="true"></i>
176 176 {{spyname}}
... ... @@ -178,7 +178,7 @@
178 178 </div>
179 179 </div>
180 180 <div style="padding-left: 0px;" class="col-md-6">
181   - <div ng-repeat="spygh in info.spyGhs">
  181 + <div ng-repeat="spygh in info.spyGhs track by $index">
182 182 <a href="#">
183 183 {{spygh}}
184 184 </a>
... ...