Просмотр исходного кода

Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

XMLWAN 4 лет назад
Родитель
Сommit
9bd7c3833f
2 измененных файлов: 2 добавлений и 8 удалений
  1. 1 4
      src/pages/main/DialysisArea.vue
  2. 1 4
      src/pages/main/WaitingArea.vue

+ 1 - 4
src/pages/main/DialysisArea.vue Просмотреть файл

186
           var filtedSchedules = []
186
           var filtedSchedules = []
187
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
187
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
188
             const schedule = originSchedules[s_i]
188
             const schedule = originSchedules[s_i]
189
-            if (
190
-              schedule.patient.name.indexOf(search_keyword) != -1 ||
191
-              schedule.patient.dialysis_no.indexOf(search_keyword) != -1
192
-            ) {
189
+            if ( schedule.patient.name.indexOf(search_keyword) != -1  ) {
193
               filtedSchedules.push(schedule)
190
               filtedSchedules.push(schedule)
194
               break
191
               break
195
             }
192
             }

+ 1 - 4
src/pages/main/WaitingArea.vue Просмотреть файл

165
         var scheduals = []
165
         var scheduals = []
166
         for (let index = 0; index < this.scheduals.length; index++) {
166
         for (let index = 0; index < this.scheduals.length; index++) {
167
           const schedual = this.scheduals[index]
167
           const schedual = this.scheduals[index]
168
-          if (
169
-            schedual.patient.name.indexOf(search_keyword) != -1 ||
170
-            schedual.patient.dialysis_no.indexOf(search_keyword) != -1
171
-          ) {
168
+          if ( schedual.patient.name.indexOf(search_keyword) != -1) {
172
             scheduals.push(schedual)
169
             scheduals.push(schedual)
173
           }
170
           }
174
         }
171
         }