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:
super_liu
2021-11-01 18:03:26 +08:00
parent 54eacdc5e8 a265b2836a
commit d1de107bca
32 changed files with 3635 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/unqualProcess.js
+1 -1
View File
@@ -33,7 +33,7 @@ export function dicTypeData (data) {
}
export function StandardsInfoPage (data) {
return axios({
url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',
url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak',
method: 'get',
params: data
})
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+4 -1
View File
@@ -491,6 +491,7 @@ export default {
},
//上传按钮
uploadFile(val) {
this.fileListData = val
},
// 文件上传限制条件
handleBeforeUpload(file) {
@@ -541,7 +542,7 @@ export default {
name: res.data.standName
})
}
this.rh_pageData.infoSources = this.newDataList
this.fileListData.fileText = this.newDataList
this.$message({
showClose: true,
message: res.message,
@@ -671,6 +672,8 @@ export default {
// 提交按钮
handleSubmit() {
let json = {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
roleList: this.roleForm,
rh_pageData: this.rh_pageData,
directorList: this.rh_pageData.comityInRoleId,
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+4 -2
View File
@@ -102,8 +102,7 @@
:disabled="true"
style="width: 30%"
v-model="rh_pageData.comityOpRole"
>
</el-input>
/>
</el-form-item>
</el-form>
</div>
@@ -432,6 +431,9 @@ export default {
.comityTel_btn {
text-align: right;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
/deep/ .el-table th {
padding: 0px;
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+3
View File
@@ -495,6 +495,9 @@ export default {
.comityTel_btn {
text-align: right;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
/deep/.el-table th {
padding: 0px;
}
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+3
View File
@@ -445,6 +445,9 @@ export default {
.comityTel_btn {
text-align: right;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
/deep/.el-table th {
padding: 0px;
}
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+25 -11
View File
@@ -2,7 +2,10 @@
<div class="bzrhStep6">
<ProcessHeader toggle>
<template slot="proName">外部标准化协会入会流程</template>
<template slot="proNode">审批</template>
<template v-if="taskInfo === '标准法规部主管领导审核'" slot="proNode">审批</template>
<template v-else-if="taskInfo === '费用管理部门会签'" slot="proNode">会签</template>
<template v-else-if="taskInfo === '技术委员会常务副主任/总院院长审定'" slot="proNode">审定</template>
<template v-else slot="proNode">批准</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -195,14 +198,20 @@
</div>
</div>
<ProcessFooter
v-if="taskInfo !== '标准法规工程师汇总修订完毕'"
show-submit
show-back
:isSubmitBack="isBack"
:submitLoading="isSubmit"
@back="handleSubmitNo"
@submit="handleSubmit"
>
</ProcessFooter>
/>
<ProcessFooter
v-else
show-submit
:submitLoading="isSubmit"
@submit="handleSubmit"
/>
</div>
</template>
@@ -349,21 +358,22 @@ export default {
// 退回按钮
handleSubmitNo() {
let json = {
passFlag: '0',
rh_pageData: this.rh_pageData,
roleList: this.roleForm
}
if (this.taskInfo === '标准法规部主管领导审核') {
json.passFlag = '0',
json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') {
json.passFlag = '0',
json.manageDepartment = this.$store.getters.userInfo.userId
json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.passFlag = '0',
json.engineerSumDone = this.roleForm.startUser
} else {
json = json
json = {
rh_pageData: this.rh_pageData,
roleList: this.roleForm
}
}
this.$refs['rh_pageData'].validate((valid) => {
if (valid) {
@@ -386,21 +396,22 @@ export default {
// 提交按钮
handleSubmit() {
let json = {
passFlag: '1',
rh_pageData: this.rh_pageData,
roleList: this.roleForm
}
if (this.taskInfo === '标准法规部主管领导审核') {
json.passFlag = '1',
json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') {
json.passFlag = '1',
json.manageDepartment = this.$store.getters.userInfo.userId
json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.passFlag = '1',
json.engineerSumDone = this.roleForm.startUser
} else {
json = json
json = {
rh_pageData: this.rh_pageData,
roleList: this.roleForm
}
}
this.$refs['rh_pageData'].validate((valid) => {
if (valid) {
@@ -498,6 +509,9 @@ export default {
padding: 0px;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
.myPart_btn {
text-align: right;
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+307 -53
View File
@@ -2,7 +2,7 @@
<template>
<div class="bzchStep1">
<ProcessHeader toggle>
<template slot="proName">外部标准化协会入会流程</template>
<template slot="proName">外部标准化协会参会流程</template>
<template slot="proNode">发起流程</template>
</ProcessHeader>
<div class="headerTabs">
@@ -33,17 +33,41 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
<el-select v-model="ch_pageData.associaName" placeholder="请选择"></el-select>
<el-select
v-model="ch_pageData.associaName"
placeholder="请选择标委会">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ch_pageData.associaName !== ''">
<el-form-item>
<el-select v-model="ch_pageData.associaNameOne" placeholder="请选择"></el-select>
<el-select
v-model="ch_pageData.associaNameOne"
placeholder="请选择分标委">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
<el-form-item>
<el-select v-model="ch_pageData.associaNameTwo" placeholder="请选择"></el-select>
<el-select
v-model="ch_pageData.associaNameTwo"
placeholder="请选择工作组">
<el-option
v-for="item in associaNameOptions"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
@@ -51,7 +75,7 @@
<el-col :span="8">
<el-form-item label="会议时间:">
<el-date-picker
v-model="ch_pageData.meetingTime"
v-model="ch_pageData.meetingStartTime"
type="datetime"
placeholder="选择日期时间"
align="right">
@@ -72,14 +96,44 @@
</el-col>
<el-col :span="8">
<el-form-item label="费用列支:">
<el-select v-model="ch_pageData.feeKind" placeholder="请选择"></el-select>
<el-select
v-model="ch_pageData.feeKind"
placeholder="请选择费用列支">
<el-option
v-for="item in feeKindOptions"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-upload></el-upload>
<el-upload
style="width: 30%"
class="upload_style"
:disabled="acceptShow"
multiple
ref="uploadFile"
:action="uploadPath"
name="file"
:file-list="fileTextList"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button
:disabled="acceptShow"
type="primary"
class="common-button-primary"
@click="uploadFile"
size="mini">
点击上传
</el-button>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -108,7 +162,7 @@
<el-table-column type="index" width="50" align="center"/>
<el-table-column label="议题" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.meetingTheme" placeholder="请填写"></el-input>
<el-input v-model="scope.row.meetingTheme" placeholder="请填写"/>
</template>
</el-table-column>
</el-table>
@@ -136,7 +190,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="指派人员" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>分委会主任/部门中心主任</h4>
@@ -148,85 +202,85 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="填写信息" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="填写信息" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<el-form-item prop="dockUserName1" style="margin-bottom: 0">
<h4>责任工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="责任工程师">
<el-input v-model="roleForm.dutyUser1" style="display: none;"></el-input>
<el-input v-model="roleForm.dutyUserName1" :disabled="true" placeholder="责任工程师">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<el-form-item prop="partUserId" style="margin-bottom: 0">
<h4>参会人员所在部门中心主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
<el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="参会人员所在部门中心主任">
<el-input v-model="roleForm.partUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.partUser" :disabled="true" placeholder="参会人员所在部门负责人">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="汇总修订" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="汇总修订" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规部人员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部人员" @click.native="choiceZRR('dockUser', '选择标准法规部人员', roleForm.dockUser)">
<el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择标准法规部人员">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.leaderUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<el-form-item prop="leaderUser" style="margin-bottom: 0">
<h4>标准法规部主管中心主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择标准法规部主管中心主任" @click.native="choiceZRR('dockUser', '选择标准法规部主管中心主任', roleForm.dockUser)">
<el-input v-model="roleForm.leaderUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.leaderUser" placeholder="选择标准法规部主管领导" @click.native="choiceZRROne('leaderUser', '选择标准法规部主管领导', roleForm.leaderUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="会签" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="会签" placement="top" :color="roleForm.feeUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<el-form-item prop="feeUser" style="margin-bottom: 0">
<h4>管理推荐部</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择管理推荐部" @click.native="choiceZRR('dockUser', '选择管理推荐部', roleForm.dockUser)">
<el-input v-model="roleForm.feeUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.feeUser" placeholder="选择费用管理部门" @click.native="choiceZRR('feeUser', '选择费用管理部门', roleForm.feeUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.engineerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<el-form-item prop="engineerUser" style="margin-bottom: 0">
<h4>技术委员会常务副主任/总院院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择人员" @click.native="choiceZRR('dockUser', '选择人员', roleForm.dockUser)">
<el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
<el-input v-model="roleForm.engineerUser" placeholder="选择人员" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<el-form-item prop="totalLeader" style="margin-bottom: 0">
<h4>技术委员会主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :disabled="true" placeholder="选择技术委员会主任" @click.native="choiceZRR('dockUser', '选择技术委员会主任', roleForm.dockUser)">
<el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任">
</el-input>
</div>
</el-form-item>
@@ -247,6 +301,12 @@
</ProcessFooter>
<Role-tree
check-box
is-title="选择人员信息"
:is-visible.sync="roleShowflagOne"
:nodeList="nodeListOne"
@checkedRole="drawerCheckOne"
/>
<Role-tree
is-title="选择人员信息"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@@ -259,7 +319,8 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { startProcess, saveTaskFirst,completeTask } from '@/api/process.js'
import {startProcess, saveTaskFirst, completeTask} from '@/api/process.js'
export default {
components: {
ProcessHeader,
@@ -277,7 +338,7 @@ export default {
associaName: '',
associaNameOne: '',
associaNameTwo: '',
meetingTime: '',
meetingStartTime: '',
meetingPlace: '',
feeStand: '',
feeKind: '',
@@ -285,20 +346,47 @@ export default {
sort: '1',
meetingTable: [],
},
associaNameOptions: [
{value: '0', label: '国内法规入库流程'},
{value: '1', label: '标准法规技术评估流程'},
],
feeKindOptions: [
{ value: '0', label: '列支1' },
{ value: '1', label: '列支2' },
{ value: '2', label: '列支3' },
{ value: '3', label: '列支4' },
],
/** 上传相关 */
acceptShow: false,
// 上传路径
uploadPath: 'api/att/attFile/upload',
// 上传所储存文件数组
fileTextList: [],
newDataList: [],
ch_rules: {},
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
dockUserName: '',
dockUser: ''
dockUser: '',
leaderUser: '',
leaderUserId: '',
feeUser: '',
feeUserId: '',
engineerUser: '',
engineerUserId: '',
},
roleFormRules: {
dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
},
deleteDataList: [],
unqualidiedData: [],
nodeList: [],
nodeListOne: [],
roleShowflag: false,
roleShowflagOne: false,
isSubmit: false,
saveLoading: false,
}
@@ -309,6 +397,69 @@ export default {
this.active = name
},
//上传按钮
uploadFile(val) {
this.fileListData = val
},
// 文件上传限制条件
handleBeforeUpload(file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
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') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
return false
}
// 判断文件上传大小
// eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
return false
}
return true
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
this.fileData = fileList
this.fileTextList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id) {
this.fileTextList.splice(index, 1)
}
})
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
if (this.fileTextList !== null) {
this.newDataList = this.fileTextList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
}
this.rh_pageData.infoSources = this.newDataList
this.$message({
showClose: true,
message: res.message,
type: 'success'
})
this.fileMadel = false
}
},
meeting_add() {
var list = {
meetingTheme: this.meetingTheme,
@@ -345,26 +496,112 @@ export default {
this.deleteDataList = val
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
choiceZRR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.roleShowflag = true
},
drawerCheck (data) {
drawerCheck(data) {
var idList = ''
var nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id;
nameList += item.name;
});
if (this.type === 'feeUser') {
this.roleForm.feeUser = nameList
this.roleForm.feeUserId = idList
} else {
this.roleForm.dockUser = idList
this.roleForm.dockUserName = nameList
}
this.roleShowflag = false
},
// 流程阶段人选择
choiceZRROne(type, title, id) {
this.nodeListOne = []
this.nodeListOne.push(id)
this.type = type
this.drawerTitleOne = title
this.roleShowflagOne = true
},
drawerCheckOne(data) {
this.unqualidiedData.forEach(item => {
item.engineer = data[0].name
item.engineerId = data[0].id
})
this.roleForm.dockUser = data[0].id
this.roleForm.dockUserName = data[0].name
this.roleShowflag = false
if (this.type === 'leaderUser') {
this.roleForm.leaderUser = data[0].name
this.roleForm.leaderUserId = data[0].id
} else {
this.roleForm.engineerUser = data[0].name
this.roleForm.engineerUserId = data[0].id
}
this.roleShowflagOne = false
},
/** 保存按钮*/
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '20')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
ch_pageData: this.ch_pageData
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
/** 提交按钮*/
handleSubmit() {}
handleSubmit() {
let json = {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
roleList: this.roleForm,
ch_pageData: this.ch_pageData,
directorList: this.roleForm.dockUser,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
const paramsInfo = {
type: '21'
}
startProcess(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskID)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
})
})
}
})
}
})
}
}
}
@@ -372,15 +609,18 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzchStep1 {
position: relative;
height: 100%;
/deep/.el-drawer__container {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.headerTabs {
height: 52px;
display: flex;
@@ -388,6 +628,7 @@ export default {
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
@@ -395,21 +636,25 @@ export default {
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;
.tableTitle {
margin-bottom: 10px;
height: 30px;
@@ -417,6 +662,7 @@ export default {
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
@@ -424,30 +670,38 @@ export default {
}
}
}
.content_form {
padding-top: 15px;
padding-left: 30px;
.el-divider--horizontal {
margin-top: 0px;
}
/deep/.el-table__body-wrapper {
height: auto!important;
/deep/ .el-table__body-wrapper {
height: auto !important;
}
.el-select {
width: 100%;
}
.el-date-editor.el-input {
width: 100%;
}
.table_btn {
text-align: right;
}
.meeting_table {
/deep/.el-input__inner {
/deep/ .el-input__inner {
text-align: center;
}
}
/deep/.el-table th {
/deep/ .el-table th {
padding: 0px;
}
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+78 -45
View File
@@ -1,8 +1,8 @@
<template>
<div class="bzchStep2">
<ProcessHeader toggle>
<template slot="proName">外部标准化协会入会流程</template>
<template slot="proNode">发起流程</template>
<template slot="proName">外部标准化协会参会流程</template>
<template slot="proNode">参会人员确认</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -35,7 +35,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
{{ ch_pageData.meetingTime || '-' }}
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
@@ -59,7 +59,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-upload></el-upload>
<i></i>
</el-form-item>
</el-col>
</el-row>
@@ -81,7 +81,7 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="index" width="50" align="center"/>
<el-table-column label="议题" align="center" prop="ch_pageData.meetingTable.meetingTheme"/>
<el-table-column label="议题" align="center" prop="meetingTheme"/>
</el-table>
</el-form-item>
<ProcessTitle>
@@ -89,16 +89,28 @@
</ProcessTitle>
<el-form-item label="入会人员:">
<el-input
:disabled="true"
style="width: 30%"
clearable
placeholder="请选择入会人员"
v-model="ch_pageData.meetingInRole"
@click.native="inRoleChice">
</el-input>
/>
</el-form-item>
</el-form>
</div>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textContent">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -168,23 +180,15 @@
</div>
</div>
<ProcessFooter
show-save
show-submit
show-back
backBTNTexts="不涉及"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:isSubmitBack="isBack"
@back="handleSubmitNo"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择人员信息"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -207,7 +211,9 @@ export default {
ch_pageData: {},
ch_rules: {},
nodeList: [],
textContent: '',
isBack: false,
isSubmit: false,
saveLoading: false,
roleShowflag: false,
@@ -259,40 +265,62 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
// this.rh_pageData.comityFileNum = this.fileTextList
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
})
},
// 流程阶段负责人选择
inRoleChice (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.roleShowflag = true
},
drawerCheck (data) {
var idList = ''
var nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id;
nameList += item.name;
});
this.ch_pageData.meetingInRole = nameList
this.ch_pageData.meetingInRoleId = idList
this.roleShowflag = false
},
// 退回按钮
handleSubmitNo() {},
// 保存按钮
handleSave() {
handleSubmitNo() {
let json = {
roleList: this.roleForm,
memberId: this.$store.getters.userInfo.userId,
passFlag: '0',
commentText: this.textContent,
ch_pageData: this.ch_pageData,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isBack = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('退回成功')
this.$router.push("/processCenter");
}
this.isBack = false
});
}
})
},
// 提交按钮
handleSubmit() {
let json = {
roleList: this.roleForm,
memberId: this.$store.getters.userInfo.userId,
passFlag: '1',
commentText: this.textContent,
ch_pageData: this.ch_pageData,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isSubmit = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
})
}
}
}
@@ -361,6 +389,11 @@ export default {
/deep/.el-table__body-wrapper {
height: auto!important;
}
.meeting_table {
/deep/ .el-input__inner {
text-align: center;
}
}
/deep/.el-textarea__inner {
font-family: inherit;
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+92 -9
View File
@@ -1,8 +1,8 @@
<template>
<div class="bzchStep3">
<ProcessHeader toggle>
<template slot="proName">外部标准化协会入会流程</template>
<template slot="proNode">发起流程</template>
<template slot="proName">外部标准化协会参会流程</template>
<template slot="proNode">参会人员填写信息</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -35,7 +35,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
{{ ch_pageData.meetingTime || '-' }}
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
@@ -59,7 +59,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-upload></el-upload>
<i></i>
</el-form-item>
</el-col>
</el-row>
@@ -81,7 +81,7 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="index" width="50" align="center"/>
<el-table-column label="议题" align="center" prop="ch_pageData.meetingTable.meetingTheme"/>
<el-table-column label="议题" align="center" prop="meetingTheme"/>
</el-table>
</el-form-item>
<ProcessTitle>
@@ -91,6 +91,7 @@
<el-col :span="8">
<el-form-item label="人员:">
<el-input
:disabled="true"
style="width: 100%"
placeholder="请填写"
v-model="ch_pageData.fillPeople"
@@ -121,8 +122,9 @@
<el-form-item label="参与人部门领导:">
<el-input
style="width: 100%"
placeholder="请填写"
placeholder="请选择"
v-model="ch_pageData.fillLeader"
@click.native="choiceZRR"
/>
</el-form-item>
</el-col>
@@ -225,6 +227,13 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
is-title="选择人员信息"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -232,7 +241,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail } from '@/api/process.js'
import {startProcess, saveTaskFirst, saveTaskForPub, completeTask, inboundLiaisonDetail } from '@/api/process.js'
export default {
components: {
@@ -245,13 +254,26 @@ export default {
return {
active: '1',
ch_pageData: {},
ch_pageData: {
fillPeople: '',
fillUnit: '',
fillDept: '',
fillPost: '',
fillTel: '',
fillMail: '',
fillLeader: '',
fillFile: '',
},
ch_rules: {},
detailData: [],
loading: false,
unqualidiedData: [],
nodeList: [],
roleShowflag: false,
isBack: false,
isSubmit: false,
saveLoading: false,
@@ -299,15 +321,71 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
choiceZRR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.roleShowflag = true
},
drawerCheck (data) {
this.unqualidiedData.forEach(item => {
item.engineer = data[0].name
item.engineerId = data[0].id
})
this.ch_pageData.fillLeaderId = data[0].id
this.ch_pageData.fillLeader = data[0].name
this.roleShowflag = false
},
// 保存按钮
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId,
charge: this.ch_pageData.fillLeaderId,
ch_pageData: this.ch_pageData,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
// 提交按钮
handleSubmit() {
let json = {
roleList: this.roleForm,
selfUser: this.$store.getters.userInfo.userId,
charge: this.ch_pageData.fillLeaderId,
ch_pageData: this.ch_pageData,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isSubmit = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
})
}
}
}
@@ -385,6 +463,11 @@ export default {
margin-top: 0px;
}
.meeting_table {
/deep/ .el-input__inner {
text-align: center;
}
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+94 -48
View File
@@ -1,8 +1,8 @@
<template>
<div class="bzchStep4">
<ProcessHeader toggle>
<template slot="proName">外部标准化协会入会流程</template>
<template slot="proNode">发起流程</template>
<template slot="proName">外部标准化协会参会流程</template>
<template slot="proNode">审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -35,7 +35,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
{{ ch_pageData.meetingTime || '-' }}
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
@@ -59,7 +59,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-upload></el-upload>
<i/>
</el-form-item>
</el-col>
</el-row>
@@ -81,7 +81,7 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="index" width="50" align="center"/>
<el-table-column label="议题" align="center" prop="ch_pageData.meetingTable.meetingTheme"/>
<el-table-column label="议题" align="center" prop="meetingTheme"/>
</el-table>
</el-form-item>
<el-form-item label="入会人员:">
@@ -94,49 +94,29 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="index" width="50" align="center"/>
<el-table-column
v-model="ch_pageData.myPartRole.fillPeople"
align="center"
label="人员">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillUnit"
align="center"
label="单位">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillDept"
align="center"
label="部门">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillTel"
align="center"
label="电话">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillMail"
align="center"
label="邮箱">
</el-table-column>
<el-table-column prop="fillPeople" align="center" label="人员"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
</el-table>
</el-form-item>
</el-form>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
@@ -206,11 +186,11 @@
</div>
</div>
<ProcessFooter
show-save
show-submit
show-back
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
:isSubmitBack="isBack"
@back="handleSubmitNo"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -239,12 +219,15 @@ export default {
ch_rules: {},
textarea: '',
isBack: false,
isSubmit: false,
saveLoading: false,
detailData: [],
loading: false,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
}
},
computed: {
@@ -288,14 +271,72 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.ch_pageData.myPartRole = [{
fillPeople: this.ch_pageData.fillPeople,
fillUnit: this.ch_pageData.fillUnit,
fillDept: this.ch_pageData.fillDept,
fillPost: this.ch_pageData.fillPost,
fillTel: this.ch_pageData.fillTel,
fillMail: this.ch_pageData.fillMail,
fillFile: this.ch_pageData.fillFile,
}]
this.selfUser = JSON.parse(JSON.stringify(item)).selfUser
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.ch_pageData.comityFileNum = this.fileTextList
})
},
// 保存按钮
handleSave() {
// 退回按钮
handleSubmitNo() {
let json = {
member: this.selfUser,
passFlag: '0',
roleList: this.roleForm,
commentText: this.textarea,
ch_pageData: this.ch_pageData,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isBack = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('退回成功')
this.$router.push("/processCenter");
}
this.isBack = false
});
}
})
},
// 提交按钮
handleSubmit() {
let json = {
member: this.selfUser,
passFlag: '1',
engineerSum: this.roleForm.startUser,
roleList: this.roleForm,
commentText: this.textarea,
ch_pageData: this.ch_pageData,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isSubmit = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
})
}
}
}
@@ -361,6 +402,11 @@ export default {
.el-divider--horizontal {
margin-top: 0px;
}
.meeting_table {
/deep/ .el-input__inner {
text-align: center;
}
}
/deep/.el-table__body-wrapper {
height: auto!important;
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+91 -30
View File
@@ -1,8 +1,8 @@
<template>
<div class="bzchStep5">
<ProcessHeader toggle>
<template slot="proName">外部标准化协会入会流程</template>
<template slot="proNode">发起流程</template>
<template slot="proName">外部标准化协会参会流程</template>
<template slot="proNode">汇总修订</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -35,7 +35,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
{{ ch_pageData.meetingTime || '-' }}
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
@@ -59,7 +59,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<el-upload></el-upload>
<i/>
</el-form-item>
</el-col>
</el-row>
@@ -84,7 +84,7 @@
<el-table-column
label="议题"
align="center"
prop="ch_pageData.meetingTable.meetingTheme">
prop="meetingTheme">
<template slot-scope="scope">
<el-input v-model="scope.row.meetingTheme"/>
</template>
@@ -92,40 +92,31 @@
</el-table>
</el-form-item>
<el-form-item label="入会人员:">
<div class="myPart_btn">
<el-button
type="danger"
size="small"
icon="el-icon-delete"
@click="del_paryForm">
批量删除
</el-button>
</div>
<el-table
:data="ch_pageData.myPartRole"
border
ref="entryTable"
@selection-change="selectedDelete"
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" width="50" align="center"/>
<el-table-column
v-model="ch_pageData.myPartRole.fillPeople"
align="center"
label="人员">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillUnit"
align="center"
label="单位">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillDept"
align="center"
label="部门">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillTel"
align="center"
label="电话">
</el-table-column>
<el-table-column
v-model="ch_pageData.myPartRole.fillMail"
align="center"
label="邮箱">
</el-table-column>
<el-table-column prop="fillPeople" align="center" label="人员"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
</el-table>
</el-form-item>
</el-form>
@@ -236,9 +227,12 @@ export default {
isSubmit: false,
saveLoading: false,
deleteDataList: [],
detailData: [],
loading: false,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
}
},
computed: {
@@ -282,14 +276,68 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.ch_pageData.comityFileNum = this.fileTextList
})
},
/** 批量删除 */
del_paryForm() {
if (this.deleteDataList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
let exits = [];
this.deleteDataList.map(item => {
let index;
index = this.ch_pageData.myPartRole.findIndex(items => {
return items.id === item;
});
if (index > -1) {
this.ch_pageData.myPartRole.splice(index, 1);
}
exits.push(item);
});
this.deleteDataList = [];
}).catch(() => {
});
}
},
selectedDelete(val) {
this.deleteDataList = val
},
// 保存按钮
handleSave() {
},
// 提交按钮
handleSubmit() {
let json = {
leader: this.roleForm.leaderUserId,
ch_pageData: this.ch_pageData,
roleList: this.roleForm,
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isSubmit = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
})
}
}
}
@@ -355,15 +403,28 @@ export default {
.el-divider--horizontal {
margin-top: 0px;
}
.meeting_table {
/deep/ .el-input__inner {
text-align: center;
}
}
/deep/.el-table__body-wrapper {
height: auto!important;
}
/deep/.el-textarea__inner {
font-family: inherit;
}
.meeting_table {
/deep/ .el-input__inner {
text-align: center;
}
}
/deep/.el-table th {
padding: 0px;
}
.myPart_btn {
text-align: right;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+463
View File
@@ -0,0 +1,463 @@
<template>
<div class="bzchStep6">
<ProcessHeader toggle>
<template slot="proName">外部标准化协会参会流程</template>
<template v-if="taskInfo === '技术管理中心主任审批'" slot="proNode">审批</template>
<template v-else-if="taskInfo === '费用管理部门会签'" slot="proNode">会签</template>
<template v-else-if="taskInfo === '技术委员会常务副主任/总院院长审定'" slot="proNode">审定</template>
<template v-else slot="proNode">批准</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; overflow: auto;">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="content_form">
<el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="auto">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议名称:">
{{ ch_pageData.meetingName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主办单位:">
{{ ch_pageData.primaryUnit || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="协会名称:">
{{ ch_pageData.associaName || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会议时间:">
{{ ch_pageData.meetingStartTime || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="会议地点:">
{{ ch_pageData.meetingPlace || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用标准:">
{{ ch_pageData.feeStand || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="费用列支:">
{{ ch_pageData.feeKind || '-' }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="上传附件:" prop="uploadFile">
<i/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="类别:">
{{ ch_pageData.sort || '-' }}
</el-form-item>
</el-col>
</el-row>
<el-form-item label="议题:">
<el-table
class="meeting_table"
:data="ch_pageData.meetingTable"
border
ref="entryTable"
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="index" width="50" align="center"/>
<el-table-column label="议题" align="center" prop="meetingTheme"/>
</el-table>
</el-form-item>
<el-form-item label="入会人员:">
<el-table
:data="ch_pageData.myPartRole"
border
ref="entryTable"
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="index" width="50" align="center"/>
<el-table-column prop="fillPeople" align="center" label="人员"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
</el-table>
</el-form-item>
</el-form>
</div>
</div>
</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
v-if="taskInfo !== '标准法规工程师修订完毕'"
show-submit
show-back
:isSubmitBack="isBack"
:submitLoading="isSubmit"
@back="handleSubmitNo"
@submit="handleSubmit"
/>
<ProcessFooter
v-else
show-submit
:submitLoading="isSubmit"
@submit="handleSubmit"
/>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
export default {
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
name: "bzchStep6",
data() {
return {
active: '1',
ch_pageData: {
myPartRole: [],
},
ch_rules: {},
textarea: '',
isBack: false,
isSubmit: false,
saveLoading: false,
deleteDataList: [],
detailData: [],
loading: false,
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
created() {
this.processTable()
this.getData()
},
methods: {
// 右上标签页面切换
handleTabs(name) {
this.active = name
},
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() {
const params = {
taskIds: this.taskIds,
pId: this.pId,
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
})
},
getFormFieldList (item) {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.ch_pageData.comityFileNum = this.fileTextList
})
},
/** 批量删除 */
del_paryForm() {
if (this.deleteDataList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
let exits = [];
this.deleteDataList.map(item => {
let index;
index = this.ch_pageData.myPartRole.findIndex(items => {
return items.id === item;
});
if (index > -1) {
this.ch_pageData.myPartRole.splice(index, 1);
}
exits.push(item);
});
this.deleteDataList = [];
}).catch(() => {
});
}
},
selectedDelete(val) {
this.deleteDataList = val
},
// 退回按钮
handleSubmitNo() {
let json = {
passFlag: '0',
ch_pageData: this.ch_pageData,
roleList: this.roleForm
}
if (this.taskInfo === '技术管理中心主任审批') {
json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') {
json.manageDepartment = this.$store.getters.userInfo.userId
json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser
} else {
json = {
ch_pageData: this.ch_pageData,
roleList: this.roleForm
}
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isBack = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isBack = false
});
}
})
},
// 提交按钮
handleSubmit() {
let json = {
passFlag: '1',
ch_pageData: this.ch_pageData,
roleList: this.roleForm
}
if (this.taskInfo === '技术管理中心主任审批') {
json.manageDepartmentList = this.roleForm.feeUserId
} else if (this.taskInfo === '费用管理部门会签') {
json.manageDepartment = this.$store.getters.userInfo.userId
json.president = this.roleForm.engineerUserId
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
json.engineerSumDone = this.roleForm.startUser
} else {
json = {
ch_pageData: this.ch_pageData,
roleList: this.roleForm
}
}
this.$refs['ch_pageData'].validate((valid) => {
if (valid) {
this.isSubmit = true
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskIds)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
})
}
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzchStep6 {
position: relative;
height: 100%;
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
}
}
.content_form {
padding-top: 15px;
padding-left: 30px;
.el-divider--horizontal {
margin-top: 0px;
}
/deep/.el-table__body-wrapper {
height: auto!important;
}
/deep/.el-textarea__inner {
font-family: inherit;
}
.meeting_table {
/deep/ .el-input__inner {
text-align: center;
}
}
/deep/.el-table th {
padding: 0px;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
+7 -7
View File
@@ -1,8 +1,8 @@
<!-- 加入标准化协会信息备案流程-->
<template>
<div class="jrbzhxh-step1">
<div class="cywbbz-step1">
<ProcessHeader>
<template slot="proName">参与外部标准制修订信息备案流程</template>
<template slot="proName">参与外部标准制修订信息提报流程</template>
<template slot="proNode">发起流程</template>
</ProcessHeader>
<div class="content">
@@ -28,14 +28,14 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择标准化员进行入会信息填报" placement="top"
<el-timeline-item timestamp="责任部门对接人选择责任人填写信息" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>标准化员</h4>
<h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择标准化员"
<el-input v-model="roleForm.dockUserName" placeholder="选择责任部门对接人"
@click.native="choiceZRRS">
</el-input>
</div>
@@ -116,7 +116,7 @@ export default {
},
roleFormRules: {
dockUserName: [
{required: true, message: "请选择标准化员", trigger: "change"}
{required: true, message: "请选择责任部门对接人", trigger: "change"}
],
directorUserName: [
{required: true, message: "请选择标准法规部部长", trigger: "change"}
@@ -201,7 +201,7 @@ export default {
</script>
<style lang="less" scoped>
.jrbzhxh-step1 {
.cywbbz-step1 {
height: 100%;
position: relative;
.content {
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
+253 -3
View File
@@ -1,13 +1,263 @@
<!-- 加入标准化协会信息备案流程-->
<template>
<div class="cywbbz-step2">
<ProcessHeader>
<template slot="proName">参与外部标准制修订信息提报流程</template>
<template slot="proNode">发起流程</template>
</ProcessHeader>
<div class="content">
<ProcessTitle>
<template slot="title">人员信息</template>
</ProcessTitle>
<div class="block" style="padding-top: 20px; height: 100%">
<el-timeline>
<el-form
ref="Form"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
<el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
disabled></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="责任部门对接人选择责任人填写信息" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择责任部门对接人"
@click.native="choiceZRRS" disabled>
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择责任工程师填写信息" placement="top"
:color="roleForm.workPeople ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="workPeopleName" style="margin-bottom: 0">
<h4>责任工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.workPeople" style="display: none;"></el-input>
<el-input v-model="roleForm.workPeopleName" placeholder="选择责任工程师"
@click.native="choiceZRRS">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审批" placement="top"
:color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
<el-input v-model="roleForm.directorUserName" placeholder="选择标准法规部部长"
@click.native="choiceZRR('directorUser', '选择标准法规部部长', roleForm.directorUser)" disabled></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
</el-form>
</el-timeline>
</div>
</div>
<!-- 多选择责任人-->
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
export default {
name: "cywbbzzxdStep1"
name: "cywbbzzxdStep2",
components: {
ProcessHeader,
ProcessTitle,
ProcessFooter
},
data() {
return {
isSubmit: false,
saveLoading: false,
modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
drawerTitle: "", //drawer标题
nodeList: [],
roleForm: {
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
dockUser: "",
directorUser: "",
workPeople: "",
dockUserName: "",
workPeopleName: "",
directorUserName: ""
},
roleFormRules: {
dockUserName: [
{required: true, message: "请选择标准化员", trigger: "change"}
],
workPeopleName: [
{required: true, message: '请选择责任工程师', trigger: "change"}
],
directorUserName: [
{required: true, message: "请选择标准法规部部长", trigger: "change"}
]
},
};
},
methods:{
choiceZRR(type, title, id) {
this.nodeList = [];
this.nodeList.push(id);
this.type = type;
this.drawerTitle = title;
this.modalshowflag = true;
},
choiceZRRS() {
this.nodeList2 = [];
if (this.roleForm.workPeople.length > 0) {
this.nodeList2 = this.roleForm.workPeople.split(",");
}
this.modalshowflag2 = true;
},
checkedRole(data) {
if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id;
this.roleForm.dockUserName = this.roleRow.name;
} else if (this.type === "directorUser") {
this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = data[0].name;
} else if(this.type === "workPeople"){
this.roleForm.workPeople = data[0].id;
this.roleForm.workPeopleName = data[0].name;
}
this.modalshowflag = false;
},
checkedRole2(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
this.roleForm.workPeople = idList;
this.roleForm.workPeopleName = nameList;
},
handleSubmit(){
var json = this.roleForm
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
},
handleSave(){
},
},
};
</script>
<style scoped>
<style lang="less" scoped>
.cywbbz-step2 {
height: 100%;
position: relative;
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.form-select{
display: flex;
}
}
.headerTabs {
display: flex;
align-items: center;
position: absolute;
height: 52px;
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;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
+33 -1
View File
@@ -89,6 +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";
export default {
name: "jrbzhxhStep1",
@@ -124,7 +125,22 @@ export default {
},
};
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getData()
}
},
methods:{
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.roleForm = mes.roleForm
});
},
choiceZRR(type, title, id) {
this.nodeList = [];
this.nodeList.push(id);
@@ -194,7 +210,23 @@ export default {
},
handleSave(){
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "15");
_formData.append("json", JSON.stringify({
taskInfo: '备案任务下发',
roleForm: this.roleForm,
}));
saveTaskFirst(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
},
};
src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+57 -2
View File
@@ -329,7 +329,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter";
import { inboundLiaisonDetail } from "api/process";
import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, saveTaskForPub } from "api/process";
export default {
name: "jrbzhxhStep2",
@@ -353,6 +353,7 @@ export default {
nodeList: [],
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
fileName:'',
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
dlFlag: '', // 1为通过 0为不通过
@@ -416,6 +417,18 @@ export default {
}, e => {
});
},
getDatas() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes);
console.log(mes);
this.wbbzform = mes.form
this.associationData = mes.form.associationData
this.getFileInfo();
this.processTable();
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -430,6 +443,27 @@ export default {
});
});
},
// 请求上传的文件信息
getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds
}, {
_this: this
}, res => {
this.$nextTick(() => {
res.data.map(item => {
// 赋值要回显的上传文件内容
this.fileList.push({
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
});
});
});
}, e => {
});
},
/**
* @description: 动态表单读取
*/
@@ -506,11 +540,28 @@ export default {
});
},
//流程保存
handleSave() {},
handleSave() {
this.saveLoading = true
this.wbbzform.fileName = this.fileInfoList
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
roleList: this.roleForm,
wbbzform: this.wbbzform,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
//流程提交
handleSubmit() {
this.isSubmit = true
this.wbbzform.dlFlag = '1',
this.wbbzform.fileName = this.fileInfoList
this.wbbzform.passUser = this.$store.getters.userInfo.userId,
this.wbbzform.commentText = this.commentText;
this.wbbzform.participantsData = this.participantsData
@@ -634,6 +685,10 @@ export default {
},
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDatas()
}
this.getData()
this.processTable()
},
src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+4
View File
@@ -484,6 +484,10 @@ export default {
this.wbbzform = JSON.parse(JSON.stringify(item));
this.associationData = item.associationData
this.participantsData = item.participantsData
item.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.getFileInfo();
});
});
},
// 请求上传的文件信息
src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+4
View File
@@ -484,6 +484,10 @@ export default {
this.wbbzform = JSON.parse(JSON.stringify(item));
this.associationData = item.associationData
this.participantsData = item.participantsData
item.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.getFileInfo();
});
});
},
// 请求上传的文件信息
src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
+75 -5
View File
@@ -62,7 +62,7 @@
<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.workPeople" placeholder="请选择推荐署名人及单位"
@click.native="choiceZRRS(scope.row, scope.$index)" readonly/>
</template>
</el-table-column>
@@ -92,7 +92,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
@@ -343,12 +343,12 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js'
import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "@/api/process.js";
export default {
name: "wbsmStep1",
data() {
return {
textarea: '', // 意见
commentText: '', // 意见
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
@@ -389,6 +389,8 @@ export default {
roleForm: {
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
passUserName: this.$store.getters.userInfo.userName,
passUser: this.$store.getters.userInfo.userId,
dockUser: "",
ministerUser: "" ,
directorUser: "",
@@ -422,6 +424,7 @@ export default {
},
mounted() {
this.getStandData()
this.getData()
//从数据库中查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this:this
@@ -433,6 +436,30 @@ export default {
})
},
methods: {
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
});
},
//点击新增事件
addList() {
this.standModel = true
@@ -529,6 +556,9 @@ export default {
if (newStand) {
this.$message.warning("请勿重复添加数据");
} else {
this.$set(item, "workPeople", '');
this.$set(item, "reason", '');
this.$set(item, "expenses", '');
this.dataList.push(item);
exits.push(item.id);
}
@@ -604,6 +634,46 @@ export default {
},
// 提交按钮
handleSubmit() {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
this.dataList.forEach(item => {
if( item.workPeople === ''){
this.$message.warning('请选择推荐署名人及单位')
}
})
let json = {
commentText: this.commentText,
roleForm: this.roleForm,
dataList: this.dataList,
}
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", {type: "16"}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
}
},
// 流程阶段负责人选择
choiceZRR(type, title, id) {
@@ -629,7 +699,7 @@ export default {
}else{
const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
newRow.workPeopleId = data[0].id;
newRow.workPeople = data[0].name;
newRow.workPeople = data[0].name + '(' + data[0].institutionName + ')';
this.$set(this.dataList, this.zrIndex, newRow);
}
this.modalshowflag = false;
src/pages/processCenter/pages/creatProcess/wbsm/step2.vue
+92 -67
View File
@@ -17,41 +17,46 @@
:data="dataList"
border
ref="entryTable"
height="94%"
style="width: 100%; margin-top: 10px; "
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="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<el-table-column
prop="code"
width="180px"
align="center"
label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<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" align="center" show-overflow-tooltip label="标准名称">
<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="productName" label="标准类别" align="center" show-overflow-tooltip>
<!-- <template>-->
<!-- <el-select v-model="dataList.productName" placeholder="请选择标准类别">-->
<!-- <el-option-->
<!-- v-for="item in standOptions"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="itemsNum" label="推荐署名人及单位" align="center"/>
<el-table-column prop="itemsName" label="署名人所在单位" align="center"/>
<el-table-column prop="planCloseTime" label="推荐署名原因" align="center">
<el-table-column prop="standSortShow" label="标准类别" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<el-input></el-input>
<a>{{ scope.row.standSortShow }}</a>
</template>
</el-table-column>
<el-table-column prop="itemsNum" label="费用" align="center"/>
<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>
@@ -62,7 +67,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
@@ -180,8 +185,9 @@ export default {
passInfo: 0,
detailData: [],
loading: false,
textarea: '', // 意见
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
isTransfer: false,
ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
@@ -283,26 +289,28 @@ export default {
})
},
getData() {
const params = {
taskIds: this.taskIds,
pId: this.pId,
// standId: '', // 标准号/名称
// productName: '', // 项目名称
// responsibleUnit: '' // 责任部门
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
})
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 => {
});
});
},
getFormFieldList (item) {
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
if (item.passInfo !== undefined) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
})
this.dataList = item.dataList
this.roleForm = item.roleForm
});
},
// 批量选择分发责任人
dutyEngineerList(id) {
@@ -355,10 +363,51 @@ export default {
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
let son = {
signFlag: '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(){
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");
}
}, e => {
});
},
//转办按钮
handleTransfer(){
@@ -410,30 +459,6 @@ export default {
}
this.modalshowflag = false
},
//查询按钮
/*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
let matchUnit = true; // 部门 筛选
if (standId) {
const keysId = standId
.toUpperCase() // 转大写
.replace(' ', '') // 删掉空格
.split('') // 切割成 单个字
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
}
if (productName) {
matchName = item.productName === productName;
}
if (responsibleUnit) {
matchUnit = item.responsibleUnit === responsibleUnit;
}
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
},*/
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
src/pages/processCenter/pages/creatProcess/wbsm/step3.vue
+539
View File
@@ -0,0 +1,539 @@
<template>
<div class="wfhxzgStep2">
<ProcessHeader toggle>
<template slot="proName">外部署名推荐审批流程</template>
<template slot="proNode">标准法规部部长审核</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: "wbsmStep3",
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 = {
signFlag: '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(){
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");
}
}, 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/step4.vue
+539
View File
@@ -0,0 +1,539 @@
<template>
<div class="wfhxzgStep2">
<ProcessHeader toggle>
<template slot="proName">外部署名推荐审批流程</template>
<template slot="proNode">技术管理中心主任审核</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: "wbsmStep4",
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 = {
signFlag: '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(){
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");
}
}, 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/step5.vue
+539
View File
@@ -0,0 +1,539 @@
<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: "wbsmStep5",
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(){
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/xmpg/step1.vue
+1 -1
View File
@@ -919,7 +919,7 @@ export default {
this.getStandData();
},
pageChangeNo(page) {
this.pageNO = page;
this.pageNo = page;
this.getProductData();
},
pageSizeChangeNo(pageSize) {
src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue
+38 -25
View File
@@ -392,7 +392,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst,inboundLiaisonDetail } from "api/process";
import { saveTaskFirst,inboundLiaisonDetail,queryTaskFirst } from "api/process";
export default {
name: "zcchStep1-1",
@@ -484,32 +484,45 @@
},
methods: {
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
if (this.$route.query.bpnId) {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let data = JSON.parse(res.mesg)
this.json = data
this.data1 = data.data1
this.data2 = data.data2
this.rhform.commentText = data.commentText
this.rhform.content = data.content
this.rhform.price = data.price
this.rhform.time = data.time
this.rhform.title = data.title
this.rhform.Company = data.Company
this.rhform.place = data.place
this.rhform.time2 = data.time2
this.rhform.modelList = data.modelList
this.rhform.modelNameList = data.modelNameList
this.roleForm.ministerId = data.ministerId
this.roleForm.ministerIdName = data.ministerIdName
this.roleForm.presidentId = data.presidentId
this.roleForm.presidentIdName = data.presidentIdName
}).catch(e => {
let mes = JSON.parse(res.mes)
this.rhform = mes.form
this.data1 = mes.data1
this.data2 = mes.data2
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
})
} else {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.json = data
this.data1 = data.data1
this.data2 = data.data2
this.rhform.commentText = data.commentText
this.rhform.content = data.content
this.rhform.price = data.price
this.rhform.time = data.time
this.rhform.title = data.title
this.rhform.Company = data.Company
this.rhform.place = data.place
this.rhform.time2 = data.time2
this.rhform.modelList = data.modelList
this.rhform.modelNameList = data.modelNameList
this.roleForm.ministerId = data.ministerId
this.roleForm.ministerIdName = data.ministerIdName
this.roleForm.presidentId = data.presidentId
this.roleForm.presidentIdName = data.presidentIdName
}).catch(e => {
})
})
}
},
add1() {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
src/pages/processCenter/pages/creatProcess/zcch/step1.vue
+20
View File
@@ -664,6 +664,26 @@
this.foldFormFlag = !this.foldFormFlag
}, // 基础信息显隐
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '18')
_formData.append('json', JSON.stringify({
form: this.rhform,
roleForm: this.roleForm,
commentText: this.commentText,
data1: this.data1,
data2: this.data2
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
}, // 保存事件
handleSubmit() {
this.$refs['rhForm'].validate((valid) => {
src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue
+37 -24
View File
@@ -381,7 +381,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst,inboundLiaisonDetail } from "api/process";
import { saveTaskFirst,inboundLiaisonDetail,queryTaskFirst } from "api/process";
export default {
name: "zcrhStep1",
@@ -463,31 +463,44 @@
},
methods: {
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
if (this.$route.query.bpnId) {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let data = JSON.parse(res.mesg)
this.json = data
this.data1 = data.data1
this.data2 = data.data2
this.rhform.commentText = data.commentText
this.rhform.content = data.content
this.rhform.price = data.price
this.rhform.time = data.time
this.rhform.title = data.title
this.rhform.modelList = data.modelList
this.rhform.modelNameList = data.modelNameList
this.roleForm.inspectorId = data.inspectorId
this.roleForm.inspectorIdName = data.inspectorIdName
this.roleForm.ministerId = data.ministerId
this.roleForm.ministerIdName = data.ministerIdName
this.roleForm.presidentId = data.presidentId
this.roleForm.presidentIdName = data.presidentIdName
}).catch(e => {
let mes = JSON.parse(res.mes)
this.rhform = mes.form
this.data1 = mes.data1
this.data2 = mes.data2
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
})
} else {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.json = data
this.data1 = data.data1
this.data2 = data.data2
this.rhform.commentText = data.commentText
this.rhform.content = data.content
this.rhform.price = data.price
this.rhform.time = data.time
this.rhform.title = data.title
this.rhform.modelList = data.modelList
this.rhform.modelNameList = data.modelNameList
this.roleForm.inspectorId = data.inspectorId
this.roleForm.inspectorIdName = data.inspectorIdName
this.roleForm.ministerId = data.ministerId
this.roleForm.ministerIdName = data.ministerIdName
this.roleForm.presidentId = data.presidentId
this.roleForm.presidentIdName = data.presidentIdName
}).catch(e => {
})
})
}
},
add1() {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
+20
View File
@@ -643,6 +643,26 @@
this.foldFormFlag = !this.foldFormFlag
}, // 基础信息显隐
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '17')
_formData.append('json', JSON.stringify({
form: this.rhform,
roleForm: this.roleForm,
commentText: this.commentText,
data1: this.data1,
data2: this.data2
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
}, // 保存事件
handleSubmit() {
this.$refs['rhForm'].validate((valid) => {
src/pages/processCenter/pages/newProcess/index.vue
-15
View File
@@ -187,21 +187,6 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('19')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策课题会后流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('16')">
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+112 -4
View File
@@ -931,6 +931,65 @@ export default {
})
}
break
case '16':
//外部署名推荐审批流程
if (row.taskInfo === '会签') {
this.$router.push({
name: 'wbsmStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if(row.taskInfo === '标准法规部部长审核'){
this.$router.push({
name: 'wbsmStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '技术管理中心主任审定'){
this.$router.push({
name: 'wbsmStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if(row.taskInfo === '工程研究总院院长批准'){
this.$router.push({
name: 'wbsmStep5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if(row.taskInfo === '修改信息'){
this.$router.push({
name: 'wbsmStep1',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
// 外部标准化协会入会流程
case '20':
if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {
@@ -1102,7 +1161,7 @@ export default {
break
// 政策会后流程
case '21':
if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {
if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') {
this.$router.push({
name: 'bzchStep2',
query:{
@@ -1113,7 +1172,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '') {
} else if (row.taskInfo === '参会代表填写参会信息表') {
this.$router.push({
name: 'bzchStep3',
query:{
@@ -1124,7 +1183,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '') {
} else if (row.taskInfo === '参会人员所在部门中心主任审核') {
this.$router.push({
name: 'bzchStep4',
query:{
@@ -1135,7 +1194,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '') {
} else if (row.taskInfo === '标准法规工程师修订') {
this.$router.push({
name: 'bzchStep5',
query:{
@@ -1146,7 +1205,56 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '技术管理中心主任审批') {
this.$router.push({
name: 'bzchStep6',
query:{
taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '费用管理部门会签') {
this.$router.push({
name: 'bzchStep6',
query:{
taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
this.$router.push({
name: 'bzchStep6',
query:{
taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '标准法规工程师修订完毕') {
this.$router.push({
name: 'bzchStep6',
query:{
taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
}
},
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+64
View File
@@ -389,6 +389,60 @@ export default {
}
})
break
case '17':
this.$router.push({
name: 'zcrhStep1-1',
query: {
type: '17',
processName: '政策课题入会流程',
bpnId: id
}
})
break
case '18':
this.$router.push({
name: 'zcchStep1-1',
query: {
type: '18',
processName: '政策课题参会流程',
bpnId: id
}
})
break
case '15':
if(mes !== null && mes.taskInfo !== null){
if (mes.taskInfo === '备案任务下发') {
this.$router.push({
name: 'jrbzhxhStep1',
query: {
type: '15',
processName: '加入标准化协会信息提报流程',
bpnId: id,
verifySarStandard: true,
}
})
}else if(mes.taskInfo === '入会信息填报'){
this.$router.push({
name: 'jrbzhxhStep2',
query: {
type: '15',
processName: '加入标准化协会信息提报流程',
bpnId: id,
}
})
}
}else{
}
this.$router.push({
name: 'jrbzhxhStep1',
query: {
type: '15',
processName: '加入标准化协会信息提报流程',
bpnId: id
}
})
break
case '20':
this.$router.push({
name: 'bzrhStep1',
@@ -425,6 +479,16 @@ export default {
})
}
break
case '21':
this.$router.push({
name: 'bzchStep1',
query: {
type: '21',
processName: '外部标准化协会参会流程',
bpnId: id
}
})
break
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
src/router/index.js
+36
View File
@@ -1123,6 +1123,33 @@ const routes = [
title: '外部署名推荐审批流程'
}
},
{
path: '/wbsmStep3',
name: 'wbsmStep3',
component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step3.vue'),
meta: {
requireAuth: true,
title: '外部署名推荐审批流程'
}
},
{
path: '/wbsmStep4',
name: 'wbsmStep4',
component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step4.vue'),
meta: {
requireAuth: true,
title: '外部署名推荐审批流程'
}
},
{
path: '/wbsmStep5',
name: 'wbsmStep5',
component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step5.vue'),
meta: {
requireAuth: true,
title: '外部署名推荐审批流程'
}
},
{
path: '/cywbbzzxdStep1',
name: 'cywbbzzxdStep1',
@@ -1288,6 +1315,15 @@ const routes = [
title: '外部标准化协会参会流程（修订）'
}
},
{
path: '/bzchStep6',
name: 'bzchStep6',
component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue'),
meta: {
requireAuth: true,
title: '外部标准化协会参会流程（审定）'
}
},
]
},
// 本地工具