凉纪 1 vuosi sitten
vanhempi
commit
a6a20d5629

+ 3 - 3
src/views/system/user/index.vue

@@ -951,7 +951,7 @@ export default {
         this.form.password = "";
       });
     },
-    
+
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
       console.log(row, "row");
@@ -959,9 +959,9 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
-        inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,16}$/,
+        inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[a-zA-Z0-9])[a-zA-Z0-9]{8,16}$/,
         inputErrorMessage:
-          "用户密码长度介于8和16之间,必须包含大小写字母和数字",
+          "用户密码长度介于8和16之间,必须包含大小写字母和数字,禁止输入中文",
       })
         .then(({ value }) => {
           let data = {

+ 2 - 2
src/views/system/workTimeSet/dialog.add.vue

@@ -318,8 +318,8 @@ export default {
       }
     },
     async onSubmit() {
-      if(this.orgIdList.length === 0)return  this.$message.warning('请选择机构');
-      if(this.workTimeList.length === 0)return  this.$message.warning('请添加日期');
+      if(this.orgIdList.length === 0)return  this.$message.error('请选择机构');
+      if(this.workTimeList.length === 0)return  this.$message.error('请添加日期');
       //判断是否有重复的日期
       let dateList = [];
       console.log(this.workTimeList,"this.workTimeList")