潘钊 / bsth_control · Commits

Commit 8939a8a1984ffdb4ef87b7333a50f1b0d53fd9d0

Authored by 徐烜
1 parent f9376be6

Update

Inline Side-by-side
Showing 3 changed files with 24 additions and 24 deletions
src/main/resources/static/pages/scheduleApp/module/common/dts2/employeeGroup/saEmployeegroup.js
  View file @8939a8a
... ... @@ -60,9 +60,9 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
60 60 angular.forEach(self.$$dataReal, function(obj) {
61 61 if (self.$$isAll) { // 显示全部
62 62 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
63   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
64   - || obj.$camelChars.indexOf(self.$$searchText) != -1
65   - || obj.$str.indexOf(self.$$searchText) != -1) {
  63 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  64 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  65 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
66 66 this.push(obj);
67 67 }
68 68 } else {
... ... @@ -71,9 +71,9 @@ angular.module('ScheduleApp').directive('saEmployeegroup', [
71 71 } else { // 显示限定数量
72 72 if (this.length < self.$$showNumber) {
73 73 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
74   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
75   - || obj.$camelChars.indexOf(self.$$searchText) != -1
76   - || obj.$str.indexOf(self.$$searchText) != -1) {
  74 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  75 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  76 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
77 77 this.push(obj);
78 78 }
79 79 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/guideboardGroup/saGuideboardgroup.js
  View file @8939a8a
... ... @@ -49,9 +49,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
49 49 angular.forEach(self.$$dataReal, function(obj) {
50 50 if (self.$$isAll) { // 显示全部
51 51 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
52   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
53   - || obj.$camelChars.indexOf(self.$$searchText) != -1
54   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  52 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  53 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  54 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
55 55 this.push(obj);
56 56 }
57 57 } else {
... ... @@ -60,9 +60,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
60 60 } else { // 显示限定数量
61 61 if (this.length < self.$$showNumber) {
62 62 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
63   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
64   - || obj.$camelChars.indexOf(self.$$searchText) != -1
65   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  63 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  64 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  65 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
66 66 this.push(obj);
67 67 }
68 68 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @8939a8a
... ... @@ -2254,9 +2254,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
2254 2254 angular.forEach(self.$$dataReal, function(obj) {
2255 2255 if (self.$$isAll) { // 显示全部
2256 2256 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2257   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2258   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2259   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  2257 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2258 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2259 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
2260 2260 this.push(obj);
2261 2261 }
2262 2262 } else {
... ... @@ -2265,9 +2265,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saGuideboardgroup&#39;, [
2265 2265 } else { // 显示限定数量
2266 2266 if (this.length < self.$$showNumber) {
2267 2267 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2268   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2269   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2270   - || obj.lpname.indexOf(self.$$searchText) != -1) {
  2268 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2269 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2270 + || obj.lpname.indexOf(self.$$searchText.toUpperCase()) != -1) {
2271 2271 this.push(obj);
2272 2272 }
2273 2273 } else {
... ... @@ -2708,9 +2708,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
2708 2708 angular.forEach(self.$$dataReal, function(obj) {
2709 2709 if (self.$$isAll) { // 显示全部
2710 2710 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2711   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2712   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2713   - || obj.$str.indexOf(self.$$searchText) != -1) {
  2711 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2712 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2713 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
2714 2714 this.push(obj);
2715 2715 }
2716 2716 } else {
... ... @@ -2719,9 +2719,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saEmployeegroup&#39;, [
2719 2719 } else { // 显示限定数量
2720 2720 if (this.length < self.$$showNumber) {
2721 2721 if (self.$$searchText && self.$$searchText != "") { // 有筛选条件
2722   - if (obj.$fullChars.indexOf(self.$$searchText) != -1
2723   - || obj.$camelChars.indexOf(self.$$searchText) != -1
2724   - || obj.$str.indexOf(self.$$searchText) != -1) {
  2722 + if (obj.$fullChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2723 + || obj.$camelChars.indexOf(self.$$searchText.toUpperCase()) != -1
  2724 + || obj.$str.indexOf(self.$$searchText.toUpperCase()) != -1) {
2725 2725 this.push(obj);
2726 2726 }
2727 2727 } else {
... ...