Compare commits

..

No commits in common. "e3aca637cda32d163651d6d0531923037f42cb00" and "4417302d56e6b966c06ef0db3659d3e438e31438" have entirely different histories.

4 changed files with 13 additions and 9 deletions

View File

@ -40,7 +40,11 @@ export function listOrgs(params) {
params params
}).then(response => { }).then(response => {
const res = response.data const res = response.data
if (res.code == 0) {
resolve(res) resolve(res)
} else {
reject(new Error(res.msg || '获取组织列表失败'))
}
}).catch(error => { }).catch(error => {
reject(error) reject(error)
}) })

View File

@ -68,21 +68,21 @@
orgId: data.id, orgId: data.id,
orgName: data.text, orgName: data.text,
orgLevel: '', orgLevel: '',
// parentOrgId: data.parentId, parentOrgId: data.parentId,
// parentOrgName: data.parentText || '', parentOrgName: data.parentText || '',
//description: data.text || '' description: data.text || ''
} }
this.visible = true this.visible = true
this.getList() this.getList()
}, },
async getList() { async getList() {
const {orgs} = await listOrgs({ const {data} = await listOrgs({
page: 1, page: 1,
row: 1, row: 1,
orgId: this.form.orgId orgId: this.form.orgId
}) })
this.form = {...orgs[0]} this.form = {...data[0]}
console.log(orgs) console.log(data)
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {

View File

@ -264,7 +264,7 @@ export default {
this.visible = false this.visible = false
this.$emit('success') this.$emit('success')
} catch (error) { } catch (error) {
this.$message.error(error) this.$message.error(this.$t('listOwner.updateFailed'))
} }
}) })
}, },

View File

@ -2,7 +2,7 @@
<div class="system-user-container"> <div class="system-user-container">
<!-- 查询条件 --> <!-- 查询条件 -->
<el-card class="search-wrapper"> <el-card class="search-wrapper">
<div slot="header" class="flex justify-between"> <div slot="header" class="clearfix">
<span>{{ $t('systemUser.search.title') }}</span> <span>{{ $t('systemUser.search.title') }}</span>
</div> </div>
<el-row :gutter="20"> <el-row :gutter="20">
@ -26,7 +26,7 @@
<!-- 用户列表 --> <!-- 用户列表 -->
<el-card class="list-wrapper"> <el-card class="list-wrapper">
<div slot="header" class="flex justify-between"> <div slot="header" class="clearfix">
<span>{{ $t('systemUser.list.title') }}</span> <span>{{ $t('systemUser.list.title') }}</span>
</div> </div>
<el-table :data="systemUserInfo.users" border style="width: 100%"> <el-table :data="systemUserInfo.users" border style="width: 100%">