From 50cbbe9386bf56b49871326d52563df891ec44ac Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 25 May 2022 13:59:13 +0800 Subject: [PATCH 01/11] 29843 --- .../AppCountryAlbum/AttendanceFiexdTime.vue | 23 +++++++++++++++++-- .../AttendanceFlexibleTime.vue | 23 +++++++++++++++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue b/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue index 4b0597d6..06353a78 100644 --- a/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue +++ b/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue @@ -103,14 +103,14 @@ -
+

{{ address.title }}

{{ address.address }}

允许打卡范围{{ address.distance }}米

- + 删除
@@ -378,5 +378,24 @@ } } } + + .form-item__address { + .left { + flex: 1; + margin-right: 10px; + + p { + line-height: 1.3; + } + } + + .right { + span { + margin-left: 10px; + color: #1088F9; + font-size: 28px; + } + } + } } diff --git a/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue b/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue index ff2c73d4..795f9752 100644 --- a/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue +++ b/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue @@ -90,14 +90,14 @@
-
+

{{ address.title }}

{{ address.address }}

允许打卡范围{{ address.distance }}米

- + 删除
@@ -367,5 +367,24 @@ } } } + + .form-item__address { + .left { + flex: 1; + margin-right: 10px; + + p { + line-height: 1.3; + } + } + + .right { + span { + margin-left: 10px; + color: #1088F9; + font-size: 28px; + } + } + } } From 0f432f8938d0c32efbafb499b4d0050e1da965d5 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 25 May 2022 14:02:55 +0800 Subject: [PATCH 02/11] 29841 --- src/saas/AppCountryAlbum/Form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/saas/AppCountryAlbum/Form.vue b/src/saas/AppCountryAlbum/Form.vue index 3f48e616..2052857a 100644 --- a/src/saas/AppCountryAlbum/Form.vue +++ b/src/saas/AppCountryAlbum/Form.vue @@ -4,7 +4,7 @@
{{ mapFieldLable(config.type) }}
- +
From efabc73bb8f678693512ff370d9a59397ec08827 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 25 May 2022 14:05:35 +0800 Subject: [PATCH 03/11] 29838 --- src/saas/AppCountryAlbum/AddReport.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue index f85e2186..1c0cb40e 100644 --- a/src/saas/AppCountryAlbum/AddReport.vue +++ b/src/saas/AppCountryAlbum/AddReport.vue @@ -22,7 +22,7 @@ export default { name: 'Report', - appName: '工作汇报', + appName: '拼图汇报', data () { return { From cf813ed8ef0ec587164344228dc142b4f73eb2f1 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 25 May 2022 14:10:30 +0800 Subject: [PATCH 04/11] 29836 --- src/saas/AppCountryAlbum/EditAlbum.vue | 2 +- src/saas/AppCountryAlbum/Photo.vue | 2 +- src/saas/AppCountryAlbum/components/report/Daily.vue | 5 +++++ src/saas/AppCountryAlbum/components/report/InspectLog.vue | 6 ++++++ .../AppCountryAlbum/components/report/MeetingMminutes.vue | 6 ++++++ src/saas/AppCountryAlbum/components/report/WorkReport.vue | 6 ++++++ 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/saas/AppCountryAlbum/EditAlbum.vue b/src/saas/AppCountryAlbum/EditAlbum.vue index 0ed91b95..85c275ed 100644 --- a/src/saas/AppCountryAlbum/EditAlbum.vue +++ b/src/saas/AppCountryAlbum/EditAlbum.vue @@ -109,7 +109,7 @@ return this.$u.toast('请选择相片') } - this.$confirm('确定删除该数据?').then(() => { + this.$confirm('确定删除这些图片?').then(() => { this.$http.post(`/api/appalbumphoto/delete?ids=${this.chooseImg}`).then(res => { if (res.code == 0) { this.$u.toast('删除成功') diff --git a/src/saas/AppCountryAlbum/Photo.vue b/src/saas/AppCountryAlbum/Photo.vue index d3cb11b6..e0785711 100644 --- a/src/saas/AppCountryAlbum/Photo.vue +++ b/src/saas/AppCountryAlbum/Photo.vue @@ -76,7 +76,7 @@ }, remove () { - this.$confirm('确定删除该数据?').then(() => { + this.$confirm('确定删除该图片?').then(() => { this.$http.post(`/api/appalbumphoto/delete?ids=${this.id}`).then(res => { if (res.code == 0) { this.$u.toast('删除成功') diff --git a/src/saas/AppCountryAlbum/components/report/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue index 5d67fc5d..35302db0 100644 --- a/src/saas/AppCountryAlbum/components/report/Daily.vue +++ b/src/saas/AppCountryAlbum/components/report/Daily.vue @@ -157,6 +157,11 @@ image { display: block; width: 100%; + margin-bottom: 10px; + + &:last-child { + margin-bottom: 20px; + } } } diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue index 568ead74..1fcaa7e0 100644 --- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue +++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue @@ -159,9 +159,15 @@ .imgs { margin-top: 20px; + image { display: block; width: 100%; + margin-bottom: 10px; + + &:last-child { + margin-bottom: 20px; + } } } diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue index 0215c2d6..04b0f57a 100644 --- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue +++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue @@ -175,9 +175,15 @@ .imgs { margin-top: 20px; + image { display: block; width: 100%; + margin-bottom: 10px; + + &:last-child { + margin-bottom: 20px; + } } } diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue index 0da001a7..f2d87a74 100644 --- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue +++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue @@ -161,9 +161,15 @@ .imgs { margin-top: 20px; + image { display: block; width: 100%; + margin-bottom: 10px; + + &:last-child { + margin-bottom: 20px; + } } } From 70111080466be4df88f2f7c02154a87c45964b26 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 25 May 2022 14:12:31 +0800 Subject: [PATCH 05/11] 29835 --- src/saas/AppCountryAlbum/AlbumDetail.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue index 3999609b..7335404d 100644 --- a/src/saas/AppCountryAlbum/AlbumDetail.vue +++ b/src/saas/AppCountryAlbum/AlbumDetail.vue @@ -117,6 +117,10 @@ }, toEdit () { + if (!this.list.length) { + return this.$u.toast('相册无照片,请上传照片') + } + this.linkTo(`./EditAlbum?id=${this.id}`) }, From 33327386a1c119432093f021c2619de905e50c36 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 25 May 2022 14:18:40 +0800 Subject: [PATCH 06/11] 29834 --- src/saas/AppCountryAlbum/components/report/InspectLog.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue index 1fcaa7e0..facbaf1f 100644 --- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue +++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue @@ -150,6 +150,7 @@