|
|
@@ -495,6 +495,16 @@
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="deptName" :label="$t('subordinatedepartments')" width="150">
|
|
|
+ <template slot-scope="scope" >
|
|
|
+ <span v-if="user.userNameNeedTranslate == '1'">
|
|
|
+ <ww-open-data type='departmentName' :openid='scope.row.deptName'></ww-open-data>
|
|
|
+ </span>
|
|
|
+ <span v-if="user.userNameNeedTranslate != '1'">
|
|
|
+ {{scope.row.deptName}}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="jobNumber" :label="$t('Worknumber')" width="150"></el-table-column>
|
|
|
<el-table-column prop="unPublic" :label="$t('ordinaryprojecthours')" min-width="160" align="right">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -506,6 +516,8 @@
|
|
|
<span>{{scope.row.isPublic == null? 0 + 'h' : scope.row.isPublic.toFixed(1) + 'h'}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="leaveSum" :label="$t('qing-jia-gong-shi')" min-width="160" align="right">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="workingTime" :label="$t('other.totalworkinghours')" min-width="160" align="right">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.workingTime == null? 0 + 'h' : scope.row.workingTime.toFixed(1) + 'h'}}</span>
|
ggooalice