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

src/common/preview/index.js

@@ -8,7 +8,7 @@ export default attId => {
         attId
     }).then(res => {
         if(res){
-            const editFileInfo = res
+            const editFileInfo = res.data
             if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
                 window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
             }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -424,10 +424,9 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {
-  startProcess, saveTaskFirst,
+  saveTaskFirst,
   completeTask, queryTaskFirst,
-  taskDel, workGroup, processBack,
+  taskDel, workGroup, processBack,upFile
-  getBusStandFileByAttId,upFile
 } from '@/api/process.js'
 
 export default {
@@ -660,43 +659,9 @@ export default {
         this.fileMadel = false
       }
     },
-
-    // 文件预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     filesUpload (file) { // 下载
       const attId = file.id

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -231,10 +231,6 @@ import ProcessTitle from "../../components/ProcessTitle";
 import {
   completeTask,
   inboundLiaisonDetail,
-  getBusStandFileByAttId,
-  startProcess,
-  saveinboundTask,
-  saveTaskForPub,
 } from "@/api/process.js"
 
 export default {
@@ -296,9 +292,6 @@ export default {
     this.getData()
   },
   methods: {
-    phoneClick () {
-      this.$router.push('/phoneBzrhStep2')
-    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -336,41 +329,9 @@ export default {
       this.active = name
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -318,8 +318,6 @@ import ProcessTitle from "../../components/ProcessTitle";
 import {
   completeTask,
   inboundLiaisonDetail,
-  getBusStandFileByAttId,
-  saveinboundTask,
   saveTaskForPub,
   upFile
 } from "@/api/process.js"
@@ -584,41 +582,9 @@ export default {
       }
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -237,10 +237,6 @@ import ProcessTitle from "../../components/ProcessTitle";
 import {
   completeTask,
   inboundLiaisonDetail,
-  saveinboundTask,
-  getBusStandFileByAttId,
-  saveTaskForPub,
-  changeAssigneeNew
 } from "@/api/process.js"
 
 export default {
@@ -309,9 +305,6 @@ export default {
     this.getData()
   },
   methods: {
-    phoneClick () {
-      this.$router.push('/phoneBzrhStep4')
-    },
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
@@ -419,41 +412,9 @@ export default {
       })
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -403,10 +403,7 @@ import ProcessTitle from "../../components/ProcessTitle";
 import {
   completeTask,
   inboundLiaisonDetail,
-  saveinboundTask,
+  saveTaskForPub,upFile
-  getBusStandFileByAttId,
-  saveTaskForPub,
-  changeAssigneeNew,upFile
 } from "@/api/process.js"
 
 export default {
@@ -742,41 +739,9 @@ export default {
 
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if (res) {
-            const editFileInfo = res
-            if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
-              window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
-            } else if (editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF') {
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            } else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
 
     /** 点击对应附件进行下载*/

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -247,10 +247,6 @@ import ProcessTitle from "../../components/ProcessTitle";
 import {
   completeTask,
   inboundLiaisonDetail,
-  saveinboundTask,
-  getBusStandFileByAttId,
-  saveTaskForPub,
-  changeAssigneeNew
 } from "@/api/process.js"
 
 export default {
@@ -320,11 +316,6 @@ export default {
     this.getData()
   },
   methods: {
-    phoneClick () {
-      if (this.taskInfo !== '标准法规工程师汇总修订完毕') {
-        this.$router.push('/phoneBzrhStep6')
-      }
-    },
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
@@ -366,41 +357,9 @@ export default {
       })
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue

@@ -289,9 +289,6 @@ export default {
     this.getData()
   },
   methods: {
-    phoneClick () {
-      this.$router.push('/phoneBzhhStep2')
-    },
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -350,10 +350,10 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {
-  startProcess, queryTaskFirst,
+  queryTaskFirst,
   saveTaskFirst, completeTask,
   taskDel, workGroup, processBack,
-  getBusStandFileByAttId,upFile
+  upFile
 } from '@/api/process.js'
 
 export default {
@@ -587,41 +587,9 @@ export default {
       }
     },
     // 文件预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     filesUpload (file) { // 下载
       const attId = file.id

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -224,7 +224,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail,getBusStandFileByAttId} from '@/api/process.js'
+import {completeTask, inboundLiaisonDetail} from '@/api/process.js'
 
 export default {
   components: {
@@ -265,9 +265,6 @@ export default {
     this.getData()
   },
   methods: {
-    phoneClick () {
-      this.$router.push('/phoneBzchStep2')
-    },
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
@@ -384,41 +381,9 @@ export default {
       })
 
     },
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      tis.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -277,7 +277,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {startProcess, saveTaskFirst, saveTaskForPub, completeTask, inboundLiaisonDetail,getBusStandFileByAttId} from '@/api/process.js'
+import {saveTaskForPub, completeTask, inboundLiaisonDetail} from '@/api/process.js'
 
 export default {
   components: {
@@ -441,41 +441,9 @@ export default {
 
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue

@@ -221,7 +221,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail,getBusStandFileByAttId} from '@/api/process.js'
+import {completeTask, inboundLiaisonDetail} from '@/api/process.js'
 
 export default {
   components: {
@@ -262,9 +262,6 @@ export default {
     this.getData()
   },
   methods: {
-    phoneClick () {
-      this.$router.push('/phoneBzchStep4')
-    },
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
@@ -370,41 +367,9 @@ export default {
       })
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -315,7 +315,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {startProcess, saveTaskForPub, completeTask, inboundLiaisonDetail,getBusStandFileByAttId} from '@/api/process.js'
+import {saveTaskForPub, completeTask, inboundLiaisonDetail} from '@/api/process.js'
 
 export default {
   components: {
@@ -528,41 +528,9 @@ export default {
 
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue

@@ -230,7 +230,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail,getBusStandFileByAttId} from '@/api/process.js'
+import {completeTask, inboundLiaisonDetail} from '@/api/process.js'
 
 export default {
   components: {
@@ -276,11 +276,6 @@ export default {
     this.getData()
   },
   methods: {
-    phoneClick () {
-      if (this.taskInfo !== '标准法规工程师修订完毕') {
-        this.$router.push('/phoneBzchStep6')
-      }
-    },
     // 右上标签页面切换
     handleTabs(name) {
       this.active = name
@@ -437,41 +432,9 @@ export default {
 
     },
     // 预览
-    getBusStandFileByAttId(attId) { // 预览
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
-          } else {
-            reject()
-          }
-        }).catch(e => {
-          reject(e)
-        })
-      })
-    },
     fileLook(file) { // 预览
       const attId = file.id
-      this.getBusStandFileByAttId(attId)
+      this.$preview(attId)
-        .then(res => {
-          if(res){
-            const editFileInfo = res
-            if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-              window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-            }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-            }else {
-              const nowTime = new Date().getTime()
-              // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-              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)
-            }
-            // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-          }
-        }).catch(e => {
-        this.$message.warning('文件不存在,预览失败')
-      })
     },
     /** 点击对应附件进行下载*/
     previews(val) {

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1171,6 +1171,7 @@
                               <custom-select-array
                                   :key="applyArcticOptions.options"
                                   :config="applyArcticOptions"
+                                  style="margin-left: -14px"
                                   v-model="sarBussionessSearch['SYCXCLASS']"
                               ></custom-select-array>
                             </template>
@@ -1220,6 +1221,7 @@
                               <custom-select-array
                                   :key="categoryOptions.options"
                                   :config="categoryOptions"
+                                  style="margin-left: -14px"
                                   v-model="sarBussionessSearch['NYLXCLASS']"
                               ></custom-select-array>
                             </template>
@@ -1239,6 +1241,7 @@
                               <custom-select-array
                                   :key="sycpxOptions.options"
                                   :config="sycpxOptions"
+                                  style="margin-left: -14px"
                                   v-model="sarBussionessSearch['SYCPXCLASS']"
                               ></custom-select-array>
                             </template>