-

src/views/systemManage/rolePermission/roleInfoCom/index.vue

@@ -21,9 +21,7 @@
             :label="item.name"
             :key="item.actionid"
             v-model="item.checked"
-            :disabled="
-              scope.row.menu == '权限管理' ? true : false
-            "
+           
             @change="handleCheckedChange"
           ></el-checkbox>
         </template>

src/views/tenantManage/adminConfig/component/adminDialog.vue

@@ -11,7 +11,7 @@
         :model="form"
         :rules="rules"
         ref="ruleForm"
-        label-width="150px"
+        label-width="130px"
         class="demo-ruleForm"
       >
         <el-form-item label="管理员姓名:" prop="nickName">
@@ -143,6 +143,22 @@ export default defineComponent({
       console.log(form.value)
     }
 
+    const validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'))
+      } else if (
+        !/^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,20}$/.test(value)
+      ) {
+        callback(new Error('请输入6-18位特殊字符、字母、数字组合的密码'))
+      } else {
+        // if (this.ruleForm.confirmPwd !== '') {
+        //   this.$refs.ruleForm.validateField('confirmPwd')
+        // }
+        callback()
+      }
+    }
+
+
     // close(): Dialog弹窗关闭之后做的事
     const close = () => {
       resetForm()
@@ -166,6 +182,7 @@ export default defineComponent({
       submit,
       form,
       cloneDialog,
+      validatePass,
 
       ruleForm,
       resetForm,
@@ -214,6 +231,7 @@ export default defineComponent({
             message: '密码不能为空',
             trigger: 'blur',
           },
+          { validator: validatePass, trigger: 'blur' },
         ],
         status: [
           {

src/views/tenantManage/adminConfig/component/checkAdminList.vue

@@ -68,7 +68,7 @@
     <div class="paginationBlock1" style="margin-top:30px">
       <el-pagination
         v-model:currentPage="page"
-        :page-sizes="[15, 20, 25, 30]"
+        :page-sizes="[5,10,15, 20]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
@@ -269,6 +269,7 @@ export default defineComponent({
 
     const closeNo = (value) => {
       showDialog2.value = value
+      Select()
     }
 
     const closeNo3 = (value) => {

src/views/tenantManage/tenantUnit/dialogComponent.vue

@@ -375,8 +375,8 @@ export default defineComponent({
           { required: true, message: '请输入联系地址', trigger: 'blur' },
           {
             min: 1,
-            max: 15,
-            message: '长度在 1 到 15个字符',
+            max: 30,
+            message: '长度在 1 到 30个字符',
             trigger: 'blur',
           },
         ],