diff --git a/src/api/process.js b/src/api/process.js index 1d8b7a763..414496639 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -440,6 +440,14 @@ export function isEnd (data) { }) } +export function processModelHisOne (data) { + return axios({ + url: '/api/lawss/activiti/processModelHisOne', + method: 'get', + params: data + }) +} + export function evaluationHisList (data) { return axios({ url: '/api/lawss/activiti/evaluationHisList', @@ -681,6 +689,14 @@ export function getStandInfoById (data) { params: data }) } +// 流程撤回接口 +export function processBack(data) { + return axios({ + url: 'api/lawss/activiti/startProcessRollBack', + method: 'post', + data + }) +} // 标准法规工作组接口 export function workGroup(data) { return axios({ diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index b7faa2136..b3b911791 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -185,7 +185,7 @@ export default { } break; case '3': - if (row.taskInfo === '责任对接人选择责任人') { + if (row.taskInfo === '责任部门对接人选择责任人') { this.$router.push({ name: 'bzzqyjStep2', query: { @@ -196,7 +196,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人填写征求意见'){ + } else if (row.taskInfo === '责任人反馈'){ this.$router.push({ name: 'bzzqyjStep3', query: { @@ -207,7 +207,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任对接人审批') { + } else if (row.taskInfo === '责任部门对接人汇总并选择审批人') { this.$router.push({ name: 'bzzqyjStep4', query: { @@ -218,7 +218,29 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') { + } else if (row.taskInfo === '审批人审批') { + this.$router.push({ + name: 'bzzqyjStep4-1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师分线审核') { + this.$router.push({ + name: 'bzzqyjStep4-2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总') { this.$router.push({ name: 'bzzqyjStep5', query: { @@ -251,7 +273,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) { + } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任审定' ) { this.$router.push({ name: 'bzzqyjStep8', query: { @@ -262,7 +284,7 @@ export default { prcType: row.prcType } }) - } else { + } else if (row.taskInfo === '工程研究总院院长批准') { this.$router.push({ name: 'bzzqyjStep9', query: { diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 0e7bcbdb5..8b1a745ce 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -9,7 +9,8 @@ icon="el-icon-edit-outline" size="small" class="common-button-warning" - @click="handleOnLineEdit" + :loading="submitLoading" + @click="handleOnLineReEdit" v-if="showEdit">在线编辑 @@ -318,6 +319,9 @@ export default { handleTransfer(){ this.$emit('transfer') }, + handleOnLineReEdit(){ + this.$emit('onLineEdit') + }, handleSendEmail() { this.$emit('sendEmail') }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 79dff1783..6b0cf9cb0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -46,14 +46,14 @@ v-model="form.modelNameList" clearable > -
+
-
- {{ item.name }} +
+ {{ item.name }}
@@ -74,14 +74,14 @@ v-model="form.fjNameList" clearable > -
+
-
- {{ item.name }} +
+ {{ item.name }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index ae1b8ef08..a759791e9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -46,14 +46,14 @@ v-model="form.modelNameList" clearable > -
+
-
- {{ item.name }} +
+ {{ item.name }}
@@ -74,14 +74,14 @@ v-model="form.fjNameList" clearable > -
+
-
- {{ item.name }} +
+ {{ item.name }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 5535f6b24..c64557857 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -42,13 +42,13 @@ -
-
- {{ item.name }} +
+
+ {{ item.name }}
@@ -58,13 +58,13 @@
-
-
- {{ item.name }} +
+
+ {{ item.name }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 9991a3e2e..9fb360147 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -42,13 +42,13 @@ -
-
- {{ item.name }} +
+
+ {{ item.name }}
@@ -58,13 +58,13 @@
-
-
- {{ item.name }} +
+
+ {{ item.name }}
@@ -97,20 +97,18 @@
-
- - 点击上传 - -
+ + 点击上传 +
@@ -439,6 +437,7 @@ } }, fileUpload () { + this.fileMadel = true }, handleTabs(name) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index b2e23d503..d368c4532 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -42,13 +42,13 @@ -
-
- {{ item.name }} +
+
+ {{ item.name }}
@@ -58,13 +58,13 @@
-
-
- {{ item.name }} +
+
+ {{ item.name }}
@@ -95,14 +95,14 @@
-
+
{{ form.fileName }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 160df19ce..e3c3837a3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -42,24 +42,26 @@ - -
- {{ form.hzfileName }} -
-
- - 点击上传 - +
+
+
+ {{ form.hzfileName }} +
+ +
+ + 点击上传 + @@ -97,9 +99,13 @@ label="回执文件" align="center"> @@ -227,7 +233,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,saveTaskForPub,changeAssigneeNew} from 'api/process' + import {inboundLiaisonDetail,saveTaskForPub,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -266,6 +272,42 @@ ProcessTitle }, methods: { + getBusStandFileByAttId(attId) { + return new Promise((resolve, reject) => { + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + clickButtonToUpload2(file) { + const attId = file + 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('文件不存在,预览失败') + }) + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 87da7b48f..fe18dfe5e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -42,8 +42,14 @@ -
- {{ form.hzfileName }} +
+ {{ form.hzfileName }} +
- - @@ -92,8 +98,14 @@ label="文件" align="center"> @@ -217,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' + import {inboundLiaisonDetail,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -257,6 +269,42 @@ ProcessTitle }, methods: { + getBusStandFileByAttId(attId) { + return new Promise((resolve, reject) => { + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + clickButtonToUpload2(file) { + const attId = file + 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('文件不存在,预览失败') + }) + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index e170af563..98aa6d46b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -42,8 +42,14 @@ -
- {{ form.hzfileName }} +
+ {{ form.hzfileName }} +
- - @@ -92,8 +98,14 @@ label="文件" align="center"> @@ -217,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' + import {inboundLiaisonDetail,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -257,6 +269,42 @@ ProcessTitle }, methods: { + getBusStandFileByAttId(attId) { + return new Promise((resolve, reject) => { + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + clickButtonToUpload2(file) { + const attId = file + 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('文件不存在,预览失败') + }) + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 5024d3034..49b5f88d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -42,8 +42,14 @@ -
- {{ form.hzfileName }} +
+ {{ form.hzfileName }} +
- - @@ -92,8 +98,14 @@ label="文件" align="center"> @@ -217,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' + import {inboundLiaisonDetail,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -257,6 +269,42 @@ ProcessTitle }, methods: { + getBusStandFileByAttId(attId) { + return new Promise((resolve, reject) => { + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + clickButtonToUpload2(file) { + const attId = file + 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('文件不存在,预览失败') + }) + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index aaaab8fb0..5b0432e08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -42,8 +42,14 @@ -
- {{ form.hzfileName }} +
+ {{ form.hzfileName }} +
- - @@ -92,8 +98,14 @@ label="文件" align="center"> @@ -217,7 +229,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process' + import {inboundLiaisonDetail,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -257,6 +269,42 @@ ProcessTitle }, methods: { + getBusStandFileByAttId(attId) { + return new Promise((resolve, reject) => { + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + clickButtonToUpload2(file) { + const attId = file + 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('文件不存在,预览失败') + }) + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 946f33d86..792560783 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -395,7 +395,7 @@ import ProcessTitle from '../../components/ProcessTitle' import { startProcess, saveTaskFirst, completeTask, queryTaskFirst, - taskDel, workGroup + taskDel, workGroup,processBack } from '@/api/process.js' export default { @@ -742,10 +742,17 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - const paramsInfo = { - type: '20' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '20') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + rh_pageData: this.rh_pageData, + commentText: this.commentText + })) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index ef76e0fb6..96510f1c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -338,7 +338,7 @@ import ProcessTitle from '../../components/ProcessTitle' import { startProcess, queryTaskFirst, saveTaskFirst, completeTask, - taskDel, workGroup} from '@/api/process.js' + taskDel, workGroup, processBack} from '@/api/process.js' export default { components: { @@ -658,10 +658,18 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - const paramsInfo = { - type: '21' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '21') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + ch_pageData: this.ch_pageData, + commentText: this.commentText + + })) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index d3a13061a..cf9ecbb40 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1062,7 +1062,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "4"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '4', + json: JSON.stringify({ + taskInfo: '引入法规标准清单', + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index a9f2bbf5a..df47e84dc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -47,12 +47,18 @@ 选择附件
-
- {{ item.fileName }} +
+ {{ item.fileName }} +
@@ -63,12 +69,18 @@ v-model="form.modelNameList" clearable > -
-
- {{ item.name }} +
+
+ {{ item.name }} +
-
+
{ + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + fileLook(file) { // 预览 + const attId = file.attId + 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('文件不存在,预览失败') + }) + }, beginImportFile (file) { var filename = file.name var index1 = filename.lastIndexOf('.') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index d1ae55826..a7f8eb4a7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -51,17 +51,17 @@ style="display: none;" >
-
- {{ item.fileName }} +
+ {{ item.fileName }} +
- - - - - - -
-
- {{ item.name }} +
+
+ {{ item.name }} +
-
+
{ + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + fileLook(file) { // 预览 + const attId = file.attId + 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('文件不存在,预览失败') + }) + }, beginImportFile (file) { var filename = file.name var index1 = filename.lastIndexOf('.') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 028661cc1..9394e1669 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -46,13 +46,30 @@ style="display: none;" >
-
{{ item.fileName }}
+
+ {{ item.fileName }} + +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -174,7 +191,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew} from "api/process"; +import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew,getBusStandFileByAttId} from "api/process"; import axios from "axios"; export default { @@ -221,6 +238,50 @@ export default { ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e0062beed..9def032ea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -46,16 +46,30 @@ style="display: none;" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -318,7 +332,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail, processCreateStand, saveTaskForPub,changeAssigneeNew,execTask} from 'api/process' + import {inboundLiaisonDetail, processCreateStand, saveTaskForPub,changeAssigneeNew,execTask,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -386,6 +400,50 @@ ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, itermsConditionsClose () { this.itermsConditionsFlag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 6cbadc4ec..24ba96755 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -46,23 +46,37 @@ style="display: none;" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
- -
- + { + getBusStandFileByAttId({ + attId + }).then(res => { + if (res.ok) { + resolve(res.data) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + fileLook(file) { // 预览 + const attId = file.attId + 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('文件不存在,预览失败') + }) + }, checkedRole2(data) { this.form.bzfgId = data[0].id this.form.bzfgName = data[0].name @@ -400,6 +458,8 @@ } this.isSubmit = false }) + } else { + this.$message.warning('请选择标准法规工程师分线管理员') } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 7eaad4088..9bbcc251c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -46,16 +46,30 @@ style="display: none;" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -248,7 +262,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process' + import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -304,6 +318,50 @@ ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, checkedRole2(data) { this.form.bzfgId = data[0].id this.form.bzfgName = data[0].name diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 1468ea86b..f6513b873 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -328,7 +342,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process' +import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -396,6 +410,50 @@ export default { ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, handleSelectionChange(val) { this.idList = [] val.forEach(item => { @@ -585,6 +643,8 @@ export default { } this.isSubmit = false }) + } else { + this.$message.warning('请选择审批人') } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 5e1e6bcca..dc18ccf8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -46,16 +46,30 @@ style="display: none;" >
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -317,7 +331,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; - import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew } from "api/process"; + import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew,getBusStandFileByAttId } from "api/process"; import axios from "axios"; export default { @@ -382,6 +396,50 @@ ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, getItemList (standId, fileType) { // 查询分解单条款数据 this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { standId: standId, @@ -573,11 +631,12 @@ if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { - unique: data.unique + unique: data.uniques }, {}, res => { res.data.forEach(item => { item.chapterNumber = item.partCode; item.responUserName = item.userName; + item.state = '1' this.data.push(item); }); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 884d04912..b89f1b7f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -262,7 +276,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process"; +import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew,getBusStandFileByAttId } from "api/process"; import axios from "axios"; export default { @@ -320,6 +334,50 @@ export default { ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, itermsConditionsClose () { this.itermsConditionsFlag = false }, @@ -382,8 +440,6 @@ export default { } }, upload(row, title) { - console.log(row); - return var params = { columnName: { chapterNumber: "章条编号", @@ -394,10 +450,12 @@ export default { reason: "修改理由", department: "提出部门", responUserName: "提出人", - stateText: "处理意见" }, dataList: [] }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" + } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 3fe206cb5..4d0bb709f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -262,7 +276,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process' +import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -317,6 +331,50 @@ export default { ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, itermsConditionsClose () { this.itermsConditionsFlag = false }, @@ -382,10 +440,12 @@ export default { reason: "修改理由", department: "提出部门", responUserName: "提出人", - stateText: "处理意见" }, dataList: [] } + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" + } params.dataList = JSON.parse(JSON.stringify(row)) params.dataList.forEach(item => { if (item.state === '1') { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index b3d4a40f9..d8ebf13aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -262,7 +276,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process' +import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew,getBusStandFileByAttId} from 'api/process' import axios from "axios"; export default { @@ -317,6 +331,50 @@ export default { ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, itermsConditionsClose () { this.itermsConditionsFlag = false }, @@ -382,10 +440,12 @@ export default { reason: "修改理由", department: "提出部门", responUserName: "提出人", - stateText: "处理意见" }, dataList: [] } + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" + } params.dataList = JSON.parse(JSON.stringify(row)) params.dataList.forEach(item => { if (item.state === '1') { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 6055e3d72..188fd08a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -42,20 +42,34 @@
-
- {{ item.fileName }} - 下载 +
+ {{ item.fileName }} +
-
-
- {{ item.name }} +
+
+ {{ item.name }} +
@@ -262,7 +276,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process"; +import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew,getBusStandFileByAttId } from "api/process"; import axios from "axios"; export default { @@ -317,6 +331,50 @@ export default { ProcessTitle }, methods: { + filesUpload (file) { // 下载 + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, + 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.attId + 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('文件不存在,预览失败') + }) + }, itermsConditionsClose () { this.itermsConditionsFlag = false }, @@ -382,10 +440,12 @@ export default { reason: "修改理由", department: "提出部门", responUserName: "提出人", - stateText: "处理意见" }, dataList: [] }; + if (title === '上报意见.xls') { + params.columnName.stateText = "处理意见" + } params.dataList = JSON.parse(JSON.stringify(row)); params.dataList.forEach(item => { if (item.state === "1") { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index f46d88d82..c1af624bd 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -186,7 +186,16 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "14"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '14', + json: JSON.stringify({ + taskInfo: '责任部门对接人选择责任人', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 4702a989d..fe193ebd3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -455,8 +455,10 @@ v-show="verifySarStandard" show-save show-submit + show-edit :submitLoading="isSubmit" :saveLoading="saveLoading" + @onLineEdit="handleOnLineEdit" @save="handleSave" @submit="handleSubmit" > @@ -805,7 +807,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; let Base64 = require('js-base64').Base64; @@ -2263,6 +2265,44 @@ handleTabs(name) { this.active = name }, + processModelHisOne(pId,taskIds) { + return new Promise((resolve, reject) => { + processModelHisOne({ + pid: pId, + taskId: taskIds + }).then(res => { + if (res) { + resolve(res) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + // 在线编辑 + handleOnLineEdit(){ + this.isSubmit = true + this.processModelHisOne(this.pId,this.taskIds) + .then(res => { + console.log(res) + if(res){ + const editFileInfo = res + const showName = this.$store.getters.userInfo.userName + editFileInfo.taskInfo + const editFilePath = editFileInfo.editFilePath.split("/") + editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/' + editFileInfo.fileName = editFilePath[2] + editFileInfo.userName = this.$store.getters.userInfo.userName + const nowTime = new Date().getTime() + window.open('http://127.0.0.1:8080/editor?oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + this.isSubmit = false + } + }).catch(e => { + console.log(e) + // this.$message.warning('文件不存在,预览失败') + }) + }, //保存 handleSave() { this.form.country=this.countryArr; diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 025398b68..a67d73a42 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -455,8 +455,10 @@ v-show="verifySarStandard" show-save show-submit + show-edit :saveLoading="saveLoading" :submitLoading="isSubmit" + @onLineEdit="handleOnLineEdit" @save="handleSave" @submit="handleSubmit" > @@ -804,7 +806,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; let Base64 = require('js-base64').Base64; @@ -2262,6 +2264,44 @@ handleTabs(name) { this.active = name }, + processModelHisOne(pId,taskIds) { + return new Promise((resolve, reject) => { + processModelHisOne({ + pid: pId, + taskId: taskIds + }).then(res => { + if (res) { + resolve(res) + } else { + reject() + } + }).catch(e => { + reject(e) + }) + }) + }, + // 在线编辑 + handleOnLineEdit(){ + this.isSubmit = true + this.processModelHisOne(this.pId,this.taskIds) + .then(res => { + console.log(res) + if(res){ + const editFileInfo = res + const showName = this.$store.getters.userInfo.userName + editFileInfo.taskInfo + const editFilePath = editFileInfo.editFilePath.split("/") + editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/' + editFileInfo.fileName = editFilePath[2] + editFileInfo.userName = this.$store.getters.userInfo.userName + const nowTime = new Date().getTime() + window.open('http://127.0.0.1:8080/editor?oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + this.isSubmit = false + } + }).catch(e => { + console.log(e) + // this.$message.warning('文件不存在,预览失败') + }) + }, //保存 handleSave() { this.form.country=this.countryArr; diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue index 137e02b6b..24aca3580 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue @@ -60,7 +60,7 @@
- +
{ if (valid) { this.isSubmit = true - const paramsInfo = { - type: '8' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '8') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + })) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 5892599d3..8503a7890 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -125,7 +125,7 @@
- +
@@ -140,7 +140,7 @@
- +
@@ -155,7 +155,7 @@
- +
@@ -190,7 +190,7 @@

企业标准相关流程

- +
@@ -205,7 +205,7 @@
- +
@@ -220,7 +220,7 @@
- +
@@ -235,7 +235,7 @@
- +
@@ -256,7 +256,7 @@

标准化活动相关流程

- +
@@ -271,7 +271,7 @@
- +
@@ -301,7 +301,7 @@
- +
@@ -316,7 +316,7 @@
- +
@@ -331,7 +331,7 @@
- +
@@ -346,14 +346,14 @@
- -
+ +
-
加入标准化协会信息提报流程
+
参与外部标准制修订信息提报流程
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 59b78eea8..5801004e3 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -610,16 +610,63 @@ -