From c0dd166af33eda7fb76ba5c50f78ba6cb0726eaa Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 17:13:17 +0800
Subject: [PATCH] 29793

---
 src/saas/AppCountryAlbum/AddReport.vue                   | 2 +-
 src/saas/AppCountryAlbum/components/report/Daily.vue     | 8 ++++++++
 .../AppCountryAlbum/components/report/InspectLog.vue     | 8 ++++++++
 .../components/report/MeetingMminutes.vue                | 8 ++++++++
 .../AppCountryAlbum/components/report/WorkReport.vue     | 9 ++++++++-
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index 1c0cb40e..2f2a4bdc 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -62,7 +62,7 @@
 
       save () {
         this.$loading()
-        this.$refs.reportItem.screenshot().then(canvas => {
+        this.$refs.reportItem.screenshot() && this.$refs.reportItem.screenshot().then(canvas => {
           let dataURL = canvas.toDataURL('image/png')
           const file = this.dataURLtoFile(dataURL, 'photo.png')
           let formData = new FormData()
diff --git a/src/saas/AppCountryAlbum/components/report/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue
index 1d9cc7fc..8782bb62 100644
--- a/src/saas/AppCountryAlbum/components/report/Daily.vue
+++ b/src/saas/AppCountryAlbum/components/report/Daily.vue
@@ -42,6 +42,7 @@
 <script>
   import html2canvas from 'html2canvas'
   import RenderContent from './RenderContent.vue'
+  import { mapFieldLable } from './../../config'
   export default {
     name: 'Daily',
     label: '日报',
@@ -119,6 +120,13 @@
 
     methods: {
       screenshot () {
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
+
         const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
 
         return html2canvas(this.$refs.report, {
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index 4c5a2b23..95e07bf1 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -43,6 +43,7 @@
 
 <script>
   import html2canvas from 'html2canvas'
+  import { mapFieldLable } from './../../config'
   import RenderContent from './RenderContent.vue'
   export default {
     name: 'InspectLog',
@@ -128,6 +129,13 @@
 
     methods: {
       screenshot () {
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
+
         const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
 
         return html2canvas(this.$refs.report, {
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index 51660a14..4fb3dd8e 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -55,6 +55,7 @@
 <script>
   import html2canvas from 'html2canvas'
   import RenderContent from './RenderContent.vue'
+  import { mapFieldLable } from './../../config'
   export default {
     name: 'MeetingMminutes',
 
@@ -149,6 +150,13 @@
 
     methods: {
       screenshot () {
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
+
         const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
 
         return html2canvas(this.$refs.report, {
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index 91a69c3f..bc2a5643 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -41,6 +41,7 @@
 <script>
   import html2canvas from 'html2canvas'
   import RenderContent from './RenderContent.vue'
+  import { mapFieldLable } from './../../config'
 
   export default {
     name: 'WorkReport',
@@ -119,8 +120,14 @@
 
     methods: {
       screenshot () {
-        const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
 
+        const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
         return html2canvas(this.$refs.report, {
           allowTaint: true,
           useCORS: true,