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

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/bzqdfb/step1-3.vue

@@ -155,11 +155,6 @@
           :no-data-text="listNoDataText"
           :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
           <el-table-column
             prop="name"
             label="任务步骤"

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

@@ -152,11 +152,6 @@
           :no-data-text="listNoDataText"
           :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
           <el-table-column
             prop="name"
             label="任务步骤"

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

@@ -1287,35 +1287,66 @@ export default {
           this.fileInfoList = []
         }
         this.ListModel = false;
-
+        //如果是国家地区清单传入types字段对日期进行区分
-        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
+        if(this.listType === 'country'){
-          { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
+          this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-            _this: this
+            { id: this.selectedList[0].id, types: '1', page: this.page, Size: this.pageSize }, {
-          }, res => {
+              _this: this
-            if (res.data === null) {
+            }, res => {
-              this.dataList = [];
+              if (res.data === null) {
-            }
+                this.dataList = [];
-            this.dataList = res.data.records;
+              }
-            this.dataList.forEach(item => {
+              this.dataList = res.data.records;
-             if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
+              this.dataList.forEach(item => {
-               item.xcxssrqgj = ''
+                if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
-             }else{
+                  item.xcxssrqgj = ''
-               this.$set(item, "XCXSSRQ", item.xcxssrqgj)
+                }else{
-             }
+                  this.$set(item, "XCXSSRQ", item.xcxssrqgj)
-             if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
+                }
-               item.zccssrqgj = ''
+                if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
-             }else{
+                  item.zccssrqgj = ''
-               this.$set(item, "ZCCSSRQ", item.zccssrqgj)
+                }else{
-             }
+                  this.$set(item, "ZCCSSRQ", item.zccssrqgj)
-            })
+                }
-            this.listForm.dataList = this.dataList;
+              })
-            let formId = [];
+              this.listForm.dataList = this.dataList;
-            this.dataList.map(item => {
+              let formId = [];
-              formId.push(item.id);
+              this.dataList.map(item => {
+                formId.push(item.id);
+              });
+              this.listForm.inforlist = formId.join(",");
+            }, e => {
             });
-            this.listForm.inforlist = formId.join(",");
+        }else{
-          }, e => {
+          this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          });
+            { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
+              _this: this
+            }, res => {
+              if (res.data === null) {
+                this.dataList = [];
+              }
+              this.dataList = res.data.records;
+              this.dataList.forEach(item => {
+                if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
+                  item.xcxssrqgj = ''
+                }else{
+                  this.$set(item, "XCXSSRQ", item.xcxssrqgj)
+                }
+                if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
+                  item.zccssrqgj = ''
+                }else{
+                  this.$set(item, "ZCCSSRQ", item.zccssrqgj)
+                }
+              })
+              this.listForm.dataList = this.dataList;
+              let formId = [];
+              this.dataList.map(item => {
+                formId.push(item.id);
+              });
+              this.listForm.inforlist = formId.join(",");
+            }, e => {
+            });
+        }
         this.$refs.detailedSelection.clearSelection()
       } else {
         this.$message.warning("请选择一条数据进行带入");

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

@@ -40,7 +40,7 @@
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div class="file-box" v-if="fileList.length > 0">
                   <p v-for="item in fileList"
-                  :key="item.id"> {{ item.name }}
+                  :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
                     <i
                       title="下载"
                       @click="downloadFile(item.id)"
@@ -151,11 +151,6 @@
           :no-data-text="listNoDataText"
           :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
           <el-table-column
             prop="name"
             label="任务步骤"
@@ -372,6 +367,10 @@ export default {
       }, e => {
       });
     },
+    clickButtonToUpload2(file) {
+      const attId = file
+      this.$preview(attId)
+    },
     /**
      * @Description: 点击下载
      */

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

@@ -170,11 +170,6 @@
           :no-data-text="listNoDataText"
           :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
           <el-table-column
             prop="name"
             label="任务步骤"
@@ -779,7 +774,6 @@ export default {
           this.listForm.jlUserId = item.jlUserId
           this.listForm.zrUserId = item.zrUserId
           this.fileInfoList = item.fileName
-          this.commentText = item.commentText
          } else {
           this.listForm = item.form
           this.dataList = item.form.dataList

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

@@ -40,7 +40,7 @@
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div class="file-box" v-if="fileList.length > 0">
                   <p v-for="item in fileList"
-                     :key="item.id"> {{ item.name }}
+                     :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
                     <i
                       title="下载"
                       @click="downloadFile(item.id)"
@@ -152,11 +152,6 @@
           :no-data-text="listNoDataText"
           :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
           <el-table-column
             prop="name"
             label="任务步骤"
@@ -441,6 +436,11 @@ export default {
       }, e => {
       });
     },
+    //点击预览
+    clickButtonToUpload2(file) {
+      const attId = file
+      this.$preview(attId)
+    },
     /**
      * @Description: 点击下载
      */

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

@@ -986,13 +986,20 @@
                                 <el-option value="FOREIGN" label="国外标准库"></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="编号/名称" class="search-item">
+                      <el-form-item label="标准编号" class="search-item">
-                            <el-input
+                        <el-input
-                                    v-model="replaceLawsNumForm.standNumber"
+                            v-model="replaceLawsNumForm.standNumber"
-                                    placeholder="根据编号/名称查找"
+                            placeholder="根据标准编号查找"
-                                    clearable
+                            clearable
-                                    :maxlength="100"></el-input>
+                            :maxlength="100"></el-input>
-                        </el-form-item>
+                      </el-form-item>
+                      <el-form-item label="标准名称" class="search-item">
+                        <el-input
+                            v-model="replaceLawsNumForm.standName"
+                            placeholder="根据标准名称查找"
+                            clearable
+                            :maxlength="100"></el-input>
+                      </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
                                     size="mini"
@@ -1385,6 +1392,7 @@
                 replaceLawsNumForm: {
                     dataSource: '',
                     standNumber: '', // 标准编号
+                    standName: '', // 标准名称
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,

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

@@ -1256,12 +1256,19 @@
                 <el-option value="FOREIGN" label="国外标准库"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="编号/名称" class="search-item">
+            <el-form-item label="标准编号" class="search-item">
               <el-input
-                      v-model="replaceLawsNumForm.standNumber"
+                  v-model="replaceLawsNumForm.standNumber"
-                      placeholder="根据编号/名称查找"
+                  placeholder="根据标准编号查找"
-                      clearable
+                  clearable
-                      :maxlength="100"></el-input>
+                  :maxlength="100"></el-input>
+            </el-form-item>
+            <el-form-item label="标准名称" class="search-item">
+              <el-input
+                  v-model="replaceLawsNumForm.standName"
+                  placeholder="根据标准名称查找"
+                  clearable
+                  :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
@@ -1463,6 +1470,7 @@ export default {
       replaceLawsNumForm: {
         dataSource: '',
         standNumber: '', // 标准编号
+        standName: '', // 标准编号
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,

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/creatProcess/wfhxzg/step4.vue

@@ -44,7 +44,6 @@
           <el-table-column  label="佐证材料"  align="center" width="150">
             <template slot-scope="scope">
               <el-upload
-                  :disabled="acceptShow"
                   multiple
                   ref="uploadFile"
                   :action="uploadPath"
@@ -58,7 +57,6 @@
                   :on-success="handleOnsuccess"
                 >
                 <el-button
-                  :disabled="acceptShow"
                   type="primary"
                   class="common-button-primary"
                   @click="uploadFile(scope.row)"

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

@@ -6,7 +6,6 @@
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">
-      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>

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

@@ -40,7 +40,8 @@
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div class="file-box" v-if="fileList.length > 0">
                   <p v-for="item in fileList"
-                     :key="item.id"> {{ item.name }}
+                     :key="item.id"  @click="clickButtonToUpload2(item.id)">
+                    {{ item.name }}
                     <i
                       title="下载"
                       @click="downloadFile(item.id)"
@@ -145,65 +146,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 +301,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;
@@ -453,6 +383,11 @@ export default {
       }, e => {
       });
     },
+    //点击预览
+    clickButtonToUpload2(file) {
+      const attId = file
+      this.$preview(attId)
+    },
     /**
      * @Description: 点击下载
      */
@@ -562,7 +497,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/qbfz/step2.vue

@@ -110,65 +110,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="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-back

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

@@ -246,65 +246,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -246,65 +246,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -246,65 +246,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue

@@ -170,65 +170,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="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-back

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

@@ -170,65 +170,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="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-back

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

@@ -170,65 +170,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="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

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

@@ -170,65 +170,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="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

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

@@ -74,65 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -74,65 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -74,65 +74,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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/processCenter/pages/phone/xmpg/step2.vue

@@ -178,65 +178,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -260,65 +260,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -260,65 +260,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -260,65 +260,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

src/pages/processCenter/pages/phone/xmpg2/step10.vue

@@ -190,65 +190,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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-back

src/pages/processCenter/pages/phone/xmpg2/step11.vue

@@ -190,65 +190,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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-submit

src/pages/processCenter/pages/phone/xmpg2/step12.vue

@@ -190,65 +190,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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-back

src/pages/processCenter/pages/phone/xmpg2/step2.vue

@@ -159,65 +159,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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-back

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

@@ -190,65 +190,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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-back

src/pages/processCenter/pages/phone/xmpg2/step8.vue

@@ -190,65 +190,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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-back

src/pages/processCenter/pages/phone/xmpg2/step9.vue

@@ -190,65 +190,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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-back

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

@@ -190,65 +190,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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

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

@@ -128,67 +128,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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="任务步骤"
-          min-width="130"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          min-width="130"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          min-width="130"
-          sortable="custom"
-          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"
-          min-width="130"
-          label="完成时间"
-          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="流程信息"
-          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-submit

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

@@ -202,67 +202,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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"
-          min-width="130"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          min-width="130"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          min-width="130"
-          sortable="custom"
-          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="完成时间"
-          min-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="流程信息"
-          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-submit

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

@@ -136,67 +136,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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="任务步骤"
-          min-width="130"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          min-width="130"
-          label="任务受理人"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          min-width="130"
-          sortable="custom"
-          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"
-          min-width="130"
-          label="完成时间"
-          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="流程信息"
-          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-submit

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

@@ -136,67 +136,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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"
-          min-width="130"
-          label="任务步骤"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          min-width="130"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          min-width="130"
-          sortable="custom"
-          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="完成时间"
-          min-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="流程信息"
-          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-submit

src/pages/processCenter/pages/phone/zczqyj/step8.vue

@@ -136,67 +136,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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="任务步骤"
-          min-width="130"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          min-width="130"
-          label="任务受理人"
-          align="center"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          min-width="130"
-          sortable="custom"
-          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="完成时间"
-          min-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="流程信息"
-          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-submit

src/pages/processCenter/pages/phone/zczqyj/step9.vue

@@ -136,67 +136,7 @@
       </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
-      <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"
-          min-width="130"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="assignee"
-          label="任务受理人"
-          align="center"
-          min-width="130"
-          sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="创建时间"
-          min-width="130"
-          sortable="custom"
-          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="完成时间"
-          min-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="流程信息"
-          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-submit

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -197,7 +197,7 @@
               label="标准名称"
           >
             <template slot-scope="scope">
-              <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</span>
+              <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName|| scope.row.standEnName || scope.row.lawsName}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -334,14 +334,14 @@
         </el-table-column>
         <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
             sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             sortable
             align="center"
             width="210px"
@@ -457,17 +457,17 @@
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrq">
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
-              v-model.trim="editRowData.zccssrq"
+              v-model.trim="editRowData.zccssrqgj"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrq">
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
-              v-model.trim="editRowData.xcxssrq"
+              v-model.trim="editRowData.xcxssrqgj"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
@@ -503,31 +503,30 @@
   </div>
 </template>
 <script>
-import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandards'
+import CustomInputForStandards from "@/components/CustomFormComponents/InputForStandards";
-import CustomInputForStandardsForeign from '@/components/CustomFormComponents/InputForStandardsForForeign'
+import CustomInputForStandardsForeign from "@/components/CustomFormComponents/InputForStandardsForForeign";
-import CustomInput from '@/components/CustomFormComponents/Input'
+import CustomInput from "@/components/CustomFormComponents/Input";
-import CustomTextarea from '@/components/CustomFormComponents/Textarea'
+import CustomTextarea from "@/components/CustomFormComponents/Textarea";
-import CustomSearchSelect from '@/components/CustomFormComponents/SearchSelect'
+import CustomSearchSelect from "@/components/CustomFormComponents/SearchSelect";
-import CustomSelect from '@/components/CustomFormComponents/Select'
+import CustomSelect from "@/components/CustomFormComponents/Select";
-import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
+import CustomDatePick from "@/components/CustomFormComponents/DatePicker";
-import CustomFile from '@/components/CustomFormComponents/File'
+import CustomFile from "@/components/CustomFormComponents/File";
-import CustomInputNum from '@/components/CustomFormComponents/InputNum'
+import CustomInputNum from "@/components/CustomFormComponents/InputNum";
-import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
+import CustomDatePickGroup from "@/components/CustomFormComponents/DatePickerGroup";
-import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
+import CustomSelectArray from "@/components/CustomFormComponents/SelectArray";
-import TreePopover from '@/components/CustomFormComponents/TreePopover'
+import TreePopover from "@/components/CustomFormComponents/TreePopover";
-import CustomOrg from '@/components/CustomFormComponents/OrgTree'
+import CustomOrg from "@/components/CustomFormComponents/OrgTree";
-import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithText'
+import CustomEopDatePick from "@/components/CustomFormComponents/DatePickerWithText";
-import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText'
+import CustomDatePickWithText, { formatText } from "@/components/CustomFormComponents/DatePickerGroupWithText";
-import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
+import CustomSVPPS from "@/components/CustomFormComponents/SVPPS";
-import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy'
+import CustomInputForPolicy from "@/components/CustomFormComponents/InputForPolicy";
-import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
+import CustomRoleTree from "@/components/CustomFormComponents/roleTree";
-import stand from "../../../config/pages/attributeCustom/components/stand";
+import { mapGetters } from "vuex";
-import {mapGetters} from 'vuex'
+import { dicTypeData, StandardsInfoPage } from "@/api/unqualProcess";
-import {dicTypeData, StandardsInfoPage} from '@/api/unqualProcess'
+import { interfaceUrl } from "@/sysConfig";
-import {interfaceUrl} from "@/sysConfig";
 
 export default {
-  name: 'ListOfStandardsAndRegulationsDetails',
+  name: "ListOfStandardsAndRegulationsDetails",
   components: {
     CustomFile,
     CustomInput,
@@ -1170,19 +1169,19 @@ export default {
         //为空转换
         for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
           //适用车型为空
-          if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){
+          if (this.selectedAccInfoSearchList[i].typeApplicable === "[]"){
             this.selectedAccInfoSearchList[i].typeApplicable = null
           }
           //能源类型为空
-          if (this.selectedAccInfoSearchList[i].nylx === '[]'){
+          if (this.selectedAccInfoSearchList[i].nylx === "[]"){
             this.selectedAccInfoSearchList[i].nylx = null
           }
           //责任部门为空
-          if (this.selectedAccInfoSearchList[i].zrbm === '[]'){
+          if (this.selectedAccInfoSearchList[i].zrbm === "[]"){
             this.selectedAccInfoSearchList[i].zrbm = null
           }
           //试用产品线为空
-          if (this.selectedAccInfoSearchList[i].sycpx === '[]'){
+          if (this.selectedAccInfoSearchList[i].sycpx === "[]"){
             this.selectedAccInfoSearchList[i].sycpx = null
           }
         }
@@ -1200,6 +1199,38 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
+            this.sarAccessInfoList.forEach(item => {
+              this.$set(item, 'xcxssrqgj', item.xcxssrq)
+              this.$set(item, 'zccssrqgj', item.zccssrq)
+              if(item.attrInfoCaseMap !== undefined){
+                this.$set(item, 'typeApplicable', item.attrInfoCaseMap.cllx)
+                this.$set(item, 'nylx', item.attrInfoCaseMap.nylx)
+              }
+              // 能源类型转换
+              if (item.nylx !== null) {
+                let k = (item.nylx || "").split(",");
+                for (let i in this.applyArcticOptions) {
+                  for (let m = 0; m < k.length; m++) {
+                    if (this.applyArcticOptions[i].value === k[m]) {
+                      k[m] = this.applyArcticOptions[i].label;
+                    }
+                    item.nylx = k.join(",");
+                  }
+                }
+              }
+              // 适用车型转换
+              if (item.typeApplicable !== null) {
+                let k = (item.typeApplicable || "").split(",");
+                for (let i in this.energyKindOptions) {
+                  for (let m = 0; m < k.length; m++) {
+                    if (this.energyKindOptions[i].value === k[m]) {
+                      k[m] = this.energyKindOptions[i].label;
+                    }
+                    item.typeApplicable = k.join(",");
+                  }
+                }
+              }
+            })
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1236,40 +1267,48 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      console.log(row);
       // 用来储存取消时原来的数据，防止取消时修改
-      localStorage.setItem('obj', JSON.stringify(row))
+      localStorage.setItem("obj", JSON.stringify(row));
 
-      this.rowList = row
+      this.rowList = row;
-      this.editRowData = this.rowList
+      this.editRowData = this.rowList;
-      if (this.editRowData.ssrq !== null) {
+      if (this.editRowData.ssrq === "-") {
-        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+        this.editRowData.ssrq = "";
+      } else if (this.editRowData.ssrq !== null && this.editRowData.ssrq !== "-" && this.editRowData.ssrq !== "") {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(",");
       }
-      if (this.editRowData.zccssrq !== null) {
+      if (this.editRowData.zccssrqgj === "-") {
-        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
+        this.editRowData.zccssrqgj = "";
+      } else if (this.editRowData.zccssrqgj !== null && this.editRowData.zccssrqgj !== "-" && this.editRowData.zccssrqgj !== "") {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(",");
       }
-      if (this.editRowData.xcxssrq !== null) {
+      if (this.editRowData.xcxssrqgj === "-") {
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
+        this.editRowData.xcxssrqgj = "";
+      } else if (this.editRowData.xcxssrqgj !== null && this.editRowData.xcxssrqgj !== "-" && this.editRowData.xcxssrqgj !== " ") {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(",");
       }
-      this.drawerEdit = true
+      this.drawerEdit = true;
     },
     // 抽屉取消按钮
     cancelInfo() {
       let Item = JSON.parse(localStorage.getItem('obj'))
       this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrq = Item.xcxssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
-      this.editRowData.zccssrq = Item.zccssrq
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      if (this.editRowData.ssrq !== null) {
+      console.log(this.editRowData);
+      if (this.editRowData.ssrq !== '') {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrq !== null){
+      if (this.editRowData.xcxssrqgj !== ''){
-        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
       }
-      if (this.editRowData.zccssrq !== null){
+      if (this.editRowData.zccssrqgj !== ''){
-        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
       }
       this.drawerEdit = false
     },
@@ -1344,15 +1383,15 @@ export default {
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq)
             }
-            if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
+            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrq)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }
-            if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
+            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrq)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
             }
           }
           console.log(rowlist1)
@@ -2024,6 +2063,7 @@ export default {
     getData() {
       this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
         id: this.zqaId,
+        types: '1',
         page: this.page,
         Size: this.Size
       }, {
@@ -2032,12 +2072,23 @@ export default {
         if (res.ok) {
           this.sarAccessInfoList = res.data.records
           this.sarAccessInfoList.map(item => {
+            if (item.nylx === "[]") {
+              item.nylx = "";
+            }
+            if (item.zrbm === "[]") {
+              item.zrbm = "";
+            }
+            if (item.sycpx === "[]") {
+              item.sycpx = "";
+            }
+            if (item.typeApplicable === "[]") {
+              item.typeApplicable = "";
+            }
             if (item.standYear === null) {
-              item.standNumber = item.standSortShow + ' ' + item.standNumber
+              item.standNumber = item.standSortShow + " " + item.standNumber;
             } else {
-              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+              item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
             }
-            console.log(item.standNumber)
           })
         }
       })
@@ -2076,10 +2127,12 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
+      console.log('能源类型',res.data.NYLXCLASS);
+      console.log('适用车型',res.data.ENERGYTYPES);
       this.allSelectOptions = res.data || {}
       this.regionOptions = res.data.REGION // 基础信息 区域list
-      this.applyArcticOptions = res.data.PRODUCTTYPE // 基础车型 适用车型list
+      this.applyArcticOptions = res.data.NYLXCLASS // 能源类型
-      this.energyKindOptions = res.data.ENERGYTYPES // 能源种类list
+      this.energyKindOptions = res.data.ENERGYTYPES // 适用车型
       this.CycxOptions = res.data.CLLX
       this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
       this.applyOptions = res.data.COUNTRY  //适用区域list

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -184,29 +184,19 @@
             align="center"
             sortable
             label="发布日期">
-            <template slot-scope="scope">
-               <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             sortable
             align="center"
             label="新车型实施日期">
-              <template slot-scope="scope">
-                <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
-                <span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
-              </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="zccssrq"
             align="center"
             sortable
             label="在产车实施日期">
-              <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj }}</span>
-              </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -314,14 +304,14 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          prop="zccssrqgj"
+          prop="zccssrq"
           sortable
           width="210px"
           align="center"
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
-          prop="xcxssrqgj"
+          prop="xcxssrq"
           sortable
           align="center"
           width="210px"
@@ -457,17 +447,17 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+        <el-form-item label="在产车实施日期" prop="zccssrq">
           <el-date-picker
-            v-model.trim="editRowData.zccssrqgj"
+            v-model.trim="editRowData.zccssrq"
             type="dates"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+        <el-form-item label="新车型实施日期" prop="xcxssrq">
           <el-date-picker
-            v-model.trim="editRowData.xcxssrqgj"
+            v-model.trim="editRowData.xcxssrq"
             type="dates"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
@@ -576,8 +566,8 @@ export default {
         typeApplicable: '',
         nylx: '',
         ssrq: '',
-        zccssrqgj: '',
+        zccssrq: '',
-        xcxssrqgj: '',
+        xcxssrq: '',
         zrbm: '',
         sycpx: '',
         cycvppsbm: '',
@@ -1237,11 +1227,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.split(',')
       }
-      if (this.editRowData.zccssrqgj !== null) {
+      if (this.editRowData.zccssrq !== null) {
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
       }
-      if (this.editRowData.xcxssrqgj !== null) {
+      if (this.editRowData.xcxssrq !== null) {
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
       }
       this.drawerEdit = true
     },
@@ -1249,8 +1239,8 @@ export default {
     cancelInfo() {
       let Item = JSON.parse(localStorage.getItem('obj'))
       this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.xcxssrq = Item.xcxssrq
-      this.editRowData.zccssrqgj = Item.zccssrqgj
+      this.editRowData.zccssrq = Item.zccssrq
       this.drawerEdit = false
     },
     // 抽屉提交按钮
@@ -1258,11 +1248,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrqgj !== null){
+      if (this.editRowData.xcxssrq !== null){
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
       }
-      if (this.editRowData.zccssrqgj !== null){
+      if (this.editRowData.zccssrq !== null){
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
       }
       this.drawerEdit = false
     },
@@ -1336,15 +1326,15 @@ export default {
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
+            if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq.toString())
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
+            if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq.toString())
             }
           }
           rowlist = rowlist.join(',')

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -241,29 +241,19 @@
               sortable
               align="center"
               label="发布日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-              prop="xcxssrqgj"
+              prop="xcxssrq"
               sortable
               align="center"
               label="新车型实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
-              <span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="zccssrqgj"
+              prop="zccssrq"
               sortable
               align="center"
               label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj }}</span>
-            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
@@ -372,14 +362,14 @@
         </el-table-column>
         <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="zccssrq"
             sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             sortable
             align="center"
             width="210px"
@@ -494,17 +484,17 @@
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+        <el-form-item label="在产车实施日期" prop="zccssrq">
           <el-date-picker
-              v-model.trim="editRowData.zccssrqgj"
+              v-model.trim="editRowData.zccssrq"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+        <el-form-item label="新车型实施日期" prop="xcxssrq">
           <el-date-picker
-              v-model.trim="editRowData.xcxssrqgj"
+              v-model.trim="editRowData.xcxssrq"
               type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
@@ -631,8 +621,8 @@ export default {
         syrz: '',
         nylx: '',
         ssrq: '',
-        zccssrqgj: '',
+        zccssrq: '',
-        xcxssrqgj: '',
+        xcxssrq: '',
         zrbm: '',
         sycpx: '',
         cycvppsbm: '',
@@ -1207,11 +1197,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.split(',')
       }
-      if (this.editRowData.zccssrqgj !== null) {
+      if (this.editRowData.zccssrq !== null) {
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+        this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
       }
-      if (this.editRowData.xcxssrqgj !== null) {
+      if (this.editRowData.xcxssrq !== null) {
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
       }
       this.drawerEdit = true
     },
@@ -1219,8 +1209,8 @@ export default {
     cancelInfo() {
       let Item = JSON.parse(localStorage.getItem('obj'))
       this.editRowData.ssrq = Item.ssrq
-      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.xcxssrq = Item.xcxssrq
-      this.editRowData.zccssrqgj = Item.zccssrqgj
+      this.editRowData.zccssrq = Item.zccssrq
       this.drawerEdit = false
     },
     // 抽屉提交按钮
@@ -1228,11 +1218,11 @@ export default {
       if (this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrqgj !== null){
+      if (this.editRowData.xcxssrq !== null){
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+        this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
       }
-      if (this.editRowData.zccssrqgj !== null){
+      if (this.editRowData.zccssrq !== null){
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+        this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
       }
       this.drawerEdit = false
     },
@@ -1307,15 +1297,15 @@ export default {
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
+            if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrq.toString())
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
+            if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrq.toString())
             }
           }
           rowlist = rowlist.join(',')

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -20,6 +20,10 @@
           <label class="transition-box-label">资料标题：</label>
           <span class="transition-box-span">{{ detailInfoForm.dataTitle }}</span>
         </p>
+        <p class="transition-box-p">
+          <label class="transition-box-label">资料说明：</label>
+          <span class="transition-box-span">{{ detailInfoForm.dataExplain }}</span>
+        </p>
         <div class="transition-box-p">
           <label class="transition-box-label">附件：</label>
           <div class="file-box" v-if="fileList.length > 0">
@@ -233,8 +237,8 @@ export default {
     .title {
       flex: 1;
       font-weight: bold;
-      font-size: 20px;
+      font-size: 40px;
-      margin-left: 15px;
+      margin-left: 30px;
 
       .el-icon-s-order {
         font-size: 22px;
@@ -244,16 +248,16 @@ export default {
     }
   }
   .transition-box {
-    padding: 0 10px;
+    padding: 0 10% 0 10%;
     background: #ffffff;
-    font-size: 14px;
+    font-size: 28px;
 
     .transition-box-p {
-      line-height: 35px;
+      line-height: 50px;
 
       .transition-box-label {
         display: inline-block;
-        width: 100px;
+        width: 200px;
         vertical-align: top;
       }
 
@@ -280,9 +284,9 @@ export default {
 
           & > i {
             display: inline-block;
-            margin-left: 3px;
+            margin-left: 6px;
-            width: 18px;
+            width: 36px;
-            height: 16px;
+            height: 32px;
             background-repeat: no-repeat;
             background-size: 100% 100%;
             background-position: center center;

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -156,6 +156,23 @@
                 clearable
             />
           </el-form-item>
+          <el-form-item
+              label="资料说明"
+              prop="dataExplain"
+              class="add-form-item"
+          >
+            <el-input
+                type="textarea"
+                autosize
+                style="width: 95%"
+                maxlength="200"
+                show-word-limit
+                v-model="attributeEO.dataExplain"
+                placeholder="请输入资料说明"
+                clearable
+            />
+            <el-button icon="el-icon-delete" circle type="danger" size="mini" @click="attributeEO.dataExplain = ''"></el-button>
+          </el-form-item>
           <el-form-item
               label="附件"
               prop="attachFileId"
@@ -220,6 +237,7 @@ export default {
       attributeEO: {
         dataType: '',
         dataTitle: '',
+        dataExplain: '',
         attachFileId: '',
       },
       attributeEOFormRules: {

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>