2022-09-07

src/views/client/index.vue

@@ -104,7 +104,7 @@
         <el-row :gutter="24">
           <el-col :span="24">
             <el-form-item label="用户账号配额" prop="number" >
-              <el-input-number style="width:100%" controls-position="right" :max="99" :min="0" v-model="ruleForm.number" :step="10" placeholder="请输入用户账号配额"></el-input-number>
+              <el-input-number style="width:100%" controls-position="right" :max="99" :min="1" v-model="ruleForm.number" :step="10" placeholder="请输入用户账号配额"></el-input-number>
             </el-form-item>
           </el-col>
         
@@ -245,8 +245,8 @@ export default {
         number: [{ required: true, message: '请输入用户账号配额', trigger: 'blur' },],
         username:[{ required: true, message: '请输入管理员账号', trigger: 'blur' },],
         password:[{ required: true, message: '请输入管理员密码', trigger: 'blur' },],
-        type:[{ required: true, message: '请输入类型', trigger: 'blur' },],
-        	email:[{required:true,message: "请输入手机号码", trigger: "blur"},
+        type:[{ required: true, message: '请选择类型', trigger: 'change' },],
+        	email:[{required:true,message: "请输入邮箱", trigger: "blur"},
       		{pattern:/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9_\.\-])+\.)+([a-zA-Z0-9]{2,4})+$/,
        		 message:'请输入正确的邮箱格式',trigger:'blur'}],
       },

src/views/dataPermission/index.vue

@@ -454,7 +454,10 @@ export default {
         if (valid) {
           this.ruleForm.functionId=this.fun.fun.id
           this.btnLoading = true
-          this.ListToTree()
+          if(this.list.length>0){
+            this.ListToTree()
+          }
+          
           if (this.ruleForm.id) {
             this.$api.editData(this.ruleForm).then(response => {
               this.$message.success('编辑成功')

src/views/user/index.vue

@@ -392,9 +392,9 @@
 												@close="handleClose(index)"
 											>
 												<span
-													>{{ tag.positionName }}[{{
+													>{{ tag.positionName }}<span v-if="tag.departmentName">[{{
 														tag.departmentName
-													}}]</span
+													}}]</span></span
 												>
 											</el-tag>
 										</div>
@@ -647,7 +647,7 @@
 				}
 			},
 			"ruleForm.email"(val) {
-				console.log(val)
+				// console.log(val)
 				if (val.indexOf("@qq.com") != -1) {
 					var index = val.indexOf("@qq.com");
 					var str = val.substring(0, index);
@@ -692,7 +692,8 @@
 			},
 			getVal(data, options, arr) {
 				options.forEach((e) => {
-					data.forEach((i) => {
+					if(data){
+						data.forEach((i) => {
 						if (i == e.id) {
 							arr.push(e.name || e.position);
 							return;
@@ -704,6 +705,8 @@
 							}
 						}
 					});
+					}
+					
 				});
 				return arr;
 			},
@@ -765,7 +768,9 @@
 				});
 			},
 			showInputLabel() {
-				let departmentName = this.getVal(
+				// console.log(this.positionAndDepartment.hasOwnProperty('department'))
+				if(this.positionAndDepartment.hasOwnProperty('department')==true){
+					var departmentName = this.getVal(
 					[
 						this.positionAndDepartment.department[
 							this.positionAndDepartment.department.length - 1
@@ -774,7 +779,12 @@
 					this.departmentList,
 					[]
 				);
-				let positionName = this.getVal(
+				}else{
+					this.positionAndDepartment.department=[''],
+					 departmentName=['']
+				}
+				
+				var positionName = this.getVal(
 					[this.positionAndDepartment.position],
 					this.positionList,
 					[]
@@ -788,6 +798,7 @@
 						],
 					departmentName: departmentName[departmentName.length - 1],
 				});
+				
 				this.positionAndDepartment = {};
 				this.labelVal = "";
 			},