update

src/modules/basic/view/sys_login_rule_list.vue

@@ -7,7 +7,6 @@
     >
       <el-form-item label="学校">
         <el-select
-          v-if="isSuperAdmin"
           v-model="searchForm.rootOrgId"
           placeholder="请选择"
           filterable
@@ -84,7 +83,6 @@
       border
       stripe
     >
-      <el-table-column label="ID" prop="id" width="80px" sortable />
       <el-table-column label="学校ID" prop="rootOrgId" width="110px" sortable />
 
       <el-table-column label="规则类型" width="150px">
@@ -110,7 +108,7 @@
             icon="el-icon-edit"
             @click="loginRuleDialogOpen(scope.row)"
             plain
-            >编辑
+            >修改
           </el-button>
 
           <el-button
@@ -138,7 +136,7 @@
     </div>
 
     <el-dialog
-      title="规则新增"
+      :title="this.isCreate ? '规则新增' : '规则修改'"
       width="380px"
       :visible.sync="loginRuleDialog"
       @close="loginRuleDialogClose"
@@ -148,13 +146,13 @@
         ref="loginRuleForm"
         :rules="formRules"
         label-position="right"
-        label-width="120px"
+        label-width="110px"
         inline-message
       >
-        <el-form-item label="学校">
+        <el-form-item label="学校" prop="rootOrgId">
           <el-select
-            v-if="isSuperAdmin"
             v-model="loginRuleForm.rootOrgId"
+            :disabled="!isCreate"
             placeholder="请选择"
             filterable
             clearable
@@ -170,9 +168,10 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="规则类型">
+        <el-form-item label="规则类型" prop="type">
           <el-select
             v-model="loginRuleForm.type"
+            :disabled="!isCreate"
             size="small"
             class="w180"
             placeholder="请选择"
@@ -187,15 +186,20 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="是否白名单">
-          <el-radio-group v-model="loginRuleForm.allow">
-            <el-radio label="true">是</el-radio>
-            <el-radio label="false">否</el-radio>
+        <el-form-item label="是否白名单" prop="allow">
+          <el-radio-group v-model="loginRuleForm.allow" class="w180">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <div style="text-align: center">
-          <el-button type="primary" @click="doAddRule">确 定</el-button>
+          <el-button type="primary" @click="doAddRule" v-if="isCreate"
+            >确 定</el-button
+          >
+          <el-button type="primary" @click="doEditRule" v-if="!isCreate"
+            >确 定</el-button
+          >
           <el-button @click="loginRuleDialogClose">取 消</el-button>
         </div>
       </el-form>
@@ -226,18 +230,22 @@ export default {
         { label: "考生端登录", value: "STUDENT_CLIENT_LOGIN" },
         { label: "极验验证码登录", value: "GEETEST_LOGIN" }
       ],
+      isCreate: true,
       loginRuleDialog: false,
       loginRuleForm: {
         rootOrgId: null,
         type: null,
-        allow: null
+        allow: false
       },
       formRules: {
         rootOrgId: [
-          { required: true, message: "学校不能为空！", trigger: "change" }
+          { required: true, message: "请选择学校！", trigger: "change" }
         ],
         type: [
-          { required: true, message: "规则类型不能为空！", trigger: "change" }
+          { required: true, message: "请选择规则类型！", trigger: "change" }
+        ],
+        allow: [
+          { required: true, message: "请选择是否白名单！", trigger: "change" }
         ]
       }
     };
@@ -271,13 +279,15 @@ export default {
     },
     loginRuleDialogOpen(row) {
       if (row) {
+        this.isCreate = false;
         this.loginRuleForm.rootOrgId = row.rootOrgId;
         this.loginRuleForm.type = row.type;
         this.loginRuleForm.allow = row.allow;
       } else {
+        this.isCreate = true;
         this.loginRuleForm.rootOrgId = null;
         this.loginRuleForm.type = null;
-        this.loginRuleForm.allow = null;
+        this.loginRuleForm.allow = false;
       }
       this.loginRuleDialog = true;
     },
@@ -290,7 +300,7 @@ export default {
           return false;
         }
 
-        this.loginRuleDialogClose();
+        // this.loginRuleDialogClose();
       });
     },
     doEditRule() {