#

src/views/projectSettlement/projectSettlement.vue

@@ -152,11 +152,7 @@
                         <el-button type="info"  disabled v-if="scope.row.isupload==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  size="mini">已审核</el-button>
                         <el-button type="primary" disabled v-if="scope.row.isupload==0" style="width: 73.3px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"  @click="audit(scope.row.courseId,scope.row.title)" size="mini">审核</el-button>
 
-<<<<<<< HEAD
-                        <el-button type="primary" size="mini" @click="resultShow(scope.row.id,scope.row.status)">成果查看</el-button>
-=======
                         <el-button type="primary" size="mini" @click="edit(scope.row.courseId)">成果查看</el-button>
->>>>>>> 89c9d3483bb7f349ff6d15d0d6f55ae91fe4990e
               </div>
           </template>
         </el-table-column>