From 0369512b73b5c3512e8706ede98114a91ff5cf02 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Thu, 23 Dec 2021 10:42:31 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzhHd-rh/step1.vue | 41 ++----------------
.../pages/creatProcess/bzhHd-rh/step2.vue | 41 +-----------------
.../pages/creatProcess/bzhHd-rh/step3.vue | 36 +---------------
.../pages/creatProcess/bzhHd-rh/step4.vue | 41 +-----------------
.../pages/creatProcess/bzhHd-rh/step5.vue | 39 +----------------
.../pages/creatProcess/bzhHd-rh/step6.vue | 43 +------------------
.../pages/creatProcess/bzhHh-hh/step2.vue | 3 --
.../pages/creatProcess/bzhHy-ch/step1.vue | 38 ++--------------
.../pages/creatProcess/bzhHy-ch/step2.vue | 39 +----------------
.../pages/creatProcess/bzhHy-ch/step3.vue | 36 +---------------
.../pages/creatProcess/bzhHy-ch/step4.vue | 39 +----------------
.../pages/creatProcess/bzhHy-ch/step5.vue | 36 +---------------
.../pages/creatProcess/bzhHy-ch/step6.vue | 41 +-----------------
13 files changed, 22 insertions(+), 451 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index c82d6a169..c5481e7e7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/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,
- getBusStandFileByAttId,upFile
+ taskDel, workGroup, processBack,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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
filesUpload (file) { // 下载
const attId = file.id
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index bb642744e..328d95fdd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index dfdf27ea7..995e2cb6d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 1c28c7a20..88159ba87 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index 929851347..35749dc51 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -403,10 +403,7 @@ import ProcessTitle from "../../components/ProcessTitle";
import {
completeTask,
inboundLiaisonDetail,
- saveinboundTask,
- getBusStandFileByAttId,
- saveTaskForPub,
- changeAssigneeNew,upFile
+ saveTaskForPub,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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index 663ef1ecf..dcbfb6485 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
index f5a18f10f..64b12093f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 037c9dc45..4b1452486 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
filesUpload (file) { // 下载
const attId = file.id
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index 6b4b4f427..bde8597c7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ tis.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index 9b5d03a58..b7503a739 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
index 27eda0b2d..0b5e95d1f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
index 16a327aa9..fce417416 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
index e1ff12e19..0b145656b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+++ b/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)
- .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('文件不存在,预览失败')
- })
+ this.$preview(attId)
},
/** 点击对应附件进行下载*/
previews(val) {
From 185b4678ae5d7be96aaea63be01dc8da4a5b6f1f Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 23 Dec 2021 10:49:47 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=BA=93=20-=20?=
=?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/EnterpriseStandardDatabase.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 7d050d4e6..295ff82ea 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1171,6 +1171,7 @@
@@ -1220,6 +1221,7 @@
@@ -1239,6 +1241,7 @@
From a335776bbb0cfb99231f019799e869516d6bf243 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 23 Dec 2021 10:50:25 +0800
Subject: [PATCH 03/14] feat: There is no way the,
---
.../pages/creatProcess/qbrk/step1.vue | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index cb1830288..512a3286c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -2239,22 +2239,7 @@
this.$message.warning('文件不存在,下载失败')
}
} else {
- this.getBusStandFileByAttId(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('文件不存在,预览失败')
- })
+ this.$preview(attId)
}
},
// 导入标准数据成功后执行
From 3837cd2c2d729256702a446d5ff211f39296b296 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Thu, 23 Dec 2021 11:20:17 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=8E=BB?=
=?UTF-8?q?=E9=99=A4=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue | 4 ++--
src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue | 6 +++---
src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue | 6 +++---
src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue | 6 +++---
src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue | 6 +++---
src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue | 8 ++++----
src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue | 6 +++---
src/pages/processCenter/pages/phone/wfhxzg/step5.vue | 2 +-
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
index c867911dc..12af4ac80 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
@@ -60,7 +60,7 @@
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
@@ -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)
}
},
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
index bba3520fc..415e0efe6 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
@@ -60,7 +60,7 @@
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
@@ -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)
}
},
}
diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
index 71116be48..a1a23bdea 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
@@ -62,7 +62,7 @@
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
@@ -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)
}
},
}
diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
index 88988431e..5ecad82b8 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
+++ b/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)
}
},
// 点击上传的文件进行下载
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
index b3d003239..4a7655ffa 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
@@ -67,7 +67,7 @@
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
@@ -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)
}
},
// 退回按钮
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
index 53624b7e2..5d390b704 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
@@ -67,7 +67,7 @@
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
@@ -110,7 +110,7 @@
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
@@ -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)
}
},
}
diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
index ecd507b37..ca303871f 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
@@ -69,7 +69,7 @@
{{ '-' }}
-
+
{{ item.name }} {{ ';' }}
@@ -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) {
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
index 325bcfe71..3274c138c 100644
--- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+++ b/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)
}
},
// 提交按钮
From a0abbb618df1acf1198d323de5fd2dd720e5d909 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Thu, 23 Dec 2021 11:28:34 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E5=8E=86=E5=8F=B2=E4=BD=BF=E7=94=A8=E5=85=AC=E5=85=B1?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/phone/bzqdfb/step4.vue | 74 +------------------
.../pages/phone/cywbbzzxd/step4.vue | 74 +------------------
.../pages/phone/cywbbzzxd/step5.vue | 74 +------------------
.../pages/phone/cywbbzzxd/step6.vue | 74 +------------------
.../pages/phone/jrbzhxh/step3.vue | 74 +------------------
.../pages/phone/jrbzhxh/step4.vue | 74 +------------------
.../processCenter/pages/phone/qbfs/step4.vue | 74 +------------------
7 files changed, 7 insertions(+), 511 deletions(-)
diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
index 43304b587..a29b3fab2 100644
--- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
@@ -145,65 +145,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
{
- this.detailData = res;
- }, e => {
- });
- },
//tab发生变化
handleTabs(name) {
this.active = name;
@@ -562,7 +491,6 @@ export default {
this.setMap(this.standStateOptions);
});
this.getData();
- this.processTable();
}
};
diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue
index e2671b0ff..7cb95b24a 100644
--- a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue
+++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue
@@ -165,65 +165,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
{
- this.detailData = res;
- }, e => {
- });
- },
handleTabs(type) {
this.active = type;
},
diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue
index 9e0a65c1b..95c9a13f0 100644
--- a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue
+++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue
@@ -165,65 +165,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
{
- this.detailData = res;
- }, e => {
- });
- },
handleTabs(type) {
this.active = type;
},
diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue
index 009955d7f..2ebb559cc 100644
--- a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue
+++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue
@@ -165,65 +165,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
{
- this.detailData = res;
- }, e => {
- });
- },
handleTabs(type) {
this.active = type;
},
diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
index b0195886e..5b6ce5734 100644
--- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
@@ -212,65 +212,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
{
- this.detailData = res;
- }, e => {
- });
- },
choiceZRRS(row, index) {
this.selectedId = index;
@@ -637,7 +566,6 @@ export default {
},
mounted() {
this.getData()
- this.processTable()
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
index 3d9b553ff..c781cb384 100644
--- a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
@@ -212,65 +212,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
{
- this.detailData = res;
- }, e => {
- });
- },
choiceZRRS(row, index) {
this.selectedId = index;
@@ -619,7 +548,6 @@ export default {
},
mounted() {
this.getData()
- this.processTable()
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/phone/qbfs/step4.vue b/src/pages/processCenter/pages/phone/qbfs/step4.vue
index 4599950b4..f8c4c2e3e 100644
--- a/src/pages/processCenter/pages/phone/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/phone/qbfs/step4.vue
@@ -179,65 +179,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
{
- this.detailData = res;
- }, e => {
- });
- },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
From dbc2f0fcb10b20ec01d94595784d1bcd38765972 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 23 Dec 2021 14:25:20 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=20-?=
=?UTF-8?q?=20=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=20-=20?=
=?UTF-8?q?=E8=B5=84=E6=96=99=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dataCenter/dataCenterDetail.vue | 22 +++++++++++--------
.../regulatoryRepository/dataCenter/index.vue | 18 +++++++++++++++
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
index 20b2fcfb0..74c71c018 100644
--- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
@@ -20,6 +20,10 @@
{{ detailInfoForm.dataTitle }}
+
+
+ {{ detailInfoForm.dataExplain }}
+
@@ -233,8 +237,8 @@ export default {
.title {
flex: 1;
font-weight: bold;
- font-size: 20px;
- margin-left: 15px;
+ font-size: 40px;
+ 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: 70px;
.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;
- width: 18px;
- height: 16px;
+ margin-left: 6px;
+ width: 36px;
+ height: 32px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index 822529d62..c74ed9f61 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -156,6 +156,23 @@
clearable
/>
+
+
+
+
Date: Thu, 23 Dec 2021 14:27:33 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=20-?=
=?UTF-8?q?=20=E8=AF=A6=E6=83=85=20-=20=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
index 74c71c018..546107e42 100644
--- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
@@ -253,7 +253,7 @@ export default {
font-size: 28px;
.transition-box-p {
- line-height: 70px;
+ line-height: 50px;
.transition-box-label {
display: inline-block;
From b4dd6f4c4cf966d6cb64f303f863795d6f18ebd8 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Thu, 23 Dec 2021 14:37:31 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 2e07df7b1..cef543329 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -58,7 +58,6 @@
:on-success="handleOnsuccess"
>
Date: Thu, 23 Dec 2021 14:55:28 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index cef543329..971972a09 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -44,7 +44,6 @@
Date: Thu, 23 Dec 2021 15:02:21 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzqdfb/step1.vue | 87 ++++++---
.../pages/creatProcess/bzqdfb/step2.vue | 6 +-
.../pages/creatProcess/bzqdfb/step4.vue | 7 +-
.../pages/phone/bzqdfb/step4.vue | 8 +-
.../pages/addEdit.vue | 177 ++++++++++++------
.../pages/otherAddEit.vue | 62 +++---
.../pages/projectAddEit.vue | 62 +++---
7 files changed, 244 insertions(+), 165 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 1866f0943..f29da4ab8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1287,35 +1287,66 @@ export default {
this.fileInfoList = []
}
this.ListModel = false;
-
- 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);
+ //如果是国家地区清单传入types字段对日期进行区分
+ if(this.listType === 'country'){
+ this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
+ { id: this.selectedList[0].id, types: '1', 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.listForm.inforlist = formId.join(",");
- }, e => {
- });
+ }else{
+ 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("请选择一条数据进行带入");
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 3462d36d7..6488e245c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -40,7 +40,7 @@
{{ item.name }}
+ :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
{
});
},
+ clickButtonToUpload2(file) {
+ const attId = file
+ this.$preview(attId)
+ },
/**
* @Description: 点击下载
*/
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 79cdea8a9..f8ad130b0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -40,7 +40,7 @@
{{ item.name }}
+ :key="item.id" @click="clickButtonToUpload2(item.id)"> {{ item.name }}
{
});
},
+ //点击预览
+ clickButtonToUpload2(file) {
+ const attId = file
+ this.$preview(attId)
+ },
/**
* @Description: 点击下载
*/
diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
index a29b3fab2..c3d7e0ab6 100644
--- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
@@ -40,7 +40,8 @@
{{ item.name }}
+ :key="item.id" @click="clickButtonToUpload2(item.id)">
+ {{ item.name }}
{
});
},
+ //点击预览
+ clickButtonToUpload2(file) {
+ const attId = file
+ this.$preview(attId)
+ },
/**
* @Description: 点击下载
*/
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 99cae6987..edc19d107 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -197,7 +197,7 @@
label="标准名称"
>
- {{ scope.row.standName || scope.row.lawsName}}
+ {{ scope.row.standName|| scope.row.standEnName || scope.row.lawsName}}
-
+
-
+
@@ -503,31 +503,30 @@