diff --git a/attendance-performance-manager-ui/admin/src/components/SearchForm.vue b/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
index 6913ba819337bf9898769b40f14f71752d401bec..ae9e5188948bef185864efa0d34b1a74367df543 100644
--- a/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
+++ b/attendance-performance-manager-ui/admin/src/components/SearchForm.vue
@@ -35,8 +35,8 @@
clearable="true"
@change="item.change"
@clear="item.clear"
- :placeholder="item.label ? item.label : '璇烽€夋嫨'"
v-if="item.type === 'select'"
+ :placeholder="'璇烽€夋嫨' + item.label"
>
<el-option
label="鍏ㄩ儴"
@@ -111,7 +111,7 @@
v-if="item.type === 'date' && !item.valueFormat"
type="date"
value-format="yyyy-MM-dd"
- :placeholder="item.label ? item.label : '閫夋嫨鏃ユ湡'"
+ placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
@@ -120,7 +120,7 @@
v-if="item.type === 'date' && item.valueFormat"
type="date"
:value-format="item.valueFormat"
- :placeholder="item.label ? item.label : '閫夋嫨鏃ユ湡'"
+ placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
diff --git a/attendance-performance-manager-ui/admin/src/components/tools/FormButtons.vue b/attendance-performance-manager-ui/admin/src/components/tools/FormButtons.vue
index dcb67e563b0412d11423a3be14dc04f5ed4763e8..8e56be91ed542a2ada8756c52572a8fa7edb579a 100644
--- a/attendance-performance-manager-ui/admin/src/components/tools/FormButtons.vue
+++ b/attendance-performance-manager-ui/admin/src/components/tools/FormButtons.vue
@@ -1,33 +1,43 @@
// 琛ㄥ崟閫氱敤鐨勪繚瀛樺拰鍙栨秷鎸夐挳锛屽彲浠ラ€氳繃榛樿slot鏂瑰紡鏇挎崲
<template>
- <el-form-item>
- <slot name="prepend"></slot>
- <slot>
- <el-button v-if="!noSaveBtn" type="primary" @click='$emit("submit")' size='small' icon='el-icon-circle-check-outline'>淇濆瓨</el-button>
- <el-button v-if="!noCancelBtn" @click="$router.go(-1)" size='small' icon='el-icon-circle-close-outline'>鍙栨秷</el-button>
- </slot>
- <slot name="append"></slot>
- </el-form-item>
+ <el-form-item>
+ <slot name="prepend"></slot>
+ <slot>
+ <el-button
+ v-if="!noSaveBtn"
+ type="primary"
+ @click="$emit('submit')"
+ size="small"
+ icon="el-icon-circle-check-outline"
+ >淇濆瓨</el-button
+ >
+ <el-button
+ v-if="!noCancelBtn"
+ @click="$router.go(-1)"
+ size="small"
+ icon="el-icon-circle-close-outline"
+ >鍙栨秷</el-button
+ >
+ </slot>
+ <slot name="append"></slot>
+ </el-form-item>
</template>
<script>
export default {
- props: {
- noSaveBtn: {
- type: Boolean,
- default: false,
- },
- noCancelBtn: {
- type: Boolean,
- default: false,
- },
+ props: {
+ noSaveBtn: {
+ type: Boolean,
+ default: false,
},
- methods: {},
- data() {
- return {};
+ noCancelBtn: {
+ type: Boolean,
+ default: false,
},
+ },
+ methods: {},
+ data() {
+ return {};
+ },
};
</script>
-
-
-
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
index 43b16b79eb328a32e3226d7a1d054f6b654094f2..07d567623a1f426c15eba8c82a5bc33a3b7b1496 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
@@ -123,7 +123,7 @@ export default {
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
direction: "rtl",
- toString: ["leaveType","deptId","approverId"],
+ toString: ["leaveType", "deptId", "approverId"],
toDate: ["startTime", "endTime"],
// 琛ㄥ崟鏍￠獙
rules: {
@@ -223,6 +223,7 @@ export default {
if (this.form.endTime.valueOf() > this.form.startTime.valueOf()) {
this.form.duration = getMinu(this.form.startTime, this.form.endTime);
} else {
+ this.$message.closeAll();
this.$message.error("缁撴潫鏃ユ湡闇€澶т簬璇峰亣鏃ユ湡");
}
}
diff --git a/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
index 261b1ba82686ea9f413ed62b1b3ff1f5a87908b5..b20439571d7511eb17aa5533ebbe4bd513a4d00d 100644
--- a/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue
@@ -74,7 +74,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
- if ((column.label == "鍥剧墖鍑瘉")) {
+ if (column.label == "鍥剧墖鍑瘉") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
@@ -172,13 +172,13 @@ export default {
{
name: "checkStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
@@ -249,6 +249,8 @@ export default {
{ label: "璇存槑", prop: "checkDesc" },
+ { label: "宸℃煡浜哄憳", prop: "createUserId", formatter: this.formatter },
+
{ label: "鏍告煡浜哄憳", prop: "checkPerson" },
{
diff --git a/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
index ca687c5209e62246adbac47094eab0e11e7c377a..87753865ba047e0b507c064d0d89e9a62b943b6b 100644
--- a/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue
@@ -74,7 +74,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
- if ((column.label == "鍥剧墖鍑瘉")) {
+ if (column.label == "鍥剧墖鍑瘉") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
@@ -173,19 +173,19 @@ export default {
{
name: "checkStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
name: "complainSource",
type: "select",
- label: "鍏ㄩ儴鏉ユ簮",
+ label: "鎶曡瘔鏉ユ簮",
fuzzy: false,
},
{
@@ -255,6 +255,11 @@ export default {
{ label: "鏍告煡缁撴灉", prop: "checkResult", formatter: this.formatter },
{ label: "璇存槑", prop: "checkDesc" },
+ {
+ label: "宸℃煡浜哄憳",
+ prop: "createUserId",
+ formatter: this.formatter,
+ },
{ label: "鏍告煡浜哄憳", prop: "checkPerson" },
diff --git a/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
index 8817943b11568f323bb9590bc6ecfa1945ed1a71..08da21299e9fc8a4628d2521141c1bf68bcdb25c 100644
--- a/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue
@@ -74,7 +74,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
- if ((column.label == "鍥剧墖鍑瘉")) {
+ if (column.label == "鍥剧墖鍑瘉") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
@@ -172,13 +172,13 @@ export default {
{
name: "status",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
@@ -229,7 +229,7 @@ export default {
formatter: this.formatterDate,
},
- {
+ {
label: "鍥剧墖鍑瘉",
prop: "filePaths",
width: 150,
@@ -256,6 +256,12 @@ export default {
{ label: "璇存槑", prop: "checkDesc" },
+ {
+ label: "宸℃煡浜哄憳",
+ prop: "createUserId",
+ formatter: this.formatter,
+ },
+
{ label: "鏍告煡浜哄憳", prop: "checkPerson" },
{
diff --git a/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
index 22c7338ba25df34c7491599ef3551cd799c9b641..d41a600a458a8ecd93b79d705f95da0d8a6732c8 100644
--- a/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue
@@ -74,7 +74,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
- if ((column.label == "鍥剧墖鍑瘉")) {
+ if (column.label == "鍥剧墖鍑瘉") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
@@ -173,13 +173,13 @@ export default {
{
name: "checkStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
@@ -244,6 +244,12 @@ export default {
{ label: "璇存槑", prop: "checkDesc" },
+ {
+ label: "宸℃煡浜哄憳",
+ prop: "createUserId",
+ formatter: this.formatter,
+ },
+
{ label: "鏍告煡浜哄憳", prop: "checkPerson" },
{
diff --git a/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
index 5ed740e3875ccdee569967c52c4bc74115be8157..0032dc1a0f70757e69b059666c8a2b5f492c25df 100644
--- a/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue
@@ -74,7 +74,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
- if ((column.label == "鍥剧墖鍑瘉")) {
+ if (column.label == "鍥剧墖鍑瘉") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
@@ -172,13 +172,13 @@ export default {
{
name: "checkStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
@@ -225,7 +225,7 @@ export default {
// },
// { label: "缁╂晥瑙勫垯id", prop: "ruleId", formatter: this.formatter },
- {
+ {
label: "鍥剧墖鍑瘉",
prop: "filePaths",
width: 150,
@@ -252,6 +252,12 @@ export default {
{ label: "璇存槑", prop: "checkDesc" },
+ {
+ label: "宸℃煡浜哄憳",
+ prop: "createUserId",
+ formatter: this.formatter,
+ },
+
{ label: "鏍告煡浜哄憳", prop: "checkPerson" },
{
diff --git a/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue b/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
index 5dbfa963ae2f3a5a36454103b2461e194d129908..3d24029fb5f04deaf40d81936af3699bdaf00c99 100644
--- a/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue
@@ -74,7 +74,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
- if ((column.label == "鍥剧墖鍑瘉")) {
+ if (column.label == "鍥剧墖鍑瘉") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
@@ -172,19 +172,19 @@ export default {
{
name: "checkStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
name: "reviewSource",
type: "select",
- label: "鍏ㄩ儴鏉ユ簮",
+ label: "宸瘎鏉ユ簮",
fuzzy: false,
},
{
@@ -253,6 +253,12 @@ export default {
{ label: "璇存槑", prop: "checkDesc" },
+ {
+ label: "宸℃煡浜哄憳",
+ prop: "createUserId",
+ formatter: this.formatter,
+ },
+
{ label: "鏍告煡浜哄憳", prop: "checkPerson" },
{
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
index ccd4360618a97d54850149584a0706fa0236e8ff..899fe50c6ae118b5fc43e405583c0dd896e28a2b 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue
@@ -122,14 +122,40 @@
<span v-if="!form.performAttendAppealFilesList">
--
</span>
+
<div class="img_content" v-else>
<div
class="imgBox"
v-for="val in form.performAttendAppealFilesList"
:key="val.id"
- @click="hanldeDownloadFile(val)"
>
- <img src="../../../../assets/images/fileImg.png" alt="" />
+ <el-image
+ v-if="
+ val.filePath.includes(
+ '.png' || '.jpg' || '.jpeg' || 'bmp'
+ )
+ "
+ style="width: 100px; height: 100px"
+ :src="
+ `${
+ val.filePath.indexOf('http') == -1
+ ? baseUrl + val.filePath
+ : val.filePath
+ }`
+ "
+ :preview-src-list="
+ val.filePath.indexOf('http') == -1
+ ? [baseUrl + val.filePath]
+ : [val.filePath]
+ "
+ >
+ </el-image>
+ <img
+ src="../../../../assets/images/fileImg.png"
+ v-else
+ alt=""
+ @click="hanldeDownloadFile(val)"
+ />
{{ val.fileName }}
</div>
</div>
@@ -502,6 +528,7 @@ export default {
"checkTime",
"appealTime",
],
+ baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
// 琛ㄥ崟鏍￠獙
rules: {
staffName: [
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
index 506a0754afb2e639eff4e6a07b7175908ac13623..fa429e373729ad974edd263e0b192881fc6512f7 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue
@@ -180,13 +180,13 @@ export default {
{
name: "processStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
index 1026e0936ae92b0410f789662b8ba0ee4a5fc482..7202f8475d381564091ea5505f49f4bb06a84447 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue
@@ -180,19 +180,19 @@ export default {
{
name: "processStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
name: "complainSource",
type: "select",
- label: "鍏ㄩ儴鏉ユ簮",
+ label: "鎶曡瘔鏉ユ簮",
fuzzy: false,
},
{
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
index 219b111d142d94a2930a79a9d0442adf32c36ef2..f6af5ea27056685ce69dfe30f0cedd54298ef78c 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue
@@ -180,13 +180,13 @@ export default {
{
name: "processStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
index 947eb1928c320cfa9e481b076c1d20a9c2182a18..44f59047ac0a6d9645b4ff4b86e0f2ddf057eb05 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue
@@ -180,13 +180,13 @@ export default {
{
name: "processStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
index 9f6b61f0fa0e9763f39ecd92e97dc1acba9be005..265c2653b6344aaa336fdcbcf3e0837154fdd8fe 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue
@@ -180,13 +180,13 @@ export default {
{
name: "processStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
diff --git a/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue b/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
index b84df96806144491aba2e42de4a02d3560fb6bdc..78a56e67175a385c7cab9fd43beed277bf749d63 100644
--- a/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue
@@ -82,7 +82,7 @@ export default {
created() {},
methods: {
handleCellClick(row, column, event, cell) {
- if ((column.label == "鍥剧墖鍑瘉")) {
+ if (column.label == "鍥剧墖鍑瘉") {
const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
const regular = new RegExp(`.*\.${suffix}`);
regular.test(row.filePaths);
@@ -180,19 +180,19 @@ export default {
{
name: "processStatus",
type: "select",
- label: "鍏ㄩ儴鐘舵€�",
+ label: "澶勭悊鐘舵€�",
fuzzy: false,
},
{
name: "deptId",
type: "select",
- label: "鍏ㄩ儴閮ㄩ棬",
+ label: "鎵€灞為儴闂�",
fuzzy: false,
},
{
name: "reviewSource",
type: "select",
- label: "鍏ㄩ儴鏉ユ簮",
+ label: "宸瘎鏉ユ簮",
fuzzy: false,
},
{