修改531

src/xt_pages/sign/index.vue

@@ -39,11 +39,7 @@
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
                         <template slot-scope="scope">
-<<<<<<< .mine
                            {{scope.row.before}} / {{scope.row.after}}
-=======
-                            {{scope.row.before}} / {{scope.row.after}}
->>>>>>> .theirs
                         </template>
                     </el-table-column>
                 </el-table>
@@ -210,12 +206,6 @@ export default {
             }
           }
 
-          for (let i = this.patients.length - 1; ; i--) {
-            if (this.patients[i].schedule.id == 0) {
-              this.patients.splice(i, 1)
-            }
-          }
-
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today