Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -863,7 +863,7 @@
|
||||
<el-form-item prop="zrUserName" style="margin-bottom: 0">
|
||||
<h4>会签责任人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRR('zrUserId', '选择责任人', form.zrUserId)">
|
||||
<el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRRS('zrUserId', '选择责任人', form.zrUserId)">
|
||||
</el-input></div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
@@ -1598,16 +1598,16 @@
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
choiceZRRS () {
|
||||
if (this.userType === 'zrUserId') {
|
||||
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
|
||||
this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
|
||||
}
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
// choiceZRRS () {
|
||||
// if (this.userType === 'zrUserId') {
|
||||
// this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
|
||||
// this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
|
||||
// }
|
||||
// this.modalshowflag2 = true
|
||||
// },
|
||||
checkedRole2 (data) {
|
||||
var idList = ''
|
||||
var nameList = ''
|
||||
let idList = ''
|
||||
let nameList = ''
|
||||
data.forEach( item => {
|
||||
if (nameList.length > 0) {
|
||||
nameList += ','
|
||||
@@ -1616,18 +1616,14 @@
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
this.zrUserIds = idList
|
||||
this.zrUserIds = nameList
|
||||
this.roleForm.zrUserId=idList;
|
||||
this.roleForm.zrUserName=nameList;
|
||||
},
|
||||
checkedRole (data) {
|
||||
if (this.userType === 'jlUserId') {
|
||||
this.roleForm.jlUserId = data[0].id
|
||||
this.roleForm.jlUserName = data[0].name
|
||||
}else if(this.userType === 'zrUserId'){
|
||||
this.roleForm.zrUserId=data[0].id;
|
||||
this.roleForm.zrUserName=data[0].name;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
@@ -1898,6 +1894,14 @@
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag = true
|
||||
},
|
||||
|
||||
choiceZRRS (type, title, id) {
|
||||
this.nodeList = []
|
||||
this.nodeList.push(id)
|
||||
this.userType = type
|
||||
this.drawerTitle = title
|
||||
this.modalShowRoleFlag = true
|
||||
},
|
||||
choiceZRR1 (type, title, id) {
|
||||
this.drawerTitle = title
|
||||
this.modalShowFlag1 = true
|
||||
|
||||
Reference in New Issue
Block a user