From 41d50b20c975faeaa9e5277bdcff13b5acecb575 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:57:37 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/system/modules/UserModal.vue | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index e48f75b..a3f875e 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -67,7 +67,7 @@
<j-select-production v-model="model.selectedProduction" :multi="true" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-production>
</a-form-model-item>
<a-form-model-item label="鐝粍鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamId">
- <j-dict-select-tag
+ <j-dict-select-tag
v-model="model.teamId"
:triggerChange="true"
dictCode="mom_base_team,name,id,del_flag = 0"
@@ -150,6 +150,7 @@
import { duplicateCheck } from '@/api/api'
import JSelectProduction from '../../../components/jeecgbiz/JSelectProduction'
import {mapActions} from 'vuex'
+ import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
export default {
name: "UserModal",
@@ -215,6 +216,13 @@
nextProductionOptions:[],
isDepartType:'',
+ }
+ },
+ watch:{
+ visible:{
+ handler(value){
+ if(value) this.initDictData('password_length')
+ }
}
},
created () {
@@ -548,7 +556,22 @@
}else{
this.departIdShow=true;
}
- }
+ },
+ initDictData(dictCode) {
+ //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
+ ajaxGetDictItems(dictCode, null).then((res) => {
+ if (res.success) {
+ const regExp = new RegExp("^(?=.*[a-zA-Z])(?=.*\\\d)(?=.*[~!@#$%^&*()_+`\\-={}:\";'<>?,./]).{"+Number(res.result[0].value)+",}$");
+
+ this.validatorRules.password[0]={
+ required:true,
+ pattern: regExp,
+ message: `瀵嗙爜鐢�${res.result[0].value}浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!`,
+ }
+
+ }
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3