潘钊 / bsth_control · Commits

Commit 31a1bea802ef020a1dd40bfc7e016912b6590ca5

Authored by 徐烜
1 parent 81631d6d
build: skipped

Update

Inline Side-by-side
Showing 6 changed files with 226 additions and 63 deletions
src/main/resources/static/pages/scheduleApp/module/common/dts2/employeeGroup/saEmployeegroup.js
  View file @31a1bea
... ... @@ -182,6 +182,8 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
182 182 dbbm: data_temp[$index].dbbm,
183 183 jsy: data_temp[$index].jsy,
184 184 spy: data_temp[$index].spy,
  185 + jcode: data_temp[$index].jcode,
  186 + scode: data_temp[$index].scode,
185 187 isstart: false
186 188 });
187 189  
... ... @@ -199,6 +201,8 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
199 201 dbbm: data_temp[$index].dbbm,
200 202 jsy: data_temp[$index].jsy,
201 203 spy: data_temp[$index].spy,
  204 + jcode: data_temp[$index].jcode,
  205 + scode: data_temp[$index].scode,
202 206 isselected: true
203 207 };
204 208  
... ... @@ -211,12 +215,16 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
211 215 dbbm: data_temp[$index].dbbm,
212 216 jsy: data_temp[$index].jsy,
213 217 spy: data_temp[$index].spy,
  218 + jcode: data_temp[$index].jcode,
  219 + scode: data_temp[$index].scode,
214 220 isselected: false
215 221 }, {
216 222 id : data_temp[$index].id,
217 223 dbbm: data_temp[$index].dbbm,
218 224 jsy: data_temp[$index].jsy,
219 225 spy: data_temp[$index].spy,
  226 + jcode: data_temp[$index].jcode,
  227 + scode: data_temp[$index].scode,
220 228 isselected: false
221 229 }
222 230 )
... ... @@ -536,6 +544,8 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
536 544 if (dataFBSelect_temp[i].group[k].dbbm == data_temp[j].dbbm) {
537 545 dataFBSelect_temp[i].group[k].jsy = data_temp[j].jsy;
538 546 dataFBSelect_temp[i].group[k].spy = data_temp[j].spy;
  547 + dataFBSelect_temp[i].group[k].jcode = data_temp[j].jcode;
  548 + dataFBSelect_temp[i].group[k].scode = data_temp[j].scode;
539 549 break;
540 550 }
541 551 }
... ... @@ -563,6 +573,8 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
563 573 if (dataSelect_temp[i].dbbm == data_temp[j].dbbm) {
564 574 dataSelect_temp[i].jsy = data_temp[j].jsy;
565 575 dataSelect_temp[i].spy = data_temp[j].spy;
  576 + dataSelect_temp[i].jcode = data_temp[j].jcode;
  577 + dataSelect_temp[i].scode = data_temp[j].scode;
566 578 break;
567 579 }
568 580 }
... ... @@ -643,21 +655,30 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
643 655 angular.forEach(result.content, function(obj) {
644 656 var n1 = obj.jsy == null ? "" : (obj.jsy.personnelName || "");
645 657 var n2 = obj.spy == null ? "" : (obj.spy.personnelName || "");
646   - var n3 = obj.dbbm || "";
647   - //var c1 = obj.jsy == null ? "" : (obj.jsy.jobCode || "");
648   - //var c2 = obj.spy == null ? "" : (obj.spy.jobCode || "");
  658 + //var n3 = obj.dbbm || "";
  659 + var c1 = obj.jsy == null ? "" : (obj.jsy.jobCode || "");
  660 + var c2 = obj.spy == null ? "" : (obj.spy.jobCode || "");
  661 +
  662 + if (c1.indexOf("-") > 0) {
  663 + c1 = c1.substr(3);
  664 + }
  665 + if (c2.indexOf("-") > 0) {
  666 + c2 = c2.substr(3);
  667 + }
649 668  
650 669 var str = [];
651 670 str.push(n1);
652 671 str.push(n2);
653   - str.push(n3);
654   - //str.push(c1);
655   - //str.push(c2);
  672 + //str.push(n3);
  673 + str.push(c1);
  674 + str.push(c2);
656 675 this.push({
657 676 id: obj.id,
658 677 dbbm: obj.dbbm,
659 678 jsy: n1,
660 679 spy: n2,
  680 + jcode: c1,
  681 + scode: c2,
661 682 '$fullChars': pinyin.getFullChars(str.join("-")), // 全拼
662 683 '$camelChars': pinyin.getCamelChars(str.join("-")), // 简拼
663 684 '$str': str.join("-")
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/employeeGroup/saEmployeegroupTemplate.html
  View file @31a1bea
... ... @@ -56,15 +56,15 @@
56 56 color: white;
57 57 background: #8DA29F;
58 58 border: 1px solid #8DA29F;
59   - min-width: 100px;
60   - max-width: 200px;
  59 + min-width: 150px;
  60 + max-width: 300px;
61 61 }
62 62 .employee-select .employeeGroup.start {
63 63 color: white;
64 64 background: #32C5D2;
65 65 border: 1px solid #32C5D2;
66   - min-width: 100px;
67   - max-width: 200px;
  66 + min-width: 150px;
  67 + max-width: 300px;
68 68 }
69 69  
70 70  
... ... @@ -79,7 +79,7 @@
79 79 </div>
80 80 <div class="col-md-3" style="padding-left: 0px;">
81 81 <input name="rysearch" ng-model="$saEmployeegroupCtrl.$$searchText"
82   - type="text" class="input-sm" style="width: 120px; height: 20px; border: 1px solid #32C5D2;" placeholder="输入拼音或编码..."/>
  82 + type="text" class="input-sm" style="width: 120px; height: 20px; border: 1px solid #32C5D2;" placeholder="拼音,编码,工号..."/>
83 83 </div>
84 84 <div class="col-md-2" style="min-height: 19px; color: black; padding-left: 0px;">
85 85 <div class="col-md-3" style="padding-left: 0px; padding-right: 0px;">
... ... @@ -96,19 +96,50 @@
96 96 <div class="employee active"
97 97 ng-repeat="$d in $saEmployeegroupCtrl.$$data track by $index"
98 98 ng-click="$saEmployeegroupCtrl.$$internal_rylist_click($index)">
99   - <span ng-if="$d.spy">
100   - <i class="fa fa-bus" aria-hidden="true"></i>
101   - {{$d.jsy}}
102   - -
103   - <i class="fa fa-ticket" aria-hidden="true"></i>
104   - {{$d.spy}}
105   - {{"(" + $d.dbbm + ")"}}
106   - </span>
107   - <span ng-if="!$d.spy">
108   - <i class="fa fa-bus" aria-hidden="true"></i>
109   - {{$d.jsy}}
110   - {{"(" + $d.dbbm + ")"}}
111   - </span>
  99 +
  100 + <div ng-if="$d.spy">
  101 + <div>
  102 + <div>
  103 + <span>
  104 + <i class="fa fa-bus" aria-hidden="true"></i>
  105 + {{$d.jsy}}
  106 + </span>
  107 + </div>
  108 + <div>
  109 + <span>
  110 + {{"(" + $d.jcode + ")"}}
  111 + </span>
  112 + </div>
  113 + </div>
  114 + ------
  115 + <div>
  116 + <div>
  117 + <span>
  118 + <i class="fa fa-ticket" aria-hidden="true"></i>
  119 + {{$d.spy}}
  120 + </span>
  121 + </div>
  122 + <div>
  123 + <span>
  124 + {{"(" + $d.scode + ")"}}
  125 + </span>
  126 + </div>
  127 + </div>
  128 + </div>
  129 +
  130 + <div ng-if="!$d.spy">
  131 + <div>
  132 + <span>
  133 + <i class="fa fa-bus" aria-hidden="true"></i>
  134 + {{$d.jsy}}
  135 + </span>
  136 + </div>
  137 + <div>
  138 + <span>
  139 + {{"(" + $d.jcode + ")"}}
  140 + </span>
  141 + </div>
  142 + </div>
112 143 </div>
113 144 </div>
114 145 </div>
... ... @@ -137,19 +168,50 @@
137 168 ng-repeat="$d in $saEmployeegroupCtrl.$$dataSelected track by $index"
138 169 ng-click="$saEmployeegroupCtrl.$$internal_selrylist_click($index)"
139 170 ng-dblclick="$saEmployeegroupCtrl.$$internal_selrylist_dbclick($index)">
140   - <span ng-if="$d.spy">
141   - <i class="fa fa-bus" aria-hidden="true"></i>
142   - {{$d.jsy}}
143   - -
144   - <i class="fa fa-ticket" aria-hidden="true"></i>
145   - {{$d.spy}}
146   - {{"(" + $d.dbbm + ")"}}
147   - </span>
148   - <span ng-if="!$d.spy">
149   - <i class="fa fa-bus" aria-hidden="true"></i>
150   - {{$d.jsy}}
151   - {{"(" + $d.dbbm + ")"}}
152   - </span>
  171 +
  172 + <div ng-if="$d.spy">
  173 + <div>
  174 + <div>
  175 + <span>
  176 + <i class="fa fa-bus" aria-hidden="true"></i>
  177 + {{$d.jsy}}
  178 + </span>
  179 + </div>
  180 + <div>
  181 + <span>
  182 + {{"(" + $d.jcode + ")"}}
  183 + </span>
  184 + </div>
  185 + </div>
  186 + ------
  187 + <div>
  188 + <div>
  189 + <span>
  190 + <i class="fa fa-ticket" aria-hidden="true"></i>
  191 + {{$d.spy}}
  192 + </span>
  193 + </div>
  194 + <div>
  195 + <span>
  196 + {{"(" + $d.scode + ")"}}
  197 + </span>
  198 + </div>
  199 + </div>
  200 + </div>
  201 +
  202 + <div ng-if="!$d.spy">
  203 + <div>
  204 + <span>
  205 + <i class="fa fa-bus" aria-hidden="true"></i>
  206 + {{$d.jsy}}
  207 + </span>
  208 + </div>
  209 + <div>
  210 + <span>
  211 + {{"(" + $d.jcode + ")"}}
  212 + </span>
  213 + </div>
  214 + </div>
153 215  
154 216 </div>
155 217 </div>
... ... @@ -184,19 +246,48 @@
184 246 <div ng-class="{employee: true, active: true, start: $d.group[0].isselected}"
185 247 ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 0, $event)"
186 248 ng-if="$d.group[0].spy">
187   - <i class="fa fa-bus" aria-hidden="true"></i>
188   - {{$d.group[0].jsy}}
189   - -
190   - <i class="fa fa-ticket" aria-hidden="true"></i>
191   - {{$d.group[0].spy}}
192   - {{"(" + $d.group[0].dbbm + ")"}}
  249 + <div>
  250 + <div>
  251 + <span>
  252 + <i class="fa fa-bus" aria-hidden="true"></i>
  253 + {{$d.group[0].jsy}}
  254 + </span>
  255 + </div>
  256 + <div>
  257 + <span>
  258 + {{"(" + $d.group[0].jcode + ")"}}
  259 + </span>
  260 + </div>
  261 + </div>
  262 + ------
  263 + <div>
  264 + <div>
  265 + <span>
  266 + <i class="fa fa-ticket" aria-hidden="true"></i>
  267 + {{$d.group[0].spy}}
  268 + </span>
  269 + </div>
  270 + <div>
  271 + <span>
  272 + {{"(" + $d.group[0].scode + ")"}}
  273 + </span>
  274 + </div>
  275 + </div>
193 276 </div>
194 277 <div ng-class="{employee: true, active: true, start: $d.group[0].isselected}"
195 278 ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 0, $event)"
196 279 ng-if="!$d.group[0].spy">
197   - <i class="fa fa-bus" aria-hidden="true"></i>
198   - {{$d.group[0].jsy}}
199   - {{"(" + $d.group[0].dbbm + ")"}}
  280 + <div>
  281 + <span>
  282 + <i class="fa fa-bus" aria-hidden="true"></i>
  283 + {{$d.group[0].jsy}}
  284 + </span>
  285 + </div>
  286 + <div>
  287 + <span>
  288 + {{"(" + $d.group[0].jcode + ")"}}
  289 + </span>
  290 + </div>
200 291 </div>
201 292 </div>
202 293  
... ... @@ -205,19 +296,48 @@
205 296 <div ng-class="{employee: true, active: true, start: $d.group[1].isselected}"
206 297 ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 1, $event)"
207 298 ng-if="$d.group[1].spy">
208   - <i class="fa fa-bus" aria-hidden="true"></i>
209   - {{$d.group[1].jsy}}
210   - -
211   - <i class="fa fa-ticket" aria-hidden="true"></i>
212   - {{$d.group[1].spy}}
213   - {{"(" + $d.group[1].dbbm + ")"}}
  299 + <div>
  300 + <div>
  301 + <span>
  302 + <i class="fa fa-bus" aria-hidden="true"></i>
  303 + {{$d.group[1].jsy}}
  304 + </span>
  305 + </div>
  306 + <div>
  307 + <span>
  308 + {{"(" + $d.group[1].jcode + ")"}}
  309 + </span>
  310 + </div>
  311 + </div>
  312 + ------
  313 + <div>
  314 + <div>
  315 + <span>
  316 + <i class="fa fa-ticket" aria-hidden="true"></i>
  317 + {{$d.group[1].spy}}
  318 + </span>
  319 + </div>
  320 + <div>
  321 + <span>
  322 + {{"(" + $d.group[1].scode + ")"}}
  323 + </span>
  324 + </div>
  325 + </div>
214 326 </div>
215 327 <div ng-class="{employee: true, active: true, start: $d.group[1].isselected}"
216 328 ng-click="$saEmployeegroupCtrl.$$internal_selrygroup_click($index, 1, $event)"
217 329 ng-if="!$d.group[1].spy">
218   - <i class="fa fa-bus" aria-hidden="true"></i>
219   - {{$d.group[1].jsy}}
220   - {{"(" + $d.group[1].dbbm + ")"}}
  330 + <div>
  331 + <span>
  332 + <i class="fa fa-bus" aria-hidden="true"></i>
  333 + {{$d.group[1].jsy}}
  334 + </span>
  335 + </div>
  336 + <div>
  337 + <span>
  338 + {{"(" + $d.group[1].jcode + ")"}}
  339 + </span>
  340 + </div>
221 341 </div>
222 342 </div>
223 343  
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @31a1bea
... ... @@ -2907,6 +2907,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
2907 2907 dbbm: data_temp[$index].dbbm,
2908 2908 jsy: data_temp[$index].jsy,
2909 2909 spy: data_temp[$index].spy,
  2910 + jcode: data_temp[$index].jcode,
  2911 + scode: data_temp[$index].scode,
2910 2912 isstart: false
2911 2913 });
2912 2914  
... ... @@ -2924,6 +2926,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
2924 2926 dbbm: data_temp[$index].dbbm,
2925 2927 jsy: data_temp[$index].jsy,
2926 2928 spy: data_temp[$index].spy,
  2929 + jcode: data_temp[$index].jcode,
  2930 + scode: data_temp[$index].scode,
2927 2931 isselected: true
2928 2932 };
2929 2933  
... ... @@ -2936,12 +2940,16 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
2936 2940 dbbm: data_temp[$index].dbbm,
2937 2941 jsy: data_temp[$index].jsy,
2938 2942 spy: data_temp[$index].spy,
  2943 + jcode: data_temp[$index].jcode,
  2944 + scode: data_temp[$index].scode,
2939 2945 isselected: false
2940 2946 }, {
2941 2947 id : data_temp[$index].id,
2942 2948 dbbm: data_temp[$index].dbbm,
2943 2949 jsy: data_temp[$index].jsy,
2944 2950 spy: data_temp[$index].spy,
  2951 + jcode: data_temp[$index].jcode,
  2952 + scode: data_temp[$index].scode,
2945 2953 isselected: false
2946 2954 }
2947 2955 )
... ... @@ -3261,6 +3269,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
3261 3269 if (dataFBSelect_temp[i].group[k].dbbm == data_temp[j].dbbm) {
3262 3270 dataFBSelect_temp[i].group[k].jsy = data_temp[j].jsy;
3263 3271 dataFBSelect_temp[i].group[k].spy = data_temp[j].spy;
  3272 + dataFBSelect_temp[i].group[k].jcode = data_temp[j].jcode;
  3273 + dataFBSelect_temp[i].group[k].scode = data_temp[j].scode;
3264 3274 break;
3265 3275 }
3266 3276 }
... ... @@ -3288,6 +3298,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
3288 3298 if (dataSelect_temp[i].dbbm == data_temp[j].dbbm) {
3289 3299 dataSelect_temp[i].jsy = data_temp[j].jsy;
3290 3300 dataSelect_temp[i].spy = data_temp[j].spy;
  3301 + dataSelect_temp[i].jcode = data_temp[j].jcode;
  3302 + dataSelect_temp[i].scode = data_temp[j].scode;
3291 3303 break;
3292 3304 }
3293 3305 }
... ... @@ -3368,21 +3380,30 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
3368 3380 angular.forEach(result.content, function(obj) {
3369 3381 var n1 = obj.jsy == null ? "" : (obj.jsy.personnelName || "");
3370 3382 var n2 = obj.spy == null ? "" : (obj.spy.personnelName || "");
3371   - var n3 = obj.dbbm || "";
3372   - //var c1 = obj.jsy == null ? "" : (obj.jsy.jobCode || "");
3373   - //var c2 = obj.spy == null ? "" : (obj.spy.jobCode || "");
  3383 + //var n3 = obj.dbbm || "";
  3384 + var c1 = obj.jsy == null ? "" : (obj.jsy.jobCode || "");
  3385 + var c2 = obj.spy == null ? "" : (obj.spy.jobCode || "");
  3386 +
  3387 + if (c1.indexOf("-") > 0) {
  3388 + c1 = c1.substr(3);
  3389 + }
  3390 + if (c2.indexOf("-") > 0) {
  3391 + c2 = c2.substr(3);
  3392 + }
3374 3393  
3375 3394 var str = [];
3376 3395 str.push(n1);
3377 3396 str.push(n2);
3378   - str.push(n3);
3379   - //str.push(c1);
3380   - //str.push(c2);
  3397 + //str.push(n3);
  3398 + str.push(c1);
  3399 + str.push(c2);
3381 3400 this.push({
3382 3401 id: obj.id,
3383 3402 dbbm: obj.dbbm,
3384 3403 jsy: n1,
3385 3404 spy: n2,
  3405 + jcode: c1,
  3406 + scode: c2,
3386 3407 '$fullChars': pinyin.getFullChars(str.join("-")), // 全拼
3387 3408 '$camelChars': pinyin.getCamelChars(str.join("-")), // 简拼
3388 3409 '$str': str.join("-")
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
  View file @31a1bea
... ... @@ -85,6 +85,7 @@
85 85 <td>
86 86 <div ng-repeat="tinfo in info.rst">
87 87 <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : tinfo.ttInfoId, xlname: info.xl.name, ttname : tinfo.ttInfoName, rflag : true})">
  88 + <i class="fa fa-table" aria-hidden="true"></i>
88 89 {{tinfo.ttInfoName}}
89 90 </a>
90 91 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/edit.html
  View file @31a1bea
... ... @@ -129,7 +129,7 @@
129 129  
130 130 <div class="form-group has-success has-feedback">
131 131 <label class="col-md-2 control-label">人员范围*：</label>
132   - <div class="col-md-6">
  132 + <div class="col-md-8">
133 133 <sa-Employeegroup model="ctrl.scheduleRuleManageForSave"
134 134 name="ryrange"
135 135 xlidvalue="{{ctrl.scheduleRuleManageForSave.xl.id}}"
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
  View file @31a1bea
... ... @@ -129,7 +129,7 @@
129 129  
130 130 <div class="form-group has-success has-feedback">
131 131 <label class="col-md-2 control-label">人员范围*：</label>
132   - <div class="col-md-6">
  132 + <div class="col-md-8">
133 133 <sa-Employeegroup model="ctrl.scheduleRuleManageForSave"
134 134 name="ryrange"
135 135 xlidvalue="{{ctrl.scheduleRuleManageForSave.xl.id}}"
... ...