|
|
@@ -6312,8 +6312,8 @@
|
|
|
<el-table-column
|
|
|
prop="index"
|
|
|
label="序号"
|
|
|
- width="60"
|
|
|
fixed
|
|
|
+ width="60"
|
|
|
:resizable="false"
|
|
|
>
|
|
|
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
|
|
|
@@ -6321,7 +6321,8 @@
|
|
|
<el-table-column
|
|
|
prop="employeeName"
|
|
|
label="姓名"
|
|
|
- min-width="200"
|
|
|
+ min-width="80"
|
|
|
+ fixed
|
|
|
align="center"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -6339,7 +6340,8 @@
|
|
|
<el-table-column
|
|
|
prop="departmentName"
|
|
|
:label="$t('subordinatedepartments')"
|
|
|
- min-width="200"
|
|
|
+ fixed
|
|
|
+ min-width="120"
|
|
|
align="center"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -6359,7 +6361,7 @@
|
|
|
:key="date"
|
|
|
:label="date"
|
|
|
align="center"
|
|
|
- min-width="60"
|
|
|
+ min-width="40"
|
|
|
:resizable="false"
|
|
|
class-name="holiday-day-column"
|
|
|
>
|
|
|
@@ -6439,8 +6441,9 @@
|
|
|
<el-table-column
|
|
|
prop="employeeName"
|
|
|
label="姓名"
|
|
|
- min-width="200"
|
|
|
+ min-width="120"
|
|
|
align="center"
|
|
|
+ fixed
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="user.userNameNeedTranslate == '1'"
|
|
|
@@ -6457,14 +6460,15 @@
|
|
|
<el-table-column
|
|
|
prop="departmentName"
|
|
|
:label="$t('subordinatedepartments')"
|
|
|
- min-width="200"
|
|
|
+ min-width="120"
|
|
|
align="center"
|
|
|
+ fixed
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="user.userNameNeedTranslate == '1'">
|
|
|
<TranslationOpenDataText
|
|
|
type="departmentName"
|
|
|
- :openid="item"
|
|
|
+ :openid="scope.row.departmentName"
|
|
|
></TranslationOpenDataText>
|
|
|
</span>
|
|
|
<span v-if="user.userNameNeedTranslate != '1'">{{
|
|
|
@@ -6477,7 +6481,7 @@
|
|
|
:key="date"
|
|
|
:label="date"
|
|
|
align="center"
|
|
|
- width="58"
|
|
|
+ width="40"
|
|
|
:resizable="false"
|
|
|
class-name="holiday-day-column"
|
|
|
>
|
|
|
@@ -12228,7 +12232,7 @@ export default {
|
|
|
inset: "0",
|
|
|
width: "100%",
|
|
|
height: "100%",
|
|
|
- backgroundColor: isRestDay ? "#12b54a" : "transparent",
|
|
|
+ backgroundColor: isRestDay ? "#86eda7" : "transparent",
|
|
|
color: isRestDay ? "#fff" : "#303133",
|
|
|
boxSizing: "border-box",
|
|
|
};
|
|
|
@@ -12284,7 +12288,7 @@ export default {
|
|
|
justifyContent: "center",
|
|
|
minHeight: "28px",
|
|
|
borderRadius: "4px",
|
|
|
- backgroundColor: isRestDay ? "#12b54a" : "transparent",
|
|
|
+ backgroundColor: isRestDay ? "#86eda7" : "transparent",
|
|
|
color: isRestDay ? "#fff" : "#303133",
|
|
|
whiteSpace: "normal",
|
|
|
wordBreak: "break-all",
|
yusm