From 352ebb8f9a4f0e3860d2e1393d55a265e506d587 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Sat, 6 May 2023 16:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/System/Org.vue              | 52 +++++++--------------------
 src/views/System/dataDictionary.vue   |  2 +-
 src/views/System/dictionaryDetail.vue |  2 +-
 3 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/src/views/System/Org.vue b/src/views/System/Org.vue
index abee3ad..ced6852 100644
--- a/src/views/System/Org.vue
+++ b/src/views/System/Org.vue
@@ -83,7 +83,7 @@
         <!-- 新增/编辑/查看 用户 -->
         <el-dialog :title="dialogTitle + '部门'" :visible.sync="dialogUser" width="750px" :close-on-click-modal="false"
                    :close-on-press-escape="false" modal-append-to-body append-to-body>
-            <div class="user-form">
+            <div class="user-form showLimit">
                 <el-form :model="form" label-width="186px" :disabled="mode === 'view'">
                   <el-form-item label="部门名称:" required>
                       <el-input v-model="form.orgName" maxlength="50" show-word-limit placeholder="请输入部门名称"></el-input>
@@ -94,17 +94,17 @@
                   <el-form-item label="部门级别:" required>
                     <el-input v-model="form.orgLevel" maxlength="2" show-word-limit placeholder="请输入部门级别"></el-input>
                   </el-form-item>
-                  <el-form-item label="父部门编码:" required>
+                  <el-form-item label="父部门编码:" >
                     <el-input v-model="form.supOrgCode" maxlength="10" show-word-limit placeholder="请输入父部门编码"></el-input>
                   </el-form-item>
-                  <el-form-item label="部门简称:" required>
+                  <el-form-item label="部门简称:" >
                     <el-input v-model="form.orgShortName" maxlength="10" show-word-limit placeholder="请输入部门简称"></el-input>
                   </el-form-item>
-                  <el-form-item label="归属地:" required>
+                  <el-form-item label="归属地:" >
                     <el-input v-model="form.attribution" maxlength="10" show-word-limit placeholder="请输入归属地"></el-input>
                   </el-form-item>
-                  <el-form-item label="部门14位码:" required>
-                    <el-input v-model="form.bmdm14" maxlength="10" show-word-limit placeholder="部门14位码"></el-input>
+                  <el-form-item label="部门14位码:" >
+                    <el-input v-model="form.bmdm14" maxlength="14" show-word-limit placeholder="部门14位码"></el-input>
                   </el-form-item>
                     <!--<el-form-item label="密码:" :required="mode === 'add'" v-if="mode !== 'view'">-->
                         <!--<el-input v-model="form.password" maxlength="20" type="password" placeholder="请输入密码"></el-input>-->
@@ -258,46 +258,20 @@ export default {
     },
     // 验证
     checkUserForm () {
-      if (this.mode === 'add') {
-        if (!this.form.account || !(/^[a-zA-Z0-9]*$/.test(this.form.account))) {
-          return this.$message.warning('用户名只能为纯数字、纯字母或字母数字组合') && false
-        }
-        // // 密码
-        // if (!(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,}$/.test(this.form.password))) {
-        //     return this.$message.warning('密码至少8个字符，至少1个大写字母，1个小写字母，1个数字') && false;
-        // }
-        // if (this.repassword !== this.form.password) {
-        //     return this.$message.warning('请检查密码') && false;
-        // }
+      if (!this.form.orgName) {
+        return this.$message.warning('请检查部门名称') && false
       }
-      if (this.mode === 'modify') {
-        // if (this.form.password || this.repassword) {
-        //     // 密码
-        //     if (!(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,}$/.test(this.form.password))) {
-        //         return this.$message.warning('密码至少8个字符，至少1个大写字母，1个小写字母，1个数字') && false;
-        //     }
-        //     if (this.repassword !== this.form.password) {
-        //         return this.$message.warning('请检查密码') && false;
-        //     }
-        // }
+      if (!this.form.orgCode) {
+        return this.$message.warning('请检查部门编码') && false
       }
-      if (this.form.cellPhoneNumber && !(/^1[3|4|5|7|8|9][0-9]{9}$/.test(this.form.cellPhoneNumber))) {
-        return this.$message.warning('请检查手机号') && false
-      }
-      if (this.form.email && !(/^[\w-.]+@[a-z\d-]+(\.[a-z\d-]+)*\.[a-z\d]{2,6}$/i.test(this.form.email))) {
-        return this.$message.warning('请检查邮箱') && false
-      }
-      if (!this.form.roleIdList[0]) {
-        return this.$message.warning('请选择角色') && false
-      }
-      if (!this.form.usname) {
-        return this.$message.warning('请输入姓名') && false
+      if (!this.form.orgLevel || !(/^[a-zA-Z0-9]*$/.test(this.form.orgLevel))) {
+        return this.$message.warning('部门级别只能为纯数字') && false
       }
       return true
     },
     // 新增用户
     sysOrgAddOrg () {
-      // if (!this.checkUserForm()) return
+      if (!this.checkUserForm()) return
       const data = JSON.parse(JSON.stringify(this.form))
 
       this.$api.org.sysOrgAddUser(data).then(_ => {
diff --git a/src/views/System/dataDictionary.vue b/src/views/System/dataDictionary.vue
index 2ce7d25..a4ca0f6 100644
--- a/src/views/System/dataDictionary.vue
+++ b/src/views/System/dataDictionary.vue
@@ -59,7 +59,7 @@
     <!-- 新增/编辑/查看 用户 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogUser" width="750px" :close-on-click-modal="false"
                :close-on-press-escape="false" modal-append-to-body append-to-body>
-      <div class="user-form">
+      <div class="user-form showLimit">
         <el-form ref="dicRef" :rules="formRule" :model="form" label-width="186px" :disabled="mode === 'view'">
           <el-form-item label="数据字典编码:" prop="dicCode">
             <el-input v-model="form.dicCode" :disabled="mode === 'view' || mode === 'modify' "  maxlength="20" show-word-limit placeholder="请输入数据字典编码"></el-input>
diff --git a/src/views/System/dictionaryDetail.vue b/src/views/System/dictionaryDetail.vue
index 0c33145..90fe5b3 100644
--- a/src/views/System/dictionaryDetail.vue
+++ b/src/views/System/dictionaryDetail.vue
@@ -70,7 +70,7 @@
     </div>
     <el-dialog :title="dialogTitle " :visible.sync="dialogUser" width="750px" :close-on-click-modal="false"
                :close-on-press-escape="false" modal-append-to-body append-to-body>
-      <div class="user-form">
+      <div class="user-form showLimit">
         <el-form ref="addForm" :model="form" label-width="186px" :disabled="mode === 'view'"
         :rules="formRule">
           <el-form-item label="选项:"  required>