Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/src/views/project/CostBaseline.vue

@@ -52,7 +52,7 @@
                             <el-table-column label="下拨时间" prop="indate" align="center" min-width="200"></el-table-column>
                             <el-table-column label="操作人员" prop="userName" align="center" min-width="120"></el-table-column>
                             <el-table-column label="备注" prop="remark" align="left" header-align="left" show-overflow-tooltip min-width="200"></el-table-column>
-                            <el-table-column label="" align="center" fixed="right">
+                            <el-table-column label="" align="center" fixed="right" v-if="permissions.projectAllocate">
                                 <template slot-scope="scope">
                                     <el-button size="small" @click="revert(scope.row.id)" v-if="scope.$index == 0">撤销</el-button>
                                 </template>