commit
This commit is contained in:
@@ -494,7 +494,6 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
console.log(data);
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
if (data.form) {
|
||||
|
||||
@@ -0,0 +1,356 @@
|
||||
<template>
|
||||
<div class="zcrh-step2">
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">政策课题入会流程</template>
|
||||
<template slot="proNode">法规部部长审批</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem active">基础信息</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<el-form
|
||||
ref="rhForm"
|
||||
:model="rhform"
|
||||
class="label-input-form"
|
||||
label-width="210px"
|
||||
>
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="prc-content-border" v-if="foldFormFlag">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="课题名称" prop="title" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="rhform.title"
|
||||
placeholder="请输入课题名称"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="主要议题" prop="content" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="rhform.content"
|
||||
placeholder="请输入主要议题"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="费用" prop="price" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
disabled
|
||||
v-model="rhform.price"
|
||||
placeholder="请输入费用"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="课题组通知" prop="modelNameList" class="add-form-item form-item-disabled">
|
||||
<div style="display: flex;">
|
||||
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in rhform.modelList" :key="index">{{ item.name }}</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="课题研究周期" prop="time" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
disabled
|
||||
v-model="rhform.time"
|
||||
type="datetimerange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-button style="width: 100%" icon="el-icon-caret-top" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
|
||||
</el-form>
|
||||
<ProcessTitle>
|
||||
<template slot="title">课题组联系方式</template>
|
||||
</ProcessTitle>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="data1"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
row-key="id">
|
||||
<el-table-column
|
||||
prop="ContactPerson"
|
||||
label="联络人"
|
||||
width="150"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Company"
|
||||
label="单位"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Telephone"
|
||||
label="电话"
|
||||
width="200"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Email"
|
||||
label="邮箱"
|
||||
width="350"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<ProcessTitle>
|
||||
<template slot="title">集团内部参与人员</template>
|
||||
</ProcessTitle>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="data2"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
row-key="id">
|
||||
<el-table-column
|
||||
prop="Sindex"
|
||||
label="我司在工作组排名顺序"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Member"
|
||||
label="我司成员"
|
||||
width="150"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Company"
|
||||
label="单位"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Department"
|
||||
label="部门"
|
||||
width="150"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Telephone"
|
||||
label="电话"
|
||||
width="200"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Email"
|
||||
label="邮箱"
|
||||
width="300"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="Identity"
|
||||
label="身份"
|
||||
width="150"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="data"
|
||||
label="资料"
|
||||
width="200"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<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>
|
||||
<ProcessFooter
|
||||
show-submit
|
||||
show-back
|
||||
approval
|
||||
@back="handleSubmitNo"
|
||||
:submitLoading="isSubmit"
|
||||
@submit="handleSubmit"
|
||||
submitBTNText="同意"
|
||||
>
|
||||
</ProcessFooter>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import {inboundLiaisonDetail} from 'api/process'
|
||||
|
||||
export default {
|
||||
name: "zcrhStep2",
|
||||
data() {
|
||||
return {
|
||||
json: {},
|
||||
isSubmit: false,
|
||||
foldFormFlag: true,
|
||||
commentText: '',
|
||||
active: '1',
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
data1: [],
|
||||
data2: [],
|
||||
rhform: {
|
||||
title: '',
|
||||
content: '',
|
||||
price: '',
|
||||
time: '',
|
||||
modelList: []
|
||||
}
|
||||
}
|
||||
},
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
methods: {
|
||||
handleSubmit() {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.fgfbz = 1
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
},
|
||||
handleSubmitNo() {
|
||||
if (this.commentText) {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.fgfbz = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('驳回成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
},
|
||||
updataFj (item) {
|
||||
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
|
||||
},
|
||||
handleTabs(type) {
|
||||
this.active = type;
|
||||
}, // 切换tabs
|
||||
foldForm() {
|
||||
this.foldFormFlag = !this.foldFormFlag
|
||||
}, // 基础信息显隐
|
||||
getData() {
|
||||
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
|
||||
}).catch(e => {
|
||||
})
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.getData()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.zcrh-step2 {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
.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;
|
||||
}
|
||||
}
|
||||
}
|
||||
.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;
|
||||
}
|
||||
}
|
||||
.label-input-form {
|
||||
.add-form-item {
|
||||
/deep/.el-form-item__content {
|
||||
.el-date-editor {
|
||||
width: 400px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -869,6 +869,20 @@ export default {
|
||||
})
|
||||
}
|
||||
break
|
||||
case '17':
|
||||
if (row.taskInfo === '法规认证部副部长审核') {
|
||||
this.$router.push({
|
||||
name: 'zcrhStep2',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
break
|
||||
}
|
||||
},
|
||||
...mapMutations(['setProcess', 'setHandleInfo']),
|
||||
|
||||
@@ -988,6 +988,15 @@ const routes = [
|
||||
title: '政策课题入会流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/zcrhStep2',
|
||||
name: 'zcrhStep2',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step2.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '政策课题入会流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/zcchStep1',
|
||||
name: 'zcchStep1',
|
||||
|
||||
Reference in New Issue
Block a user