xiaoming_global преди 6 години
родител
ревизия
646c67c94a
променени са 1 файла, в които са добавени 0 реда и са изтрити 10 реда
  1. 0 10
      src/xt_pages/sign/index.vue

+ 0 - 10
src/xt_pages/sign/index.vue Целия файл

39
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
39
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
40
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
40
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
41
                         <template slot-scope="scope">
41
                         <template slot-scope="scope">
42
-<<<<<<< .mine
43
                            {{scope.row.before}} / {{scope.row.after}}
42
                            {{scope.row.before}} / {{scope.row.after}}
44
-=======
45
-                            {{scope.row.before}} / {{scope.row.after}}
46
->>>>>>> .theirs
47
                         </template>
43
                         </template>
48
                     </el-table-column>
44
                     </el-table-column>
49
                 </el-table>
45
                 </el-table>
210
             }
206
             }
211
           }
207
           }
212
 
208
 
213
-          for (let i = this.patients.length - 1; ; i--) {
214
-            if (this.patients[i].schedule.id == 0) {
215
-              this.patients.splice(i, 1)
216
-            }
217
-          }
218
-
219
           this.queryParams.schedule_type = response.data.data.schedule_type
209
           this.queryParams.schedule_type = response.data.data.schedule_type
220
           this.querySignParams.date_time = response.data.data.today
210
           this.querySignParams.date_time = response.data.data.today
221
 
211