|
@@ -12,13 +12,16 @@
|
|
|
|
|
|
|
|
<a-spin :spinning="confirmLoading">
|
|
<a-spin :spinning="confirmLoading">
|
|
|
<a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
|
|
<a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
|
|
|
- <a-form-model-item label="配置名称" required prop="roleName">
|
|
|
|
|
|
|
+ <a-form-model-item label="配置名称" required prop="configName">
|
|
|
<a-input v-model="model.configName" placeholder="请输入配置名称"/>
|
|
<a-input v-model="model.configName" placeholder="请输入配置名称"/>
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
|
|
+<!-- <a-form-model-item label="配置名称" required prop="configName">-->
|
|
|
|
|
+<!-- <a-input v-model="model.configNumber" placeholder="请输入配置名称"/>-->
|
|
|
|
|
+<!-- </a-form-model-item>-->
|
|
|
|
|
|
|
|
- <a-form-model-item label="数值" required prop="roleName">
|
|
|
|
|
- <a-input v-model="model.configNumber" placeholder="请输入数值"/>
|
|
|
|
|
- </a-form-model-item>
|
|
|
|
|
|
|
+ <a-form-model-item label="数值" >
|
|
|
|
|
+ <a-input-number v-model="model.configNumber" :min="1" :max="1000" :default-value="30"/>
|
|
|
|
|
+ </a-form-model-item>
|
|
|
|
|
|
|
|
</a-form-model>
|
|
</a-form-model>
|
|
|
</a-spin>
|
|
</a-spin>
|
|
@@ -26,7 +29,8 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
- import {addRole,editRole,duplicateCheck } from '@/api/api'
|
|
|
|
|
|
|
+ import {addExpire,editExpire } from '@/api/api'
|
|
|
|
|
+ import { getAction } from '@api/manage'
|
|
|
export default {
|
|
export default {
|
|
|
name: "expireModal",
|
|
name: "expireModal",
|
|
|
data () {
|
|
data () {
|
|
@@ -34,7 +38,10 @@
|
|
|
title:"操作",
|
|
title:"操作",
|
|
|
visible: false,
|
|
visible: false,
|
|
|
roleDisabled: false,
|
|
roleDisabled: false,
|
|
|
- model: {},
|
|
|
|
|
|
|
+ model: {
|
|
|
|
|
+ configName:'',
|
|
|
|
|
+ configNumber:''
|
|
|
|
|
+ },
|
|
|
layout: {
|
|
layout: {
|
|
|
labelCol: { span: 3 },
|
|
labelCol: { span: 3 },
|
|
|
wrapperCol: { span: 14 },
|
|
wrapperCol: { span: 14 },
|
|
@@ -42,12 +49,10 @@
|
|
|
confirmLoading: false,
|
|
confirmLoading: false,
|
|
|
validatorRules:{
|
|
validatorRules:{
|
|
|
configName: [
|
|
configName: [
|
|
|
- { required: true, message: '请输入配置名称!' },
|
|
|
|
|
- { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
|
|
|
|
|
- { validator: this.validateRoleName}
|
|
|
|
|
|
|
+ { required: true,message: '请输入配置名称!' },
|
|
|
],
|
|
],
|
|
|
configNumber: [
|
|
configNumber: [
|
|
|
- { required: true, message: '请输入配置名称!' },
|
|
|
|
|
|
|
+ { required: true, message: '请输入配置数值!' },
|
|
|
{ min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
|
|
{ min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
|
|
|
{ validator: this.validateRoleName}
|
|
{ validator: this.validateRoleName}
|
|
|
]
|
|
]
|
|
@@ -80,6 +85,7 @@
|
|
|
this.$emit('close');
|
|
this.$emit('close');
|
|
|
this.visible = false;
|
|
this.visible = false;
|
|
|
},
|
|
},
|
|
|
|
|
+
|
|
|
handleOk () {
|
|
handleOk () {
|
|
|
const that = this;
|
|
const that = this;
|
|
|
// 触发表单验证
|
|
// 触发表单验证
|
|
@@ -87,10 +93,16 @@
|
|
|
if (valid) {
|
|
if (valid) {
|
|
|
that.confirmLoading = true;
|
|
that.confirmLoading = true;
|
|
|
let obj;
|
|
let obj;
|
|
|
|
|
+ if(that.model.configNumber==='' ){
|
|
|
|
|
+ that.$message.warning("数值不可为空");
|
|
|
|
|
+ that.confirmLoading = false;
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if(!this.model.id){
|
|
if(!this.model.id){
|
|
|
- obj=addRole(this.model);
|
|
|
|
|
|
|
+ obj=addExpire(this.model);
|
|
|
}else{
|
|
}else{
|
|
|
- obj=editRole(this.model);
|
|
|
|
|
|
|
+ obj=editExpire(this.model);
|
|
|
}
|
|
}
|
|
|
obj.then((res)=>{
|
|
obj.then((res)=>{
|
|
|
if(res.success){
|
|
if(res.success){
|
|
@@ -111,49 +123,7 @@
|
|
|
handleCancel () {
|
|
handleCancel () {
|
|
|
this.close()
|
|
this.close()
|
|
|
},
|
|
},
|
|
|
- validateRoleCode(rule, value, callback){
|
|
|
|
|
- if(/[\u4E00-\u9FA5]/g.test(value)){
|
|
|
|
|
- callback("角色编码不可输入汉字!");
|
|
|
|
|
- }else{
|
|
|
|
|
- let params = {
|
|
|
|
|
- tableName: "sys_role",
|
|
|
|
|
- fieldName: "role_code",
|
|
|
|
|
- fieldVal: value,
|
|
|
|
|
- dataId: this.model.id,
|
|
|
|
|
- };
|
|
|
|
|
- duplicateCheck(params).then((res)=>{
|
|
|
|
|
- if(res.success){
|
|
|
|
|
- callback();
|
|
|
|
|
- }else{
|
|
|
|
|
- callback(res.message);
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- validatePower(rule, value, callback) {
|
|
|
|
|
- if ( value !=='' && value!==null) {
|
|
|
|
|
- callback();
|
|
|
|
|
- } else {
|
|
|
|
|
- callback("请选择!");
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- validateRoleName(rule, value, callback){
|
|
|
|
|
|
|
|
|
|
- let params = {
|
|
|
|
|
- tableName: "sys_role",
|
|
|
|
|
- fieldName: "role_name",
|
|
|
|
|
- fieldVal: value,
|
|
|
|
|
- dataId: this.model.id,
|
|
|
|
|
- };
|
|
|
|
|
- duplicateCheck(params).then((res)=>{
|
|
|
|
|
- if(res.success){
|
|
|
|
|
- callback();
|
|
|
|
|
- }else{
|
|
|
|
|
- callback(res.message);
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
-
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
</script>
|
|
</script>
|