|
|
@ -39,22 +39,8 @@ |
|
|
|
prop="remark"> |
|
|
|
<span>{{dataForm.remark}}</span> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="扫码支部"> |
|
|
|
<el-table :data="userGridList" |
|
|
|
style="width: 100%"> |
|
|
|
<el-table-column prop="id" |
|
|
|
label="主键" v-if="false"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="allDeptNames" |
|
|
|
label="街道-社区-支部"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="dept" |
|
|
|
label="部门名称" v-if="false"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="身份标签" > |
|
|
|
<el-select v-model="dataForm.tagIds" multiple collapse-tags placeholder="请选择身份标签"> |
|
|
|
<el-select v-model="dataForm.partyTagIds" multiple collapse-tags placeholder="请选择身份标签"> |
|
|
|
<el-option v-for="item in tagOptions" |
|
|
|
:key="item.id" |
|
|
|
:label="item.tagName" |
|
|
@ -64,6 +50,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<template slot="footer"> |
|
|
|
<el-button @click="visible = false">{{ $t('cancel') }}</el-button> |
|
|
|
<el-button @click="dataFormSubmitHandle()" |
|
|
|
type="primary">{{ $t('confirm') }}</el-button> |
|
|
|
</template> |
|
|
@ -82,8 +69,8 @@ export default { |
|
|
|
partyFlag: '', |
|
|
|
cadreFlag: '', |
|
|
|
state: '', |
|
|
|
tagIds: [], |
|
|
|
remark: '' |
|
|
|
remark: '', |
|
|
|
partyTagIds:[], |
|
|
|
}, |
|
|
|
partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }], |
|
|
|
cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }], |
|
|
@ -156,7 +143,7 @@ export default { |
|
|
|
this.isAble = true |
|
|
|
let postData = { |
|
|
|
userId: this.dataForm.id, |
|
|
|
tagIds: this.dataForm.tagIdsNew |
|
|
|
tagIds: this.dataForm.partyTagIds |
|
|
|
} |
|
|
|
this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/usertagrelation/addTag/', postData).then(({ data: res }) => { |
|
|
|
this.isAble = false |
|
|
|