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

src/pages/details/otherBussStandardDetails/index.vue

@@ -369,7 +369,6 @@
                               v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"></i>
                             <i
                               title="下载带水印"
-                              v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                               @click="downloadFileByWater(file.id, file.fileSuffix)"
                               class="icon-download2"
                               v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"></i>
@@ -2543,14 +2542,30 @@ export default {
       })
     },
     downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       this.$http.get('lawss/sarBussionessStand/logBussDownload2', {
         standCode: this.sarStandardsInfoEO.standCode,

src/pages/details/otherBussStandardExternalDetails/index.vue

@@ -369,7 +369,6 @@
                             />
                             <i
                               title="下载带水印"
-                              v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                               @click="downloadFileByWater(file.id, file.fileSuffix)"
                               class="icon-download2"
                               v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
@@ -2545,14 +2544,30 @@ export default {
       })
     },
     downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       this.$http.get('lawss/sarBussionessStand/logBussDownload2', {
         standCode: this.sarStandardsInfoEO.standCode,

src/pages/details/otherStandardDetails/index.vue

@@ -3199,14 +3199,30 @@ export default {
 
     },
     downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       if(this.$route.params.pageType === 'INLAND_STAND'){
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber

src/pages/details/otherStandardExternalDetails/index.vue

@@ -3210,14 +3210,30 @@ export default {
 
     },
     downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+      if(fileSuffix !== undefined && fileSuffix !== null){
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+        fileSuffix = fileSuffix.toUpperCase()
-      } else {
+      }
+      if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          this.$http.get('lawss/sarStandFile/queryConvertAtt', {
+            attId: attId
+          }, {
+            _this: this
+          }, res => {
+            if (res.data) {
+              let fileObj = {}
+              window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId
+            } else {
+              this.$message.error('当前暂时无法下载，请稍后重试')
+            }
+          }, e => {
+            this.$message.error('当前暂时无法下载，请稍后重试')
+          })
         } else {
           this.$message.error('请选择要下载的文件')
         }
+      } else {
+        this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件')
       }
       if(this.$route.params.pageType === 'INLAND_STAND'){
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber

src/pages/details/process/ruku/index.vue

@@ -134,12 +134,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -150,12 +144,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
@@ -224,12 +212,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -240,12 +222,6 @@
                         class="icon-download"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
                     />
-                    <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(file.id, file.fileSuffix)"
-                        class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
-                    />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>

src/pages/knowledgeGraph/index.vue

@@ -2241,18 +2241,6 @@ export default {
         this.$message.error('请选择要下载的文件')
       }
     },
-    downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
-
     // 查看详情
     getMenuDetail(menuId) {
       return new Promise((resolve, reject) => {

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -2073,17 +2073,6 @@ export default {
         this.$message.error('请选择要下载的文件')
       }
     },
-    downloadFileByWater (attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     showReferStandDetials (standNum) {
       // 验证标准号在系统中是否存在
       this.$http.post('lawss/sarTestItem/validateStandNumber', {

src/pages/phone/domesticDetails.vue

@@ -85,24 +85,12 @@
                                 <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
                                    @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                    :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
-                                <i title="下载" @click="downloadFile(file.id)" class="icon-download"
-                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                                />
-                                <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
-                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                                />
                               </span>
                               <!--多个文件时-->
                               <div v-else-if="child.value && child.value.length > 0">
                                 <span style="display: flex; align-items: center;">
                                   <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                      :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
-                                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"
-                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                                  />
-                                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
-                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                                  />
                                 </span>
                               </div>
                             </div>
@@ -2786,36 +2774,6 @@
         }
 
       },
-      downloadFileByWater(attId, fileSuffix) {
-        if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-          this.$message.error('水印下载仅支持PDF,pdf格式文件')
-        } else {
-          if (attId != null && attId !== '') {
-            window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-          } else {
-            this.$message.error('请选择要下载的文件')
-          }
-        }
-        if(this.$route.query.pageType === 'INLAND_STAND'){
-          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-          this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{
-            standNumber: standNumber,
-            standName: this.sarStandardsInfoEO.standName
-          }, {
-            _this: this
-          }, res => {
-          })
-        }else{
-          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-          this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{
-            standNumber: standNumber,
-            standName: this.sarStandardsInfoEO.standEnName
-          }, {
-            _this: this
-          }, res => {
-          })
-        }
-      },
       /**
        * @Description: 跳转流程
        */

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -210,7 +210,6 @@
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 :show-submit="submitShow"
-                :show-confirm="acceptShow"
                 :show-transfer="submitShow"
                 @transfer="handleTransfer"
                 @save="handleSave"

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -610,18 +610,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 删除上传的文件
     delFileInfo (file, fileList) {
       this.fileInfoList.forEach((item, index) => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -47,12 +47,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click="downloadFileByWater(item.id, item.name)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -423,18 +417,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 驳回事件
     beforeBack() {
       if(!this.commentText){

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -47,12 +47,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -383,17 +377,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     //确认转办
     checkedRole (data) {
       this.assigneeNewLoading = true

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -724,18 +724,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 删除上传的文件
     delFileInfo (file, fileList) {
       this.fileInfoList.forEach((item, index) => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue

@@ -47,12 +47,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -452,17 +446,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     // 驳回事件
     beforeBack() {
       if(!this.commentText){

src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue

@@ -91,27 +91,51 @@
           previewShow(attId) {
             this.iframeLoading = true
             return new Promise((resolve, reject) => {
-              getBusStandFileByAttId({
+              this.$http.get('lawss/sarStandFile/queryConvertAtt', {
-                attId
+                attId: attId
-              }).then(res => {
+              }, {
-                if(res){
+                _this: this
-                  const history = res;
+              }, res => {
-                  const editFileInfo = res.data
+                if (res.data) {
-                  if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
+                  let fileObj = {}
-                    this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
+                  fileObj.fileId = res.data.attId
-                  }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
+                  fileObj.fileName = res.data.fileOldName
-                    this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
+                  let fileList = []
-                  }else {
+                  let repeatData = 0
-                    const nowTime = new Date().getTime()
+                  if (sessionStorage.getItem('fileInfo')) {
-                    // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+                    fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                    this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
+                    if (fileList != null && fileList.length > 0) {
+                      for (let i = 0; i < fileList.length; i++) {
+                        if (fileList[i].fileId === res.data.attId) {
+                          repeatData = 1
+                          break
+                        }
+                      }
+                      if (repeatData === 0) {
+                        fileList.push(fileObj)
+                        fileList = JSON.stringify(fileList)
+                        sessionStorage.setItem('fileInfo', fileList)
+                      }
+                    }
+                  } else {
+                    fileList.push(fileObj)
+                    fileList = JSON.stringify(fileList)
+                    sessionStorage.setItem('fileInfo', fileList)
                   }
-                  this.iframeLoading = false
+                  this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId)
-                  this.$forceUpdate()
+                } else {
-                  resolve(history)
+                  this.$message.error('文档未转换成功或该文档无法读取')
                 }
-              }).catch(e => {
+                this.iframeLoading = false
+                this.$forceUpdate()
+                resolve(history)
+              }, e => {
+                this.iframeLoading = false
+                this.$forceUpdate()
+                resolve(history)
+                this.$message.error('文档未转换成功或该文档无法读取')
               })
+
             })
             console.log(this.iframeUrl);
           },

src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -536,18 +530,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //流程转办
     handleTransfer(){
         this.drawerModal = true

src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -522,18 +516,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //流程转办
     handleTransfer(){
       this.drawerModal = true

src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue

@@ -117,12 +117,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -473,18 +467,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue

@@ -104,12 +104,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click="downloadFileByWater(item.id, item.name)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -414,19 +408,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue

@@ -117,12 +117,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -484,18 +478,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfs/step1.vue

@@ -1335,19 +1335,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
 };
 </script>

src/pages/processCenter/pages/creatProcess/qbfs/step2.vue

@@ -449,19 +449,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/step3.vue

@@ -695,19 +695,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/step4.vue

@@ -665,19 +665,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/step5.vue

@@ -760,19 +760,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue

@@ -661,18 +661,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue

@@ -756,19 +756,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -447,18 +447,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step1.vue

@@ -810,19 +810,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
 };
 </script>

src/pages/processCenter/pages/creatProcess/qbfz/step4.vue

@@ -448,18 +448,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step5.vue

@@ -478,18 +478,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step6.vue

@@ -476,18 +476,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbfz/step7.vue

@@ -476,18 +476,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue

@@ -33,12 +33,6 @@
                   class="icon-download"
                   v-btn-permission="''"
                 />
-                <i
-                  title="下载带水印"
-                  @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                  class="icon-download2"
-                  v-btn-permission="''"
-                />
               </p>
             </div>
             <div v-else>
@@ -959,17 +953,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     choiceLeader(){
       this.workModel = true
     },

src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue

@@ -33,12 +33,6 @@
                   class="icon-download"
                   v-btn-permission="''"
                 />
-                <i
-                  title="下载带水印"
-                  @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
-                  class="icon-download2"
-                  v-btn-permission="''"
-                />
               </p>
             </div>
             <div v-else>
@@ -996,17 +990,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
-        if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
-        } else {
-          this.$message.error('请选择要下载的文件')
-        }
-      }
-    },
     choiceLeader(){
       this.workModel = true
     },

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue

@@ -821,14 +821,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -948,14 +948,26 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
+
     },
     dataSourceChange() {
       this.handleSelectForm.page = 1

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -845,14 +845,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue

@@ -845,14 +845,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue

@@ -836,14 +836,25 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      let routeUrl = this.$router.resolve({
+      if(item.standType ==='BUSINESS_STAND'){
-        name: "OtherStandardDetails",
+        let routeUrl = this.$router.resolve({
-        params: {
+          name: 'OtherBussStandardDetails',
-          id: item.id || item.standId,
+          params: {
-          pageType: item.standType + '_STAND'
+            id: item.id || item.standId,
-        }
+            pageType: 'BUSINESS_STAND'
-      });
+          }
-      window.open(routeUrl.href, "_blank");
+        })
+        window.open(routeUrl.href, '_blank')
+      }else{
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.id || item.standId,
+            pageType: item.standType + '_STAND'
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      }
     },
     //获取数据
     getData() {

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -34,12 +34,6 @@
                       class="icon-download"
                       v-btn-permission="''"
                     />
-                    <i
-                      title="下载带水印"
-                      @click="downloadFileByWater(item.id, item.name)"
-                      class="icon-download2"
-                      v-btn-permission="''"
-                    />
                   </p>
                 </div>
                 <div v-else>
@@ -385,18 +379,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     // 驳回事件
     beforeBack() {
       if(!this.commentText){

src/pages/processCenter/pages/phone/jrbzhxh/step3.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -472,18 +466,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //转办按钮
     handleTransfer() {
       this.phoneshowflag = true;

src/pages/processCenter/pages/phone/jrbzhxh/step4.vue

@@ -86,12 +86,6 @@
                         class="icon-download"
                         v-btn-permission="''"
                       />
-                      <i
-                        title="下载带水印"
-                        @click="downloadFileByWater(item.id, item.name)"
-                        class="icon-download2"
-                        v-btn-permission="''"
-                      />
                     </p>
                   </div>
                   <div v-else>
@@ -458,18 +452,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //转办按钮
     handleTransfer(){
       this.phoneshowflag = true

src/pages/processCenter/pages/phone/qbfs/step5.vue

@@ -779,19 +779,7 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
+    }
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/phone/qbfz/step5.vue

@@ -339,18 +339,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/phone/qbfz/step6.vue

@@ -333,18 +333,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/processCenter/pages/phone/qbfz/step7.vue

@@ -339,18 +339,6 @@ export default {
       } else {
         this.$message.error("请选择要下载的文件");
       }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
     }
   },
   computed: {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -1080,18 +1080,6 @@ export default {
         this.$message.error("请选择要下载的文件");
       }
     },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    },
     //
     changeState(row) {
       let routeUrl = this.$router.resolve({