Commit 20eddb98bb509e90f241a661235b85c72e587220
Merge branch 'PSM-10' into minhang
Showing
1 changed file
with
3 additions
and
3 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
| @@ -2250,11 +2250,11 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [ | @@ -2250,11 +2250,11 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [ | ||
| 2250 | if (self.$$data_xl_first_init && | 2250 | if (self.$$data_xl_first_init && |
| 2251 | self.$$data_ry_first_init && | 2251 | self.$$data_ry_first_init && |
| 2252 | self.$$data_rycid_first_init && | 2252 | self.$$data_rycid_first_init && |
| 2253 | - self.$$data_rystart_first_init) { | 2253 | + self.$$data_rystart_first_init && !self.$$data_init) { |
| 2254 | console.log("开始初始化数据"); | 2254 | console.log("开始初始化数据"); |
| 2255 | 2255 | ||
| 2256 | // 判定是否分班，字符串中包含-就是了 | 2256 | // 判定是否分班，字符串中包含-就是了 |
| 2257 | - if (self.$$data_ry_first_data.indexOf("-") != -1) { // 分班 | 2257 | + if (self.$$data_ry_first_data.indexOf("-") != -1 && dataFBSelect_temp.length == 0) { // 分班 |
| 2258 | self.$$isFB = true; | 2258 | self.$$isFB = true; |
| 2259 | 2259 | ||
| 2260 | // 搭班编码、人员配置id | 2260 | // 搭班编码、人员配置id |
| @@ -2290,7 +2290,7 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [ | @@ -2290,7 +2290,7 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [ | ||
| 2290 | scope[ctrlAs].$$dataFBSelectedStart = self.$$data_rystart_first_data - 1; | 2290 | scope[ctrlAs].$$dataFBSelectedStart = self.$$data_rystart_first_data - 1; |
| 2291 | 2291 | ||
| 2292 | 2292 | ||
| 2293 | - } else { | 2293 | + } else if (dataSelect_temp.length == 0) { |
| 2294 | self.$$isFB = false; | 2294 | self.$$isFB = false; |
| 2295 | 2295 | ||
| 2296 | // 搭班编码、人员配置id | 2296 | // 搭班编码、人员配置id |