Commit 4dfd3a60b659d6b98b980045c911507a2dc12da9
Merge branch 'PSM-10' into minhang
Showing
1 changed file
with
16 additions
and
2 deletions
src/main/resources/static/pages/scheduleApp/module/common/dt/MyEmployeeGroupWrapTemplate.html
| ... | ... | @@ -90,12 +90,17 @@ |
| 90 | 90 | ng-repeat="$d in $saEmployeegroupCtrl.$$data track by $index" |
| 91 | 91 | ng-click="$saEmployeegroupCtrl.$$internal_rylist_click($index)"> |
| 92 | 92 | <span ng-if="$d.spy"> |
| 93 | - {{$d.jsy}}-{{$d.spy}} | |
| 93 | + <i class="fa fa-bus" aria-hidden="true"></i> | |
| 94 | + {{$d.jsy}} | |
| 95 | + - | |
| 94 | 96 | <i class="fa fa-ticket" aria-hidden="true"></i> |
| 97 | + {{$d.spy}} | |
| 98 | + {{"(" + $d.dbbm + ")"}} | |
| 95 | 99 | </span> |
| 96 | 100 | <span ng-if="!$d.spy"> |
| 97 | 101 | <i class="fa fa-bus" aria-hidden="true"></i> |
| 98 | 102 | {{$d.jsy}} |
| 103 | + {{"(" + $d.dbbm + ")"}} | |
| 99 | 104 | </span> |
| 100 | 105 | </div> |
| 101 | 106 | </div> |
| ... | ... | @@ -115,12 +120,17 @@ |
| 115 | 120 | ng-click="$saEmployeegroupCtrl.$$internal_selrylist_click($index)" |
| 116 | 121 | ng-dblclick="$saEmployeegroupCtrl.$$internal_selrylist_dbclick($index)"> |
| 117 | 122 | <span ng-if="$d.spy"> |
| 118 | - {{$d.jsy}}-{{$d.spy}} | |
| 123 | + <i class="fa fa-bus" aria-hidden="true"></i> | |
| 124 | + {{$d.jsy}} | |
| 125 | + - | |
| 119 | 126 | <i class="fa fa-ticket" aria-hidden="true"></i> |
| 127 | + {{$d.spy}} | |
| 128 | + {{"(" + $d.dbbm + ")"}} | |
| 120 | 129 | </span> |
| 121 | 130 | <span ng-if="!$d.spy"> |
| 122 | 131 | <i class="fa fa-bus" aria-hidden="true"></i> |
| 123 | 132 | {{$d.jsy}} |
| 133 | + {{"(" + $d.dbbm + ")"}} | |
| 124 | 134 | </span> |
| 125 | 135 | |
| 126 | 136 | </div> |
| ... | ... | @@ -151,12 +161,14 @@ |
| 151 | 161 | - |
| 152 | 162 | <i class="fa fa-ticket" aria-hidden="true"></i> |
| 153 | 163 | {{$d.group[0].spy}} |
| 164 | + {{"(" + $d.group[0].dbbm + ")"}} | |
| 154 | 165 | </div> |
| 155 | 166 | <div ng-class="{employee: true, active: true, start: $d.group[0].isselected}" |
| 156 | 167 | ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 0, $event)" |
| 157 | 168 | ng-if="!$d.group[0].spy"> |
| 158 | 169 | <i class="fa fa-bus" aria-hidden="true"></i> |
| 159 | 170 | {{$d.group[0].jsy}} |
| 171 | + {{"(" + $d.group[0].dbbm + ")"}} | |
| 160 | 172 | </div> |
| 161 | 173 | </div> |
| 162 | 174 | |
| ... | ... | @@ -170,12 +182,14 @@ |
| 170 | 182 | - |
| 171 | 183 | <i class="fa fa-ticket" aria-hidden="true"></i> |
| 172 | 184 | {{$d.group[1].spy}} |
| 185 | + {{"(" + $d.group[1].dbbm + ")"}} | |
| 173 | 186 | </div> |
| 174 | 187 | <div ng-class="{employee: true, active: true, start: $d.group[1].isselected}" |
| 175 | 188 | ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 1, $event)" |
| 176 | 189 | ng-if="!$d.group[1].spy"> |
| 177 | 190 | <i class="fa fa-bus" aria-hidden="true"></i> |
| 178 | 191 | {{$d.group[1].jsy}} |
| 192 | + {{"(" + $d.group[1].dbbm + ")"}} | |
| 179 | 193 | </div> |
| 180 | 194 | </div> |
| 181 | 195 | ... | ... |