zhangdan há 4 anos atrás
pai
commit
453f859a0c

+ 2 - 2
src/views/appSetting/bannerSetting.vue

@@ -49,7 +49,7 @@
             :maxLength="30"
             v-decorator="['formData.title', { initialValue:formData.title,rules: [{ required: true, message: '请输入轮播图名称30个字以内!' }] }]"
             :disabled="disabled"
-            placeholder="请输入轮播图名称32个字以内" />
+            placeholder="请输入轮播图名称30个字以内" />
         </a-form-item>
         <a-form-item label="广告图位置" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <v-select
@@ -233,7 +233,7 @@ export default {
         status: '', // 状态
         sort: '', // 排序
         position: '', // 广告图位置
-        photoPath: '' // banner地址
+        photoPath: '' ,// banner地址
       },
       bannerType: 'app',
       disabled: false,

+ 1 - 1
src/views/power/role/roleList.vue

@@ -17,7 +17,7 @@
 
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
-              <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.isEnable" allowClear placeholder="请选择状态" id="roleList-isEnable"></v-select>
+              <v-select code="ENABLE_FLAG" v-model="queryParam.isEnable" allowClear placeholder="请选择状态" id="roleList-isEnable"></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">

+ 2 - 2
src/views/power/role/roleModal.vue

@@ -5,12 +5,12 @@
         <!-- 用户名称 -->
         <a-form-item label="角色名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-input
-            placeholder="请输入角色名称"
+            placeholder="请输入角色名称30个字以内"
             :maxLength="30"
             id="roleModal-name"
             v-decorator="['formData.name', {
               initialValue: formData.name,
-              rules: [{ required: true, message: '请输入角色名称!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
+              rules: [{ required: true, message: '请输入角色名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
           />
         </a-form-item>
 

+ 1 - 1
src/views/power/user/userList.vue

@@ -17,7 +17,7 @@
 
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
-              <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态" id="userList-check-enable-state"></v-select>
+              <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态" id="userList-check-enable-state"></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">

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

@@ -7,12 +7,12 @@
             <!-- 用户名称 -->
             <a-form-item label="用户名称" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-input
-                placeholder="请输入用户名称"
+                placeholder="请输入用户名称30个字以内"
                 id="userModal-name"
                 :maxLength="30"
                 v-decorator="['formData.name', {
                   initialValue: formData.name,
-                  rules: [{ required: true, message: '请输入用户名称!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
+                  rules: [{ required: true, message: '请输入用户名称!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
               />
             </a-form-item>
           </a-col>
@@ -178,7 +178,6 @@ export default {
         console.log(values, 'values222')
         if (!err) {
           values.formData.roleNames = values.formData.roleNames.join(',')
-
           console.log(values.formData, ' formData.type222222222')
           console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
           saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {