zhangdan há 4 anos atrás
pai
commit
63036a4156

+ 6 - 5
src/views/SupervisionAuth/role/roleModal.vue

@@ -1,23 +1,24 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" width="45%">
       <a-form :form="form" @submit="handleSubmit">
         <!-- 用户名称 -->
         <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-input
             placeholder="请输入角色名称30个字以内"
-						id="roleModal-name"
+			allowClear
+			id="roleModal-name"
             :maxLength="30"
             v-decorator="['formData.name', {
               initialValue: formData.name,
-              rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
+              rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
           />
         </a-form-item>
         <!-- 状态 -->
         <a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-radio-group
             name="radioGroup"
-						id="roleModal-isEnable"
+			id="roleModal-isEnable"
             v-decorator="[
               'formData.isEnable',
               {
@@ -32,7 +33,7 @@
 
         <a-form-item label="角色描述" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-textarea
-					id="roleModal-remarks"
+			id="roleModal-remarks"
             v-decorator="[
               'formData.remarks',
               { initialValue: formData.remarks,

+ 2 - 1
src/views/SupervisionAuth/user/userModal.vue

@@ -5,7 +5,7 @@
       :title="titleText"
       v-model="isshow"
       @cancle="cancel"
-      width="35%"
+      width="45%"
       :footer="null">
       <a-form :form="form" @submit="handleSubmit">
         <a-row :gutter="24">
@@ -59,6 +59,7 @@
             <a-form-item label="角色" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-select
                 id="userModal-roleNames"
+				allowClear
                 v-decorator="[
                   'formData.roleNames',
                   {

+ 5 - 4
src/views/power/role/roleModal.vue

@@ -1,12 +1,13 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" width="35%">
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" width="45%">
       <a-form :form="form" @submit="handleSubmit">
         <!-- 用户名称 -->
         <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-input
             placeholder="请输入角色名称30个字以内"
-						id="roleModal-name"
+			allowClear
+			id="roleModal-name"
             :maxLength="30"
             v-decorator="['formData.name', {
               initialValue: formData.name,
@@ -17,7 +18,7 @@
         <a-form-item label="状态" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-radio-group
             name="radioGroup"
-						id="roleModal-isEnable"
+			id="roleModal-isEnable"
             v-decorator="[
               'formData.isEnable',
               {
@@ -31,7 +32,7 @@
         </a-form-item>
         <a-form-item label="角色描述" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-textarea
-					id="roleModal-remarks"
+			id="roleModal-remarks"
             v-decorator="[
               'formData.remarks',
               { initialValue: formData.remarks,

+ 3 - 1
src/views/power/user/userModal.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
+    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" width="45%">
       <a-form :form="form" @submit="handleSubmit">
         <a-row :gutter="24">
           <a-col :span="12">
@@ -8,6 +8,7 @@
             <a-form-item label="用户名称" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
                 placeholder="请输入用户名称30个字以内"
+				allowClear
                 :maxLength="30"
                 id="userModal-name"
                 v-decorator="['formData.name', {
@@ -20,6 +21,7 @@
             <a-form-item label="手机号码" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
                 placeholder="请输入手机号码"
+				allowClear
                 :maxLength="11"
                 id="userModal-phone"
                 v-decorator="['formData.phone', {