5月31日

src/xt_pages/sign/index.vue

@@ -15,11 +15,8 @@
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
                 </div>
-<<<<<<< .mine
-                <el-table :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">  
-=======
+
                 <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">
->>>>>>> .theirs
                     <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
                     <el-table-column prop="name" label="姓名" min-width="20" align="center">
                        <template slot-scope="scope">