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

jero-web/src/components/CollectionType/index.vue

@@ -652,7 +652,7 @@
       </div>
     </div>
     <uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess"
-                          :detailDate='detailDate'></uploadFileChangeDown>
+                          :detailDate='detailDate' watermark='download'></uploadFileChangeDown>
   </div>
 </template>
 
@@ -667,6 +667,10 @@
         type: Object,
         default: {},
         require: true
+      },
+      watermark: {
+        type: String,
+        default: ''
       }
     },
     data() {

jero-web/src/components/uploadFileChangeDown/file.vue

@@ -43,7 +43,7 @@ import { mapGetters } from 'vuex'
 
   export default {
     name: 'file',
-    props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate'],
+    props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate','watermark'],
     data() {
       return {
         visible: false,
@@ -91,7 +91,11 @@ import { mapGetters } from 'vuex'
   methods: {
     ...mapGetters(['userInfo']),
     download() {
-      downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
+      if(this.watermark == 'download'){
+        downloadFile('/sys/common/downLoadFileNOMark', this.template.templateName, { id: this.template.templateId })
+      } else {
+        downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
+      }
     },
     perentHandleFunc(data) {
       this.myfileList = data
@@ -220,7 +224,11 @@ import { mapGetters } from 'vuex'
       //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
       //   window.open(url, '_blank')
       // } else {
+      if(this.watermark == 'download'){
+        downloadFile('/sys/common/downLoadFileNOMark', fileQuery.fileName, { id: fileQuery.id })
+      }else {
         downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+      }
       // }
     }
   }