Merge branch 'master' of http://47.100.37.243:10191/quyueting/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1798,7 +1798,7 @@
                   {{ $t('修改请假') }}
                 </el-link>
                 <el-link
-                    v-else-if="!scope.row.cardTime"
+                    v-else-if="!scope.row.cardTime && scope.row.status == '未填写'"
                     type="primary"
                     size="mini"
                     @click="openLeaveDialog(scope.row)">