Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -67,7 +67,7 @@
|
||||
v-for="item in comityRoleOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
:value="item.label"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -80,7 +80,7 @@
|
||||
v-for="item in comityStateOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
:value="item.label"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -93,7 +93,7 @@
|
||||
v-for="item in comityKindOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
:value="item.label"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -161,7 +161,7 @@
|
||||
</el-form>
|
||||
</el-form-item>
|
||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||
<el-input v-model="rh_pageData.workPath" type="textarea"/>
|
||||
<el-input v-model="rh_pageData.workPath" type="textarea" placeholder="请填写工作方向"/>
|
||||
</el-form-item>
|
||||
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-bottom: 50px">
|
||||
<div class="comityTel_btn">
|
||||
@@ -196,7 +196,7 @@
|
||||
align="center"
|
||||
label="联络人">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.tel_name"/>
|
||||
<el-input v-model="scope.row.tel_name" placeholder="请填写联络人"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -204,7 +204,7 @@
|
||||
align="center"
|
||||
label="单位">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.tel_unit"/>
|
||||
<el-input v-model="scope.row.tel_unit" placeholder="请填写单位"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -212,7 +212,7 @@
|
||||
align="center"
|
||||
label="电话">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.tel_phone"/>
|
||||
<el-input v-model="scope.row.tel_phone" placeholder="请填写单位"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -220,7 +220,7 @@
|
||||
align="center"
|
||||
label="邮箱">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.tel_mail"/>
|
||||
<el-input v-model="scope.row.tel_mail" placeholder="请填写邮箱"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -228,6 +228,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<div class="block" style="padding-top: 20px;">
|
||||
@@ -469,6 +482,8 @@ export default {
|
||||
nodeListOne: [],
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
|
||||
commentText: '',
|
||||
}
|
||||
},
|
||||
|
||||
@@ -530,6 +545,7 @@ export default {
|
||||
this.fileTextList.splice(index, 1)
|
||||
}
|
||||
})
|
||||
this.rh_pageData.infoSources = this.fileTextList
|
||||
},
|
||||
// 文件上传成功
|
||||
handleOnsuccess(res, file, fileList) {
|
||||
@@ -547,6 +563,7 @@ export default {
|
||||
})
|
||||
}
|
||||
this.fileListData.fileText = this.newDataList
|
||||
this.rh_pageData.infoSources = this.newDataList
|
||||
this.$message({
|
||||
showClose: true,
|
||||
message: res.message,
|
||||
@@ -663,7 +680,8 @@ export default {
|
||||
_formData.append('prcType', '20')
|
||||
_formData.append('json', JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
rh_pageData: this.rh_pageData
|
||||
rh_pageData: this.rh_pageData,
|
||||
commentText: this.commentText
|
||||
}))
|
||||
saveTaskFirst(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
@@ -675,41 +693,46 @@ export default {
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||
roleList: this.roleForm,
|
||||
rh_pageData: this.rh_pageData,
|
||||
directorList: this.rh_pageData.comityInRoleId,
|
||||
}
|
||||
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('请完成流程信息的人员选择')
|
||||
}
|
||||
})
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入回执说明')
|
||||
} else {
|
||||
let json = {
|
||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||
roleList: this.roleForm,
|
||||
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('请完成流程信息的人员选择')
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,18 +15,6 @@
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
|
||||
{{ rh_pageData.comityFileNum || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
|
||||
{{ rh_pageData.comityFileName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会名称:">
|
||||
@@ -75,8 +63,18 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||
<el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" 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 class="add-form-item" label="协会外部联系方式:">
|
||||
<el-table
|
||||
@@ -108,7 +106,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<el-collapse-item title="审批意见">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
@@ -257,6 +255,8 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
infoSourcesLength: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -298,6 +298,7 @@ export default {
|
||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||
this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
||||
// this.rh_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
},
|
||||
@@ -305,57 +306,73 @@ export default {
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
|
||||
/** 点击对应附件进行下载*/
|
||||
previews(val) {
|
||||
let attId = val
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
passFlag: '0',
|
||||
commentText: this.commentText,
|
||||
rh_pageData: this.rh_pageData,
|
||||
}
|
||||
this.$refs['rh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
passFlag: '0',
|
||||
commentText: this.commentText,
|
||||
rh_pageData: this.rh_pageData,
|
||||
}
|
||||
})
|
||||
this.$refs['rh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
passFlag: '1',
|
||||
commentText: this.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
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,19 +14,7 @@
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
|
||||
{{ rh_pageData.comityFileNum || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
|
||||
{{ rh_pageData.comityFileName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会名称:">
|
||||
@@ -75,6 +63,16 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||
<span v-if="infoSourcesLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
|
||||
<el-table
|
||||
:data="rh_pageData.comityTel"
|
||||
@@ -155,9 +153,10 @@
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="参与人部门领导:">
|
||||
<el-form-item class="add-form-item" prop="fillLeader" label="参与人部门领导:">
|
||||
<el-input
|
||||
style="width: 100%"
|
||||
readonly
|
||||
placeholder="请填写"
|
||||
v-model="rh_pageData.fillLeader"
|
||||
@click.native="choiceZRR"
|
||||
@@ -177,6 +176,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
@@ -303,6 +315,7 @@ export default {
|
||||
workPath: '',
|
||||
comityTel: [],
|
||||
fillPeople: '',
|
||||
fillPeopleId: '',
|
||||
fillUnit: '',
|
||||
fillDept: '',
|
||||
fillPost: '',
|
||||
@@ -312,6 +325,13 @@ export default {
|
||||
fillLeaderId: '',
|
||||
fillFile: '',
|
||||
},
|
||||
rh_rules: {
|
||||
fillLeader: [
|
||||
{required: true, message: "请选择参与人部门领导", trigger: 'blur'},
|
||||
{ trigger: 'change' }
|
||||
]
|
||||
|
||||
},
|
||||
roleForm: {},
|
||||
unqualidiedData: [],
|
||||
roleShowflag: false,
|
||||
@@ -324,6 +344,8 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
commentText: '',
|
||||
infoSourcesLength: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -364,7 +386,9 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
|
||||
this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
||||
// this.rh_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
},
|
||||
@@ -409,29 +433,41 @@ export default {
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
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
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入回执说明')
|
||||
} else {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
/** 点击对应附件进行下载*/
|
||||
previews(val) {
|
||||
let attId = val
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -15,18 +15,6 @@
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
|
||||
{{ rh_pageData.comityFileNum || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
|
||||
{{ rh_pageData.comityFileName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会名称:">
|
||||
@@ -75,6 +63,16 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||
<el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
|
||||
</el-form-item>
|
||||
@@ -116,7 +114,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<el-collapse-item title="审批意见">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
@@ -250,6 +248,7 @@ export default {
|
||||
workPath: '',
|
||||
comityTel: [],
|
||||
fillPeople: '',
|
||||
fillPeopleId: '',
|
||||
fillUnit: '',
|
||||
fillDept: '',
|
||||
fillPost: '',
|
||||
@@ -271,6 +270,8 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
infoSourcesLength: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -314,7 +315,9 @@ export default {
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
||||
this.rh_pageData.myPartRole = [{
|
||||
fillPeopleId: this.rh_pageData.fillPeopleId,
|
||||
fillPeople: this.rh_pageData.fillPeople,
|
||||
fillUnit: this.rh_pageData.fillUnit,
|
||||
fillDept: this.rh_pageData.fillDept,
|
||||
@@ -331,57 +334,73 @@ export default {
|
||||
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '0',
|
||||
roleList: this.roleForm,
|
||||
commentText: this.textarea,
|
||||
rh_pageData: this.rh_pageData,
|
||||
}
|
||||
this.$refs['rh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
if(this.textarea === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '0',
|
||||
roleList: this.roleForm,
|
||||
commentText: this.textarea,
|
||||
rh_pageData: this.rh_pageData,
|
||||
}
|
||||
})
|
||||
this.$refs['rh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '1',
|
||||
engineerSum: this.roleForm.startUser,
|
||||
roleList: this.roleForm,
|
||||
commentText: this.textarea,
|
||||
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
|
||||
});
|
||||
if(this.textarea === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '1',
|
||||
engineerSum: this.roleForm.startUser,
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
/** 点击对应附件进行下载*/
|
||||
previews(val) {
|
||||
let attId = val
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -15,18 +15,6 @@
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
|
||||
{{ rh_pageData.comityFileNum || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
|
||||
{{ rh_pageData.comityFileName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会名称:">
|
||||
@@ -75,6 +63,16 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
|
||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||
<el-input v-model="rh_pageData.workPath" type="textarea" style="width: 50%;height: auto"></el-input>
|
||||
</el-form-item>
|
||||
@@ -154,6 +152,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
@@ -294,6 +305,10 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
deleteDataList: [],
|
||||
|
||||
infoSourcesLength: '',
|
||||
commentText: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -338,6 +353,7 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
||||
// this.rh_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
},
|
||||
@@ -356,7 +372,7 @@ export default {
|
||||
this.deleteDataList.map(item => {
|
||||
let index;
|
||||
index = this.rh_pageData.myPartRole.findIndex(items => {
|
||||
return items.id === item;
|
||||
return items === item;
|
||||
});
|
||||
if (index > -1) {
|
||||
this.rh_pageData.myPartRole.splice(index, 1);
|
||||
@@ -374,13 +390,32 @@ export default {
|
||||
},
|
||||
// 保存按钮
|
||||
handleSave() {
|
||||
this.saveLoading = true
|
||||
let _formData = new FormData()
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
rh_pageData: this.rh_pageData,
|
||||
roleList: this.roleForm,
|
||||
commentText: this.commentText
|
||||
}))
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
this.bpnId = res.result
|
||||
}).catch(e => {
|
||||
this.saveLoading = false
|
||||
})
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入回执说明')
|
||||
} else {
|
||||
let json = {
|
||||
leader: this.roleForm.leaderUserId,
|
||||
rh_pageData: this.rh_pageData,
|
||||
roleList: this.roleForm,
|
||||
commentText: this.commentText
|
||||
}
|
||||
this.$refs['rh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
@@ -398,7 +433,17 @@ export default {
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/** 点击对应附件进行下载*/
|
||||
previews(val) {
|
||||
let attId = val
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,507 @@
|
||||
<template>
|
||||
<div class="bzrhStep6">
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">外部标准化协会入会流程</template>
|
||||
<template slot="proNode">批准</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会名称:">
|
||||
{{ rh_pageData.comityName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会状态:" prop="comityState">
|
||||
{{ rh_pageData.comityState || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
|
||||
{{ rh_pageData.comityKind || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="资质:">
|
||||
{{ rh_pageData.comityMake.makeQualification || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="成员:">
|
||||
{{ rh_pageData.comityMake.makeRole || '' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="费用估计:">
|
||||
{{ rh_pageData.comityMake.makeCost || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="职责:">
|
||||
{{ rh_pageData.comityMake.makeDuties || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="任期:">
|
||||
{{ rh_pageData.comityMake.makeTime || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||
<span v-if="infoSourcesLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||
<el-input v-model="rh_pageData.workPath" readonly type="textarea" style="width: 50%;height: auto"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
|
||||
<el-table
|
||||
:data="rh_pageData.comityTel"
|
||||
border
|
||||
ref="entryTable"
|
||||
height="49%"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="selection" width="55"></el-table-column>
|
||||
<el-table-column prop="tel_name" align="center" label="联络人"/>
|
||||
<el-table-column prop="tel_unit" align="center" label="单位"/>
|
||||
<el-table-column prop="tel_phone" align="center" label="电话"/>
|
||||
<el-table-column prop="tel_mail" align="center" label="邮箱"/>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
|
||||
<el-table
|
||||
:data="rh_pageData.myPartRole"
|
||||
border
|
||||
ref="entryTable"
|
||||
@selection-change="selectedDelete"
|
||||
height="49%"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column prop="fillPeople" align="center" label="参与人"/>
|
||||
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
||||
<el-table-column prop="fillDept" align="center" label="部门"/>
|
||||
<el-table-column prop="fillPost" align="center" label="身份"/>
|
||||
<el-table-column prop="fillTel" align="center" label="电话"/>
|
||||
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
||||
<el-table-column prop="fillFile" align="center" label="资料"/>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item :title="textTitle">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
:placeholder="textHolder"
|
||||
v-model="textarea">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="detailData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import {
|
||||
completeTask,
|
||||
inboundLiaisonDetail,
|
||||
saveinboundTask,
|
||||
saveTaskForPub,
|
||||
changeAssigneeNew
|
||||
} from "@/api/process.js"
|
||||
|
||||
export default {
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
name: "bzrhStep6-1",
|
||||
data() {
|
||||
return {
|
||||
active: '1', // 默认显示
|
||||
rh_rules: {},
|
||||
rh_pageData: {
|
||||
comityFileNum: '',
|
||||
comityFileName: '',
|
||||
comityName: '',
|
||||
comityRole: '',
|
||||
comityState: '',
|
||||
comityKind: '',
|
||||
InfoSources: '',
|
||||
comityMake: {
|
||||
makeQualification: '',
|
||||
makeRole: '',
|
||||
makeCost: '',
|
||||
makeDuties: '',
|
||||
makeTime: '',
|
||||
},
|
||||
workPath: '',
|
||||
comityTel: [],
|
||||
fillPeople: '',
|
||||
fillUnit: '',
|
||||
fillDept: '',
|
||||
fillPost: '',
|
||||
fillTel: '',
|
||||
fillMail: '',
|
||||
fillLeader: '',
|
||||
fillFile: '',
|
||||
myPartRole: [],
|
||||
},
|
||||
|
||||
detailData: [],
|
||||
loading: false,
|
||||
|
||||
roleForm: {},
|
||||
textarea: '',
|
||||
isSubmit: false,
|
||||
isBack: false,
|
||||
saveLoading: false,
|
||||
taskInfo: this.$route.query.taskInfo,
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
infoSourcesLength: '',
|
||||
|
||||
textTitle: '审批意见',
|
||||
textHolder: '请输入审批意见'
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.processTable()
|
||||
this.getData()
|
||||
},
|
||||
methods: {
|
||||
// 右上标签页面切换
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
processTable() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
sortWord: this.shunxu ? this.paixu : "",
|
||||
shunxu: this.shunxu
|
||||
}, {
|
||||
loading: "loading",
|
||||
_this: this
|
||||
}, res => {
|
||||
this.detailData = res
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
|
||||
getData() {
|
||||
if (this.taskInfo === '标准法规工程师汇总修订完毕') {
|
||||
this.textTitle = '回执说明'
|
||||
this.textHolder = '请输入回执说明'
|
||||
}
|
||||
const params = {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId,
|
||||
}
|
||||
inboundLiaisonDetail(params).then(res => {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.getFormFieldList(processForm)
|
||||
})
|
||||
},
|
||||
getFormFieldList(item) {
|
||||
this.$nextTick(() => {
|
||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
||||
this.textarea = JSON.parse(JSON.stringify(item)).commentText
|
||||
// this.rh_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
},
|
||||
/** 点击对应附件进行下载*/
|
||||
previews(val) {
|
||||
let attId = val
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
selectedDelete(val) {
|
||||
this.deleteDataList = val
|
||||
},
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
if (this.textarea === '') {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
} else {
|
||||
let json = {
|
||||
passFlag: '0',
|
||||
rh_pageData: this.rh_pageData,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
if (this.taskInfo === '标准法规部主管领导审核') {
|
||||
json.manageDepartmentList = this.roleForm.feeUserId
|
||||
} else if (this.taskInfo === '费用管理部门会签') {
|
||||
json.manageDepartment = this.$store.getters.userInfo.userId
|
||||
json.president = this.roleForm.engineerUserId
|
||||
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
|
||||
json.engineerSumDone = this.roleForm.startUser
|
||||
} else {
|
||||
json = {
|
||||
rh_pageData: this.rh_pageData,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
}
|
||||
this.$refs['rh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
if (this.textarea === '') {
|
||||
if (this.taskInfo === '标准法规工程师汇总修订完毕') {
|
||||
this.$message.warning('请输入回执说明')
|
||||
} else {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
} else {
|
||||
let json = {
|
||||
passFlag: '1',
|
||||
rh_pageData: this.rh_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 {
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.bzrhStep6 {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
|
||||
.content-center {
|
||||
padding: 10px 0px 10px 10px;
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content_form {
|
||||
padding: 15px;
|
||||
|
||||
.comityTel_btn {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/deep/ .el-table th {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
/deep/ .el-table__body-wrapper {
|
||||
height: auto !important;
|
||||
}
|
||||
.myPart_btn {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -18,18 +18,6 @@
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="150px" :rules="rh_rules">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件编号:" prop="comityFileNum">
|
||||
{{ rh_pageData.comityFileNum || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="文件名称:" prop="comityFileName">
|
||||
{{ rh_pageData.comityFileName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会名称:">
|
||||
@@ -78,8 +66,18 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
|
||||
<span v-if="infoSourcesLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item class="add-form-item" label="工作方向:" prop="workPath">
|
||||
<el-input v-model="rh_pageData.workPath" type="textarea" style="width: 50%;height: auto"></el-input>
|
||||
<el-input v-model="rh_pageData.workPath" readonly type="textarea" style="width: 50%;height: auto"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="add-form-item" label="协会外部联系方式:" style="margin-top: 10px">
|
||||
<el-table
|
||||
@@ -98,15 +96,6 @@
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
|
||||
<div class="myPart_btn">
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
icon="el-icon-delete"
|
||||
@click="del_paryForm">
|
||||
批量删除
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
:data="rh_pageData.myPartRole"
|
||||
border
|
||||
@@ -129,6 +118,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item :title="textTitle">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
:placeholder="textHolder"
|
||||
v-model="textarea">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
@@ -277,6 +279,11 @@ export default {
|
||||
taskInfo: this.$route.query.taskInfo,
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
infoSourcesLength: '',
|
||||
|
||||
textTitle: '审批意见',
|
||||
textHolder: '请输入审批意见'
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -308,6 +315,10 @@ export default {
|
||||
},
|
||||
|
||||
getData() {
|
||||
if (this.taskInfo === '标准法规工程师汇总修订完毕') {
|
||||
this.textTitle = '回执说明'
|
||||
this.textHolder = '请输入回执说明'
|
||||
}
|
||||
const params = {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId,
|
||||
@@ -321,114 +332,107 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
this.infoSourcesLength = this.rh_pageData.infoSources.length
|
||||
// this.rh_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
},
|
||||
/** 批量删除 */
|
||||
del_paryForm() {
|
||||
if (this.deleteDataList.length < 1) {
|
||||
this.$message.warning("请选择一条数据进行删除");
|
||||
} else {
|
||||
this.$confirm("您确认删除这些数据?", "提示", {
|
||||
confirmButtonText: "确认",
|
||||
confirmButtonClass: "common-button-primary",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
let exits = [];
|
||||
this.deleteDataList.map(item => {
|
||||
let index;
|
||||
index = this.rh_pageData.myPartRole.findIndex(items => {
|
||||
return items.id === item;
|
||||
});
|
||||
if (index > -1) {
|
||||
this.rh_pageData.myPartRole.splice(index, 1);
|
||||
}
|
||||
exits.push(item);
|
||||
});
|
||||
this.deleteDataList = [];
|
||||
}).catch(() => {
|
||||
});
|
||||
/** 点击对应附件进行下载*/
|
||||
previews(val) {
|
||||
let attId = val
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
|
||||
selectedDelete(val) {
|
||||
this.deleteDataList = val
|
||||
},
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
let json = {
|
||||
passFlag: '0',
|
||||
rh_pageData: this.rh_pageData,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
if (this.taskInfo === '标准法规部主管领导审核') {
|
||||
json.manageDepartmentList = this.roleForm.feeUserId
|
||||
} else if (this.taskInfo === '费用管理部门会签') {
|
||||
json.manageDepartment = this.$store.getters.userInfo.userId
|
||||
json.president = this.roleForm.engineerUserId
|
||||
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
|
||||
json.engineerSumDone = this.roleForm.startUser
|
||||
if (this.textarea === '') {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
} else {
|
||||
json = {
|
||||
let json = {
|
||||
passFlag: '0',
|
||||
rh_pageData: this.rh_pageData,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
}
|
||||
this.$refs['rh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
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.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
passFlag: '1',
|
||||
rh_pageData: this.rh_pageData,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
if (this.taskInfo === '标准法规部主管领导审核') {
|
||||
json.manageDepartmentList = this.roleForm.feeUserId
|
||||
} else if (this.taskInfo === '费用管理部门会签') {
|
||||
json.manageDepartment = this.$store.getters.userInfo.userId
|
||||
json.president = this.roleForm.engineerUserId
|
||||
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
|
||||
json.engineerSumDone = this.roleForm.startUser
|
||||
if (this.textarea === '') {
|
||||
if (this.taskInfo === '标准法规工程师汇总修订完毕') {
|
||||
this.$message.warning('请输入回执说明')
|
||||
} else {
|
||||
this.$message.warning('请输入反馈意见')
|
||||
}
|
||||
} else {
|
||||
json = {
|
||||
let json = {
|
||||
passFlag: '1',
|
||||
rh_pageData: this.rh_pageData,
|
||||
commentText: this.textarea,
|
||||
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
|
||||
});
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,7 +97,8 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="费用列支:">
|
||||
<el-select
|
||||
<el-input v-model="ch_pageData.feeKind" placeholder="请输入费用列支"></el-input>
|
||||
<!-- <el-select
|
||||
v-model="ch_pageData.feeKind"
|
||||
placeholder="请选择费用列支">
|
||||
<el-option
|
||||
@@ -105,7 +106,7 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.label"/>
|
||||
</el-select>
|
||||
</el-select>-->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -170,6 +171,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '2'">
|
||||
<div class="block" style="padding-top: 20px;">
|
||||
@@ -319,7 +333,7 @@
|
||||
import ProcessHeader from '../../components/ProcessHeader'
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import {startProcess, saveTaskFirst, completeTask} from '@/api/process.js'
|
||||
import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
@@ -393,6 +407,13 @@ export default {
|
||||
roleShowflagOne: false,
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
commentText: ''
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
if (this.bpnId !== undefined) {
|
||||
this.getData()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -400,6 +421,16 @@ export default {
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
getData() {
|
||||
queryTaskFirst({
|
||||
bpnId: this.$route.query.bpnId
|
||||
}).then(res => {
|
||||
let mes = JSON.parse(res.mes)
|
||||
this.ch_pageData = mes.ch_pageData
|
||||
this.commentText = mes.commentText
|
||||
this.roleForm = mes.roleForm
|
||||
});
|
||||
},
|
||||
|
||||
//上传按钮
|
||||
/* uploadFile(val) {
|
||||
@@ -557,10 +588,12 @@ export default {
|
||||
_formData.append('id', this.bpnId || '')
|
||||
_formData.append('createUser', this.$store.getters.userInfo.userId)
|
||||
_formData.append('createUserName', this.$store.getters.userInfo.userName)
|
||||
_formData.append('prcType', '20')
|
||||
_formData.append('prcType', '21')
|
||||
_formData.append('json', JSON.stringify({
|
||||
roleForm: this.roleForm,
|
||||
ch_pageData: this.ch_pageData
|
||||
ch_pageData: this.ch_pageData,
|
||||
commentText: this.commentText
|
||||
|
||||
}))
|
||||
saveTaskFirst(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
@@ -572,39 +605,44 @@ export default {
|
||||
},
|
||||
/** 提交按钮*/
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||
roleList: this.roleForm,
|
||||
ch_pageData: this.ch_pageData,
|
||||
directorList: this.roleForm.dockUser,
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs['roleForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
const paramsInfo = {
|
||||
type: '21'
|
||||
}
|
||||
startProcess(paramsInfo).then(res => {
|
||||
this.taskID = res.data
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskID)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入回执说明')
|
||||
} else {
|
||||
let json = {
|
||||
prcCreateUser: this.$store.getters.userInfo.userId,
|
||||
prcCreateUserName: this.$store.getters.userInfo.userName,
|
||||
roleList: this.roleForm,
|
||||
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
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -59,19 +59,18 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||
<el-upload
|
||||
action=""
|
||||
name="file"
|
||||
:disabled="acceptShow"
|
||||
:file-list="ch_pageData.fileTextList"
|
||||
/>
|
||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="类别:">
|
||||
{{ ch_pageData.sort || '-'}}
|
||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||
<span v-else>计划外</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -104,14 +103,14 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<el-collapse-item title="审批意见">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="textContent">
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
@@ -217,7 +216,7 @@ export default {
|
||||
ch_pageData: {},
|
||||
ch_rules: {},
|
||||
nodeList: [],
|
||||
textContent: '',
|
||||
commentText: '',
|
||||
|
||||
isBack: false,
|
||||
isSubmit: false,
|
||||
@@ -228,6 +227,7 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
uploadFileLength: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -272,61 +272,72 @@ export default {
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||
this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
})
|
||||
},
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
passFlag: '0',
|
||||
commentText: this.textContent,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
passFlag: '0',
|
||||
commentText: this.commentText,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
})
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
passFlag: '1',
|
||||
commentText: this.textContent,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
memberId: this.$store.getters.userInfo.userId,
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,18 +59,18 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||
<el-upload
|
||||
action=""
|
||||
name="file"
|
||||
:file-list="ch_pageData.fileTextList"
|
||||
/>
|
||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="类别:">
|
||||
{{ ch_pageData.sort || '-' }}
|
||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||
<span v-else>计划外</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -123,9 +123,10 @@
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="参与人部门领导:">
|
||||
<el-form-item class="add-form-item" prop="fillLeader" label="参与人部门领导:">
|
||||
<el-input
|
||||
style="width: 100%"
|
||||
readonly
|
||||
placeholder="请选择"
|
||||
v-model="ch_pageData.fillLeader"
|
||||
@click.native="choiceZRR"
|
||||
@@ -154,6 +155,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
@@ -269,7 +283,12 @@ export default {
|
||||
fillLeader: '',
|
||||
fillFile: '',
|
||||
},
|
||||
ch_rules: {},
|
||||
ch_rules: {
|
||||
fillLeader: [
|
||||
{required: true, message: "请选择参与人部门领导", trigger: 'blur'},
|
||||
{ trigger: 'change' }
|
||||
]
|
||||
},
|
||||
|
||||
detailData: [],
|
||||
loading: false,
|
||||
@@ -284,6 +303,9 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
uploadFileLength: '',
|
||||
commentText: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -327,6 +349,7 @@ export default {
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||
this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
|
||||
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
@@ -356,6 +379,7 @@ export default {
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
roleList: this.roleForm,
|
||||
commentText: this.commentText,
|
||||
selfUser: this.$store.getters.userInfo.userId,
|
||||
charge: this.ch_pageData.fillLeaderId,
|
||||
ch_pageData: this.ch_pageData,
|
||||
@@ -370,28 +394,34 @@ export default {
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
selfUser: this.$store.getters.userInfo.userId,
|
||||
charge: this.ch_pageData.fillLeaderId,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入回执说明')
|
||||
} else {
|
||||
let json = {
|
||||
roleList: this.roleForm,
|
||||
selfUser: this.$store.getters.userInfo.userId,
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,18 +59,18 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||
<el-upload
|
||||
action=""
|
||||
name="file"
|
||||
:file-list="ch_pageData.fileTextList"
|
||||
/>
|
||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="类别:">
|
||||
{{ ch_pageData.sort || '-' }}
|
||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||
<span v-else>计划外</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -109,7 +109,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<el-collapse-item title="审批意见">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
@@ -232,6 +232,7 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
uploadFileLength: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -275,6 +276,7 @@ export default {
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||
this.ch_pageData.myPartRole = [{
|
||||
fillPeopleId: this.ch_pageData.fillPeopleId,
|
||||
fillPeople: this.ch_pageData.fillPeople,
|
||||
@@ -292,56 +294,64 @@ export default {
|
||||
},
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '0',
|
||||
roleList: this.roleForm,
|
||||
commentText: this.textarea,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
if (this.textarea === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '0',
|
||||
roleList: this.roleForm,
|
||||
commentText: this.textarea,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
})
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '1',
|
||||
engineerSum: this.roleForm.startUser,
|
||||
roleList: this.roleForm,
|
||||
commentText: this.textarea,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
if (this.textarea === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
member: this.selfUser,
|
||||
passFlag: '1',
|
||||
engineerSum: this.roleForm.startUser,
|
||||
roleList: this.roleForm,
|
||||
commentText: this.textarea,
|
||||
ch_pageData: this.ch_pageData,
|
||||
}
|
||||
})
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,18 +59,18 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||
<el-upload
|
||||
action=""
|
||||
name="file"
|
||||
:file-list="ch_pageData.fileTextList"
|
||||
/>
|
||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="类别:">
|
||||
{{ ch_pageData.sort || '-' }}
|
||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||
<span v-else>计划外</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -126,6 +126,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="审批意见">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
@@ -210,7 +223,7 @@
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
||||
import { startProcess, saveTaskForPub,completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
||||
export default {
|
||||
components: {
|
||||
ProcessHeader,
|
||||
@@ -237,6 +250,9 @@ export default {
|
||||
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
uploadFileLength: '',
|
||||
commentText: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -280,6 +296,7 @@ export default {
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
// this.ch_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
@@ -318,30 +335,51 @@ export default {
|
||||
},
|
||||
// 保存按钮
|
||||
handleSave() {
|
||||
this.saveLoading = true
|
||||
let _formData = new FormData()
|
||||
_formData.append('taskIds', this.taskIds)
|
||||
_formData.append('json', JSON.stringify({
|
||||
ch_pageData: this.ch_pageData,
|
||||
roleList: this.roleForm,
|
||||
commentText: this.commentText
|
||||
}))
|
||||
saveTaskForPub(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
this.bpnId = res.result
|
||||
}).catch(e => {
|
||||
this.saveLoading = false
|
||||
})
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
leader: this.roleForm.leaderUserId,
|
||||
ch_pageData: this.ch_pageData,
|
||||
roleList: this.roleForm,
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
leader: this.roleForm.leaderUserId,
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,377 @@
|
||||
<template>
|
||||
<div class="bzchStep6">
|
||||
<ProcessHeader toggle>
|
||||
<template slot="proName">外部标准化协会参会流程</template>
|
||||
<template slot="proNode">批准</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<ProcessTitle>
|
||||
<template slot="title">基础信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="content_form">
|
||||
<el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="会议名称:">
|
||||
{{ ch_pageData.meetingName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="主办单位:">
|
||||
{{ ch_pageData.primaryUnit || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="协会名称:">
|
||||
{{ ch_pageData.associaName || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="会议时间:">
|
||||
{{ ch_pageData.meetingStartTime || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="会议地点:">
|
||||
{{ ch_pageData.meetingPlace || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="费用标准:">
|
||||
{{ ch_pageData.feeStand || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="费用列支:">
|
||||
{{ ch_pageData.feeKind || '-' }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="类别:">
|
||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||
<span v-else>计划外</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item class="add-form-item" label="议题:">
|
||||
<el-table
|
||||
class="meeting_table"
|
||||
:data="ch_pageData.meetingTable"
|
||||
border
|
||||
ref="entryTable"
|
||||
height="49%"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="index" width="50" align="center"/>
|
||||
<el-table-column label="议题" align="center" prop="meetingTheme"/>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item class="add-form-item" label="入会人员:">
|
||||
<el-table
|
||||
:data="ch_pageData.myPartRole"
|
||||
border
|
||||
ref="entryTable"
|
||||
height="49%"
|
||||
style="width: 100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '20px'}">
|
||||
<el-table-column type="index" width="50" align="center"/>
|
||||
<el-table-column prop="fillPeople" align="center" label="人员"/>
|
||||
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
||||
<el-table-column prop="fillDept" align="center" label="部门"/>
|
||||
<el-table-column prop="fillTel" align="center" label="电话"/>
|
||||
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item :title="passTitle">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
:placeholder="passHolder"
|
||||
v-model="textarea">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="detailData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js'
|
||||
export default {
|
||||
components: {
|
||||
ProcessHeader,
|
||||
ProcessFooter,
|
||||
ProcessTitle
|
||||
},
|
||||
name: "bzchStep6-1",
|
||||
data() {
|
||||
return {
|
||||
active: '1',
|
||||
|
||||
ch_pageData: {
|
||||
myPartRole: [],
|
||||
},
|
||||
ch_rules: {},
|
||||
textarea: '',
|
||||
|
||||
isBack: false,
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
|
||||
deleteDataList: [],
|
||||
detailData: [],
|
||||
loading: false,
|
||||
|
||||
taskInfo: this.$route.query.taskInfo,
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
uploadFileLength: '',
|
||||
passTitle: '回执说明',
|
||||
passHolder: '请输入回执说明'
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
listNoDataText() {
|
||||
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.processTable()
|
||||
this.getData()
|
||||
},
|
||||
methods: {
|
||||
// 右上标签页面切换
|
||||
handleTabs(name) {
|
||||
this.active = name
|
||||
},
|
||||
processTable() {
|
||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
sortWord: this.shunxu ? this.paixu : "",
|
||||
shunxu: this.shunxu
|
||||
}, {
|
||||
loading: "loading",
|
||||
_this: this
|
||||
}, res => {
|
||||
this.detailData = res
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
|
||||
getData() {
|
||||
const params = {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId,
|
||||
}
|
||||
inboundLiaisonDetail(params).then(res => {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
this.getFormFieldList(processForm)
|
||||
})
|
||||
},
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||
this.textarea = JSON.parse(JSON.stringify(item)).commentText
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
// this.ch_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
.bzchStep6 {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
/deep/.el-drawer__container {
|
||||
.prc-content-border {
|
||||
border: none;
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
.headerTabs {
|
||||
height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 10px;
|
||||
.headerTabsItem {
|
||||
border: 1px solid #c1c1c1;
|
||||
padding: 0 5px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.active {
|
||||
border: 1px solid #E6A23C;
|
||||
color: #fff;
|
||||
background: #E6A23C;
|
||||
}
|
||||
}
|
||||
.content-center {
|
||||
padding: 10px 0px 10px 10px;
|
||||
}
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
height: calc(~'100% - 103px');
|
||||
overflow: auto;
|
||||
.tableTitle {
|
||||
margin-bottom: 10px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
position: relative;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
.tableButton {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
.content_form {
|
||||
padding-top: 15px;
|
||||
padding-left: 30px;
|
||||
.el-divider--horizontal {
|
||||
margin-top: 0px;
|
||||
}
|
||||
/deep/.el-table__body-wrapper {
|
||||
height: auto!important;
|
||||
}
|
||||
/deep/.el-textarea__inner {
|
||||
font-family: inherit;
|
||||
}
|
||||
.meeting_table {
|
||||
/deep/ .el-input__inner {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
/deep/.el-upload {
|
||||
display: unset;
|
||||
}
|
||||
/deep/.el-upload-list__item-status-label {
|
||||
font-size: 0;
|
||||
}
|
||||
/deep/.el-upload-list__item {
|
||||
.el-icon-close {
|
||||
font-size: 0;
|
||||
}
|
||||
|
||||
.el-icon-close-tip {
|
||||
font-size: 0;
|
||||
}
|
||||
}
|
||||
/deep/.el-table th {
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -62,18 +62,18 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
|
||||
<el-upload
|
||||
action=""
|
||||
name="file"
|
||||
:file-list="ch_pageData.fileTextList"
|
||||
/>
|
||||
<span v-if="uploadFileLength < 1">{{ '-' }}</span>
|
||||
<span v-for="item in ch_pageData.fileTextList" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
||||
{{ item.name }} {{ ';'}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="8">
|
||||
<el-form-item class="add-form-item" label="类别:">
|
||||
{{ ch_pageData.sort || '-' }}
|
||||
<span v-if="ch_pageData.sort === '1'">计划内</span>
|
||||
<span v-else>计划外</span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -111,6 +111,19 @@
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item :title="passTitle">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
:placeholder="passHolder"
|
||||
v-model="textarea">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div class="flow-list">
|
||||
@@ -230,6 +243,10 @@ export default {
|
||||
taskInfo: this.$route.query.taskInfo,
|
||||
taskIds: this.$route.query.taskIds,
|
||||
pId: this.$route.query.prcId,
|
||||
|
||||
uploadFileLength: '',
|
||||
passTitle: '审批意见',
|
||||
passHolder: '请输入审批意见'
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -261,6 +278,10 @@ export default {
|
||||
},
|
||||
|
||||
getData() {
|
||||
if (this.taskInfo === '标准法规工程师修订完毕') {
|
||||
this.passTitle = '回执说明',
|
||||
this.passHolder = '请输入回执说明'
|
||||
}
|
||||
const params = {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId,
|
||||
@@ -273,6 +294,7 @@ export default {
|
||||
getFormFieldList (item) {
|
||||
this.$nextTick(() => {
|
||||
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
|
||||
this.uploadFileLength = this.ch_pageData.fileTextList.length
|
||||
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
|
||||
// this.ch_pageData.comityFileNum = this.fileTextList
|
||||
})
|
||||
@@ -293,7 +315,7 @@ export default {
|
||||
this.deleteDataList.map(item => {
|
||||
let index;
|
||||
index = this.ch_pageData.myPartRole.findIndex(items => {
|
||||
return items.id === item;
|
||||
return items === item;
|
||||
});
|
||||
if (index > -1) {
|
||||
this.ch_pageData.myPartRole.splice(index, 1);
|
||||
@@ -311,77 +333,90 @@ export default {
|
||||
},
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
let json = {
|
||||
passFlag: '0',
|
||||
ch_pageData: this.ch_pageData,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
if (this.taskInfo === '技术管理中心主任审批') {
|
||||
json.manageDepartmentList = this.roleForm.feeUserId
|
||||
} else if (this.taskInfo === '费用管理部门会签') {
|
||||
json.manageDepartment = this.$store.getters.userInfo.userId
|
||||
json.president = this.roleForm.engineerUserId
|
||||
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
|
||||
json.engineerSumDone = this.roleForm.startUser
|
||||
if (this.textarea === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
json = {
|
||||
let json = {
|
||||
passFlag: '0',
|
||||
ch_pageData: this.ch_pageData,
|
||||
commentText: this.textarea,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
}
|
||||
this.$refs['ch_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
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.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
passFlag: '1',
|
||||
ch_pageData: this.ch_pageData,
|
||||
roleList: this.roleForm
|
||||
}
|
||||
if (this.taskInfo === '技术管理中心主任审批') {
|
||||
json.manageDepartmentList = this.roleForm.feeUserId
|
||||
} else if (this.taskInfo === '费用管理部门会签') {
|
||||
json.manageDepartment = this.$store.getters.userInfo.userId
|
||||
json.president = this.roleForm.engineerUserId
|
||||
} else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
|
||||
json.engineerSumDone = this.roleForm.startUser
|
||||
if (this.textarea === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
json = {
|
||||
let json = {
|
||||
passFlag: '1',
|
||||
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
|
||||
});
|
||||
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
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -702,12 +702,12 @@ export default {
|
||||
standNumber: '', //标准编号
|
||||
standCode: '', //企标编号
|
||||
dataSource: 'INLAND',
|
||||
standType: 'INLAND',
|
||||
lawNumber: '', // 标准编号/政策编号
|
||||
lawName: '', // 标准名称/政策名称
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
total: 0,
|
||||
standType: '',
|
||||
quoteIdList: '',
|
||||
validFlag: '0',
|
||||
menuId: 'nomenu'
|
||||
@@ -1094,6 +1094,7 @@ export default {
|
||||
},
|
||||
//添加标准的查询按钮
|
||||
searchLawBtn(){
|
||||
console.log(this.handleSelectForm);
|
||||
this.lawInfoTableLoading = true
|
||||
if (this.handleSelectForm.dataSource === 'INLAND'){
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
|
||||
|
||||
@@ -721,7 +721,7 @@ export default {
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
total: 0,
|
||||
standType: '',
|
||||
standType: 'INLAND',
|
||||
quoteIdList: '',
|
||||
validFlag: '0',
|
||||
menuId: 'nomenu'
|
||||
|
||||
@@ -705,7 +705,7 @@ export default {
|
||||
page: 1,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
total: 0,
|
||||
standType: '',
|
||||
standType: 'INLAND',
|
||||
quoteIdList: '',
|
||||
validFlag: '0',
|
||||
menuId: 'nomenu'
|
||||
|
||||
@@ -258,6 +258,12 @@ export default {
|
||||
}else if(prcType === '10'){
|
||||
//项目清单确认
|
||||
this.toProcessDetail('xmqdqrStep1-3',row)
|
||||
} else if(prcType === '20') {
|
||||
// 入会流程
|
||||
this.toProcessDetail('bzrhStep6-1',row)
|
||||
} else if(prcType === '21') {
|
||||
// 参会流程
|
||||
this.toProcessDetail('bzchStep6-1',row)
|
||||
}
|
||||
} else {
|
||||
this.$message.warning('当前流程未全部办理完成，无法查看')
|
||||
|
||||
@@ -1120,7 +1120,7 @@ export default {
|
||||
this.roleShowflag = true
|
||||
},
|
||||
drawerCheck(data) {
|
||||
this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('('))
|
||||
this.addForm.dutyEngineer = data[0].name
|
||||
this.roleShowflag = false
|
||||
},
|
||||
/** 选择认证工程师和质量工程师 */
|
||||
@@ -1140,7 +1140,7 @@ export default {
|
||||
idList += ','
|
||||
}
|
||||
idList += item.id
|
||||
nameList += item.name.slice(0,item.name.indexOf('('))
|
||||
nameList += item.name
|
||||
})
|
||||
if (this.type === 'authEngineer') {
|
||||
this.addForm.authEngineer = nameList
|
||||
|
||||
@@ -1631,6 +1631,15 @@ const routes = [
|
||||
title: '外部标准化协会入会流程（审批)'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzrhStep6-1',
|
||||
name: 'bzrhStep6-1',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '外部标准化协会入会流程'
|
||||
}
|
||||
},
|
||||
|
||||
// 外部标准化协会参会流程
|
||||
{
|
||||
@@ -1687,6 +1696,15 @@ const routes = [
|
||||
title: '外部标准化协会参会流程（审定）'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzchStep6-1',
|
||||
name: 'bzchStep6-1',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '外部标准化协会参会流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzhhStep1',
|
||||
name: 'bzhhStep1',
|
||||
|
||||
Reference in New Issue
Block a user