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

This commit is contained in:
super_liu
2022-02-15 10:19:42 +08:00
13 changed files with 236 additions and 144 deletions
@@ -25,6 +25,13 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
v-model="form.title"
@@ -139,13 +146,13 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserName ? '#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.dockUserList" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
<el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员" readonly="readonly" @click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
@@ -154,10 +161,10 @@
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<h4>标准法规部高级经理责任部门高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" readonly="readonly" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部高级经理、责任部门高级经理" readonly="readonly" @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -288,6 +295,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '', // 流程名称
title: '', // 调研标题
date: '', // 完成时间
fjList: [],
@@ -296,6 +304,9 @@
modelNameList: ''
},
formRules: {
processName: [
{ required: true, message: '请输入流程名称', trigger: 'blur' },
],
title: [
{ required: true, message: '请输入调研标题', trigger: 'blur' },
],
@@ -413,7 +424,7 @@
this.type2 = type
this.nodeList2 = []
if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
this.drawerTitle2 = '选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
@@ -25,6 +25,13 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
v-model="form.title"
@@ -139,13 +146,13 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择部门责任人" placement="top" :color="roleForm.dockUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserName ? '#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.dockUserList" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
<el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员" readonly="readonly" @click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
@@ -154,10 +161,10 @@
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<h4>标准法规部高级经理责任部门高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" readonly="readonly" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
<el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部高级经理、责任部门高级经理" readonly="readonly" @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -292,6 +299,7 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
processName: '', // 流程名称
title: '', // 调研标题
date: '', // 完成时间
fjList: [],
@@ -300,6 +308,9 @@ export default {
modelNameList: ''
},
formRules: {
processName: [
{ required: true, message: '请输入流程名称', trigger: 'blur' },
],
title: [
{ required: true, message: '请输入调研标题', trigger: 'blur' },
],
@@ -403,7 +414,7 @@ export default {
this.type2 = type
this.nodeList2 = []
if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
this.drawerTitle2 = '选择技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -213,6 +221,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
modelList: [],
@@ -357,6 +366,7 @@
this.form.fjList = data.fjList || data.form.fjList
this.form.modelList = data.modelList || data.form.modelList
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.responUserList = data.form? data.form.responUserList : ''
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -265,6 +273,7 @@
acceptShow: false,
todoId: '',
form: {
processName: '',
fileList: [],
dyhz: '',
title: '', // 调研标题
@@ -479,6 +488,7 @@
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.fjList = data.fjList || data.form.fjList
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -242,6 +250,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
dyhz: '',
title: '', // 调研标题
date: '', // 完成时间
@@ -377,6 +386,7 @@
let data = JSON.parse(res.mesg)
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.form ? data.form.fileId : data.fileId
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -255,6 +263,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -419,6 +428,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
let arr = data.responUserList || data.form.responUserList
let newArr = []
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -412,6 +421,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -413,6 +422,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -413,6 +422,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
@@ -25,6 +25,14 @@
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
<el-input
v-model="form.processName"
placeholder="请输入流程名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -250,6 +258,7 @@
isSubmit: false,
saveLoading: false,
form: {
processName: '',
title: '', // 调研标题
date: '', // 完成时间
hzfileId: '',
@@ -412,6 +421,7 @@
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
@@ -263,7 +263,6 @@
</div>
</div>
<ProcessFooter
show-back
show-transfer
show-submit
:transfer-loading="isTransfer"
@@ -271,7 +270,6 @@
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -448,31 +446,6 @@ export default {
}, e => {
});
},
//驳回
beforeBack(){
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.listForm.commentText = this.commentText
this.listForm.stepFlag = '1'
const json = JSON.stringify(this.listForm);
this.isSubmit = true
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 => {
});
}
},
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
@@ -12,81 +12,98 @@
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="Form"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form myForm">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" style="display: none;"/>
<el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>标准法规工程师事业部标准化员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
<div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
</div>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择标准法规工程师、事业部标准化员"
@click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审核" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="ministerUser" style="margin-bottom: 0">
<h4>标准法规部高级经理责任部门高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.endTime"
type="date"
:picker-options="pickerOptions"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
<el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
<el-option
v-for="(item, index) in textTypeList"
:key="index"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
</div>
<el-input
v-model="roleForm.ministerUserName"
placeholder="选择标准法规部高级经理、责任部门高级经理"
@click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"
/>
</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="directorUser" style="margin-bottom: 0">
<h4>技术委员会相关专委会主任/ 工程研究总院责任部门中心主任技术管理中心主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"/>
v-model="form.fjListId"
style="display: none;"
></el-input>
<div style="">
<div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
<span @click="fileLook(item)" >{{ item.fileName }}</span>
<el-button
size="small"
@click="filesUpload(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
</el-form-item>
<el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
v-model="roleForm.directorUserName"
placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任"
@click.native="choiceZRRS('2')"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="presidentUser" style="margin-bottom: 0">
<h4>工程研究院总院院长/标准法规业务主管副院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.presidentUser" style="display: none;"/>
<el-input
v-model="roleForm.presidentUserName"
placeholder="选择工程研究院总院院长/标准法规业务主管副院长"
@click.native="choiceZRR('presidentUser', '选择工程研究院总院院长/标准法规业务主管副院长', roleForm.presidentUser)"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
disabled
style="display: none;"
v-model="form.modelNameList"
clearable
></el-input>
<div v-if="form.modelList.length > 0" class="fileClass" style="">
<div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
@click="filesUpload(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div class="addButton" style="padding-left: 10px">
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="small">
点击上传
</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
<el-collapse accordion v-model="activeNames">
@@ -107,76 +124,76 @@
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-form
ref="Form"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form myForm">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
ref="Form"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form myForm">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>流程发起人</h4>
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" style="display: none;"/>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/>
<el-input v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-timeline-item timestamp="任务分发" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>责任部门对接人</h4>
<h4>标准法规工程师事业部标准化员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人"
@click.native="choiceZRRS('1')">
v-model="roleForm.dockUserListName"
placeholder="选择标准法规工程师、事业部标准化员"
@click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="审核" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="ministerUser" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<h4>标准法规部高级经理责任部门高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
<el-input
v-model="roleForm.ministerUserName"
placeholder="选择标准法规部部长·"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
v-model="roleForm.ministerUserName"
placeholder="选择标准法规部高级经理、责任部门高级经理"
@click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="审定" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="directorUser" style="margin-bottom: 0">
<h4>技术委员会相关专委会主任/研究总院职能部门领导技术管理中心主任</h4>
<h4>技术委员会相关专委会主任/ 工程研究总院责任部门中心主任技术管理中心主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUser" style="display: none;"/>
<el-input
v-model="roleForm.directorUserName"
placeholder="选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任"
@click.native="choiceZRRS('2')"
v-model="roleForm.directorUserName"
placeholder="选择技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任"
@click.native="choiceZRRS('2')"
/>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="presidentUser" style="margin-bottom: 0">
<h4>工程研究总院院长标准法规主管副院长</h4>
<h4>工程研究总院院长/标准法规业务主管副院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.presidentUser" style="display: none;"/>
<el-input
v-model="roleForm.presidentUserName"
placeholder="选择工程研究总院院长标准法规主管副院长"
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长标准法规主管副院长', roleForm.presidentUser)"
v-model="roleForm.presidentUserName"
placeholder="选择工程研究总院院长/标准法规业务主管副院长"
@click.native="choiceZRR('presidentUser', '选择工程研究总院院长/标准法规业务主管副院长', roleForm.presidentUser)"
/>
</div>
</el-form-item>
@@ -283,7 +283,7 @@ export default {
const prcType = row.prcType
switch(prcType) {
case '1':
if (row.taskInfo === '标准法规业务经理审批') {
if (row.taskInfo === '批') {
this.$router.push({
name: 'bzrkStep2',
query: {
@@ -294,7 +294,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '责任人会签'){
}else if (row.taskInfo === '会签'){
this.$router.push({
name: 'bzrkStep3',
query: {
@@ -305,7 +305,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '申请人修订'){
}else if (row.taskInfo === '修订'){
this.$router.push({
name: 'bzrkStep4',
query: {
@@ -1175,7 +1175,7 @@ export default {
break
//未符合项整改流程
case '8' :
if(row.taskInfo === '下发至标准法规工程师'){
if(row.taskInfo === '审核'){
this.$router.push({
name: 'wfhxzgStep2',
query: {
@@ -1187,7 +1187,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '确认+选择责任人') {
} else if (row.taskInfo === '合规排查(上传合规举证材料)') {
this.$router.push({
name: 'wfhxzgStep3',
query: {
@@ -1199,7 +1199,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '上传佐证材料填写信息') {
}else if (row.taskInfo === '审定') {
this.$router.push({
name: 'wfhxzgStep4',
query: {