合并冲突

src/views/second/coordinationManage/applyCooperation/basicTarget.vue

@@ -187,18 +187,11 @@ export default {
   methods: {
     judge(row) {
       let arr = [].concat(
-<<<<<<< HEAD
         row.leaderDept,
         row.cooperateDept.split(",").map((item) => parseInt(item)),
         row.otherDept.split(",").map((item) => parseInt(item))
       );
       let bool = arr.includes(this.user.user.deptId) || row.status == 1;
-=======
-        row.cooperateDept?row.cooperateDept.split(",").map((item) => parseInt(item)):[],
-        row.leaderDept?row.leaderDept.split(",").map((item) => parseInt(item)):[]
-      );
-      let bool = arr.includes(this.user.user.deptId);
->>>>>>> 690237002de21be6eeb5ebc60c73daa2a09a1246
       return bool;
     },
     updateParams(data) {