--

src/components/table/index.vue

@@ -50,12 +50,8 @@ export default {
       this.$emit('checkboxCallBack',val)      
     },
     isCheck(row,rowIndex) {
-<<<<<<< HEAD
-      if(row.status == '待跟进' || row.status == '跟进中') {
-=======
       if (!row.status) return true
       if(row.status == '待跟进' || row.status == '待分配') {
->>>>>>> develop
         return true
       } else {
         return false