|
|
@@ -5358,14 +5358,8 @@
|
|
|
v-model="allowanceTabActive"
|
|
|
@tab-click="handleAllowanceTabClick"
|
|
|
>
|
|
|
- <el-tab-pane
|
|
|
- label="餐补明细表"
|
|
|
- name="detail"
|
|
|
- ></el-tab-pane>
|
|
|
- <el-tab-pane
|
|
|
- label="按人员统计"
|
|
|
- name="summary"
|
|
|
- ></el-tab-pane>
|
|
|
+ <el-tab-pane label="餐补明细表" name="detail"></el-tab-pane>
|
|
|
+ <el-tab-pane label="按人员统计" name="summary"></el-tab-pane>
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
<!-- 餐补明细表 -->
|
|
|
@@ -5529,9 +5523,11 @@
|
|
|
{{
|
|
|
scope.row.type == 1 ||
|
|
|
scope.row.type == 2 ||
|
|
|
- scope.row.type == 3 ? (scope.row.allowance
|
|
|
- ? scope.row.allowance.toFixed(2)
|
|
|
- : "0.00") : "0.00"
|
|
|
+ scope.row.type == 3
|
|
|
+ ? scope.row.allowance
|
|
|
+ ? scope.row.allowance.toFixed(2)
|
|
|
+ : "0.00"
|
|
|
+ : "0.00"
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -5545,9 +5541,11 @@
|
|
|
{{
|
|
|
scope.row.type == 1 ||
|
|
|
scope.row.type == 2 ||
|
|
|
- scope.row.type == 3 ? "0.00":(scope.row.allowance
|
|
|
+ scope.row.type == 3
|
|
|
+ ? "0.00"
|
|
|
+ : scope.row.allowance
|
|
|
? scope.row.allowance.toFixed(2)
|
|
|
- : "0.00")
|
|
|
+ : "0.00"
|
|
|
}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -5632,7 +5630,11 @@
|
|
|
label="夜班补贴合计(元)"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.nightAllowance ? scope.row.nightAllowance.toFixed(2) : "0.00" }}
|
|
|
+ {{
|
|
|
+ scope.row.nightAllowance
|
|
|
+ ? scope.row.nightAllowance.toFixed(2)
|
|
|
+ : "0.00"
|
|
|
+ }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -5641,7 +5643,11 @@
|
|
|
label="餐补合计(元)"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.mealAllowance ? scope.row.mealAllowance.toFixed(2) : "0.00" }}
|
|
|
+ {{
|
|
|
+ scope.row.mealAllowance
|
|
|
+ ? scope.row.mealAllowance.toFixed(2)
|
|
|
+ : "0.00"
|
|
|
+ }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -5650,7 +5656,11 @@
|
|
|
label="补贴总计(元)"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- {{ scope.row.allowance ? scope.row.allowance.toFixed(2) : "0.00" }}
|
|
|
+ {{
|
|
|
+ scope.row.allowance
|
|
|
+ ? scope.row.allowance.toFixed(2)
|
|
|
+ : "0.00"
|
|
|
+ }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -5832,18 +5842,18 @@
|
|
|
label="当前审核人"
|
|
|
width="120"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="scope.row.auditStatusText == '待审核'">
|
|
|
- <TranslationOpenDataText
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.auditStatusText == '待审核'">
|
|
|
+ <TranslationOpenDataText
|
|
|
v-if="user.userNameNeedTranslate == '1'"
|
|
|
type="userName"
|
|
|
:openid="scope.row.auditorName"
|
|
|
></TranslationOpenDataText>
|
|
|
<span v-else>{{ scope.row.auditorName }}</span>
|
|
|
- </span>
|
|
|
- <span v-else>-</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ </span>
|
|
|
+ <span v-else>-</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="auditStatusText"
|
|
|
align="center"
|
|
|
@@ -5995,18 +6005,18 @@
|
|
|
label="当前审核人"
|
|
|
width="120"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="scope.row.state == 0">
|
|
|
- <TranslationOpenDataText
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.state == 0">
|
|
|
+ <TranslationOpenDataText
|
|
|
v-if="user.userNameNeedTranslate == '1'"
|
|
|
type="userName"
|
|
|
:openid="scope.row.deptAuditorName"
|
|
|
></TranslationOpenDataText>
|
|
|
<span v-else>{{ scope.row.deptAuditorName }}</span>
|
|
|
- </span>
|
|
|
- <span v-else>-</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ </span>
|
|
|
+ <span v-else>-</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="auditStatus"
|
|
|
align="center"
|
|
|
@@ -6334,18 +6344,10 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="user.userNameNeedTranslate == '1'">
|
|
|
- <span
|
|
|
- v-for="(item, index) in scope.row.departmentName"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <TranslationOpenDataText
|
|
|
- type="departmentName"
|
|
|
- :openid="item"
|
|
|
- ></TranslationOpenDataText>
|
|
|
- <span v-if="index < scope.row.departmentName.length - 1"
|
|
|
- >/</span
|
|
|
- >
|
|
|
- </span>
|
|
|
+ <TranslationOpenDataText
|
|
|
+ type="departmentName"
|
|
|
+ :openid="scope.row.departmentName"
|
|
|
+ ></TranslationOpenDataText>
|
|
|
</span>
|
|
|
<span v-if="user.userNameNeedTranslate != '1'">{{
|
|
|
scope.row.departmentName
|
|
|
@@ -9200,7 +9202,7 @@ export default {
|
|
|
sl.userId = this.userId;
|
|
|
}
|
|
|
} else if (this.ins == 36) {
|
|
|
- if (this.allowanceTabActive === 'summary') {
|
|
|
+ if (this.allowanceTabActive === "summary") {
|
|
|
fName = `餐补表(按人员统计).xlsx`;
|
|
|
url = `/overtime-allowance/exportSummaryList`;
|
|
|
} else {
|
yusm