|
@@ -2,64 +2,52 @@
|
|
|
<div>
|
|
|
<a-modal
|
|
|
centered
|
|
|
- class="modalBox"
|
|
|
+ class="roleEdit-modal"
|
|
|
+ :footer="null"
|
|
|
+ :maskClosable="false"
|
|
|
:title="titleText"
|
|
|
v-model="isshow"
|
|
|
- @cancle="cancel"
|
|
|
- :maskClosable="false"
|
|
|
- width="45%">
|
|
|
+ @cancle="isshow=false"
|
|
|
+ :width="800">
|
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <a-form :form="form" @submit="handleSubmit">
|
|
|
+ <a-form-model
|
|
|
+ id="roleEdit-form"
|
|
|
+ ref="ruleForm"
|
|
|
+ :model="form"
|
|
|
+ :rules="rules"
|
|
|
+ :label-col="formItemLayout.labelCol"
|
|
|
+ :wrapper-col="formItemLayout.wrapperCol"
|
|
|
+ >
|
|
|
<!-- 用户名称 -->
|
|
|
- <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
|
|
|
+ <a-form-model-item label="角色名称" prop="name">
|
|
|
<a-input
|
|
|
- placeholder="请输入角色名称(最多30个字符)"
|
|
|
+ id="roleEdit-name"
|
|
|
+ v-model.trim="form.name"
|
|
|
+ @change="filterEmpty"
|
|
|
:maxLength="30"
|
|
|
- v-decorator="['formData.name', {
|
|
|
- initialValue: formData.name,
|
|
|
- getValueFromEvent: $filterEmpty,
|
|
|
- rules: [{ required: true, message: '请输入角色名称(最多30个字符)!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
|
|
|
- />
|
|
|
- </a-form-item>
|
|
|
-
|
|
|
+ allowClear
|
|
|
+ placeholder="请输入角色名称(最多30个字符)"/>
|
|
|
+ </a-form-model-item>
|
|
|
<!-- 状态 -->
|
|
|
- <a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
|
|
|
- <a-radio-group
|
|
|
- name="radioGroup"
|
|
|
- v-decorator="[
|
|
|
- 'formData.isEnable',
|
|
|
- {
|
|
|
- initialValue: formData.isEnable,
|
|
|
- rules: [{ required: true, message: '请选择状态!' }] },
|
|
|
- ]"
|
|
|
- >
|
|
|
+ <a-form-model-item label="状态" prop="isEnable">
|
|
|
+ <a-radio-group name="radioGroup" v-model="form.isEnable" placeholder="请选择状态">
|
|
|
<a-radio :value="1">启用</a-radio>
|
|
|
<a-radio :value="0">禁用</a-radio>
|
|
|
</a-radio-group>
|
|
|
- </a-form-item>
|
|
|
-
|
|
|
- <a-form-item label="角色描述" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
|
|
|
+ </a-form-model-item>
|
|
|
+ <a-form-model-item label="角色描述" prop="remarks">
|
|
|
<a-textarea
|
|
|
- v-decorator="[
|
|
|
- 'formData.remarks',
|
|
|
- { initialValue: formData.remarks,
|
|
|
- rules: [] },
|
|
|
- ]"
|
|
|
- style="min-height: 60px;"
|
|
|
+ id="roleEdit-remarks"
|
|
|
+ v-model.trim="form.remarks"
|
|
|
:maxLength="500"
|
|
|
- placeholder="请输入描述(最多500个字符)"
|
|
|
- autosize />
|
|
|
- </a-form-item>
|
|
|
-
|
|
|
- <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
|
|
|
- <a-button type="primary" @click="handleSubmit()">
|
|
|
- 保存
|
|
|
- </a-button>
|
|
|
- <a-button :style="{ marginLeft: '8px' }" @click="cancel">
|
|
|
- 取消
|
|
|
- </a-button>
|
|
|
- </a-form-item>
|
|
|
- </a-form>
|
|
|
+ allowClear
|
|
|
+ placeholder="请输入描述(最多500个字符)"/>
|
|
|
+ </a-form-model-item>
|
|
|
+ <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
|
|
|
+ <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
|
|
|
+ <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-form-model>
|
|
|
</a-spin>
|
|
|
</a-modal>
|
|
|
</div>
|
|
@@ -78,7 +66,7 @@ export default {
|
|
|
type: Boolean,
|
|
|
default: false
|
|
|
},
|
|
|
- data: {
|
|
|
+ nowData: {
|
|
|
type: Object,
|
|
|
default: function () {
|
|
|
return {}
|
|
@@ -90,84 +78,88 @@ export default {
|
|
|
titleText: '添加角色',
|
|
|
isshow: this.visible,
|
|
|
spinning: false,
|
|
|
- formLayout: 'horizontal',
|
|
|
- form: this.$form.createForm(this, { name: 'roleModal' }),
|
|
|
- formData: {
|
|
|
+ formItemLayout: {
|
|
|
+ labelCol: { span: 6 },
|
|
|
+ wrapperCol: { span: 16 }
|
|
|
+ },
|
|
|
+ form: {
|
|
|
name: '',
|
|
|
- isEnable: '', // 活动状态
|
|
|
+ isEnable: undefined,
|
|
|
remarks: ''
|
|
|
+ },
|
|
|
+ rules: {
|
|
|
+ name: [ { required: true, message: '请输入角色名称', trigger: 'blur' }, { pattern: '^[^<|>]{1,30}$', message: '请输入不含<或>的字符,最多30个字符' } ],
|
|
|
+ isEnable: [ { required: true, message: '请选择状态', trigger: 'change' } ]
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- cancel () {
|
|
|
- this.clear()
|
|
|
- this.$emit('close')
|
|
|
+ // 过滤空格
|
|
|
+ filterEmpty () {
|
|
|
+ let str = this.form.name
|
|
|
+ str = str.replace(/\ +/g, '')
|
|
|
+ str = str.replace(/[ ]/g, '')
|
|
|
+ str = str.replace(/[\r\n]/g, '')
|
|
|
+ this.form.name = str
|
|
|
},
|
|
|
// 保存提交
|
|
|
handleSubmit () {
|
|
|
const _this = this
|
|
|
- this.form.validateFields((err, values) => {
|
|
|
- if (!err) {
|
|
|
- console.log(values.formData, ' formData.type222222222')
|
|
|
+ this.$refs.ruleForm.validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ const params = JSON.parse(JSON.stringify(_this.form))
|
|
|
+ params.id = _this.nowData && _this.nowData.id ? _this.nowData.id : null
|
|
|
_this.spinning = true
|
|
|
- saveRolePower(Object.assign(this.formData, values.formData)).then(res => {
|
|
|
- console.log(res, 'res--save')
|
|
|
- if (res.status + '' === '200') {
|
|
|
- this.$message.success(res.message ? res.message : '保存成功')
|
|
|
- this.$emit('refresh')
|
|
|
+ saveRolePower(params).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ _this.$message.success(res.message)
|
|
|
+ _this.$emit('refresh')
|
|
|
setTimeout(function () {
|
|
|
- _this.cancel()
|
|
|
+ _this.isshow = false
|
|
|
_this.spinning = false
|
|
|
}, 300)
|
|
|
} else {
|
|
|
_this.spinning = false
|
|
|
- // this.$message.error(res.message)
|
|
|
}
|
|
|
})
|
|
|
+ } else {
|
|
|
+ console.log('error submit!!')
|
|
|
+ return false
|
|
|
}
|
|
|
})
|
|
|
- },
|
|
|
- clear () {
|
|
|
- this.form.resetFields()
|
|
|
- delete this.formData.id
|
|
|
- this.formData.name = ''
|
|
|
- this.formData.isEnable = ''
|
|
|
- this.formData.remarks = ''
|
|
|
}
|
|
|
},
|
|
|
- mounted () {
|
|
|
- },
|
|
|
- beforeCreate () {
|
|
|
- this.form = this.$form.createForm(this, { name: 'roleModal' })
|
|
|
- },
|
|
|
watch: {
|
|
|
visible (newValue, oldValue) {
|
|
|
this.isshow = newValue
|
|
|
},
|
|
|
isshow (newValue, oldValue) {
|
|
|
- if (newValue) {
|
|
|
- if (this.data.id) { // 编辑
|
|
|
- this.titleText = '编辑角色'
|
|
|
- this.formData = Object.assign({}, this.data)
|
|
|
- delete this.formData.no
|
|
|
- this.formData.isEnable = Number(this.formData.isEnable)
|
|
|
- console.log(this.formData, 'this.formData')
|
|
|
- } else {
|
|
|
- this.titleText = '添加角色'
|
|
|
- }
|
|
|
- } else {
|
|
|
- this.cancel()
|
|
|
+ if (!newValue) {
|
|
|
+ this.$emit('close')
|
|
|
+ this.$refs.ruleForm.resetFields()
|
|
|
+ this.form.name = ''
|
|
|
+ this.form.isEnable = undefined
|
|
|
+ this.form.remarks = ''
|
|
|
+ this.titleText = '新增角色'
|
|
|
}
|
|
|
+ },
|
|
|
+ nowData: {
|
|
|
+ handler (newValue, oldValue) {
|
|
|
+ if (this.isshow && newValue) {
|
|
|
+ if (this.nowData.id) { // 编辑
|
|
|
+ this.titleText = '编辑角色'
|
|
|
+ this.form = Object.assign({}, this.nowData)
|
|
|
+ this.form.isEnable = Number(this.nowData.isEnable)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ deep: true
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
<style >
|
|
|
- .modalBox{
|
|
|
- }
|
|
|
.ant-modal-footer {
|
|
|
display: none;
|
|
|
}
|