Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
Superman_Main
@@ -6,16 +6,16 @@
|
|||||||
<span class="title borderRight">友情链接</span>
|
<span class="title borderRight">友情链接</span>
|
||||||
</div>
|
</div>
|
||||||
<div style="display: inline-block;width: 80%;text-align: center">
|
<div style="display: inline-block;width: 80%;text-align: center">
|
||||||
<div>
|
<el-row>
|
||||||
<el-row>
|
<span v-for="(item, index) in linkListFirst" :key="index">
|
||||||
<span v-for="(item, index) in linkListFirst" :key="index">
|
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<img
|
<img
|
||||||
style="height: 10px;width: 10px;margin-bottom: 3px"
|
style="height: 10px;width: 10px;margin-bottom: 3px"
|
||||||
:src="item.icon"
|
:src="item.icon"
|
||||||
v-if="index < 5">
|
v-if="index < 5">
|
||||||
<a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
|
<a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
|
||||||
{{ item.name }}
|
<a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a>
|
||||||
|
<a v-else>{{ item.name }}</a>
|
||||||
</a>
|
</a>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1" v-if="index < 4" v-show="true">
|
<el-col :span="1" v-if="index < 4" v-show="true">
|
||||||
@@ -25,18 +25,17 @@
|
|||||||
<span class="borderMiddle"></span>
|
<span class="borderMiddle"></span>
|
||||||
</el-col>
|
</el-col>
|
||||||
</span>
|
</span>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
<el-row style="margin-bottom: 10px;">
|
||||||
<div>
|
<span v-for="(item, index) in linkListSecond" :key="index">
|
||||||
<el-row>
|
|
||||||
<span v-for="(item, index) in linkListSecond" :key="index">
|
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<img
|
<img
|
||||||
style="height: 10px;width: 10px;margin-bottom: 3px"
|
style="height: 10px;width: 10px;margin-bottom: 3px"
|
||||||
:src="item.icon"
|
:src="item.icon"
|
||||||
v-if="index < 5">
|
v-if="index < 5">
|
||||||
<a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
|
<a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
|
||||||
{{ item.name }}
|
<a v-if="item.name.length > 8"> {{ item.name.slice(0, 8) + '...' }}</a>
|
||||||
|
<a v-else>{{ item.name }}</a>
|
||||||
</a>
|
</a>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1" v-if="index < 4" v-show="true">
|
<el-col :span="1" v-if="index < 4" v-show="true">
|
||||||
@@ -46,8 +45,7 @@
|
|||||||
<span class="borderMiddle"></span>
|
<span class="borderMiddle"></span>
|
||||||
</el-col>
|
</el-col>
|
||||||
</span>
|
</span>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div style="display: inline-block;width: 15%;">
|
<div style="display: inline-block;width: 15%;">
|
||||||
<span class="borderLeft"></span>
|
<span class="borderLeft"></span>
|
||||||
@@ -61,6 +59,15 @@ import {getImg} from '@/api/linkApi.js'
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Empennage',
|
name: 'Empennage',
|
||||||
|
filters: {
|
||||||
|
snippet: function (value) {
|
||||||
|
if (value && value.length > 8) {
|
||||||
|
return value.slice(0, 8) + '...'
|
||||||
|
} else {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
components: {},
|
components: {},
|
||||||
mixins: [],
|
mixins: [],
|
||||||
data() {
|
data() {
|
||||||
@@ -168,6 +175,7 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
.link {
|
.link {
|
||||||
|
background-color: #fff;
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
display: flex;
|
display: flex;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
@@ -206,6 +214,10 @@ export default {
|
|||||||
color: #0068B7;
|
color: #0068B7;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.el-col-1 {
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.el-col-4 {
|
.el-col-4 {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
|||||||
@@ -29,9 +29,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div calss="home_footer" style="padding: 0">
|
<div calss="home_footer" style="padding: 0">
|
||||||
<el-card class="footer">
|
|
||||||
<Empennage></Empennage>
|
<Empennage></Empennage>
|
||||||
</el-card>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -185,7 +183,7 @@ export default {
|
|||||||
/deep/.el-card__body {
|
/deep/.el-card__body {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
.footer {
|
.home_footer {
|
||||||
height: 70px;
|
height: 70px;
|
||||||
line-height: 33px;
|
line-height: 33px;
|
||||||
//margin-top: 0.3vh;
|
//margin-top: 0.3vh;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
|
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="协会名称:" prop="comityName">
|
<el-form-item class="add-form-item" label="协会名称:" prop="comityName">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="rh_pageData.comityName"
|
v-model="rh_pageData.comityName"
|
||||||
placeholder="请选择标委会">
|
placeholder="请选择标委会">
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
|
<el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="rh_pageData.comityNameOne"
|
v-model="rh_pageData.comityNameOne"
|
||||||
placeholder="请选择分标委">
|
placeholder="请选择分标委">
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
|
<el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="rh_pageData.comityNameTwo"
|
v-model="rh_pageData.comityNameTwo"
|
||||||
placeholder="请选择工作组">
|
placeholder="请选择工作组">
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
|
<el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="rh_pageData.comityRole"
|
v-model="rh_pageData.comityRole"
|
||||||
placeholder="请选择会员角色">
|
placeholder="请选择会员角色">
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
|
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="rh_pageData.comityState"
|
v-model="rh_pageData.comityState"
|
||||||
placeholder="选择协会状态">
|
placeholder="选择协会状态">
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
|
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="rh_pageData.comityKind"
|
v-model="rh_pageData.comityKind"
|
||||||
placeholder="请选择入会性质">
|
placeholder="请选择入会性质">
|
||||||
@@ -98,7 +98,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||||
<el-upload
|
<el-upload
|
||||||
style="width: 30%"
|
style="width: 30%"
|
||||||
class="upload_style"
|
class="upload_style"
|
||||||
@@ -122,7 +122,7 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="add-form-item" label="协会构成:" prop="comityMake">
|
<el-form-item class="add-form-item" label="协会构成:" prop="comityMake">
|
||||||
<el-form
|
<el-form
|
||||||
class="make_form"
|
class="make_form"
|
||||||
ref="rh_pageData.comityMake"
|
ref="rh_pageData.comityMake"
|
||||||
@@ -130,40 +130,40 @@
|
|||||||
label-width="auto">
|
label-width="auto">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="资质:">
|
<el-form-item class="add-form-item" label="资质:">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="rh_pageData.comityMake.makeQualification" placeholder="请填写资质"/>
|
v-model="rh_pageData.comityMake.makeQualification" placeholder="请填写资质"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="成员:">
|
<el-form-item class="add-form-item" label="成员:">
|
||||||
<el-input v-model="rh_pageData.comityMake.makeRole" placeholder="请填写成员"/>
|
<el-input v-model="rh_pageData.comityMake.makeRole" placeholder="请填写成员"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用估计:">
|
<el-form-item class="add-form-item" label="费用估计:">
|
||||||
<el-input v-model="rh_pageData.comityMake.makeCost" placeholder="请填写费用估计"/>
|
<el-input v-model="rh_pageData.comityMake.makeCost" placeholder="请填写费用估计"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="职责:">
|
<el-form-item class="add-form-item" label="职责:">
|
||||||
<el-input v-model="rh_pageData.comityMake.makeDuties" placeholder="请填写职责"/>
|
<el-input v-model="rh_pageData.comityMake.makeDuties" placeholder="请填写职责"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="任期:">
|
<el-form-item class="add-form-item" label="任期:">
|
||||||
<el-input v-model="rh_pageData.comityMake.makeTime" placeholder="请填写任期"/>
|
<el-input v-model="rh_pageData.comityMake.makeTime" placeholder="请填写任期"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||||
<el-input v-model="rh_pageData.workPath" type="textarea" placeholder="请填写工作方向"/>
|
<el-input v-model="rh_pageData.workPath" type="textarea" placeholder="请填写工作方向"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-bottom: 50px">
|
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-bottom: 50px">
|
||||||
<div class="comityTel_btn">
|
<div class="comityTel_btn">
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -315,7 +315,7 @@
|
|||||||
<h4>标准法规部主管领导</h4>
|
<h4>标准法规部主管领导</h4>
|
||||||
<div style="margin-top: 10px;width: 300px;">
|
<div style="margin-top: 10px;width: 300px;">
|
||||||
<el-input v-model="roleForm.leaderUserId" style="display: none;"></el-input>
|
<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 v-model="roleForm.leaderUser" placeholder="选择标准法规部主管领导" @click.native="choiceZRROne('leaderUser', '选择标准法规部主管领导', roleForm.leaderUser)">
|
||||||
</el-input>
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -693,46 +693,42 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入回执说明')
|
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||||
} else {
|
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||||
let json = {
|
roleList: this.roleForm,
|
||||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
rh_pageData: this.rh_pageData,
|
||||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
commentText: this.commentText,
|
||||||
roleList: this.roleForm,
|
directorList: this.rh_pageData.comityInRoleId,
|
||||||
rh_pageData: this.rh_pageData,
|
|
||||||
commentText: this.commentText,
|
|
||||||
directorList: this.rh_pageData.comityInRoleId,
|
|
||||||
}
|
|
||||||
this.$refs['rh_pageData'].validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
this.$refs['roleForm'].validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
this.isSubmit = true
|
|
||||||
const paramsInfo = {
|
|
||||||
type: '20'
|
|
||||||
}
|
|
||||||
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
|
|
||||||
})
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
this.$message.warning('请完成流程信息的人员选择')
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
this.$refs['rh_pageData'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.$refs['roleForm'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.isSubmit = true
|
||||||
|
const paramsInfo = {
|
||||||
|
type: '20'
|
||||||
|
}
|
||||||
|
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
|
||||||
|
})
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.$message.warning('请完成流程信息的人员选择')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,66 +17,66 @@
|
|||||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
|
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="协会名称:">
|
<el-form-item class="add-form-item" label="协会名称:">
|
||||||
{{ rh_pageData.comityName || '-' }}
|
{{ rh_pageData.comityName || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
|
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
|
||||||
{{ rh_pageData.comityState || '-' }}
|
{{ rh_pageData.comityState || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
|
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
|
||||||
{{ rh_pageData.comityKind || '-' }}
|
{{ rh_pageData.comityKind || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="资质:">
|
<el-form-item class="add-form-item" label="资质:">
|
||||||
{{ rh_pageData.comityMake.makeQualification || '-' }}
|
{{ rh_pageData.comityMake.makeQualification || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="成员:">
|
<el-form-item class="add-form-item" label="成员:">
|
||||||
{{ rh_pageData.comityMake.makeRole || '' }}
|
{{ rh_pageData.comityMake.makeRole || '' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用估计:">
|
<el-form-item class="add-form-item" label="费用估计:">
|
||||||
{{ rh_pageData.comityMake.makeCost || '-' }}
|
{{ rh_pageData.comityMake.makeCost || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="职责:">
|
<el-form-item class="add-form-item" label="职责:">
|
||||||
{{ rh_pageData.comityMake.makeDuties || '-' }}
|
{{ rh_pageData.comityMake.makeDuties || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="任期:">
|
<el-form-item class="add-form-item" label="任期:">
|
||||||
{{ rh_pageData.comityMake.makeTime || '-' }}
|
{{ rh_pageData.comityMake.makeTime || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||||
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
||||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||||
<el-input v-model="rh_pageData.workPath" type="textarea" readonly style="width: 50%;height: auto"></el-input>
|
<el-input v-model="rh_pageData.workPath" type="textarea" readonly style="width: 50%;height: auto"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="add-form-item" label="协会外部联系方式:">
|
<el-form-item class="add-form-item" label="协会外部联系方式:">
|
||||||
<el-table
|
<el-table
|
||||||
:data="rh_pageData.comityTel"
|
:data="rh_pageData.comityTel"
|
||||||
border
|
border
|
||||||
@@ -95,7 +95,7 @@
|
|||||||
<ProcessTitle>
|
<ProcessTitle>
|
||||||
<template slot="title">选择人员</template>
|
<template slot="title">选择人员</template>
|
||||||
</ProcessTitle>
|
</ProcessTitle>
|
||||||
<el-form-item class="add-form-item" label="入会人员:">
|
<el-form-item class="add-form-item" label="入会人员:">
|
||||||
<el-input
|
<el-input
|
||||||
:disabled="true"
|
:disabled="true"
|
||||||
style="width: 30%"
|
style="width: 30%"
|
||||||
@@ -346,33 +346,29 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入审批意见')
|
roleList: this.roleForm,
|
||||||
} else {
|
memberId: this.$store.getters.userInfo.userId,
|
||||||
let json = {
|
passFlag: '1',
|
||||||
roleList: this.roleForm,
|
commentText: this.commentText,
|
||||||
memberId: this.$store.getters.userInfo.userId,
|
rh_pageData: this.rh_pageData,
|
||||||
passFlag: '1',
|
|
||||||
commentText: this.commentText,
|
|
||||||
rh_pageData: this.rh_pageData,
|
|
||||||
}
|
|
||||||
this.$refs['rh_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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
this.$refs['rh_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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -448,12 +444,15 @@ export default {
|
|||||||
.comityTel_btn {
|
.comityTel_btn {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
/deep/.el-input.is-disabled .el-input__inner {
|
|
||||||
background-color: #fff ;
|
/deep/ .el-input.is-disabled .el-input__inner {
|
||||||
}
|
|
||||||
/deep/.el-textarea.is-disabled .el-textarea__inner {
|
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/deep/ .el-textarea.is-disabled .el-textarea__inner {
|
||||||
|
background-color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
/deep/ .el-table__body-wrapper {
|
/deep/ .el-table__body-wrapper {
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,10 +65,10 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||||
<span v-if="infoSourcesLength < 1">{{ '-' }}</span>
|
<span v-if="infoSourcesLength < 1">{{ '-' }}</span>
|
||||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -328,7 +328,7 @@ export default {
|
|||||||
rh_rules: {
|
rh_rules: {
|
||||||
fillLeader: [
|
fillLeader: [
|
||||||
{required: true, message: "请选择参与人部门领导", trigger: 'blur'},
|
{required: true, message: "请选择参与人部门领导", trigger: 'blur'},
|
||||||
{ trigger: 'change' }
|
{trigger: 'change'}
|
||||||
]
|
]
|
||||||
|
|
||||||
},
|
},
|
||||||
@@ -382,7 +382,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||||
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
|
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
|
||||||
@@ -403,7 +403,7 @@ export default {
|
|||||||
this.drawerTitle = title
|
this.drawerTitle = title
|
||||||
this.roleShowflag = true
|
this.roleShowflag = true
|
||||||
},
|
},
|
||||||
drawerCheck (data) {
|
drawerCheck(data) {
|
||||||
this.unqualidiedData.forEach(item => {
|
this.unqualidiedData.forEach(item => {
|
||||||
item.engineer = data[0].name
|
item.engineer = data[0].name
|
||||||
item.engineerId = data[0].id
|
item.engineerId = data[0].id
|
||||||
@@ -433,32 +433,28 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入回执说明')
|
roleList: this.roleForm,
|
||||||
} else {
|
selfUser: this.$store.getters.userInfo.userId,
|
||||||
let json = {
|
charge: this.rh_pageData.fillLeaderId,
|
||||||
roleList: this.roleForm,
|
rh_pageData: this.rh_pageData,
|
||||||
selfUser: this.$store.getters.userInfo.userId,
|
|
||||||
charge: this.rh_pageData.fillLeaderId,
|
|
||||||
rh_pageData: this.rh_pageData,
|
|
||||||
}
|
|
||||||
this.$refs['rh_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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
this.$refs['rh_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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
/** 点击对应附件进行下载*/
|
/** 点击对应附件进行下载*/
|
||||||
@@ -474,15 +470,18 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzrhStep3 {
|
.bzrhStep3 {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
/deep/.el-drawer__container {
|
|
||||||
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -490,6 +489,7 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -497,21 +497,25 @@ export default {
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center {
|
.content-center {
|
||||||
padding: 10px 0px 10px 10px;
|
padding: 10px 0px 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -519,6 +523,7 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -526,18 +531,23 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content_form {
|
.content_form {
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
|
|
||||||
.comityTel_btn {
|
.comityTel_btn {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
/deep/.el-input.is-disabled .el-input__inner {
|
|
||||||
background-color: #fff ;
|
/deep/ .el-input.is-disabled .el-input__inner {
|
||||||
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-table__body-wrapper {
|
/deep/ .el-table__body-wrapper {
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
}
|
}
|
||||||
/deep/.el-table th {
|
|
||||||
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,10 +65,10 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||||
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
||||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -218,6 +218,7 @@ import {
|
|||||||
saveTaskForPub,
|
saveTaskForPub,
|
||||||
changeAssigneeNew
|
changeAssigneeNew
|
||||||
} from "@/api/process.js"
|
} from "@/api/process.js"
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
@@ -312,7 +313,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||||
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
||||||
@@ -334,7 +335,7 @@ export default {
|
|||||||
|
|
||||||
// 退回按钮
|
// 退回按钮
|
||||||
handleSubmitNo() {
|
handleSubmitNo() {
|
||||||
if(this.textarea === '') {
|
if (this.textarea === '') {
|
||||||
this.$message.warning('请输入审批意见')
|
this.$message.warning('请输入审批意见')
|
||||||
} else {
|
} else {
|
||||||
let json = {
|
let json = {
|
||||||
@@ -365,34 +366,30 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if(this.textarea === '') {
|
let json = {
|
||||||
this.$message.warning('请输入审批意见')
|
member: this.selfUser,
|
||||||
} else {
|
passFlag: '1',
|
||||||
let json = {
|
engineerSum: this.roleForm.startUser,
|
||||||
member: this.selfUser,
|
roleList: this.roleForm,
|
||||||
passFlag: '1',
|
commentText: this.textarea,
|
||||||
engineerSum: this.roleForm.startUser,
|
rh_pageData: this.rh_pageData,
|
||||||
roleList: this.roleForm,
|
|
||||||
commentText: this.textarea,
|
|
||||||
rh_pageData: this.rh_pageData,
|
|
||||||
}
|
|
||||||
this.$refs['rh_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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
this.$refs['rh_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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
},
|
},
|
||||||
/** 点击对应附件进行下载*/
|
/** 点击对应附件进行下载*/
|
||||||
previews(val) {
|
previews(val) {
|
||||||
@@ -407,15 +404,18 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzrhStep4 {
|
.bzrhStep4 {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
/deep/.el-drawer__container {
|
|
||||||
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -423,6 +423,7 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -430,21 +431,25 @@ export default {
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center {
|
.content-center {
|
||||||
padding: 10px 0px 10px 10px;
|
padding: 10px 0px 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -452,6 +457,7 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -459,18 +465,23 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content_form {
|
.content_form {
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
|
|
||||||
.comityTel_btn {
|
.comityTel_btn {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
/deep/.el-textarea.is-disabled .el-textarea__inner {
|
|
||||||
|
/deep/ .el-textarea.is-disabled .el-textarea__inner {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-table__body-wrapper {
|
/deep/ .el-table__body-wrapper {
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
}
|
}
|
||||||
/deep/.el-table th {
|
|
||||||
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,10 +65,10 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||||
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
||||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -256,6 +256,7 @@ import {
|
|||||||
saveTaskForPub,
|
saveTaskForPub,
|
||||||
changeAssigneeNew
|
changeAssigneeNew
|
||||||
} from "@/api/process.js"
|
} from "@/api/process.js"
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
@@ -349,7 +350,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||||
@@ -408,32 +409,28 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入回执说明')
|
leader: this.roleForm.leaderUserId,
|
||||||
} else {
|
rh_pageData: this.rh_pageData,
|
||||||
let json = {
|
roleList: this.roleForm,
|
||||||
leader: this.roleForm.leaderUserId,
|
commentText: this.commentText
|
||||||
rh_pageData: this.rh_pageData,
|
|
||||||
roleList: this.roleForm,
|
|
||||||
commentText: this.commentText
|
|
||||||
}
|
|
||||||
this.$refs['rh_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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
this.$refs['rh_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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -450,15 +447,18 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzrhStep5 {
|
.bzrhStep5 {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
/deep/.el-drawer__container {
|
|
||||||
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -466,6 +466,7 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -473,21 +474,25 @@ export default {
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center {
|
.content-center {
|
||||||
padding: 10px 0px 10px 10px;
|
padding: 10px 0px 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -495,6 +500,7 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -505,15 +511,19 @@ export default {
|
|||||||
|
|
||||||
.content_form {
|
.content_form {
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
|
|
||||||
.comityTel_btn {
|
.comityTel_btn {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
/deep/.el-table th {
|
|
||||||
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
/deep/.el-table__body-wrapper {
|
|
||||||
height: auto!important;
|
/deep/ .el-table__body-wrapper {
|
||||||
|
height: auto !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.myPart_btn {
|
.myPart_btn {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,10 +68,10 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||||
<span v-if="infoSourcesLength < 1">{{ '-' }}</span>
|
<span v-if="infoSourcesLength < 1">{{ '-' }}</span>
|
||||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -352,7 +352,7 @@ export default {
|
|||||||
this.$message.warning('请输入反馈意见')
|
this.$message.warning('请输入反馈意见')
|
||||||
} else {
|
} else {
|
||||||
let json = {
|
let json = {
|
||||||
passFlag: '0',
|
passFlag: '0',
|
||||||
rh_pageData: this.rh_pageData,
|
rh_pageData: this.rh_pageData,
|
||||||
roleList: this.roleForm
|
roleList: this.roleForm
|
||||||
}
|
}
|
||||||
@@ -390,49 +390,41 @@ export default {
|
|||||||
|
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.textarea === '') {
|
let json = {
|
||||||
if (this.taskInfo === '标准法规工程师汇总修订完毕') {
|
passFlag: '1',
|
||||||
this.$message.warning('请输入回执说明')
|
rh_pageData: this.rh_pageData,
|
||||||
} else {
|
commentText: this.textarea,
|
||||||
this.$message.warning('请输入反馈意见')
|
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 {
|
} else {
|
||||||
let json = {
|
json = {
|
||||||
passFlag: '1',
|
|
||||||
rh_pageData: this.rh_pageData,
|
rh_pageData: this.rh_pageData,
|
||||||
commentText: this.textarea,
|
|
||||||
roleList: this.roleForm
|
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 = {
|
|
||||||
rh_pageData: this.rh_pageData,
|
|
||||||
roleList: this.roleForm
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.$refs['rh_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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
this.$refs['rh_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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -516,6 +508,7 @@ export default {
|
|||||||
/deep/ .el-table__body-wrapper {
|
/deep/ .el-table__body-wrapper {
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.myPart_btn {
|
.myPart_btn {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,15 +98,15 @@
|
|||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用列支:">
|
<el-form-item class="add-form-item" label="费用列支:">
|
||||||
<el-input v-model="ch_pageData.feeKind" placeholder="请输入费用列支"></el-input>
|
<el-input v-model="ch_pageData.feeKind" placeholder="请输入费用列支"></el-input>
|
||||||
<!-- <el-select
|
<!-- <el-select
|
||||||
v-model="ch_pageData.feeKind"
|
v-model="ch_pageData.feeKind"
|
||||||
placeholder="请选择费用列支">
|
placeholder="请选择费用列支">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in feeKindOptions"
|
v-for="item in feeKindOptions"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.label"/>
|
:value="item.label"/>
|
||||||
</el-select>-->
|
</el-select>-->
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@@ -366,10 +366,10 @@ export default {
|
|||||||
{value: '1', label: '标准法规技术评估流程'},
|
{value: '1', label: '标准法规技术评估流程'},
|
||||||
],
|
],
|
||||||
feeKindOptions: [
|
feeKindOptions: [
|
||||||
{ value: '0', label: '列支1' },
|
{value: '0', label: '列支1'},
|
||||||
{ value: '1', label: '列支2' },
|
{value: '1', label: '列支2'},
|
||||||
{ value: '2', label: '列支3' },
|
{value: '2', label: '列支3'},
|
||||||
{ value: '3', label: '列支4' },
|
{value: '3', label: '列支4'},
|
||||||
],
|
],
|
||||||
/** 上传相关 */
|
/** 上传相关 */
|
||||||
acceptShow: false,
|
acceptShow: false,
|
||||||
@@ -433,9 +433,9 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
//上传按钮
|
//上传按钮
|
||||||
/* uploadFile(val) {
|
/* uploadFile(val) {
|
||||||
this.fileListData = val
|
this.fileListData = val
|
||||||
},*/
|
},*/
|
||||||
// 文件上传限制条件
|
// 文件上传限制条件
|
||||||
handleBeforeUpload(file) {
|
handleBeforeUpload(file) {
|
||||||
var filename = file.name
|
var filename = file.name
|
||||||
@@ -605,44 +605,40 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 提交按钮*/
|
/** 提交按钮*/
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入回执说明')
|
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||||
} else {
|
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||||
let json = {
|
roleList: this.roleForm,
|
||||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
ch_pageData: this.ch_pageData,
|
||||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
commentText: this.commentText,
|
||||||
roleList: this.roleForm,
|
directorList: this.roleForm.dockUser,
|
||||||
ch_pageData: this.ch_pageData,
|
|
||||||
commentText: this.commentText,
|
|
||||||
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
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
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
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -74,7 +74,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item class="add-form-item" >
|
<el-form-item class="add-form-item">
|
||||||
<el-table
|
<el-table
|
||||||
class="meeting_table"
|
class="meeting_table"
|
||||||
:data="ch_pageData.meetingTable"
|
:data="ch_pageData.meetingTable"
|
||||||
@@ -200,7 +200,8 @@
|
|||||||
import ProcessHeader from "../../components/ProcessHeader";
|
import ProcessHeader from "../../components/ProcessHeader";
|
||||||
import ProcessFooter from "../../components/ProcessFooter";
|
import ProcessFooter from "../../components/ProcessFooter";
|
||||||
import ProcessTitle from "../../components/ProcessTitle";
|
import ProcessTitle from "../../components/ProcessTitle";
|
||||||
import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
@@ -269,7 +270,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||||
@@ -310,33 +311,29 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入审批意见')
|
roleList: this.roleForm,
|
||||||
} else {
|
memberId: this.$store.getters.userInfo.userId,
|
||||||
let json = {
|
passFlag: '1',
|
||||||
roleList: this.roleForm,
|
commentText: this.commentText,
|
||||||
memberId: this.$store.getters.userInfo.userId,
|
ch_pageData: this.ch_pageData,
|
||||||
passFlag: '1',
|
|
||||||
commentText: this.commentText,
|
|
||||||
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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -345,15 +342,18 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzchStep2 {
|
.bzchStep2 {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
/deep/.el-drawer__container {
|
|
||||||
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -361,6 +361,7 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -368,21 +369,25 @@ export default {
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center {
|
.content-center {
|
||||||
padding: 10px 0px 10px 10px;
|
padding: 10px 0px 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -390,6 +395,7 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -397,41 +403,52 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content_form {
|
.content_form {
|
||||||
padding-top: 15px;
|
padding-top: 15px;
|
||||||
padding-left: 30px;
|
padding-left: 30px;
|
||||||
|
|
||||||
.el-divider--horizontal {
|
.el-divider--horizontal {
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
}
|
}
|
||||||
/deep/.el-input.is-disabled .el-input__inner {
|
|
||||||
background-color: #fff ;
|
/deep/ .el-input.is-disabled .el-input__inner {
|
||||||
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
/deep/.el-table__body-wrapper {
|
|
||||||
height: auto!important;
|
/deep/ .el-table__body-wrapper {
|
||||||
|
height: auto !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.meeting_table {
|
.meeting_table {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-textarea__inner {
|
|
||||||
|
/deep/ .el-textarea__inner {
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
}
|
}
|
||||||
/deep/.el-upload {
|
|
||||||
|
/deep/ .el-upload {
|
||||||
display: unset;
|
display: unset;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item-status-label {
|
|
||||||
|
/deep/ .el-upload-list__item-status-label {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item {
|
|
||||||
|
/deep/ .el-upload-list__item {
|
||||||
.el-icon-close {
|
.el-icon-close {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-icon-close-tip {
|
.el-icon-close-tip {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-table th {
|
|
||||||
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -259,7 +259,7 @@
|
|||||||
import ProcessHeader from "../../components/ProcessHeader";
|
import ProcessHeader from "../../components/ProcessHeader";
|
||||||
import ProcessFooter from "../../components/ProcessFooter";
|
import ProcessFooter from "../../components/ProcessFooter";
|
||||||
import ProcessTitle from "../../components/ProcessTitle";
|
import ProcessTitle from "../../components/ProcessTitle";
|
||||||
import {startProcess, saveTaskFirst, saveTaskForPub, completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
import {startProcess, saveTaskFirst, saveTaskForPub, completeTask, inboundLiaisonDetail} from '@/api/process.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
@@ -286,7 +286,7 @@ export default {
|
|||||||
ch_rules: {
|
ch_rules: {
|
||||||
fillLeader: [
|
fillLeader: [
|
||||||
{required: true, message: "请选择参与人部门领导", trigger: 'blur'},
|
{required: true, message: "请选择参与人部门领导", trigger: 'blur'},
|
||||||
{ trigger: 'change' }
|
{trigger: 'change'}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -346,7 +346,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||||
@@ -363,7 +363,7 @@ export default {
|
|||||||
this.drawerTitle = title
|
this.drawerTitle = title
|
||||||
this.roleShowflag = true
|
this.roleShowflag = true
|
||||||
},
|
},
|
||||||
drawerCheck (data) {
|
drawerCheck(data) {
|
||||||
this.unqualidiedData.forEach(item => {
|
this.unqualidiedData.forEach(item => {
|
||||||
item.engineer = data[0].name
|
item.engineer = data[0].name
|
||||||
item.engineerId = data[0].id
|
item.engineerId = data[0].id
|
||||||
@@ -394,33 +394,29 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入回执说明')
|
roleList: this.roleForm,
|
||||||
} else {
|
selfUser: this.$store.getters.userInfo.userId,
|
||||||
let json = {
|
commentText: this.commentText,
|
||||||
roleList: this.roleForm,
|
charge: this.ch_pageData.fillLeaderId,
|
||||||
selfUser: this.$store.getters.userInfo.userId,
|
ch_pageData: this.ch_pageData,
|
||||||
commentText: this.commentText,
|
|
||||||
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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -495,9 +491,10 @@ export default {
|
|||||||
padding-left: 30px;
|
padding-left: 30px;
|
||||||
padding-top: 15px;
|
padding-top: 15px;
|
||||||
|
|
||||||
/deep/.el-input.is-disabled .el-input__inner {
|
/deep/ .el-input.is-disabled .el-input__inner {
|
||||||
background-color: #fff ;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-divider--horizontal {
|
.el-divider--horizontal {
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
}
|
}
|
||||||
@@ -507,6 +504,7 @@ export default {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-table__body-wrapper {
|
/deep/ .el-table__body-wrapper {
|
||||||
height: auto !important;
|
height: auto !important;
|
||||||
}
|
}
|
||||||
@@ -515,13 +513,15 @@ export default {
|
|||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/.el-upload {
|
/deep/ .el-upload {
|
||||||
display: unset;
|
display: unset;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item-status-label {
|
|
||||||
|
/deep/ .el-upload-list__item-status-label {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item {
|
|
||||||
|
/deep/ .el-upload-list__item {
|
||||||
.el-icon-close {
|
.el-icon-close {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
@@ -530,6 +530,7 @@ export default {
|
|||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/deep/ .el-table th {
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,64 +17,64 @@
|
|||||||
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
|
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议名称:">
|
<el-form-item class="add-form-item" label="会议名称:">
|
||||||
{{ ch_pageData.meetingName || '-' }}
|
{{ ch_pageData.meetingName || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="主办单位:">
|
<el-form-item class="add-form-item" label="主办单位:">
|
||||||
{{ ch_pageData.primaryUnit || '-' }}
|
{{ ch_pageData.primaryUnit || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="协会名称:">
|
<el-form-item class="add-form-item" label="协会名称:">
|
||||||
{{ ch_pageData.associaName || '-' }}
|
{{ ch_pageData.associaName || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议时间:">
|
<el-form-item class="add-form-item" label="会议时间:">
|
||||||
{{ ch_pageData.meetingStartTime || '-' }}
|
{{ ch_pageData.meetingStartTime || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议地点:">
|
<el-form-item class="add-form-item" label="会议地点:">
|
||||||
{{ ch_pageData.meetingPlace || '-' }}
|
{{ ch_pageData.meetingPlace || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用标准:">
|
<el-form-item class="add-form-item" label="费用标准:">
|
||||||
{{ ch_pageData.feeStand || '-' }}
|
{{ ch_pageData.feeStand || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用列支:">
|
<el-form-item class="add-form-item" label="费用列支:">
|
||||||
{{ ch_pageData.feeKind || '-' }}
|
{{ ch_pageData.feeKind || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="类别:">
|
<el-form-item class="add-form-item" label="类别:">
|
||||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||||
<span v-else>计划外</span>
|
<span v-else>计划外</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item class="add-form-item" label="议题:">
|
<el-form-item class="add-form-item" label="议题:">
|
||||||
<el-table
|
<el-table
|
||||||
class="meeting_table"
|
class="meeting_table"
|
||||||
:data="ch_pageData.meetingTable"
|
:data="ch_pageData.meetingTable"
|
||||||
@@ -88,7 +88,7 @@
|
|||||||
<el-table-column label="议题" align="center" prop="meetingTheme"/>
|
<el-table-column label="议题" align="center" prop="meetingTheme"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="add-form-item" label="入会人员:">
|
<el-form-item class="add-form-item" label="入会人员:">
|
||||||
<el-table
|
<el-table
|
||||||
:data="ch_pageData.myPartRole"
|
:data="ch_pageData.myPartRole"
|
||||||
border
|
border
|
||||||
@@ -205,7 +205,8 @@
|
|||||||
import ProcessHeader from "../../components/ProcessHeader";
|
import ProcessHeader from "../../components/ProcessHeader";
|
||||||
import ProcessFooter from "../../components/ProcessFooter";
|
import ProcessFooter from "../../components/ProcessFooter";
|
||||||
import ProcessTitle from "../../components/ProcessTitle";
|
import ProcessTitle from "../../components/ProcessTitle";
|
||||||
import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
@@ -273,7 +274,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||||
@@ -324,34 +325,30 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.textarea === '') {
|
let json = {
|
||||||
this.$message.warning('请输入审批意见')
|
member: this.selfUser,
|
||||||
} else {
|
passFlag: '1',
|
||||||
let json = {
|
engineerSum: this.roleForm.startUser,
|
||||||
member: this.selfUser,
|
roleList: this.roleForm,
|
||||||
passFlag: '1',
|
commentText: this.textarea,
|
||||||
engineerSum: this.roleForm.startUser,
|
ch_pageData: this.ch_pageData,
|
||||||
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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -359,15 +356,18 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzchStep4 {
|
.bzchStep4 {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
/deep/.el-drawer__container {
|
|
||||||
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -375,6 +375,7 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -382,21 +383,25 @@ export default {
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center {
|
.content-center {
|
||||||
padding: 10px 0px 10px 10px;
|
padding: 10px 0px 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -404,6 +409,7 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -411,30 +417,38 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content_form {
|
.content_form {
|
||||||
padding-top: 15px;
|
padding-top: 15px;
|
||||||
padding-left: 30px;
|
padding-left: 30px;
|
||||||
|
|
||||||
.el-divider--horizontal {
|
.el-divider--horizontal {
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.meeting_table {
|
.meeting_table {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-table__body-wrapper {
|
|
||||||
height: auto!important;
|
/deep/ .el-table__body-wrapper {
|
||||||
|
height: auto !important;
|
||||||
}
|
}
|
||||||
/deep/.el-textarea__inner {
|
|
||||||
|
/deep/ .el-textarea__inner {
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
}
|
}
|
||||||
/deep/.el-upload {
|
|
||||||
|
/deep/ .el-upload {
|
||||||
display: unset;
|
display: unset;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item-status-label {
|
|
||||||
|
/deep/ .el-upload-list__item-status-label {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item {
|
|
||||||
|
/deep/ .el-upload-list__item {
|
||||||
.el-icon-close {
|
.el-icon-close {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
@@ -443,7 +457,8 @@ export default {
|
|||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-table th {
|
|
||||||
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,64 +17,64 @@
|
|||||||
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
|
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议名称:">
|
<el-form-item class="add-form-item" label="会议名称:">
|
||||||
{{ ch_pageData.meetingName || '-' }}
|
{{ ch_pageData.meetingName || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="主办单位:">
|
<el-form-item class="add-form-item" label="主办单位:">
|
||||||
{{ ch_pageData.primaryUnit || '-' }}
|
{{ ch_pageData.primaryUnit || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="协会名称:">
|
<el-form-item class="add-form-item" label="协会名称:">
|
||||||
{{ ch_pageData.associaName || '-' }}
|
{{ ch_pageData.associaName || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议时间:">
|
<el-form-item class="add-form-item" label="会议时间:">
|
||||||
{{ ch_pageData.meetingStartTime || '-' }}
|
{{ ch_pageData.meetingStartTime || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议地点:">
|
<el-form-item class="add-form-item" label="会议地点:">
|
||||||
{{ ch_pageData.meetingPlace || '-' }}
|
{{ ch_pageData.meetingPlace || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用标准:">
|
<el-form-item class="add-form-item" label="费用标准:">
|
||||||
{{ ch_pageData.feeStand || '-' }}
|
{{ ch_pageData.feeStand || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用列支:">
|
<el-form-item class="add-form-item" label="费用列支:">
|
||||||
{{ ch_pageData.feeKind || '-' }}
|
{{ ch_pageData.feeKind || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="类别:">
|
<el-form-item class="add-form-item" label="类别:">
|
||||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||||
<span v-else>计划外</span>
|
<span v-else>计划外</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item class="add-form-item" label="议题:">
|
<el-form-item class="add-form-item" label="议题:">
|
||||||
<el-table
|
<el-table
|
||||||
class="meeting_table"
|
class="meeting_table"
|
||||||
:data="ch_pageData.meetingTable"
|
:data="ch_pageData.meetingTable"
|
||||||
@@ -95,7 +95,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="add-form-item" label="入会人员:">
|
<el-form-item class="add-form-item" label="入会人员:">
|
||||||
<div class="myPart_btn">
|
<div class="myPart_btn">
|
||||||
<el-button
|
<el-button
|
||||||
type="danger"
|
type="danger"
|
||||||
@@ -223,7 +223,8 @@
|
|||||||
import ProcessHeader from "../../components/ProcessHeader";
|
import ProcessHeader from "../../components/ProcessHeader";
|
||||||
import ProcessFooter from "../../components/ProcessFooter";
|
import ProcessFooter from "../../components/ProcessFooter";
|
||||||
import ProcessTitle from "../../components/ProcessTitle";
|
import ProcessTitle from "../../components/ProcessTitle";
|
||||||
import { startProcess, saveTaskForPub,completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
import {startProcess, saveTaskForPub, completeTask, inboundLiaisonDetail} from '@/api/process.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
@@ -293,7 +294,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||||
@@ -353,32 +354,28 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.commentText === '') {
|
let json = {
|
||||||
this.$message.warning('请输入审批意见')
|
leader: this.roleForm.leaderUserId,
|
||||||
} else {
|
ch_pageData: this.ch_pageData,
|
||||||
let json = {
|
commentText: this.commentText,
|
||||||
leader: this.roleForm.leaderUserId,
|
roleList: this.roleForm,
|
||||||
ch_pageData: this.ch_pageData,
|
|
||||||
commentText: this.commentText,
|
|
||||||
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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -387,15 +384,18 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzchStep5 {
|
.bzchStep5 {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
/deep/.el-drawer__container {
|
|
||||||
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -403,6 +403,7 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -410,21 +411,25 @@ export default {
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center {
|
.content-center {
|
||||||
padding: 10px 0px 10px 10px;
|
padding: 10px 0px 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -432,6 +437,7 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -439,38 +445,48 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content_form {
|
.content_form {
|
||||||
padding-top: 15px;
|
padding-top: 15px;
|
||||||
padding-left: 30px;
|
padding-left: 30px;
|
||||||
|
|
||||||
.el-divider--horizontal {
|
.el-divider--horizontal {
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.meeting_table {
|
.meeting_table {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-table__body-wrapper {
|
|
||||||
height: auto!important;
|
/deep/ .el-table__body-wrapper {
|
||||||
|
height: auto !important;
|
||||||
}
|
}
|
||||||
/deep/.el-textarea__inner {
|
|
||||||
|
/deep/ .el-textarea__inner {
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.meeting_table {
|
.meeting_table {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-table th {
|
|
||||||
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
/deep/.el-upload {
|
|
||||||
|
/deep/ .el-upload {
|
||||||
display: unset;
|
display: unset;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item-status-label {
|
|
||||||
|
/deep/ .el-upload-list__item-status-label {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item {
|
|
||||||
|
/deep/ .el-upload-list__item {
|
||||||
.el-icon-close {
|
.el-icon-close {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
@@ -479,6 +495,7 @@ export default {
|
|||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.myPart_btn {
|
.myPart_btn {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,64 +20,64 @@
|
|||||||
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
|
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议名称:">
|
<el-form-item class="add-form-item" label="会议名称:">
|
||||||
{{ ch_pageData.meetingName || '-' }}
|
{{ ch_pageData.meetingName || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="主办单位:">
|
<el-form-item class="add-form-item" label="主办单位:">
|
||||||
{{ ch_pageData.primaryUnit || '-' }}
|
{{ ch_pageData.primaryUnit || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="协会名称:">
|
<el-form-item class="add-form-item" label="协会名称:">
|
||||||
{{ ch_pageData.associaName || '-' }}
|
{{ ch_pageData.associaName || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议时间:">
|
<el-form-item class="add-form-item" label="会议时间:">
|
||||||
{{ ch_pageData.meetingStartTime || '-' }}
|
{{ ch_pageData.meetingStartTime || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="会议地点:">
|
<el-form-item class="add-form-item" label="会议地点:">
|
||||||
{{ ch_pageData.meetingPlace || '-' }}
|
{{ ch_pageData.meetingPlace || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用标准:">
|
<el-form-item class="add-form-item" label="费用标准:">
|
||||||
{{ ch_pageData.feeStand || '-' }}
|
{{ ch_pageData.feeStand || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="费用列支:">
|
<el-form-item class="add-form-item" label="费用列支:">
|
||||||
{{ ch_pageData.feeKind || '-' }}
|
{{ ch_pageData.feeKind || '-' }}
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||||
{{ item.name }} {{ ';'}}
|
{{ item.name }} {{ ';' }}
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="类别:">
|
<el-form-item class="add-form-item" label="类别:">
|
||||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||||
<span v-else>计划外</span>
|
<span v-else>计划外</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item class="add-form-item" label="议题:">
|
<el-form-item class="add-form-item" label="议题:">
|
||||||
<el-table
|
<el-table
|
||||||
class="meeting_table"
|
class="meeting_table"
|
||||||
:data="ch_pageData.meetingTable"
|
:data="ch_pageData.meetingTable"
|
||||||
@@ -91,7 +91,7 @@
|
|||||||
<el-table-column label="议题" align="center" prop="meetingTheme"/>
|
<el-table-column label="议题" align="center" prop="meetingTheme"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="add-form-item" label="入会人员:">
|
<el-form-item class="add-form-item" label="入会人员:">
|
||||||
<el-table
|
<el-table
|
||||||
:data="ch_pageData.myPartRole"
|
:data="ch_pageData.myPartRole"
|
||||||
border
|
border
|
||||||
@@ -214,7 +214,8 @@
|
|||||||
import ProcessHeader from "../../components/ProcessHeader";
|
import ProcessHeader from "../../components/ProcessHeader";
|
||||||
import ProcessFooter from "../../components/ProcessFooter";
|
import ProcessFooter from "../../components/ProcessFooter";
|
||||||
import ProcessTitle from "../../components/ProcessTitle";
|
import ProcessTitle from "../../components/ProcessTitle";
|
||||||
import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
@@ -280,7 +281,7 @@ export default {
|
|||||||
getData() {
|
getData() {
|
||||||
if (this.taskInfo === '标准法规工程师修订完毕') {
|
if (this.taskInfo === '标准法规工程师修订完毕') {
|
||||||
this.passTitle = '回执说明',
|
this.passTitle = '回执说明',
|
||||||
this.passHolder = '请输入回执说明'
|
this.passHolder = '请输入回执说明'
|
||||||
}
|
}
|
||||||
const params = {
|
const params = {
|
||||||
taskIds: this.taskIds,
|
taskIds: this.taskIds,
|
||||||
@@ -291,7 +292,7 @@ export default {
|
|||||||
this.getFormFieldList(processForm)
|
this.getFormFieldList(processForm)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getFormFieldList (item) {
|
getFormFieldList(item) {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||||
@@ -337,7 +338,7 @@ export default {
|
|||||||
this.$message.warning('请输入审批意见')
|
this.$message.warning('请输入审批意见')
|
||||||
} else {
|
} else {
|
||||||
let json = {
|
let json = {
|
||||||
passFlag: '0',
|
passFlag: '0',
|
||||||
ch_pageData: this.ch_pageData,
|
ch_pageData: this.ch_pageData,
|
||||||
commentText: this.textarea,
|
commentText: this.textarea,
|
||||||
roleList: this.roleForm
|
roleList: this.roleForm
|
||||||
@@ -376,46 +377,42 @@ export default {
|
|||||||
},
|
},
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.textarea === '') {
|
let json = {
|
||||||
this.$message.warning('请输入审批意见')
|
passFlag: '1',
|
||||||
|
ch_pageData: this.ch_pageData,
|
||||||
|
commentText: this.textarea,
|
||||||
|
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 {
|
} else {
|
||||||
let json = {
|
json = {
|
||||||
passFlag: '1',
|
|
||||||
ch_pageData: this.ch_pageData,
|
ch_pageData: this.ch_pageData,
|
||||||
commentText: this.textarea,
|
commentText: this.textarea,
|
||||||
roleList: this.roleForm
|
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,
|
|
||||||
commentText: this.textarea,
|
|
||||||
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
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -424,15 +421,18 @@ export default {
|
|||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzchStep6 {
|
.bzchStep6 {
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
/deep/.el-drawer__container {
|
|
||||||
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -440,6 +440,7 @@ export default {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 10px;
|
right: 10px;
|
||||||
|
|
||||||
.headerTabsItem {
|
.headerTabsItem {
|
||||||
border: 1px solid #c1c1c1;
|
border: 1px solid #c1c1c1;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
@@ -447,21 +448,25 @@ export default {
|
|||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.active {
|
||||||
border: 1px solid #E6A23C;
|
border: 1px solid #E6A23C;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: #E6A23C;
|
background: #E6A23C;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-center {
|
.content-center {
|
||||||
padding: 10px 0px 10px 10px;
|
padding: 10px 0px 10px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: calc(~'100% - 103px');
|
height: calc(~'100% - 103px');
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
||||||
.tableTitle {
|
.tableTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
@@ -469,6 +474,7 @@ export default {
|
|||||||
position: relative;
|
position: relative;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
||||||
.tableButton {
|
.tableButton {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
@@ -476,30 +482,38 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content_form {
|
.content_form {
|
||||||
padding-top: 15px;
|
padding-top: 15px;
|
||||||
padding-left: 30px;
|
padding-left: 30px;
|
||||||
|
|
||||||
.el-divider--horizontal {
|
.el-divider--horizontal {
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
}
|
}
|
||||||
/deep/.el-table__body-wrapper {
|
|
||||||
height: auto!important;
|
/deep/ .el-table__body-wrapper {
|
||||||
|
height: auto !important;
|
||||||
}
|
}
|
||||||
/deep/.el-textarea__inner {
|
|
||||||
|
/deep/ .el-textarea__inner {
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.meeting_table {
|
.meeting_table {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-upload {
|
|
||||||
|
/deep/ .el-upload {
|
||||||
display: unset;
|
display: unset;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item-status-label {
|
|
||||||
|
/deep/ .el-upload-list__item-status-label {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
/deep/.el-upload-list__item {
|
|
||||||
|
/deep/ .el-upload-list__item {
|
||||||
.el-icon-close {
|
.el-icon-close {
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
@@ -508,7 +522,8 @@ export default {
|
|||||||
font-size: 0;
|
font-size: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-table th {
|
|
||||||
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ export default {
|
|||||||
//企业标准查询
|
//企业标准查询
|
||||||
getStandDataBtn(){
|
getStandDataBtn(){
|
||||||
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
||||||
reviseStatus: this.standardSearch.reviseStatus,
|
reviseStatus: this.standardSearch.reviseStatus || '',
|
||||||
esName: this.standardSearch.standName,
|
esName: this.standardSearch.standName,
|
||||||
page: this.page,
|
page: this.page,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
@@ -336,6 +336,7 @@ export default {
|
|||||||
}else if(this.selectList.length < 1){
|
}else if(this.selectList.length < 1){
|
||||||
this.$message.warning('请至少选择一条数据进行带入')
|
this.$message.warning('请至少选择一条数据进行带入')
|
||||||
}else{
|
}else{
|
||||||
|
this.qbfsForm.esId = this.selectList[0].id
|
||||||
this.qbfsForm.esName = this.selectList[0].esName
|
this.qbfsForm.esName = this.selectList[0].esName
|
||||||
this.qbfsForm.draftTime = this.selectList[0].draftTime
|
this.qbfsForm.draftTime = this.selectList[0].draftTime
|
||||||
this.qbfsForm.drafter = this.selectList[0].drafter
|
this.qbfsForm.drafter = this.selectList[0].drafter
|
||||||
|
|||||||
@@ -327,7 +327,7 @@ export default {
|
|||||||
//企业标准查询
|
//企业标准查询
|
||||||
getStandDataBtn(){
|
getStandDataBtn(){
|
||||||
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
||||||
reviseStatus: this.standardSearch.reviseStatus,
|
reviseStatus: this.standardSearch.reviseStatus || '',
|
||||||
esName: this.standardSearch.standName,
|
esName: this.standardSearch.standName,
|
||||||
page: this.page,
|
page: this.page,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
@@ -358,6 +358,7 @@ export default {
|
|||||||
}else if(this.selectList.length < 1){
|
}else if(this.selectList.length < 1){
|
||||||
this.$message.warning('请至少选择一条数据进行带入')
|
this.$message.warning('请至少选择一条数据进行带入')
|
||||||
}else{
|
}else{
|
||||||
|
this.qbfsForm.esId = this.selectList[0].id
|
||||||
this.qbfsForm.esName = this.selectList[0].esName
|
this.qbfsForm.esName = this.selectList[0].esName
|
||||||
this.qbfsForm.draftTime = this.selectList[0].draftTime
|
this.qbfsForm.draftTime = this.selectList[0].draftTime
|
||||||
this.qbfsForm.drafter = this.selectList[0].drafter
|
this.qbfsForm.drafter = this.selectList[0].drafter
|
||||||
|
|||||||
@@ -1,91 +1,109 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<process-title>
|
<process-title>
|
||||||
<template slot="title">立项信息</template>
|
<template slot="title">立项信息</template>
|
||||||
</process-title>
|
</process-title>
|
||||||
<el-form :model="qbfsForm" class="label-input-form prc-content-border"
|
<el-form :model="qbfsForm" class="label-input-form prc-content-border"
|
||||||
label-width="150px" :rules="qbfsFormRules" ref="qbfsForm">
|
label-width="150px" :rules="qbfsFormRules" ref="qbfsForm">
|
||||||
<el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
|
<el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="qbfsForm.type"
|
v-model="qbfsForm.type"
|
||||||
clearable
|
clearable
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="qbfsForm.esName"
|
v-model="qbfsForm.esName"
|
||||||
placeholder="请输入企标名称"
|
placeholder="请输入企标名称"
|
||||||
:maxlength="500"/>
|
:maxlength="500"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
|
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
|
||||||
<el-option label="制定" value="制定"></el-option>
|
<el-option label="制定" value="制定"></el-option>
|
||||||
<el-option label="修订" value="修订"></el-option>
|
<el-option label="修订" value="修订"></el-option>
|
||||||
<el-option label="完成" value="完成"></el-option>
|
<el-option label="完成" value="完成"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
|
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
|
||||||
<el-option label="制定完成" value="制定完成"></el-option>
|
<el-option label="制定完成" value="制定完成"></el-option>
|
||||||
<el-option label="制定中" value="制定中"></el-option>
|
<el-option label="制定中" value="制定中"></el-option>
|
||||||
<el-option label="未制定" value="未制定"></el-option>
|
<el-option label="未制定" value="未制定"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
|
||||||
v-model="qbfsForm.drafter"
|
<el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
|
||||||
placeholder="请输入起草人"
|
@click.native="choiceZRRS('1')">
|
||||||
:maxlength="500"/>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
|
||||||
v-model="qbfsForm.resPerson"
|
<el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
|
||||||
placeholder="请输入评审责任人"
|
@click.native="choiceZRRS('2')">
|
||||||
:maxlength="500"/>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
|
||||||
v-model="qbfsForm.wgLeader"
|
<el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
|
||||||
placeholder="请输入工作组组长"
|
@click.native="choiceZRR"></el-input>
|
||||||
:maxlength="500"/>
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
|
||||||
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
|
<el-date-picker
|
||||||
<el-date-picker
|
v-model="qbfsForm.draftTime"
|
||||||
v-model="qbfsForm.draftTime"
|
value-format="yyyy-MM-dd"
|
||||||
value-format="yyyy-MM-dd"
|
type="date"
|
||||||
type="date"
|
placeholder="请选择计划标准初稿完成时间">
|
||||||
placeholder="请选择计划标准初稿完成时间">
|
</el-date-picker>
|
||||||
</el-date-picker>
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
|
||||||
<el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
|
<el-date-picker
|
||||||
<el-date-picker
|
v-model="qbfsForm.releaseTime"
|
||||||
v-model="qbfsForm.releaseTime"
|
value-format="yyyy-MM-dd"
|
||||||
value-format="yyyy-MM-dd"
|
type="date"
|
||||||
type="date"
|
placeholder="请选择计划标准发布时间">
|
||||||
placeholder="请选择计划标准发布时间">
|
</el-date-picker>
|
||||||
</el-date-picker>
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
|
||||||
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
|
<el-select v-model="qbfsForm.unit" filterable multiple clearable>
|
||||||
<el-input
|
<el-option
|
||||||
v-model="qbfsForm.unit"
|
v-for="item in qcdwOptions"
|
||||||
placeholder="请输入起草责任单位"
|
placeholder="请选择起草责任单位"
|
||||||
:maxlength="500"/>
|
:key="item.value"
|
||||||
</el-form-item>
|
:value="item.value"
|
||||||
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
|
:label="item.label"
|
||||||
<el-input
|
></el-option>
|
||||||
type="textarea"
|
</el-select>
|
||||||
v-model="qbfsForm.newReason"
|
</el-form-item>
|
||||||
placeholder="请输入新增原因"
|
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
|
||||||
:maxlength="500"/>
|
<el-input
|
||||||
</el-form-item>
|
type="textarea"
|
||||||
<!-- <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
|
v-model="qbfsForm.newReason"
|
||||||
<!-- <el-input-->
|
placeholder="请输入新增原因"
|
||||||
<!-- v-model="qbfsForm.remarks"-->
|
:maxlength="500"/>
|
||||||
<!-- placeholder="请输入备注"-->
|
</el-form-item>
|
||||||
<!-- :maxlength="500"/>-->
|
<!-- <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
|
||||||
<!-- </el-form-item>-->
|
<!-- <el-input-->
|
||||||
</el-form>
|
<!-- v-model="qbfsForm.remarks"-->
|
||||||
</div>
|
<!-- placeholder="请输入备注"-->
|
||||||
|
<!-- :maxlength="500"/>-->
|
||||||
|
<!-- </el-form-item>-->
|
||||||
|
</el-form>
|
||||||
|
<!-- 多选择责任人-->
|
||||||
|
<Role-tree
|
||||||
|
:is-title="drawerTitle2"
|
||||||
|
: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>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -100,6 +118,14 @@ export default {
|
|||||||
props: ['message'],
|
props: ['message'],
|
||||||
data(){
|
data(){
|
||||||
return {
|
return {
|
||||||
|
drawerTitle2: '',
|
||||||
|
drawerTitle: '',
|
||||||
|
roleType: '',
|
||||||
|
modalshowflag2: false,
|
||||||
|
modalshowflag: false,
|
||||||
|
nodeList2: [],
|
||||||
|
nodeList: [],
|
||||||
|
qcdwOptions: [],
|
||||||
qbfsForm: {
|
qbfsForm: {
|
||||||
type: '5',
|
type: '5',
|
||||||
unit: '', // 单位
|
unit: '', // 单位
|
||||||
@@ -107,10 +133,13 @@ export default {
|
|||||||
planStatus: '', // 计划状态
|
planStatus: '', // 计划状态
|
||||||
reviseStatus: '', // 制修订状态
|
reviseStatus: '', // 制修订状态
|
||||||
resPerson: '', // 评审责任人
|
resPerson: '', // 评审责任人
|
||||||
|
resPersonName: '',
|
||||||
wgLeader: '', // 工作组组长
|
wgLeader: '', // 工作组组长
|
||||||
|
wgLeaderName: '',
|
||||||
draftTime: '', // 计划标准初稿完成时间
|
draftTime: '', // 计划标准初稿完成时间
|
||||||
releaseTime: '', // 计划标准发布时间
|
releaseTime: '', // 计划标准发布时间
|
||||||
drafter: '', // 起草人
|
drafter: '', // 起草人
|
||||||
|
drafterName: '',
|
||||||
newReason: '', //新增原因
|
newReason: '', //新增原因
|
||||||
// remarks: '', // 备注
|
// remarks: '', // 备注
|
||||||
},
|
},
|
||||||
@@ -127,10 +156,10 @@ export default {
|
|||||||
reviseStatus: [
|
reviseStatus: [
|
||||||
{required: true, message: '请选择制修订状态', trigger: 'change'},
|
{required: true, message: '请选择制修订状态', trigger: 'change'},
|
||||||
],
|
],
|
||||||
resPerson: [
|
resPersonName: [
|
||||||
{required: true, message: '请输入评审责任人', trigger: 'blur'},
|
{required: true, message: '请输入评审责任人', trigger: 'blur'},
|
||||||
],
|
],
|
||||||
wgLeader: [
|
wgLeaderName: [
|
||||||
{required: true, message: '请输入工作组组长', trigger: 'blur'},
|
{required: true, message: '请输入工作组组长', trigger: 'blur'},
|
||||||
],
|
],
|
||||||
draftTime: [
|
draftTime: [
|
||||||
@@ -139,7 +168,7 @@ export default {
|
|||||||
releaseTime: [
|
releaseTime: [
|
||||||
{required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
|
{required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
|
||||||
],
|
],
|
||||||
drafter: [
|
drafterName: [
|
||||||
{required: true, message: '请输入起草人', trigger: 'blur'},
|
{required: true, message: '请输入起草人', trigger: 'blur'},
|
||||||
],
|
],
|
||||||
newReason: [
|
newReason: [
|
||||||
@@ -158,7 +187,62 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
mounted(){
|
||||||
|
//查询下拉框数据
|
||||||
|
this.$http.get('sys/dictype/getDicTypeListCode', '',{
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
console.log(res);
|
||||||
|
this.qcdwOptions = res.data.QCDW // 起草单位
|
||||||
|
})
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
choiceZRR() {
|
||||||
|
this.nodeList = [];
|
||||||
|
this.drawerTitle = '请选择工作组组长';
|
||||||
|
this.modalshowflag = true;
|
||||||
|
},
|
||||||
|
checkedRole(data) {
|
||||||
|
this.qbfsForm.wgLeader = data[0].id;
|
||||||
|
this.qbfsForm.wgLeaderName = data[0].name;
|
||||||
|
this.modalshowflag = false;
|
||||||
|
},
|
||||||
|
choiceZRRS(type) {
|
||||||
|
this.roleType = type
|
||||||
|
if(type === '1' ){
|
||||||
|
this.drawerTitle2 = '请选择起草人'
|
||||||
|
this.nodeList2 = [];
|
||||||
|
if (this.qbfsForm.drafter !== undefined) {
|
||||||
|
this.nodeList2 = this.qbfsForm.drafter.split(",");
|
||||||
|
}
|
||||||
|
}else if(type === '2'){
|
||||||
|
this.drawerTitle2 = '请选择评审责任人'
|
||||||
|
this.nodeList2 = [];
|
||||||
|
if (this.qbfsForm.resPerson !== undefined) {
|
||||||
|
this.nodeList2 = this.qbfsForm.resPerson.split(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.modalshowflag2 = true;
|
||||||
|
},
|
||||||
|
checkedRole2(data) {
|
||||||
|
var idList = "";
|
||||||
|
var nameList = "";
|
||||||
|
data.forEach(item => {
|
||||||
|
if (nameList.length > 0) {
|
||||||
|
nameList += ",";
|
||||||
|
idList += ",";
|
||||||
|
}
|
||||||
|
idList += item.id;
|
||||||
|
nameList += item.name;
|
||||||
|
});
|
||||||
|
if(this.roleType === '1'){
|
||||||
|
this.qbfsForm.drafter = idList;
|
||||||
|
this.qbfsForm.drafterName = nameList;
|
||||||
|
}else if(this.roleType === '2'){
|
||||||
|
this.qbfsForm.resPerson = idList;
|
||||||
|
this.qbfsForm.resPersonName = nameList;
|
||||||
|
}
|
||||||
|
},
|
||||||
validateForm () {
|
validateForm () {
|
||||||
let flag = null
|
let flag = null
|
||||||
this.$refs['qbfsForm'].validate((valid) => {
|
this.$refs['qbfsForm'].validate((valid) => {
|
||||||
@@ -170,7 +254,7 @@ export default {
|
|||||||
})
|
})
|
||||||
return flag
|
return flag
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -3,86 +3,48 @@
|
|||||||
<process-title>
|
<process-title>
|
||||||
<template slot="title">合并企标信息</template>
|
<template slot="title">合并企标信息</template>
|
||||||
</process-title>
|
</process-title>
|
||||||
<el-form
|
|
||||||
ref="qbzxdForm"
|
|
||||||
:model="qbzxdForm"
|
|
||||||
:rules="formRules"
|
|
||||||
class="label-input-form prc-content-border"
|
|
||||||
label-width="150px"
|
|
||||||
>
|
|
||||||
<el-row :gutter="24">
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="选择合并标准1" prop="orgName" class="add-form-item form-item-disabled">
|
|
||||||
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
|
|
||||||
<el-input
|
|
||||||
readonly
|
|
||||||
v-model="qbzxdForm.esName"
|
|
||||||
placeholder="请输入企标名称"
|
|
||||||
clearable
|
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
|
|
||||||
<el-input
|
|
||||||
readonly
|
|
||||||
v-model="qbzxdForm.planStatus"
|
|
||||||
placeholder="请输入计划状态"
|
|
||||||
clearable
|
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
|
|
||||||
<el-input
|
|
||||||
readonly
|
|
||||||
v-model="qbzxdForm.reviseStatus"
|
|
||||||
placeholder="请输入制修订状态"
|
|
||||||
clearable
|
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="选择合并标准2" prop="orgName" class="add-form-item form-item-disabled">
|
|
||||||
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow2">根据企标编号、名称、类别查询</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
|
|
||||||
<el-input
|
|
||||||
readonly
|
|
||||||
v-model="qbzxdForm2.esName"
|
|
||||||
placeholder="请输入企标名称"
|
|
||||||
clearable
|
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
|
|
||||||
<el-input
|
|
||||||
readonly
|
|
||||||
v-model="qbzxdForm2.planStatus"
|
|
||||||
placeholder="请输入计划状态"
|
|
||||||
clearable
|
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
|
|
||||||
<el-input
|
|
||||||
readonly
|
|
||||||
v-model="qbzxdForm2.reviseStatus"
|
|
||||||
placeholder="请输入制修订状态"
|
|
||||||
clearable
|
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
</el-form>
|
|
||||||
<process-title>
|
|
||||||
<template slot="title">合并后企标信息</template>
|
|
||||||
</process-title>
|
|
||||||
<el-form
|
<el-form
|
||||||
ref="qbfsForm"
|
ref="qbfsForm"
|
||||||
:model="qbfsForm"
|
:model="qbfsForm"
|
||||||
:rules="formRules"
|
:rules="qbfsFormRules"
|
||||||
class="label-input-form prc-content-border"
|
class="label-input-form prc-content-border"
|
||||||
label-width="150px"
|
label-width="150px"
|
||||||
>
|
>
|
||||||
<div v-if="foldFormFlag">
|
<div v-if="foldFormFlag">
|
||||||
|
<el-row :gutter="24">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="选择合并标准1" prop="orgName" class="add-form-item form-item-disabled">
|
||||||
|
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="企标名称" prop="esName1" class="add-form-item form-item-disabled">
|
||||||
|
<el-input readonly v-model="qbfsForm.esName1" placeholder="请输入企标名称" clearable></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="计划状态" prop="planStatus1" class="add-form-item form-item-disabled">
|
||||||
|
<el-input readonly v-model="qbfsForm.planStatus1" placeholder="请输入计划状态" clearable></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
|
||||||
|
<el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="选择合并标准2" prop="orgName" class="add-form-item form-item-disabled">
|
||||||
|
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow2">根据企标编号、名称、类别查询</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="企标名称" prop="esName2" class="add-form-item form-item-disabled">
|
||||||
|
<el-input readonly v-model="qbfsForm.esName2" placeholder="请输入企标名称" clearable></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="计划状态" prop="planStatus2" class="add-form-item form-item-disabled">
|
||||||
|
<el-input readonly v-model="qbfsForm.planStatus2" placeholder="请输入计划状态" clearable></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
|
||||||
|
<el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<process-title>
|
||||||
|
<template slot="title">合并后企标信息</template>
|
||||||
|
</process-title>
|
||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
|
<el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
|
||||||
@@ -106,11 +68,10 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
|
<el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
|
||||||
v-model="qbfsForm.resPerson"
|
<el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
|
||||||
placeholder="请输入评审责任人"
|
@click.native="choiceZRRS('2')">
|
||||||
clearable
|
</el-input>
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
|
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
@@ -121,11 +82,15 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
|
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-select v-model="qbfsForm.unit" filterable multiple clearable>
|
||||||
v-model="qbfsForm.unit"
|
<el-option
|
||||||
placeholder="请输入起草责任单位"
|
v-for="item in qcdwOptions"
|
||||||
clearable
|
placeholder="请选择起草责任单位"
|
||||||
></el-input>
|
:key="item.value"
|
||||||
|
:value="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
@@ -137,18 +102,15 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
|
<el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
|
||||||
v-model="qbfsForm.drafter"
|
<el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
|
||||||
placeholder="请输入起草人"
|
@click.native="choiceZRRS('1')">
|
||||||
clearable
|
</el-input>
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
|
<el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
|
||||||
v-model="qbfsForm.wgLeader"
|
<el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
|
||||||
placeholder="请输入工作组组长"
|
@click.native="choiceZRR"></el-input>
|
||||||
clearable
|
|
||||||
></el-input>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
|
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
@@ -296,6 +258,20 @@
|
|||||||
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
|
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
<!-- 多选择责任人-->
|
||||||
|
<Role-tree
|
||||||
|
:is-title="drawerTitle2"
|
||||||
|
: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>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -310,6 +286,14 @@ export default {
|
|||||||
props: ['message'],
|
props: ['message'],
|
||||||
data(){
|
data(){
|
||||||
return {
|
return {
|
||||||
|
drawerTitle2: '',
|
||||||
|
drawerTitle: '',
|
||||||
|
type: '',
|
||||||
|
modalshowflag2: false,
|
||||||
|
modalshowflag: false,
|
||||||
|
nodeList2: [],
|
||||||
|
nodeList: [],
|
||||||
|
qcdwOptions: [],
|
||||||
standShow: false,
|
standShow: false,
|
||||||
standShow2: false,
|
standShow2: false,
|
||||||
ListModel: false,
|
ListModel: false,
|
||||||
@@ -319,7 +303,44 @@ export default {
|
|||||||
total: 0,
|
total: 0,
|
||||||
pageSize: this.$store.getters.userInfo.configContent,
|
pageSize: this.$store.getters.userInfo.configContent,
|
||||||
selectList: [],
|
selectList: [],
|
||||||
formRules: {},
|
qbfsFormRules: {
|
||||||
|
esName1: [
|
||||||
|
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
esName2: [
|
||||||
|
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
unit: [
|
||||||
|
{required: true, message: '请输入单位', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
esName: [
|
||||||
|
{required: true, message: '请输入企标名称', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
planStatus: [
|
||||||
|
{required: true, message: '请选择计划状态', trigger: 'change'},
|
||||||
|
],
|
||||||
|
reviseStatus: [
|
||||||
|
{required: true, message: '请选择制修订状态', trigger: 'change'},
|
||||||
|
],
|
||||||
|
resPerson: [
|
||||||
|
{required: true, message: '请输入评审责任人', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
wgLeader: [
|
||||||
|
{required: true, message: '请输入工作组组长', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
draftTime: [
|
||||||
|
{required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
releaseTime: [
|
||||||
|
{required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
drafter: [
|
||||||
|
{required: true, message: '请输入起草人', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
mergeReason: [
|
||||||
|
{required: true, message: '请输入合并原因', trigger: 'blur'},
|
||||||
|
],
|
||||||
|
},
|
||||||
standinfoList: [],
|
standinfoList: [],
|
||||||
standardSearch: {
|
standardSearch: {
|
||||||
reviseStatus: "",
|
reviseStatus: "",
|
||||||
@@ -334,6 +355,9 @@ export default {
|
|||||||
isSubTime: "",
|
isSubTime: "",
|
||||||
mergeReason: "",
|
mergeReason: "",
|
||||||
company: "",
|
company: "",
|
||||||
|
resPersonName: '',
|
||||||
|
drafterName: '',
|
||||||
|
wgLeaderName:'',
|
||||||
groupLeader: "",
|
groupLeader: "",
|
||||||
drafterPeople: "",
|
drafterPeople: "",
|
||||||
formulateStatus: "",
|
formulateStatus: "",
|
||||||
@@ -357,21 +381,16 @@ export default {
|
|||||||
reviewDate: '',
|
reviewDate: '',
|
||||||
abolishCause:'',
|
abolishCause:'',
|
||||||
},
|
},
|
||||||
qbzxdForm2: {
|
|
||||||
standCode: "",
|
|
||||||
standName: "",
|
|
||||||
enName: '',
|
|
||||||
entCategory: '',
|
|
||||||
replaceNumber: '',
|
|
||||||
replacedNumber: '',
|
|
||||||
releaseDate: '',
|
|
||||||
implementDate: '',
|
|
||||||
reviewDate: '',
|
|
||||||
abolishCause:'',
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
//查询下拉框数据
|
||||||
|
this.$http.get('sys/dictype/getDicTypeListCode', '',{
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
console.log(res);
|
||||||
|
this.qcdwOptions = res.data.QCDW // 起草单位
|
||||||
|
})
|
||||||
this.getStandDataBtn()
|
this.getStandDataBtn()
|
||||||
|
|
||||||
},
|
},
|
||||||
@@ -385,6 +404,52 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
choiceZRR() {
|
||||||
|
this.nodeList = [];
|
||||||
|
this.drawerTitle = '请选择工作组组长';
|
||||||
|
this.modalshowflag = true;
|
||||||
|
},
|
||||||
|
checkedRole(data) {
|
||||||
|
this.qbfsForm.wgLeader = data[0].id;
|
||||||
|
this.qbfsForm.wgLeaderName = data[0].name;
|
||||||
|
this.modalshowflag = false;
|
||||||
|
},
|
||||||
|
choiceZRRS(type) {
|
||||||
|
this.type = type
|
||||||
|
if(type === '1' ){
|
||||||
|
this.drawerTitle2 = '请选择起草人'
|
||||||
|
this.nodeList2 = [];
|
||||||
|
if (this.qbfsForm.drafter !== undefined) {
|
||||||
|
this.nodeList2 = this.qbfsForm.drafter.split(",");
|
||||||
|
}
|
||||||
|
}else if(type === '2'){
|
||||||
|
this.drawerTitle2 = '请选择评审责任人'
|
||||||
|
this.nodeList2 = [];
|
||||||
|
if (this.qbfsForm.resPerson !== undefined) {
|
||||||
|
this.nodeList2 = this.qbfsForm.resPerson.split(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.modalshowflag2 = true;
|
||||||
|
},
|
||||||
|
checkedRole2(data) {
|
||||||
|
var idList = "";
|
||||||
|
var nameList = "";
|
||||||
|
data.forEach(item => {
|
||||||
|
if (nameList.length > 0) {
|
||||||
|
nameList += ",";
|
||||||
|
idList += ",";
|
||||||
|
}
|
||||||
|
idList += item.id;
|
||||||
|
nameList += item.name;
|
||||||
|
});
|
||||||
|
if(this.type === '1'){
|
||||||
|
this.qbfsForm.drafter = idList;
|
||||||
|
this.qbfsForm.drafterName = nameList;
|
||||||
|
}else if(this.type === '2'){
|
||||||
|
this.qbfsForm.resPerson = idList;
|
||||||
|
this.qbfsForm.resPersonName = nameList;
|
||||||
|
}
|
||||||
|
},
|
||||||
validateForm () {
|
validateForm () {
|
||||||
let flag = null
|
let flag = null
|
||||||
this.$refs['qbfsForm'].validate((valid) => {
|
this.$refs['qbfsForm'].validate((valid) => {
|
||||||
@@ -418,14 +483,16 @@ export default {
|
|||||||
this.$message.warning('请至少选择一条数据进行带入')
|
this.$message.warning('请至少选择一条数据进行带入')
|
||||||
}else{
|
}else{
|
||||||
if(this.showType === 'one'){
|
if(this.showType === 'one'){
|
||||||
this.qbzxdForm.esName = this.selectList[0].esName || '--'
|
this.qbfsForm.esId1 = this.selectList[0].id || '--'
|
||||||
this.qbzxdForm.planStatus = this.selectList[0].planStatus || '--'
|
this.qbfsForm.esName1 = this.selectList[0].esName || '--'
|
||||||
this.qbzxdForm.reviseStatus = this.selectList[0].reviseStatus || '--'
|
this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
|
||||||
|
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
|
||||||
this.standShow = true
|
this.standShow = true
|
||||||
}else{
|
}else{
|
||||||
this.qbzxdForm2.esName = this.selectList[0].esName || '--'
|
this.qbfsForm.esId2 = this.selectList[0].id || '--'
|
||||||
this.qbzxdForm2.planStatus = this.selectList[0].planStatus || '--'
|
this.qbfsForm.esName2 = this.selectList[0].esName || '--'
|
||||||
this.qbzxdForm2.reviseStatus = this.selectList[0].reviseStatus || '--'
|
this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
|
||||||
|
this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
|
||||||
this.standShow2 = true
|
this.standShow2 = true
|
||||||
}
|
}
|
||||||
this.ListModel = false
|
this.ListModel = false
|
||||||
@@ -434,7 +501,7 @@ export default {
|
|||||||
//企业标准查询
|
//企业标准查询
|
||||||
getStandDataBtn(){
|
getStandDataBtn(){
|
||||||
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
||||||
reviseStatus: this.standardSearch.reviseStatus,
|
reviseStatus: this.standardSearch.reviseStatus || '',
|
||||||
esName: this.standardSearch.standName,
|
esName: this.standardSearch.standName,
|
||||||
page: this.page,
|
page: this.page,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
|
|||||||
@@ -315,7 +315,7 @@ export default {
|
|||||||
//企业标准查询
|
//企业标准查询
|
||||||
getStandDataBtn(){
|
getStandDataBtn(){
|
||||||
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
|
||||||
reviseStatus: this.standardSearch.reviseStatus,
|
reviseStatus: this.standardSearch.reviseStatus || '',
|
||||||
esName: this.standardSearch.standName,
|
esName: this.standardSearch.standName,
|
||||||
page: this.page,
|
page: this.page,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
|
|||||||
@@ -268,6 +268,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
comFlag: 0,
|
||||||
active: "1",
|
active: "1",
|
||||||
commentText: "",
|
commentText: "",
|
||||||
comName: "merge",
|
comName: "merge",
|
||||||
@@ -414,22 +415,71 @@ export default {
|
|||||||
this.saveLoading = false
|
this.saveLoading = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
repeatName(){
|
||||||
|
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
|
||||||
|
this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
let dataList = res.data
|
||||||
|
dataList.forEach(item => {
|
||||||
|
if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
|
||||||
|
this.comFlag++
|
||||||
|
}else{
|
||||||
|
this.comFlag = 0
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
//流程提交
|
//流程提交
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
if (this.$route.query.prcNum === undefined) {
|
this.repeatName()
|
||||||
let flag = this.$refs["childForm"].validateForm();
|
if(this.comFlag === '0'){
|
||||||
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
|
this.$message.warning('请更改企标名称')
|
||||||
if (flag) {
|
}else {
|
||||||
this.$refs["roleForm"].validate((valid) => {
|
if (this.$route.query.prcNum === undefined) {
|
||||||
if (valid) {
|
let flag = this.$refs["childForm"].validateForm();
|
||||||
this.isSubmit = true;
|
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
|
||||||
var json = Object.assign(qbzxdFrom, this.roleForm);
|
if (flag) {
|
||||||
this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
|
this.$refs["roleForm"].validate((valid) => {
|
||||||
_this: this
|
if (valid) {
|
||||||
}, res => {
|
this.isSubmit = true;
|
||||||
if (res.ok) {
|
var json = Object.assign(qbzxdFrom, this.roleForm);
|
||||||
|
this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
|
||||||
|
_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.isSubmit = false;
|
||||||
|
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.$message.warning("请完善人员信息");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.$message.warning("请完善基础信息");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
let flag = this.$refs["childForm"].validateForm();
|
||||||
|
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
|
||||||
|
if (flag) {
|
||||||
|
this.$refs["roleForm"].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.isSubmit = true;
|
||||||
|
var json = Object.assign(qbzxdFrom, this.roleForm);
|
||||||
this.$http.post("lawss/activiti/completeTask", {
|
this.$http.post("lawss/activiti/completeTask", {
|
||||||
taskIds: res.data,
|
taskIds: this.$route.query.taskIds,
|
||||||
userId: this.$store.getters.userInfo.userId,
|
userId: this.$store.getters.userInfo.userId,
|
||||||
json: JSON.stringify(json)
|
json: JSON.stringify(json)
|
||||||
}, {
|
}, {
|
||||||
@@ -441,46 +491,15 @@ export default {
|
|||||||
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
|
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
this.$message.warning("请完善人员信息");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning("请完善人员信息");
|
this.$message.warning("请完善基础信息");
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
} else {
|
|
||||||
this.$message.warning("请完善基础信息");
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
let flag = this.$refs["childForm"].validateForm();
|
|
||||||
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
|
|
||||||
if (flag) {
|
|
||||||
this.$refs["roleForm"].validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
this.isSubmit = true;
|
|
||||||
var json = Object.assign(qbzxdFrom, this.roleForm);
|
|
||||||
this.$http.post("lawss/activiti/completeTask", {
|
|
||||||
taskIds: this.$route.query.taskIds,
|
|
||||||
userId: this.$store.getters.userInfo.userId,
|
|
||||||
json: JSON.stringify(json)
|
|
||||||
}, {
|
|
||||||
_this: this
|
|
||||||
}, res => {
|
|
||||||
if (res.success) {
|
|
||||||
this.$message.success(res.message);
|
|
||||||
this.isSubmit = false;
|
|
||||||
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.$message.warning("请完善人员信息");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.$message.warning("请完善基础信息");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
// 流程阶段负责人选择
|
// 流程阶段负责人选择
|
||||||
choiceZRR(type, title, id) {
|
choiceZRR(type, title, id) {
|
||||||
|
|||||||
@@ -36,21 +36,21 @@
|
|||||||
<el-option label="未制定" value="未制定"></el-option>
|
<el-option label="未制定" value="未制定"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
disabled
|
disabled
|
||||||
v-model="qbfsForm.drafter"
|
v-model="qbfsForm.drafter"
|
||||||
placeholder="请输入起草人"
|
placeholder="请输入起草人"
|
||||||
:maxlength="500"/>
|
:maxlength="500"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
disabled
|
disabled
|
||||||
v-model="qbfsForm.resPerson"
|
v-model="qbfsForm.resPerson"
|
||||||
placeholder="请输入评审责任人"
|
placeholder="请输入评审责任人"
|
||||||
:maxlength="500"/>
|
:maxlength="500"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
<el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
disabled
|
disabled
|
||||||
v-model="qbfsForm.wgLeader"
|
v-model="qbfsForm.wgLeader"
|
||||||
@@ -148,7 +148,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<el-collapse accordion>
|
<el-collapse accordion>
|
||||||
<el-collapse-item title="回执说明">
|
<el-collapse-item title="审批意见">
|
||||||
<div style="margin: 10px 0;">
|
<div style="margin: 10px 0;">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
@@ -391,26 +391,29 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
beforeBack(){
|
beforeBack(){
|
||||||
this.isSubmit = true
|
if(!this.commentText){
|
||||||
this.qbfsForm.passFlag = '1'
|
this.$message.warning('请填写审批意见')
|
||||||
this.qbfsForm.commentText = this.commentText
|
}else{
|
||||||
let json = JSON.stringify(this.qbfsForm);
|
this.isSubmit = true
|
||||||
this.$http.post('lawss/activiti/completeTask', {
|
this.qbfsForm.passFlag = '1'
|
||||||
taskIds: this.$route.query.taskIds,
|
this.qbfsForm.commentText = this.commentText
|
||||||
userId: this.$store.getters.userInfo.userId,
|
let json = JSON.stringify(this.qbfsForm);
|
||||||
json: json,
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
}, {
|
taskIds: this.$route.query.taskIds,
|
||||||
_this: this
|
userId: this.$store.getters.userInfo.userId,
|
||||||
}, res => {
|
json: json,
|
||||||
if (res.success) {
|
}, {
|
||||||
this.$message.success(res.message)
|
_this: this
|
||||||
this.$router.push('/processCenter')
|
}, res => {
|
||||||
}
|
if (res.success) {
|
||||||
this.isSubmit = false
|
this.$message.success(res.message)
|
||||||
}, e => {
|
this.$router.push('/processCenter')
|
||||||
});
|
}
|
||||||
|
this.isSubmit = false
|
||||||
|
}, e => {
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -148,7 +148,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<el-collapse accordion>
|
<el-collapse accordion>
|
||||||
<el-collapse-item title="回执说明">
|
<el-collapse-item title="审批意见">
|
||||||
<div style="margin: 10px 0;">
|
<div style="margin: 10px 0;">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
@@ -391,26 +391,29 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
beforeBack(){
|
beforeBack(){
|
||||||
this.isSubmit = true
|
if(!this.commentText){
|
||||||
this.qbfsForm.deptCenterFlag = '1'
|
this.$message.warning('请填写审批意见')
|
||||||
this.qbfsForm.commentText = this.commentText
|
}else{
|
||||||
let json = JSON.stringify(this.qbfsForm);
|
this.isSubmit = true
|
||||||
this.$http.post('lawss/activiti/completeTask', {
|
this.qbfsForm.deptCenterFlag = '1'
|
||||||
taskIds: this.$route.query.taskIds,
|
this.qbfsForm.commentText = this.commentText
|
||||||
userId: this.$store.getters.userInfo.userId,
|
let json = JSON.stringify(this.qbfsForm);
|
||||||
json: json,
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
}, {
|
taskIds: this.$route.query.taskIds,
|
||||||
_this: this
|
userId: this.$store.getters.userInfo.userId,
|
||||||
}, res => {
|
json: json,
|
||||||
if (res.success) {
|
}, {
|
||||||
this.$message.success(res.message)
|
_this: this
|
||||||
this.$router.push('/processCenter')
|
}, res => {
|
||||||
}
|
if (res.success) {
|
||||||
this.isSubmit = false
|
this.$message.success(res.message)
|
||||||
}, e => {
|
this.$router.push('/processCenter')
|
||||||
});
|
}
|
||||||
|
this.isSubmit = false
|
||||||
|
}, e => {
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -148,7 +148,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<el-collapse accordion>
|
<el-collapse accordion>
|
||||||
<el-collapse-item title="回执说明">
|
<el-collapse-item title="审批意见">
|
||||||
<div style="margin: 10px 0;">
|
<div style="margin: 10px 0;">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
@@ -391,24 +391,28 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
beforeBack(){
|
beforeBack(){
|
||||||
this.isSubmit = true
|
if(!this.commentText){
|
||||||
this.qbfsForm.bzFlag = '1'
|
this.$message.warning('请填写审批意见')
|
||||||
this.qbfsForm.commentText = this.commentText
|
}else{
|
||||||
let json = JSON.stringify(this.qbfsForm);
|
this.isSubmit = true
|
||||||
this.$http.post('lawss/activiti/completeTask', {
|
this.qbfsForm.bzFlag = '1'
|
||||||
taskIds: this.$route.query.taskIds,
|
this.qbfsForm.commentText = this.commentText
|
||||||
userId: this.$store.getters.userInfo.userId,
|
let json = JSON.stringify(this.qbfsForm);
|
||||||
json: json,
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
}, {
|
taskIds: this.$route.query.taskIds,
|
||||||
_this: this
|
userId: this.$store.getters.userInfo.userId,
|
||||||
}, res => {
|
json: json,
|
||||||
if (res.success) {
|
}, {
|
||||||
this.$message.success(res.message)
|
_this: this
|
||||||
this.$router.push('/processCenter')
|
}, res => {
|
||||||
}
|
if (res.success) {
|
||||||
this.isSubmit = false
|
this.$message.success(res.message)
|
||||||
}, e => {
|
this.$router.push('/processCenter')
|
||||||
});
|
}
|
||||||
|
this.isSubmit = false
|
||||||
|
}, e => {
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -148,7 +148,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<el-collapse accordion>
|
<el-collapse accordion>
|
||||||
<el-collapse-item title="回执说明">
|
<el-collapse-item title="审批意见">
|
||||||
<div style="margin: 10px 0;">
|
<div style="margin: 10px 0;">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
@@ -391,24 +391,28 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
beforeBack(){
|
beforeBack(){
|
||||||
this.isSubmit = true
|
if(!this.commentText){
|
||||||
this.qbfsForm.bzfgbzFlag = '1'
|
this.$message.warning('请填写审批意见')
|
||||||
this.qbfsForm.commentText = this.commentText
|
}else{
|
||||||
let json = JSON.stringify(this.qbfsForm);
|
this.isSubmit = true
|
||||||
this.$http.post('lawss/activiti/completeTask', {
|
this.qbfsForm.bzfgbzFlag = '1'
|
||||||
taskIds: this.$route.query.taskIds,
|
this.qbfsForm.commentText = this.commentText
|
||||||
userId: this.$store.getters.userInfo.userId,
|
let json = JSON.stringify(this.qbfsForm);
|
||||||
json: json,
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
}, {
|
taskIds: this.$route.query.taskIds,
|
||||||
_this: this
|
userId: this.$store.getters.userInfo.userId,
|
||||||
}, res => {
|
json: json,
|
||||||
if (res.success) {
|
}, {
|
||||||
this.$message.success(res.message)
|
_this: this
|
||||||
this.$router.push('/processCenter')
|
}, res => {
|
||||||
}
|
if (res.success) {
|
||||||
this.isSubmit = false
|
this.$message.success(res.message)
|
||||||
}, e => {
|
this.$router.push('/processCenter')
|
||||||
});
|
}
|
||||||
|
this.isSubmit = false
|
||||||
|
}, e => {
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user