FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yanyizhou
2021-12-14 20:41:53 +08:00
parent 7180ffcb19 0ecccd5107
commit e449a34f23
54 changed files with 1687 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/solicitopinions/index.vue
+5
View File
@@ -25,6 +25,7 @@
</el-table-column>
<el-table-column
prop="cid"
show-overflow-tooltip
label="标准名称/政策名称">
<template slot-scope="scope">
<span @click="standForComments(scope.row)">{{ scope.row.cid }}</span>
@@ -91,6 +92,10 @@ export default {
<style lang="less" scoped>
.solicitopinions {
/deep/.el-table__body-wrapper {
max-height: calc(65vh - 101px);
overflow-y: auto;
}
/deep/.el-table th > .cell {
font-size: 15px;
}
src/pages/home2/index.vue
+3
View File
@@ -22,6 +22,9 @@
</el-tabs>
</div>
</div>
<div style="height: 20px;background-color: #fff;text-align: right;color: #4788c0">
<span style="margin-right: 10px;cursor: pointer;font-size: 12px" @click="$router.push('standardForComments')">更多 ⋙</span>
</div>
</div>
<div class="right_wrapper">
<nav-menu></nav-menu>
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+75 -17
View File
@@ -46,20 +46,26 @@
v-model="form.modelNameList"
clearable
></el-input>
<div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
{{ item.name }}
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;">
<div class="fileClass" @click="handlePreview(item)" style="display: flex; align-items: center;">
{{ item.name }}
<el-button
size="small"
@click="clickButtonToUpload(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="mini">
点击上传
</el-button>
</div>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="mini">
点击上传
</el-button>
</el-form-item>
<el-form-item label="相关附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
@@ -68,12 +74,20 @@
v-model="form.fjNameList"
clearable
></el-input>
<div v-if="form.fjList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.fjList" :key="index" @click="fileUpload2" style="margin-right: 5px;">
{{ item.name }}
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;">
<div class="fileClass" @click="handlePreview(item)" style="display: flex; align-items: center;">
{{ item.name }}
<el-button
size="small"
@click="clickButtonToUpload(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
</div>
<div v-else>
<div>
<el-button
type="primary"
class="common-button-primary"
@@ -241,7 +255,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { saveTaskFirst, queryTaskFirst } from 'api/process'
import { saveTaskFirst, queryTaskFirst, getBusStandFileByAttId } from 'api/process'
export default {
name: "bzdyStep1-1",
@@ -319,6 +333,50 @@
ProcessTitle
},
methods: {
clickButtonToUpload (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)
})
})
},
handlePreview(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('文件不存在,预览失败')
})
},
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+77 -18
View File
@@ -24,7 +24,7 @@
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
v-model="form.title"
@@ -46,20 +46,26 @@
v-model="form.modelNameList"
clearable
></el-input>
<div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
{{ item.name }}
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;">
<div class="fileClass" @click="handlePreview(item)" style="display: flex; align-items: center;">
{{ item.name }}
<el-button
size="small"
@click="clickButtonToUpload(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="mini">
点击上传
</el-button>
</div>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="mini">
点击上传
</el-button>
</el-form-item>
<el-form-item label="相关附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
@@ -68,12 +74,20 @@
v-model="form.fjNameList"
clearable
></el-input>
<div v-if="form.fjList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.fjList" :key="index" @click="fileUpload2" style="margin-right: 5px;">
{{ item.name }}
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;">
<div class="fileClass" @click="handlePreview(item)" style="display: flex; align-items: center;">
{{ item.name }}
<el-button
size="small"
@click="clickButtonToUpload(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
</div>
<div v-else>
<div>
<el-button
type="primary"
class="common-button-primary"
@@ -243,6 +257,7 @@ import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { saveTaskFirst } from 'api/process'
import { getBusStandFileByAttId } from 'api/process'
export default {
name: "bzdyStep1",
@@ -321,6 +336,50 @@ export default {
ProcessTitle
},
methods: {
clickButtonToUpload (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)
})
})
},
handlePreview(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('文件不存在,预览失败')
})
},
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
@@ -375,7 +434,7 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX') {
return true
} else {
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+52 -4
View File
@@ -24,7 +24,7 @@
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -43,8 +43,14 @@
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="clickButtonToUpload(item)">
{{ item.name }}
<el-button
size="small"
@click="updateFile(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
@@ -53,8 +59,14 @@
</el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="clickButtonToUpload(item)">
{{ item.name }}
<el-button
size="small"
@click="updateFile(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
@@ -180,7 +192,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 {
@@ -224,6 +236,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)
})
})
},
clickButtonToUpload(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
},
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+82 -7
View File
@@ -24,7 +24,7 @@
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -43,8 +43,14 @@
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="clickButtonToUpload(item)">
{{ item.name }}
<el-button
size="small"
@click="updateFile(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
@@ -53,8 +59,14 @@
</el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="clickButtonToUpload(item)">
{{ item.name }}
<el-button
size="small"
@click="updateFile(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
@@ -72,7 +84,7 @@
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -80,8 +92,14 @@
v-model="form.fileName"
clearable
></el-input>
<div v-if="form.fileName" @click="fileUpload" class="fileClass">
<div v-if="form.fileName" @click="clickButtonToUpload2(form.fileId)" class="fileClass">
{{ form.fileName }}
<el-button
size="small"
@click="updateFile(form)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
<div v-else>
<el-button
@@ -230,7 +248,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 {
@@ -279,6 +297,63 @@
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('文件不存在,预览失败')
})
},
clickButtonToUpload(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
},
@@ -323,7 +398,7 @@
}, e => {})
},
updateFile (item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.fileId
},
// 导入按钮 上传之前的钩子
beginImportFile (file) {
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+94 -14
View File
@@ -24,7 +24,7 @@
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -43,8 +43,14 @@
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item.id)">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="clickButtonToUpload(item)">
{{ item.name }}
<el-button
size="small"
@click="updateFile(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
@@ -53,22 +59,28 @@
</el-form-item>
<el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="clickButtonToUpload(item)">
{{ item.name }}
<el-button
size="small"
@click="updateFile(item)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<div v-if="form.file" class="fileClass" @click="updateFile(form.file)">
{{ form.fileName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<!-- <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.file" class="fileClass" @click="updateFile(form.file)">-->
<!-- {{ form.fileName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -82,8 +94,18 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<div v-if="form.file" class="fileClass" @click="updateFile(form.file)">
{{ form.fileName }}
<div v-if="form.file" class="fileClass">
<div style="display: flex;">
<div @click="clickButtonToUpload2(form.fileId)">
{{ form.fileName }}
</div>
<el-button
size="small"
@click="updateFile(form.fileId)"
icon="el-icon-upload"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
@@ -205,7 +227,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 {
@@ -249,6 +271,63 @@
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('文件不存在,预览失败')
})
},
clickButtonToUpload(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
},
@@ -350,6 +429,7 @@
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.fileId = data.fileId || data.form.fileId
this.form.modelList = data.modelList || data.form.modelList
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+49 -24
View File
@@ -20,26 +20,28 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:" prop="comityName">
<el-select
@change="comityChange"
v-model="rh_pageData.comityName"
placeholder="请选择标委会">
<el-option
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
<el-select
@change="comityChangeOne"
v-model="rh_pageData.comityNameOne"
placeholder="请选择分标委">
<el-option
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in rh_pageData.comityOptionsTwo"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -49,10 +51,10 @@
v-model="rh_pageData.comityNameTwo"
placeholder="请选择工作组">
<el-option
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in rh_pageData.comityOptionsTree"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -390,7 +392,11 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {startProcess, saveTaskFirst, completeTask, queryTaskFirst, taskDel} from '@/api/process.js'
import {
startProcess, saveTaskFirst,
completeTask, queryTaskFirst,
taskDel, workGroup
} from '@/api/process.js'
export default {
components: {
@@ -429,11 +435,10 @@ export default {
fillLeader: '',
fillLeaderId: '',
fillFile: [],
comityOptionsOne: [],
comityOptionsTwo: [],
comityOptionsTree: [],
},
comityNameOptions: [
{value: '0', label: '国内法规入库流程'},
{value: '1', label: '标准法规技术评估流程'},
],
comityRoleOptions: [
{value: '0', label: '委员'},
{value: '1', label: '观察委员'},
@@ -474,11 +479,7 @@ export default {
engineerUserId: '',
},
rh_rules: {
comityName: [{required: true, message: "请选择协会名称", trigger: ['blur', 'change']}],
comityNameOne: [{required: true, message: "请选择分标委", trigger: ['blur', 'change']}],
comityNameTwo: [{required: true, message: "请选择工作组", trigger: ['blur', 'change']}]
},
rh_rules: {},
roleFormRules: {
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
@@ -503,13 +504,37 @@ export default {
if (this.bpnId !== undefined) {
this.getData()
}
let type = {
type: 0
}
workGroup(type).then(res => {
this.rh_pageData.comityOptionsOne = res.data.children
})
},
methods: {
// 右上标签页面切换
handleTabs(name) {
this.active = name
},
/** 获取分标委数据字典数据 */
comityChange() {
this.rh_pageData.comityNameOne = ''
this.rh_pageData.comityNameTwo = ''
this.rh_pageData.comityOptionsOne.forEach(item => {
if (item.children !== null && item.id === this.rh_pageData.comityName) {
this.rh_pageData.comityOptionsTwo = item.children
}
})
},
/** 获取工作组字典数据 */
comityChangeOne() {
this.rh_pageData.comityNameTwo = ''
this.rh_pageData.comityOptionsTwo.forEach(item => {
if (item.children !== null && item.id === this.rh_pageData.comityNameOne) {
this.rh_pageData.comityOptionsTree = item.children
}
})
},
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -733,7 +758,7 @@ export default {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
taskDel(taskId).then(res => {
return res
})
}
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+6 -1
View File
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+6 -1
View File
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+6 -1
View File
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+6 -1
View File
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
+6 -1
View File
@@ -18,7 +18,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+6 -1
View File
@@ -21,7 +21,12 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ rh_pageData.comityName || '-' }}
<span
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
+21 -3
View File
@@ -18,17 +18,32 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="标委会:">
{{ hh_pageData.associaName || '-' }}
<span
v-for="item in hh_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === hh_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="分标委:">
{{ hh_pageData.associaNameOne || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTwo"
:key="item.id"
v-if="item.id === hh_pageData.associaNameOne">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="工作组:">
{{ hh_pageData.associaNameTwo || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTree"
:key="item.id"
v-if="item.id === hh_pageData.associaNameTwo">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
</el-row>
@@ -310,6 +325,9 @@ export default {
this.hh_pageData.associaName = formList.associaName
this.hh_pageData.associaNameOne = formList.associaNameOne
this.hh_pageData.associaNameTwo = formList.associaNameTwo
this.hh_pageData.associaOptionsOne = formList.associaOptionsOne
this.hh_pageData.associaOptionsTwo = formList.associaOptionsTwo
this.hh_pageData.associaOptionsTree = formList.associaOptionsTree
this.hh_pageData.meetingStartTime = formList.meetingStartTime
this.hh_pageData.meetingName = formList.meetingName
this.hh_pageData.themeTable = formList.meetingTable
src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
+18 -3
View File
@@ -18,17 +18,32 @@
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="标委会:">
{{ hh_pageData.associaName || '-' }}
<span
v-for="item in hh_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === hh_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="分标委:">
{{ hh_pageData.associaNameOne || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTwo"
:key="item.id"
v-if="item.id === hh_pageData.associaNameOne">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="工作组:">
{{ hh_pageData.associaNameTwo || '-' }}
<span
v-for="item in hh_pageData.associaOptionsTree"
:key="item.id"
v-if="item.id === hh_pageData.associaNameTwo">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
</el-row>
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+49 -19
View File
@@ -34,26 +34,28 @@
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
<el-select
@change="comityChange"
v-model="ch_pageData.associaName"
placeholder="请选择标委会">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ch_pageData.associaName !== ''">
<el-form-item class="add-form-item">
<el-select
@change="comityChangeOne"
v-model="ch_pageData.associaNameOne"
placeholder="请选择分标委">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in ch_pageData.associaOptionsTwo"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -63,10 +65,10 @@
v-model="ch_pageData.associaNameTwo"
placeholder="请选择工作组">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.label"/>
v-for="item in ch_pageData.associaOptionsTree"
:key="item.id"
:label="item.name"
:value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -76,7 +78,7 @@
<el-form-item class="add-form-item" label="会议时间:">
<el-date-picker
v-model="ch_pageData.meetingStartTime"
type="datetime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
align="right">
@@ -144,7 +146,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-form-item label-width="0" prop="meetingTable">
<div class="table_btn">
<el-button type="primary" size="small" @click="meeting_add">添加</el-button>
<el-button type="danger" size="small" @click="meeting_delete">批量删除</el-button>
@@ -333,7 +335,10 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {startProcess, queryTaskFirst, saveTaskFirst, completeTask,taskDel} from '@/api/process.js'
import {
startProcess, queryTaskFirst,
saveTaskFirst, completeTask,
taskDel, workGroup} from '@/api/process.js'
export default {
components: {
@@ -369,12 +374,11 @@ export default {
fillMail: '',
fillLeader: '',
fillFile: '',
associaOptionsOne: [],
associaOptionsTwo: [],
associaOptionsTree: []
},
associaNameOptions: [
{value: '0', label: '国内法规入库流程'},
{value: '1', label: '标准法规技术评估流程'},
],
feeKindOptions: [
{value: '0', label: '列支1'},
{value: '1', label: '列支2'},
@@ -426,12 +430,37 @@ export default {
if (this.bpnId !== undefined) {
this.getData()
}
let type = {
type: 0
}
workGroup(type).then(res => {
this.ch_pageData.associaOptionsOne = res.data.children
})
},
methods: {
// 右上标签页面切换
handleTabs(name) {
this.active = name
},
/** 获取分标委数据字典数据 */
comityChange() {
this.ch_pageData.associaNameOne = ''
this.ch_pageData.associaNameTwo = ''
this.ch_pageData.associaOptionsOne.forEach(item => {
if (item.children !== null && item.id === this.ch_pageData.associaName) {
this.ch_pageData.associaOptionsTwo = item.children
}
})
},
/** 获取工作组字典数据 */
comityChangeOne() {
this.ch_pageData.associaNameTwo = ''
this.ch_pageData.associaOptionsTwo.forEach(item => {
if (item.children !== null && item.id === this.ch_pageData.associaNameOne) {
this.ch_pageData.associaOptionsTree = item.children
}
})
},
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -656,6 +685,7 @@ export default {
})
} else {
this.$message.warning('请完成流程信息的人员选择')
this.isSubmit = false
}
})
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+7 -2
View File
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -79,7 +84,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item">
<el-form-item class="add-form-item" label-width="0">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+7 -2
View File
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -79,7 +84,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item class="add-form-item">
<el-form-item class="add-form-item" label-width="0">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+6 -1
View File
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+6 -1
View File
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue
+6 -1
View File
@@ -30,7 +30,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+6 -1
View File
@@ -33,7 +33,12 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:">
{{ ch_pageData.associaName || '-' }}
<span
v-for="item in ch_pageData.associaOptionsOne"
:key="item.id"
v-if="item.id === ch_pageData.associaName">
{{ item.name || '-'}}
</span>
</el-form-item>
</el-col>
<el-col :span="8">
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+11 -1
View File
@@ -720,7 +720,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst, queryTaskFirst } from "api/process";
import { saveTaskFirst, queryTaskFirst, taskDel } from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default {
@@ -732,6 +732,7 @@ export default {
},
data() {
return {
bpnId:'',
fileUrl: "api/att/attFile/upload",
fileMadel: false,
searching: false,
@@ -1144,6 +1145,14 @@ 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;
@@ -1461,6 +1470,7 @@ export default {
},
computed: {},
mounted() {
this.bpnId = this.$route.query.bpnId
this.getData();
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+19 -15
View File
@@ -573,22 +573,26 @@ export default {
handleSave() {
},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.spId = this.form.spId
json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.spId = this.form.spId
json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
this.isSubmit = false
})
},
// handleSubmitNo() {
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+7 -5
View File
@@ -72,12 +72,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
@click="upload(oldData, '汇总单.xls')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '上报意见.xls')"
@click="upload(data, '上报意见.xls')"
size="mini">生成上报意见
</el-button>
</div>
@@ -389,6 +389,8 @@ export default {
}
},
upload(row, title) {
console.log(row);
return
var params = {
columnName: {
chapterNumber: "章条编号",
@@ -427,7 +429,7 @@ export default {
} else {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 0;
json.hqFlag = '0';
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
@@ -446,7 +448,7 @@ export default {
if (this.commentText) {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 1;
json.hqFlag = '1';
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
@@ -479,6 +481,7 @@ export default {
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
@@ -491,7 +494,6 @@ export default {
this.form.modelList = data.modelList
this.form.modelNameList = data.modelNameList
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
});
});
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+44 -7
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">审核</template>
<template slot="proNode">部长及对接人审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -46,12 +46,22 @@
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
<div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex; margin-left: 10px">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -62,12 +72,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
@click="upload(oldData, '汇总单.xls')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '上报意见.xls')"
@click="upload(data, '上报意见.xls')"
size="mini">生成上报意见
</el-button>
</div>
@@ -108,6 +118,9 @@
prop="oldText"
align="center"
label="修改前">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template>
</el-table-column>
<el-table-column
prop="newText"
@@ -233,6 +246,15 @@
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
></Role-tree>
<el-dialog
title="查看修改前内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -247,7 +269,9 @@ export default {
name: "bzzqyjStep7",
data() {
return {
drawerModal: false,
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
histortData: [],
oldData: [],
data: [],
@@ -275,6 +299,9 @@ export default {
cname: '', // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
},
formRules: {
responUserList: [
@@ -290,6 +317,13 @@ export default {
ProcessTitle
},
methods: {
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
@@ -390,7 +424,7 @@ export default {
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.bdFlag = '0'
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -409,7 +443,7 @@ export default {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.bdFlag = '1'
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -449,6 +483,9 @@ export default {
arr.push(item)
}
})
this.form.textType = data.textType
this.form.modelList = data.modelList
this.form.modelNameList = data.modelNameList
this.json = data
this.data = arr
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+44 -8
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">技术管理中心主任审定</template>
<template slot="proNode">技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -46,12 +46,22 @@
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
<div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex;margin-left: 10px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -62,12 +72,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
@click="upload(oldData, '汇总单.xls')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '上报意见.xls')"
@click="upload(data, '上报意见.xls')"
size="mini">生成上报意见
</el-button>
</div>
@@ -108,6 +118,9 @@
prop="oldText"
align="center"
label="修改前">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template>
</el-table-column>
<el-table-column
prop="newText"
@@ -233,6 +246,15 @@
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
></Role-tree>
<el-dialog
title="查看修改前内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -247,7 +269,9 @@ export default {
name: "bzzqyjStep8",
data() {
return {
drawerModal: false,
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
histortData: [],
oldData: [],
data: [],
@@ -275,6 +299,9 @@ export default {
cname: '', // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
},
formRules: {
responUserList: [
@@ -290,6 +317,13 @@ export default {
ProcessTitle
},
methods: {
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
@@ -390,7 +424,7 @@ export default {
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.directorFlag = '0'
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -409,7 +443,7 @@ export default {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.directorFlag = '0'
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -450,8 +484,10 @@ export default {
}
})
this.json = data
this.form.textType = data.textType
this.form.modelList = data.modelList
this.form.modelNameList = data.modelNameList
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+42 -6
View File
@@ -46,12 +46,22 @@
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
<div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex;margin-left: 10px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -62,12 +72,12 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
@click="upload(oldData, '汇总单.xls')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '上报意见.xls')"
@click="upload(data, '上报意见.xls')"
size="mini">生成上报意见
</el-button>
</div>
@@ -108,6 +118,9 @@
prop="oldText"
align="center"
label="修改前">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template>
</el-table-column>
<el-table-column
prop="newText"
@@ -233,6 +246,15 @@
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
></Role-tree>
<el-dialog
title="查看修改前内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -247,6 +269,8 @@ export default {
name: "bzzqyjStep9",
data() {
return {
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
histortData: [],
oldData: [],
@@ -275,6 +299,9 @@ export default {
cname: "", // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
},
formRules: {
responUserList: [
@@ -290,6 +317,13 @@ export default {
ProcessTitle
},
methods: {
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
@@ -390,7 +424,7 @@ export default {
} else {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 0;
json.presidentFlag = '0';
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
@@ -409,7 +443,7 @@ export default {
if (this.commentText) {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 1;
json.presidentFlag = '1';
json.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
@@ -450,8 +484,10 @@ export default {
}
})
this.json = data
this.form.textType = data.textType
this.form.modelList = data.modelList
this.form.modelNameList = data.modelNameList
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
});
});
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
+10 -1
View File
@@ -89,7 +89,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { queryTaskFirst, saveTaskFirst } from "api/process";
import { queryTaskFirst, saveTaskFirst, taskDel } from "api/process";
export default {
name: "cywbbzzxdStep1",
@@ -100,6 +100,7 @@ export default {
},
data() {
return {
bpnId: '',
isSubmit: false,
saveLoading: false,
modalshowflag: false, // drawer开关
@@ -198,6 +199,14 @@ 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
src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
+10 -1
View File
@@ -89,7 +89,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { queryTaskFirst, saveTaskFirst } from "api/process";
import { queryTaskFirst, saveTaskFirst,taskDel } from "api/process";
export default {
name: "jrbzhxhStep1",
@@ -100,6 +100,7 @@ export default {
},
data() {
return {
bpnId: '',
isSubmit: false,
saveLoading: false,
modalshowflag: false, // drawer开关
@@ -197,6 +198,14 @@ 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
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+10 -1
View File
@@ -353,7 +353,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process";
import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail,taskDel } from "api/process";
export default {
name: "qbfsStep1",
@@ -364,6 +364,7 @@ export default {
},
data(){
return {
bpnId: '',
active: '1',
commentText: '',
fileList: [],
@@ -595,6 +596,14 @@ 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.isSubmit = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+10 -1
View File
@@ -381,7 +381,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel } from "api/process";
export default {
name: "qbfzStep1",
@@ -392,6 +392,7 @@ export default {
},
data(){
return {
bpnId: '',
active: '1',
commentText: '',
fileList: [],
@@ -636,6 +637,14 @@ 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.isSubmit = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+9 -1
View File
@@ -254,7 +254,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
import establish from "process/creatProcess/qbzxdjhgk/component/establish";
import delay from "process/creatProcess/qbzxdjhgk/component/delay";
import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "api/process";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel} from "api/process";
export default {
name: "qbzxdjhgkStep1",
@@ -484,6 +484,14 @@ 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.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
src/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue
+543
View File
@@ -0,0 +1,543 @@
<template>
<div class="wfhxzgStep2">
<ProcessHeader toggle>
<template slot="proName">外部署名推荐审批流程</template>
<template slot="proNode">工程研究总院院长/FU/BU/SBU领导审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto;">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<el-table
:data="dataList"
border
ref="entryTable"
height="90%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
prop="code"
width="180px"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
align="center"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="standSortShow" label="标准类别" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<a>{{ scope.row.standSortShow }}</a>
</template>
</el-table-column>
<el-table-column prop="workPeople" label="推荐署名人及单位" align="center">
</el-table-column>
<el-table-column prop="reason" label="推荐署名原因" align="center">
</el-table-column>
<el-table-column prop="expenses" label="费用" align="center">
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- <ProcessFooter-->
<!-- show-back-->
<!-- show-transfer-->
<!-- show-submit-->
<!-- :submitLoading="isSubmit"-->
<!-- :transfer-loading="isTransfer"-->
<!-- :saveLoading="saveLoading"-->
<!-- :approval="true"-->
<!-- @back="beforeBack"-->
<!-- @transfer="handleTransfer"-->
<!-- @submit="handleSubmit"-->
<!-- >-->
<!-- </ProcessFooter>-->
<Role-tree
:is-title="drawerTitle"
check-box
:is-visible.sync="modalshowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { roleTreeData } from "@/api/unqualProcess.js"
import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default {
name: "wbsmStep1-5",
data() {
return {
passInfo: 0,
detailData: [],
loading: false,
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
isTransfer: false,
ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
userId: this.$route.query.taskAssignee,
nonSearch: {
standSerialNumber: '',
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
},
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
turnLoading: false,
drawerModal: false,
dataList: [],
endDataList: [],
lastDataList: [],
// 新增选择分发责任人数组
multipleSelection: [],
// 当前页数
pageNo: 1,
total: 0,
myLoading: false,
// 责任部门
zNodesSItem: [],
clearSelection: false,
nodeList: [],
drawerTitle: '', //drawer标题
modalshowflag: false, // drawer开关
roleForm: {
dutyUserInfo: [],
dutyUserInfoName: [],
dutyPeopleInfo: '',
dutyPeople: ''
},
rowDutyPeople: {},
props: { label: 'name', children: 'children', value: 'id', multiple: true, disabled: false },
dutyUserCaseData: [],
roleFormRules: {},
treeData: [], // 人员数据
defaultProps: {
children: 'children',
label: 'name'
},
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
created() {
this.processTable();
this.getData();
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
watch: {
nonSearch(val) {
this.nonSearch = val
}
},
methods: {
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res
}, e => {
})
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.dataList = item.dataList
this.roleForm = item.roleForm
});
},
// 批量选择分发责任人
dutyEngineerList(id) {
if (this.multipleSelection.length === 0) {
this.$message.warning("请选择至少一条数据进行分发责任人");
} else {
this.nodeList = []
this.nodeList.push(id)
this.modalshowflag = true
}
},
// 每行选择负责人点击操作
clickOpen(val, id) {
this.$refs.multipleTable.clearSelection()
this.rowDutyPeople = val
this.nodeList = []
this.nodeList.push(id)
this.modalshowflag = true
},
// 选择勾选项的集合
handleSelectionChange(value) {
this.multipleSelection = value
},
handleTabs(name) {
this.active = name
},
// 转办按钮
handleTurnTo() {
this.modalshowflag = true
this.drawerTitle = '转办处理人'
},
// 保存按钮
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
standardInfoList: this.dataList,
commentText: this.commentText
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
let son = {
yzFlag: '1',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
}, e => {
});
},
//驳回按钮
beforeBack(){
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
let son = {
yzFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//转办按钮
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
if (this.drawerTitle === '转办处理人') {
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
} else {
this.roleRow = data[0]
// 选取负责人时的操作
if (this.multipleSelection.length === 0) {
this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
}else {
this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow.name
item.dutyPeopleInfoId = this.roleRow.id
})
this.$refs.multipleTable.clearSelection()
}
this.lastDataList = this.dataList
// 选取流程信息完成
// this.roleForm.dutyUserInfoName = this.roleRow.name
}
this.modalshowflag = false
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 清空 查询条件
clearAllSearch () {
this.nonSearch = {
standId: '',
standSerialNumber: '',
productName: '',
responsibleUnit: ''
}
this.getData()
},
// 分页事件
pageChange (page) {
this.pageNo = page
this.getTableByPage()
},
pageSizeChange () {
this.getTableByPage()
},
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.wfhxzgStep2 {
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content-center {
padding: 10px 0px 10px 10px;
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
+68 -34
View File
@@ -61,8 +61,12 @@
<el-table-column prop="workPeople" label="推荐署名人及单位" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-model="scope.row.workPeople" placeholder="请选择推荐署名人及单位"
<el-input v-model="scope.row.workPeopleId" style="display: none;" clearable readonly/>
<el-tooltip v-if="scope.row.workPeople" class="item" :content="scope.row.workPeople" placement="top">
<el-input v-model="scope.row.workPeople" clearable placeholder="请选择推荐署名人及单位"
@click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
</el-tooltip>
<el-input v-else v-model="scope.row.workPeople" clearable placeholder="请选择推荐署名人及单位"
@click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
</template>
</el-table-column>
@@ -282,18 +286,12 @@
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -336,6 +334,13 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 多选责任人-->
<Role-tree
is-title="选择署名人"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
</div>
</template>
@@ -343,11 +348,12 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "@/api/process.js";
import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail,taskDel } from "@/api/process.js";
export default {
name: "wbsmStep1",
data() {
return {
bpnId: '',
commentText: '', // 意见
active: '1', // 默认显示
isSubmit: false,
@@ -357,9 +363,11 @@ export default {
deleteDataList: [],
drawerTitle: "", //drawer标题
modalshowflag: false, // 选择人员drawer开关
modalshowflag2: false,
standModel: false, //添加标准抽屉
zrIndex: "",
nodeList: [], //存放人员信息数组
nodeList2: [],
standOptions: [], //标准类别
standardData:[],
pageNo: 1,
@@ -519,18 +527,27 @@ export default {
this.$set(this.textStatusMap, item.value, item.label);
});
},
// 点击查看
handlePreview (item) {
// // 点击查看
// handlePreview (item) {
// let routeUrl = this.$router.resolve({
// name: 'OtherStandardDetails',
// params: {
// id: item.standId,
// pageType: item.standType + '_STAND'
// }
// })
// window.open(routeUrl.href, '_blank')
// },
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
name: "OtherStandardDetails",
params: {
id: item.standId,
pageType: item.standType + '_STAND'
id: item.id,
pageType: "INLAND_STAND"
}
})
window.open(routeUrl.href, '_blank')
});
window.open(routeUrl.href, "_blank");
},
handleTabs(name) {
this.active = name
},
@@ -539,11 +556,14 @@ export default {
this.standList = data;
},
choiceZRRS(row, index) {
this.drawerTitle = "选择责任人";
this.nodeList = [];
this.nodeList2 = [];
this.zrIndex = index;
this.nodeList.push(row);
this.modalshowflag = true;
if(row.workPeopleId){
this.nodeList2 = row.workPeopleId.split(",");
}else{
this.nodeList2.push(row);
}
this.modalshowflag2 = true;
},
typeChange(type) {
this.standardSearch.standType = type;
@@ -603,7 +623,7 @@ export default {
},
//查询项目下的标准
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
page: this.pageNo,
@@ -613,13 +633,8 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", '');
this.$set(item, "XCXSSRQ", '');
} else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
this.$set(item, "ZCCSSRQ", item.zccssrq);
this.$set(item, "XCXSSRQ", item.xcxssrq);
})
this.totalNo = res.data.count;
}, e => {
@@ -678,6 +693,14 @@ 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
@@ -748,14 +771,25 @@ export default {
}else if(this.type === 'president'){
this.roleForm.president = data[0].id;
this.roleForm.presidentName = data[0].name;
}else{
const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
newRow.workPeopleId = data[0].id;
newRow.workPeople = data[0].name + '(' + data[0].institutionName + ')';
this.$set(this.dataList, this.zrIndex, newRow);
}
this.modalshowflag = false;
},
checkedRole2(data){
let idList = "";
let nameList = "";
data.forEach(item => {
if (nameList.length) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name + '(' + item.institutionName + ')';
});
const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
newRow.workPeopleId = idList
newRow.workPeople = nameList
this.$set(this.dataList, this.zrIndex, newRow);
},
}
}
</script>
src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
+24 -20
View File
@@ -60,7 +60,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -388,26 +388,30 @@ export default {
},
//驳回按钮
beforeBack(){
let son = {
signFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
let son = {
signFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
}, e => {
});
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//转办按钮
handleTransfer(){
src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
+24 -20
View File
@@ -60,7 +60,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -388,26 +388,30 @@ export default {
},
//驳回按钮
beforeBack(){
let son = {
signFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
let son = {
signFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
}, e => {
});
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//转办按钮
handleTransfer(){
src/pages/processCenter/pages/creatProcess/wbsm/step4.vue
+24 -20
View File
@@ -60,7 +60,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -388,26 +388,30 @@ export default {
},
//驳回按钮
beforeBack(){
let son = {
signFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
let son = {
signFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
}, e => {
});
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//转办按钮
handleTransfer(){
src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
+23 -19
View File
@@ -388,26 +388,30 @@ export default {
},
//驳回按钮
beforeBack(){
let son = {
yzFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
let son = {
yzFlag: '2',
commentText: this.commentText,
dataList: this.dataList,
roleForm: this.roleForm
}
}, e => {
});
var json = JSON.stringify(son)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//转办按钮
handleTransfer(){
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+11 -1
View File
@@ -507,7 +507,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst, queryTaskFirst } from "api/process";
import { saveTaskFirst, queryTaskFirst, taskDel } from "api/process";
export default {
name: "xmpgStep1-1",
@@ -518,6 +518,7 @@ export default {
},
data() {
return {
bpnId: '',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
//用来判断提交事件条件是否满足
@@ -886,6 +887,14 @@ 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;
@@ -1062,6 +1071,7 @@ export default {
// }
},
mounted() {
this.bpnId = this.$route.query.bpnId
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+4
View File
@@ -565,6 +565,9 @@ export default {
},
//驳回事件
beforeBack () {
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
this.listForm.commentText = this.commentText;
this.listForm.dataList = this.dataList
@@ -583,6 +586,7 @@ export default {
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+2 -1
View File
@@ -561,7 +561,8 @@ export default {
})
},
//驳回事件
beforeBack () { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
beforeBack () {
if(!this.commentText){
this.$message.warning('请填写审批意见')
} else {
this.listForm.fenFlag = '2'
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+1 -1
View File
@@ -560,7 +560,7 @@ export default {
//驳回事件
beforeBack () {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
if(!this.commentText){
this.$message.warning('请填写审批意见')
} else {
this.listForm.fenFlag = '2'
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+10 -1
View File
@@ -336,7 +336,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst, queryTaskFirst } from "api/process";
import { saveTaskFirst, queryTaskFirst,taskDel } from "api/process";
export default {
name: "xmpg2Step1-1",
@@ -625,6 +625,14 @@ 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;
@@ -663,6 +671,7 @@ export default {
}
},
mounted() {
this.bpnId = this.$route.query.bpnId
//查找分解单来源数据
this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
_this: this
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+2 -3
View File
@@ -444,10 +444,9 @@ export default {
},
//提交事件
handleSubmit() {
this.peopleFlag = true;
this.listForm.dataList.forEach(item => {
if (item.liablePeople !== undefined) {
this.peopleFlag = true;
} else {
if (!item.liablePeople) {
this.peopleFlag = false;
}
});
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+11 -1
View File
@@ -380,7 +380,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { queryTaskFirst, saveTaskFirst} from "api/process";
import { queryTaskFirst, saveTaskFirst,taskDel} from "api/process";
export default {
name: "xmqdqrStep1-1",
@@ -391,6 +391,7 @@ export default {
},
data() {
return {
bpnId: '',
active: "1", //默认显示
commentText: "",
modalshowflag: false,
@@ -667,6 +668,14 @@ 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;
@@ -706,6 +715,7 @@ export default {
}
},
mounted() {
this.bpnId = this.$route.query.bpnId
this.getData();
// 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
src/pages/processCenter/pages/phone/wbsm/step4.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "step4"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/phone/wbsm/step5.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "step5"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/processDetail/index.vue
+4 -1
View File
@@ -264,7 +264,10 @@ export default {
}else if(prcType === '10'){
//项目清单确认
this.toProcessDetail('xmqdqrStep1-3',row)
} else if(prcType === '20') {
} else if(prcType === '16'){
//外部署名
this.toProcessDetail('wbsmStep1-5',row)
}else if(prcType === '20') {
// 入会流程
this.toProcessDetail('bzrhStep6-1',row)
} else if(prcType === '21') {
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -2
View File
@@ -669,7 +669,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) {
} else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) {
this.$router.push({
name: 'bzzqyjStep8',
query: {
@@ -680,7 +680,7 @@ export default {
prcType: row.prcType
}
})
} else {
} else if (row.taskInfo === '工程研究总院院长批准') {
this.$router.push({
name: 'bzzqyjStep9',
query: {
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+52 -4
View File
@@ -90,6 +90,9 @@
align="center"
label="修改前"
>
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.partCode.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template>
</el-table-column>
<el-table-column
prop="newText"
@@ -114,7 +117,7 @@
<el-table-column
prop="userName"
align="center"
width="10 0"
width="100"
label="提出人"
>
</el-table-column>
@@ -155,10 +158,16 @@
<div class="search-area">
<el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
<el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
<el-input v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
<el-select filterable v-model="opinionContent.partCode" placeholder="请选择条款章节" @change="optionsChange">
<el-option
v-for="(item,index) in options"
:key="index"
:label="item.itemsNum"
:value="item.itemsNum"></el-option>
</el-select>
</el-form-item>
<el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
<el-input v-model="opinionContent.oldText" autocomplete="off" placeholder="请输入"></el-input>
<div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
</el-form-item>
<el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
<el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
@@ -177,6 +186,15 @@
</div>
</el-drawer>
<loading :loading="spinShow">数据加载中……</loading>
<el-dialog
title="查看修改前内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -185,6 +203,9 @@ export default {
name: 'consultationDetails',
data() {
return {
itermsConditionsFlag: false,
itermsConditionsTitle: '',
options: [],
fileInfoList: [],
itemData: this.$route.query.item,
id: '', // 选中id
@@ -228,6 +249,20 @@ export default {
}
},
methods: {
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
optionsChange (data) {
for (let a = 0; a < this.options.length; a++) {
if (data === this.options[a].itemsNum) {
this.opinionContent.oldText = this.options[a].termsConditions
}
}
},
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
@@ -396,6 +431,18 @@ export default {
}
},
mounted() {
let json = JSON.parse(this.$route.query.item.files)[0]
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
standId: json.standId,
fileType: json.standFileClassify,
pageSize: 9999,
page: 1
}, {}, res => {
if (res.ok) {
this.options = res.data.list
}
}, e => {
})
this.getList()
this.getIdeaKey()
this.getFileInfo()
@@ -535,7 +582,8 @@ export default {
.add-demo {
.search-area {
height: 100%;
height: calc(~'100% - 55px');
overflow: auto;
}
::v-deep .el-textarea__inner {
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+2 -2
View File
@@ -1047,7 +1047,7 @@
if (this.pType === '选择联络人') {
this.addForm.wgNetInfos[this.pIndex].name = data[0].name
this.addForm.wgNetInfos[this.pIndex].netId = data[0].id
this.addForm.wgNetInfos[this.pIndex].unit = data[0].positionName
this.addForm.wgNetInfos[this.pIndex].unit = data[0].unit
this.addForm.wgNetInfos[this.pIndex].phone = data[0].phone
this.addForm.wgNetInfos[this.pIndex].email = data[0].email
} else if (this.pType === '选择我司人员') {
@@ -1057,7 +1057,7 @@
this.addForm.wgDepts[this.pIndex].email = data[0].email
this.addForm.wgDepts[this.pIndex].deptId = data[0].institutionId
this.addForm.wgDepts[this.pIndex].deptName = data[0].institutionName
this.addForm.wgDepts[this.pIndex].unit = data[0].positionId
this.addForm.wgDepts[this.pIndex].unit = data[0].unit
this.addForm.wgDepts[this.pIndex].unitName = data[0].positionName
}
},
src/router/index.js
+39
View File
@@ -1511,6 +1511,15 @@ const routes = [
title: '外部署名推荐审批流程'
}
},
{
path: '/wbsmStep1-5',
name: 'wbsmStep1-5',
component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue'),
meta: {
requireAuth: true,
title: '外部署名推荐审批流程'
}
},
{
path: '/cywbbzzxdStep1',
name: 'cywbbzzxdStep1',
@@ -2122,6 +2131,36 @@ const routes = [
title: '加入标准化协会信息提报流程'
}
},
{
path: '/phoneWbsmStep3',
name: 'phoneWbsmStep3',
component: () => import('@/pages/processCenter/pages/phone/wbsm/step3.vue'),
meta: {
isBoolean: true,
requireAuth: true,
title: '外部署名推荐审批流程'
}
},
{
path: '/phoneWbsmStep4',
name: 'phoneWbsmStep4',
component: () => import('@/pages/processCenter/pages/phone/wbsm/step4.vue'),
meta: {
isBoolean: true,
requireAuth: true,
title: '外部署名推荐审批流程'
}
},
{
path: '/phoneWbsmStep5',
name: 'phoneWbsmStep5',
component: () => import('@/pages/processCenter/pages/phone/wbsm/step5.vue'),
meta: {
isBoolean: true,
requireAuth: true,
title: '外部署名推荐审批流程'
}
},
{
path: '/phoneWfhxStep5',
name: 'phoneWfhxStep5',