FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhutianqi
2021-12-21 14:33:03 +08:00
parent f7508177b1 cd1c6ccd24
commit 4f01901e8f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+4 -4
View File
@@ -348,7 +348,7 @@
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="totalLeader" style="margin-bottom: 0"> <el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>总院技术委员会主任</h4> <h4>总院技术委员会主任</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUserId" style="display: none;"></el-input> <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -749,8 +749,8 @@ export default {
} else { } else {
this.roleForm.dockUser = idList this.roleForm.dockUser = idList
this.roleForm.dockUserName = nameList this.roleForm.dockUserName = nameList
this.rh_pageData.comityInRole = nameList // this.rh_pageData.comityInRole = nameList
this.rh_pageData.comityInRoleId = idList // this.rh_pageData.comityInRoleId = idList
} }
this.roleShowflag = false this.roleShowflag = false
}, },
@@ -810,7 +810,7 @@ export default {
roleList: this.roleForm, roleList: this.roleForm,
rh_pageData: this.rh_pageData, rh_pageData: this.rh_pageData,
commentText: this.commentText, commentText: this.commentText,
directorList: this.rh_pageData.comityInRoleId, directorList: this.roleForm.dockUser,
} }
this.$refs['rh_pageData'].validate((valid) => { this.$refs['rh_pageData'].validate((valid) => {
if (valid) { if (valid) {