平台端角色，用户，租户完善

package.json

@@ -64,9 +64,9 @@
     "compression-webpack-plugin": "^3.1.0"
   },
   "eslintConfig": {
-    "root": true,
+    "root": false,
     "env": {
-      "node": true
+      "node": false
     },
     "extends": [
       "plugin:vue/strongly-recommended",

src/components/jeecg/JCodeEditor.vue

@@ -299,7 +299,7 @@
         this.coder.on('blur', () => {
           if(this.code){
             this.hasCode=true
-          }else{
+          } else {
             this.hasCode=false
           }
         })
@@ -357,7 +357,7 @@
         // 允许父容器通过以下函数监听当前的语法值
         this.$emit('language-change', label)
       },
-      nullTipClick(){
+      nullTipClick() {
         this.coder.focus()
       }
     }
@@ -480,4 +480,5 @@
 .CodeMirror-cursor{
   height:18.4px !important;
 }
+
 </style>

src/views/system/UserList.vue

@@ -237,38 +237,37 @@
             dataIndex: 'avatar',
             scopedSlots: {customRender: "avatarslot"}
           },
-
-          {
-            title: '性别',
-            align: "center",
-            width: 80,
-            dataIndex: 'sex_dictText',
-            sorter: true
-          },
-          {
-            title: '生日',
-            align: "center",
-            width: 100,
-            dataIndex: 'birthday'
-          },
+          // {
+          //   title: '性别',
+          //   align: "center",
+          //   width: 80,
+          //   dataIndex: 'sex_dictText',
+          //   sorter: true
+          // },
+          // {
+          //   title: '生日',
+          //   align: "center",
+          //   width: 100,
+          //   dataIndex: 'birthday'
+          // },
           {
             title: '手机号码',
             align: "center",
             width: 100,
             dataIndex: 'phone'
           },
-          {
-            title: '部门',
-            align: "center",
-            width: 180,
-            dataIndex: 'orgCodeTxt'
-          },
-          {
-            title: '负责部门',
-            align: "center",
-            width: 180,
-            dataIndex: 'departIds_dictText'
-          },
+          // {
+          //   title: '部门',
+          //   align: "center",
+          //   width: 180,
+          //   dataIndex: 'orgCodeTxt'
+          // },
+          // {
+          //   title: '负责部门',
+          //   align: "center",
+          //   width: 180,
+          //   dataIndex: 'departIds_dictText'
+          // },
           {
             title: '状态',
             align: "center",

src/views/system/modules/TenantForm.vue

@@ -8,15 +8,14 @@
               <a-input v-model="model.name" placeholder="请输入租户名称"></a-input>
             </a-form-model-item>
           </a-col>
-          
           <a-col :span="24">
             <a-form-model-item label="租户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id">
               <a-input-number style="width: 100%" :min="1" v-model="model.id" placeholder="请输入租户编号" :disabled="disabledId"></a-input-number>
             </a-form-model-item>
           </a-col>
           
-<!--          <a-col :span="24">
-            <a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+         <a-col :span="24">
+            <a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" >
               <j-date placeholder="请选择开始时间" v-model="model.beginDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
             </a-form-model-item>
           </a-col>
@@ -24,7 +23,43 @@
             <a-form-model-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择结束时间" v-model="model.endDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
             </a-form-model-item>
-          </a-col>-->
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="管理账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="account">
+              <a-input v-model="model.account" placeholder="请输入管理账号"></a-input>
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="管理密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pwd">
+              <a-input v-model="model.pwd" placeholder="请输入管理密码"></a-input>
+            </a-form-model-item>
+          </a-col>
+
+          <!-- <a-col :span="24">
+            <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pwd">
+              <a-input v-model="model.workNo" placeholder="请输入管理密码"></a-input>
+            </a-form-model-item>
+          </a-col> -->
+
+          <a-col :span="24">
+            <a-form-model-item label="管理确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmpwd">
+              <a-input v-model="model.confirmpwd" @blur="handleConfirmBlur" placeholder="请输入管理确认密码"></a-input>
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="管理名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
+              <a-input v-model="model.username" placeholder="请输入管理名称"></a-input>
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="管理手机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入管理手机"></a-input>
+            </a-form-model-item>
+          </a-col>
+          
           
           <a-col :span="24">
             <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -76,6 +111,7 @@
     },
     data () {
       return {
+        confirmDirty: false,
         model: {status:1},
         id:'',
         labelCol: {
@@ -88,7 +124,15 @@
         },
         confirmLoading: false,
         validatorRules: {
-          id:[ { required: true, message: '请输入租户编号!' },]
+          id:[ { required: true, message: '请输入租户编号!' },],
+          account:[ { required: true, message: '请输入管理员账号!' },],
+          pwd:[{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '密码由8位数字、大小写字母和特殊符号组成!'},
+            {validator: this.validateToNextPassword,trigger: 'change'}],
+          confirmpwd:[{required: true, message: '请重新输入登录密码!',},
+            { validator: this.compareToFirstPassword,}],
+          username:[ { required: true, message: '请输入管理员名称!' },],
+          phone: [{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的座机号码' },]
+          // workNo: [ { required: true, message: '请输入管理员工号!' },]
         },
         url: {
           add: "/sys/tenant/add",
@@ -127,6 +171,27 @@
       this.showFlowData();
     },
     methods: {
+      compareToFirstPassword (rule, value, callback) {
+        if (value && value !== this.model.pwd) {
+          callback('两次输入的密码不一样！');
+        } else {
+          callback()
+        }
+      },
+      validateToNextPassword (rule, value, callback) {
+        const confirmpassword=this.model.confirmpwd;
+        if (value && confirmpassword && value !== confirmpassword) {
+          callback('两次输入的密码不一样！');
+        }
+        if (value && this.confirmDirty) {
+          this.$refs.form.validateField(['confirmpwd']);
+        }
+        callback();
+      },
+      handleConfirmBlur(e) {
+        const value = e.target.value;
+        this.confirmDirty = this.confirmDirty || !!value
+      },
       show (record) {
         this.model = record?Object.assign({}, record):this.model;
         this.id = record?record.id:'';