center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 用户不选组织报错

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-05-18 11:47:54 +08:00
parent afc6563a32
commit 893d5c68e6
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/views/system/menu/index.vue
View File

@ -27,7 +27,7 @@
<svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" /> <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" :label="$t('menu.create_time')" > <el-table-column prop="createTime" :label="$t('menu.create_time')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span> <span>{{ scope.row.createTime | timestampFormatDate }}</span>
</template> </template>
@ -85,7 +85,7 @@
<el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" style="width: 179px;" /> <el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" style="width: 179px;" />
</el-form-item> </el-form-item>
<el-form-item v-show="!form.iframe && form.type === 1" :label="$t('menu.module_name')" prop="componentName"> <el-form-item v-show="!form.iframe && form.type === 1" :label="$t('menu.module_name')" prop="componentName">
<el-input v-model="form.componentName" :disabled="formType!=='add'" style="width: 179px;" :placeholder="匹配组件内Name字段" /> <el-input v-model="form.componentName" :disabled="formType!=='add'" style="width: 179px;" placeholder="匹配组件内Name字段" />
</el-form-item> </el-form-item>
<el-form-item v-show="!form.iframe && form.type === 1" label="$t('menu.path')" prop="component"> <el-form-item v-show="!form.iframe && form.type === 1" label="$t('menu.path')" prop="component">
<el-input v-model="form.component" :disabled="formType!=='add'" style="width: 179px;" :placeholder="$t('menu.path')" /> <el-input v-model="form.component" :disabled="formType!=='add'" style="width: 179px;" :placeholder="$t('menu.path')" />

6
frontend/src/views/system/user/index.vue
View File

@ -22,10 +22,10 @@
<el-table-column :show-overflow-tooltip="true" prop="email" :label="$t('commons.email')" /> <el-table-column :show-overflow-tooltip="true" prop="email" :label="$t('commons.email')" />
<el-table-column :show-overflow-tooltip="true" prop="dept" :label="$t('commons.organization')"> <el-table-column :show-overflow-tooltip="true" prop="dept" :label="$t('commons.organization')">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.dept.deptName }}</div> <div>{{ scope.row.dept && scope.row.dept.deptName }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" :label="$t('commons.status')" > <el-table-column prop="status" :label="$t('commons.status')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<el-switch v-model="scope.row.enabled" :active-value="1" :inactive-value="0" inactive-color="#DCDFE6" @change="changeSwitch(scope.row)" /> <el-switch v-model="scope.row.enabled" :active-value="1" :inactive-value="0" inactive-color="#DCDFE6" @change="changeSwitch(scope.row)" />
</template> </template>
@ -68,7 +68,7 @@
<el-radio :label="$t('commons.woman')">{{ $t('commons.woman') }}</el-radio> <el-radio :label="$t('commons.woman')">{{ $t('commons.woman') }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="$t('commons.status')" > <el-form-item :label="$t('commons.status')">
<el-radio-group v-model="form.enabled" style="width: 140px"> <el-radio-group v-model="form.enabled" style="width: 140px">
<el-radio :label="1">{{ $t('commons.enable') }} </el-radio> <el-radio :label="1">{{ $t('commons.enable') }} </el-radio>
<el-radio :label="0"> {{ $t('commons.disable') }} </el-radio> <el-radio :label="0"> {{ $t('commons.disable') }} </el-radio>