Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/SeafreightExportF/bills/assembly/mail-component.vue → src/components/iosbasic-data/mail-component.vue

@@ -111,7 +111,41 @@ export default {
                 attachments: [
                     { required: true, message: '请输入附件名', trigger: 'blur' }
                 ]
-            }
+            },
+            fileTypeList: [
+                {
+                    key: 'Pdf',
+                    value: 'pdf'
+                },
+                {
+                    key: 'ImageSvg',
+                    value: 'svg'
+                },
+                {
+                    key: 'Excel2007',
+                    value: 'xls'
+                },
+                {
+                    key: 'Text',
+                    value: 'txt'
+                },
+                {
+                    key: 'Html',
+                    value: 'html'
+                },
+                {
+                    key: 'Word2007',
+                    value: 'doc'
+                },
+                {
+                    key: 'Csv',
+                    value: 'csv'
+                },
+                {
+                    key: 'Csv',
+                    value: 'csv'
+                }
+            ]
         }
     },
     watch: {
@@ -149,13 +183,20 @@ export default {
         },
         sendEmail() {
             this.sending = true
+            let fileContentStrList = ["ImageSvg", "Html"]
+            let nowFile = this.fileTypeList.find(f => f.key === this.formData.fileType)
             let param = {
                 fileName: this.formData.attachments,
-                fileType: this.formData.fileType,
+                fileType: nowFile.value,
                 sendTo: this.formData.to,
                 mailTitle: this.formData.subject,
-                mailContent: this.formData.message,
+                mailContent: this.formData.content,
                 fileContent: this.formData.fileContent,
+                fileContentStr: ''
+            }
+            if (fileContentStrList.indexOf(this.formData.fileType) !== -1) {
+                param.fileContent = null
+                param.fileContentStr = this.formData.fileContent
             }
             generateMailFile(param).then(res => {
                 console.info(res)

src/util/date.js

@@ -285,11 +285,8 @@ export function overdueJudgment(date) {
   const overDay = localStorage.getItem('lockTermDays')
   if (overDay) {
     const nowDate = new Date(dateFormat(new Date(),'yyyy-MM-dd'))
-
     const startDate = new Date(dateFormat(new Date(date),'yyyy-MM-dd'))
-      console.log(dateFormat(nowDate,'yyyy-MM-dd'),dateFormat(startDate,'yyyy-MM-dd'),1111111111)
     startDate.setDate(startDate.getDate() + Number(overDay))
-         console.log(dateFormat(nowDate,'yyyy-MM-dd'),dateFormat(startDate,'yyyy-MM-dd'),22222222)
     if (startDate < nowDate) {
       return true
     } else {

src/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue

@@ -62,7 +62,7 @@ import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
-import mailComponent from "@/views/iosBasicData/SeafreightExportF/bills/assembly/mail-component.vue";
+import mailComponent from "@/components/iosbasic-data/mail-component.vue";
 
 export default {
   components: {

src/views/system/user.vue

@@ -424,6 +424,12 @@ export default {
                 hide: true,
                 overHidden: true
               },
+                {
+                    label: "邮箱授权码",
+                    prop: "emailAuthorization",
+                    hide: true,
+                    overHidden: true
+                },
               {
                 label: "用户性别",
                 prop: "sex",