diff --git a/src/api/process.js b/src/api/process.js index 1a8737f23..5052cb051 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -697,6 +697,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/components/navMenu/index.vue b/src/components/navMenu/index.vue index e9e9b928e..b5ee61ce1 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -282,6 +282,13 @@ menuId: 'asfdew33', isChildren: true // 判断没有子菜单 }, + { + title: '资料中心', + path: '/dataCenter', + 'icon-class': 'el-icon-s-order', + menuId: '', + isChildren: true // 判断没有子菜单 + }, // { // title: '技术要求清单', // path: '/skillReq', 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/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..13f2883aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -110,7 +110,7 @@ :action="uploadPath" name="file" :file-list="fileTextList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -341,7 +341,7 @@

技术委员会常务副主任/总院院长

- +
@@ -352,8 +352,8 @@

总院技术委员会主任

- - + +
@@ -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 { @@ -477,7 +477,8 @@ export default { feeUserId: '', engineerUser: '', engineerUserId: '', - + directorUserId: '', + directorUserName: '', }, rh_rules: {}, roleFormRules: { @@ -486,6 +487,7 @@ export default { leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}], feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}], engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}], }, roleShowflag: false, roleShowflagOne: false, @@ -556,11 +558,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -699,9 +701,12 @@ export default { if (this.type === 'leaderUser') { this.roleForm.leaderUser = data[0].name this.roleForm.leaderUserId = data[0].id - } else { + } else if(this.type === 'ngineerUser'){ this.roleForm.engineerUser = data[0].name this.roleForm.engineerUserId = data[0].id + } else { + this.roleForm.directorUserName = data[0].name + this.roleForm.directorUserId = data[0].id } this.roleShowflagOne = false }, @@ -742,10 +747,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/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 0c1ce8d08..41be31d75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index c0b71a1bd..61cf5efe7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -184,7 +184,7 @@ :action="uploadPath" name="file" :file-list="fillFileList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -506,11 +506,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 275d52ffd..321baa576 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -127,7 +127,7 @@ ref="uploadOtherFile" name="file" :file-list="upOtherData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beforeUploadOther" :before-remove="beforeRemoveOther" :on-success="onsuccessOther" @@ -202,7 +202,7 @@ :action="actionPath" name="file" :file-list="reData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -223,7 +223,7 @@ :action="actionPath" name="file" :file-list="themeData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beforeUploadTheme" :before-remove="beforeRemoveTheme" :on-success="onsuccessTheme" @@ -420,11 +420,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -493,11 +493,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -553,11 +553,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index ef76e0fb6..939f0d879 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -124,7 +124,7 @@ :action="uploadPath" name="file" :file-list="ch_pageData.fileTextList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -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: { @@ -484,11 +484,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -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/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index c36e59a94..84c33eb92 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -67,7 +67,6 @@
批量编辑 - 查看比对
@@ -292,7 +292,7 @@ size="800px">
- +
+ 查看比对 +
相似度:{{ similarityDegree }}
-
-
-
- {{ item1.itemsNum }} -
-
-
-
-
-
-
- {{ item2.itemsNum }} -
-
-
-
+
+
@@ -463,11 +451,11 @@ name: "bzjdStep3", data() { return { + similarityDegree: '', BDmodel: false, oldNumber: '', - leftData: [], - rightData: [], - + leftData: '', + rightData: '', modalshowflag2: false, itemId: '', drawerModal: false, @@ -504,6 +492,7 @@ newData: '', // 新车型实施日期 onlineData: '', // 在产车实施日期 applyArctic: '', // 适用车型 + itemsId: '', }, modalshowflag: false, sarType: '', @@ -543,7 +532,13 @@ }, { _this: this }, res => { - this.leftData = res.data + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } }, e => { }) this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { @@ -552,13 +547,34 @@ }, { _this: this }, res => { - this.rightData = res.data + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } }, e => { }) }, - checkBD () { - this.BDmodel = true - this.getBDList() + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) }, itemEdit (row) { this.itemId = row.id @@ -571,6 +587,8 @@ newData: row.newData, // 新车型实施日期 onlineData: row.onlineData, // 在产车实施日期 applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 } }, saveUserInfo2 () { @@ -829,6 +847,7 @@ item.itemsTitle = item.itermsConditions item.applyArctic = item.applyArctic || [] }) + this.getBDList() this.itemList = itemList this.loading = false }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 53cae2420..dfd12205e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -101,6 +101,7 @@ show-overflow-tooltip prop="technicalRequir" width="200" + v-if="!form.itemsNum1" label="核心技术要求" align="center"> @@ -173,6 +174,14 @@ prop="zrUserIdName" align="center"> + + + @@ -270,6 +279,16 @@ 关闭
+ +
相似度:{{ similarityDegree }}
+
+
+
+
+
@@ -284,6 +303,11 @@ name: "bzjdStep4", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, @@ -315,6 +339,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, phoneClick () { this.$router.push('/phoneBzjdStep4') }, @@ -431,6 +521,7 @@ this.json = data this.itemList = data.itemList this.loading = false + this.getBDList() }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 86a29e90e..34681ce08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -101,6 +101,7 @@ show-overflow-tooltip prop="technicalRequir" width="200" + v-if="!form.itemsNum1" label="核心技术要求" align="center"> @@ -173,6 +174,14 @@ prop="zrUserIdName" align="center"> + + + @@ -275,6 +284,16 @@ 关闭
+ +
相似度:{{ similarityDegree }}
+
+
+
+
+
加载中...
@@ -290,6 +309,11 @@ name: "bzjdStep5", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, @@ -321,6 +345,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index a521f2e7f..e063a5855 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -102,6 +102,7 @@ show-overflow-tooltip prop="technicalRequir" width="200" + v-if="!form.itemsNum1" label="核心技术要求" align="center"> @@ -174,6 +175,14 @@ prop="zrUserIdName" align="center"> + + + @@ -274,6 +283,16 @@ 关闭
+ +
相似度:{{ similarityDegree }}
+
+
+
+
+
加载中...
@@ -289,6 +308,11 @@ name: "bzjdStep6", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, @@ -320,6 +344,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 661379ce7..ba13e4698 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1124,15 +1124,26 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - this.listForm.commentText = this.commentText; - this.listForm.fileName = this.fileInfoList; + this.listForm.commentText = this.commentText + this.listForm.fileName = this.fileInfoList var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "4" }, { + this.isSubmit = true + 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) { @@ -1145,17 +1156,9 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } - this.isSubmit = false; + this.isSubmit = false }); } }); 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/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 21eda1b26..99c95e502 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -185,7 +185,16 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "15"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '15', + json: JSON.stringify({ + taskInfo: '备案任务下发', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 4b687c61d..cee4400f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -583,7 +583,17 @@ export default { this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '23', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index c93be5d1e..5f2df297e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -624,7 +624,17 @@ export default { this.isSubmit = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '24'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '24', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.standardSearch, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index cc933eb41..d0dc8ab97 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -474,9 +474,17 @@ export default { if (valid) { // this.isSubmit = true; var json = Object.assign(qbzxdFrom, this.roleForm); - console.log(json); - return - this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index d88f83492..111d9af70 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -680,7 +680,17 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "16"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '16', + json: JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 6533ae6c2..e312fcbca 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -266,7 +266,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -509,10 +509,17 @@ export default { this.$refs['roleForm'].validate((valid) => { 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/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 99c1f4b43..aca7388ec 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -854,14 +854,14 @@ export default { if (this.dataList.length < 1) { this.satisfyFlag = false this.$message.warning("请添加产品线信息"); - }else{ + }else { this.satisfyFlag = true } this.dataList.forEach(item => { if (!item.distributePerson) { this.satisfyFlag = false this.$message.warning("请选择分发责任人"); - }else{ + }else { this.satisfyFlag = true } }); @@ -874,7 +874,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -887,14 +898,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 13b74f4af..2909c7f85 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -867,7 +867,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + 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/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index ab5bfa4d4..05e50fb08 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -612,7 +612,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -625,14 +635,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; @@ -647,7 +649,7 @@ export default { return this.$message.warning("请完善基础信息"); } }); - } + } } }, choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index ccdd41aac..395c8b95f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -629,7 +629,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 0cf0dad19..6179964e5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -655,7 +655,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -668,14 +679,6 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 028182e51..ab4dd630f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -659,7 +659,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { 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/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue new file mode 100644 index 000000000..0d3fcb05b --- /dev/null +++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue new file mode 100644 index 000000000..5149390bb --- /dev/null +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -0,0 +1,447 @@ + + + + + diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 30f65e677..b0f2bafc8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1499,7 +1499,7 @@ @@ -1777,7 +1777,7 @@ @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> - + diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 59b78eea8..b12fe4d6a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -610,16 +610,63 @@ -