Merge branch 'develop' into FOTON

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/processCenter/pages/creatProcess/qbrk/step1.vue

@@ -2239,22 +2239,7 @@
                         this.$message.warning('文件不存在,下载失败')
                     }
                 } else {
-                    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 {
-                                    const nowTime = new Date().getTime()
-                                    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)
-
-                                }
-                            }
-                        }).catch(e => {
-                        console.log(e)
-                        this.$message.warning('文件不存在,预览失败')
-                    })
                 }
             },
             // 导入标准数据成功后执行

src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue

@@ -60,7 +60,7 @@
               <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
-                  <span v-for="item in ch_pageData.fileTextList" :key="item.id">
+                  <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
@@ -275,7 +275,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
 

src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue

@@ -60,7 +60,7 @@
               <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
-                  <span v-for="item in ch_pageData.fileTextList" :key="item.id">
+                  <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
@@ -268,11 +268,11 @@ export default {
         }
       })
     },
-    /** 点击对应附件进行下载*/
+    /** 点击对应附件进行预览  */
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
   }

src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue

@@ -62,7 +62,7 @@
               <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
-                  <span v-for="item in ch_pageData.fileTextList" :key="item.id">
+                  <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
@@ -331,11 +331,11 @@ export default {
       })
 
     },
-    /** 点击对应附件进行下载*/
+    /** 点击对应附件进行预览*/
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
   }

src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue

@@ -248,14 +248,14 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
-    // 点击上传的文件进行下载
+    // 点击上传的文件进行预览
     onPreviewTheme(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
     // 点击上传的文件进行下载

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

@@ -67,7 +67,7 @@
               <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
-                  <span v-for="item in rh_pageData.infoSources" :key="item.id">
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
@@ -230,11 +230,11 @@ export default {
       this.active = name
     },
 
-    /** 点击对应附件进行下载*/
+    /** 点击对应附件进行预览*/
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
     // 退回按钮

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

@@ -67,7 +67,7 @@
               <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
-                  <span v-for="item in rh_pageData.infoSources" :key="item.id">
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
@@ -110,7 +110,7 @@
                 <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
-                    <span v-for="item in scope.row.fillFile" :key="item.id" >
+                    <span v-for="item in scope.row.fillFile" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                   </template>
@@ -310,11 +310,11 @@ export default {
         }
       })
     },
-    /** 点击对应附件进行下载*/
+    /** 点击对应附件进行预览*/
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
   }

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

@@ -69,7 +69,7 @@
               <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
-                  <span v-for="item in rh_pageData.infoSources" :key="item.id">
+                  <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
@@ -250,11 +250,11 @@ export default {
         // this.rh_pageData.comityFileNum = this.fileTextList
       })
     },
-    /** 点击对应附件进行下载*/
+    /** 点击对应附件进行预览*/
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
     selectedDelete(val) {

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

@@ -145,65 +145,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <el-table
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
-        height="100%"
-        ref="selection"
-        :data="detailData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        row-key="id"
-        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-          prop="name"
-          label="任务步骤"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="完成时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="comment"
-          label="流程信息"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="completeFlag"
-          label="状态"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
 
     <ProcessFooter
@@ -358,19 +300,6 @@ export default {
         })
       this.modalshowflag = false
     },
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        // loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
     //tab发生变化
     handleTabs(name) {
       this.active = name;
@@ -562,7 +491,6 @@ export default {
       this.setMap(this.standStateOptions);
     });
     this.getData();
-    this.processTable();
   }
 };
 </script>

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

@@ -165,65 +165,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <el-table
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
-        height="100%"
-        ref="selection"
-        :data="histortData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        row-key="id"
-        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-          prop="name"
-          label="任务步骤"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="完成时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="comment"
-          label="流程信息"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="completeFlag"
-          label="状态"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
     <ProcessFooter
       show-transfer
@@ -333,7 +275,6 @@ export default {
   },
   mounted() {
     this.getData();
-    this.processTable();
   },
   methods: {
     getData() {
@@ -361,19 +302,6 @@ export default {
       });
     },
     //审批历史信息
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
     handleTabs(type) {
       this.active = type;
     },

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

@@ -165,65 +165,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <el-table
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
-        height="100%"
-        ref="selection"
-        :data="detailData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        row-key="id"
-        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-          prop="name"
-          label="任务步骤"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="完成时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="comment"
-          label="流程信息"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="completeFlag"
-          label="状态"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
     <ProcessFooter
       show-transfer
@@ -333,7 +275,6 @@ export default {
   },
   mounted() {
     this.getData();
-    this.processTable();
   },
   methods: {
     getData() {
@@ -361,19 +302,6 @@ export default {
       });
     },
     //审批历史信息
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
     handleTabs(type) {
       this.active = type;
     },

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

@@ -165,65 +165,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <el-table
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
-        height="100%"
-        ref="selection"
-        :data="histortData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        row-key="id"
-        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-          prop="name"
-          label="任务步骤"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="完成时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="comment"
-          label="流程信息"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="completeFlag"
-          label="状态"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
     <ProcessFooter
       show-transfer
@@ -333,7 +275,6 @@ export default {
   },
   mounted() {
     this.getData();
-    this.processTable();
   },
   methods: {
     getData() {
@@ -361,19 +302,6 @@ export default {
       });
     },
     //审批历史信息
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
     handleTabs(type) {
       this.active = type;
     },

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

@@ -212,65 +212,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <el-table
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
-        height="100%"
-        ref="selection"
-        :data="detailData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        row-key="id"
-        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-          prop="name"
-          label="任务步骤"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="完成时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="comment"
-          label="流程信息"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="completeFlag"
-          label="状态"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
     <ProcessFooter
       show-transfer
@@ -412,19 +354,6 @@ export default {
         }
       })
     },
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
 
     choiceZRRS(row, index) {
       this.selectedId = index;
@@ -637,7 +566,6 @@ export default {
   },
   mounted() {
     this.getData()
-    this.processTable()
   },
   computed: {
     listNoDataText() {

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

@@ -212,65 +212,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <el-table
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
-        height="100%"
-        ref="selection"
-        :data="detailData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        row-key="id"
-        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-          prop="name"
-          label="任务步骤"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="完成时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="comment"
-          label="流程信息"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="completeFlag"
-          label="状态"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
     <ProcessFooter
       show-transfer
@@ -413,19 +355,6 @@ export default {
         }
       })
     },
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
 
     choiceZRRS(row, index) {
       this.selectedId = index;
@@ -619,7 +548,6 @@ export default {
   },
   mounted() {
     this.getData()
-    this.processTable()
   },
   computed: {
     listNoDataText() {

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

@@ -179,65 +179,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
-      <el-table
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
-        height="100%"
-        ref="selection"
-        :data="detailData"
-        tooltip-effect="dark"
-        style="width: 100%"
-        border
-        row-key="id"
-        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-          prop="name"
-          label="任务步骤"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          width="130"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="完成时间"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="comment"
-          label="流程信息"
-          width="130"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="completeFlag"
-          label="状态"
-          align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
     </div>
     <ProcessFooter
       show-transfer
@@ -323,23 +265,9 @@ export default {
     };
   },
   mounted() {
-    this.processTable();
     this.getData();
   },
   methods: {
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({

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

@@ -208,7 +208,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        this.$preview(attId)
       }
     },
     // 提交按钮

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>