From 008245cbe95c63a80f9a255378a5ffbe25d15085 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 16 七月 2025 21:16:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/EquipmentList/PasswordModal.vue | 18 ++++----
src/views/user/alteration/Step3.vue | 6 +-
src/views/system/modules/UserModal.vue | 12 +++---
src/views/system/modules/PasswordModal.vue | 18 ++++----
src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue | 4 +-
src/components/tools/UserPassword.vue | 22 +++++-----
src/views/system/SysPositionList.vue | 7 +++
src/views/system/modules/SysPositionModal.vue | 7 +++
8 files changed, 53 insertions(+), 41 deletions(-)
diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue
index 0067138..687b23c 100644
--- a/src/components/tools/UserPassword.vue
+++ b/src/components/tools/UserPassword.vue
@@ -54,17 +54,17 @@
required: true, message: '璇疯緭鍏ユ棫瀵嗙爜!',
}],
},
- password:{
- rules: [{
- required: true, message: '璇疯緭鍏ユ柊瀵嗙爜!',trigger:'blur'
- }, {
- validator: this.validateToNextPassword,
- },
- {
- pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!',
- }],
- },
+ // password:{
+ // rules: [{
+ // required: true, message: '璇疯緭鍏ユ柊瀵嗙爜!',trigger:'blur'
+ // }, {
+ // validator: this.validateToNextPassword,
+ // },
+ // {
+ // pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+ // message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!',
+ // }],
+ // },
confirmpassword:{
rules: [{
required: true, message: '璇风‘璁ゆ柊瀵嗙爜!',
diff --git a/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue b/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
index ce4eb25..710f537 100644
--- a/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
@@ -155,8 +155,8 @@
validatorRules:{
username:[{required: true, message: '璇疯緭鍏ョ敤鎴疯处鍙�!'},
{validator: this.validateUsername,}],
- password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'},
- {validator: this.validateToNextPassword,trigger: 'change'}],
+ // password: [{required: true,pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'},
+ // {validator: this.validateToNextPassword,trigger: 'change'}],
confirmpassword: [{required: true, message: '璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�!',},
{ validator: this.compareToFirstPassword,}],
realname:[{ required: true, message: '璇疯緭鍏ョ敤鎴峰悕绉�!' }],
diff --git a/src/views/mdc/base/modules/EquipmentList/PasswordModal.vue b/src/views/mdc/base/modules/EquipmentList/PasswordModal.vue
index f9f897e..1333286 100644
--- a/src/views/mdc/base/modules/EquipmentList/PasswordModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/PasswordModal.vue
@@ -40,15 +40,15 @@
confirmLoading: false,
confirmDirty: false,
validatorRules:{
- password:{
- rules: [{
- required: true,
- pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'
- }, {
- validator: this.validateToNextPassword,
- }],
- },
+ // password:{
+ // rules: [{
+ // required: true,
+ // pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+ // message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'
+ // }, {
+ // validator: this.validateToNextPassword,
+ // }],
+ // },
confirmpassword:{
rules: [{
required: true, message: '璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�!',
diff --git a/src/views/system/SysPositionList.vue b/src/views/system/SysPositionList.vue
index 2decdbc..bb262a6 100644
--- a/src/views/system/SysPositionList.vue
+++ b/src/views/system/SysPositionList.vue
@@ -15,7 +15,7 @@
<a-form-item label="宀椾綅鍚嶇О">
<j-input placeholder="璇疯緭鍏ュ矖浣嶅悕绉�" v-model="queryParam.name"></j-input>
</a-form-item>
- </a-col>
+ </a-col
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
@@ -128,6 +128,11 @@
align: 'center',
dataIndex: 'name'
},
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
+ },
// {
// title: '鑱岀骇',
// align: 'center',
diff --git a/src/views/system/modules/PasswordModal.vue b/src/views/system/modules/PasswordModal.vue
index ed45ce5..83c3df4 100644
--- a/src/views/system/modules/PasswordModal.vue
+++ b/src/views/system/modules/PasswordModal.vue
@@ -41,15 +41,15 @@
confirmLoading: false,
confirmDirty: false,
validatorRules:{
- password:{
- rules: [{
- required: true,
- pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'
- }, {
- validator: this.validateToNextPassword,
- }],
- },
+ // password:{
+ // rules: [{
+ // required: true,
+ // pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+ // message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'
+ // }, {
+ // validator: this.validateToNextPassword,
+ // }],
+ // },
confirmpassword:{
rules: [{
required: true, message: '璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�!',
diff --git a/src/views/system/modules/SysPositionModal.vue b/src/views/system/modules/SysPositionModal.vue
index 4d8a9b8..ae26a34 100644
--- a/src/views/system/modules/SysPositionModal.vue
+++ b/src/views/system/modules/SysPositionModal.vue
@@ -26,6 +26,13 @@
label="宀椾綅鍚嶇О">
<a-input placeholder="璇疯緭鍏ュ矖浣嶅悕绉�" v-model="model.name" />
</a-form-model-item>
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="remark"
+ label="澶囨敞">
+ <a-input placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" />
+ </a-form-model-item>
</a-form-model>
</a-spin>
</a-modal>
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 740580c..ce2b780 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -147,12 +147,12 @@
validatorRules: {
username: [{ required: true, message: '璇疯緭鍏ョ敤鎴疯处鍙�!' },
{ validator: this.validateUsername }],
- password: [{
- required: true,
- pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'
- },
- { validator: this.validateToNextPassword, trigger: 'change' }],
+ // password: [{
+ // required: true,
+ // pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+ // message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!'
+ // },
+ // { validator: this.validateToNextPassword, trigger: 'change' }],
confirmpassword: [{ required: true, message: '璇烽噸鏂拌緭鍏ョ櫥褰曞瘑鐮�!' },
{ validator: this.compareToFirstPassword }],
realname: [{ required: true, message: '璇疯緭鍏ョ敤鎴峰悕绉�!' }],
diff --git a/src/views/user/alteration/Step3.vue b/src/views/user/alteration/Step3.vue
index 735d398..46e3133 100644
--- a/src/views/user/alteration/Step3.vue
+++ b/src/views/user/alteration/Step3.vue
@@ -40,9 +40,9 @@
loading: false,
accountName: this.userList.username,
validatorRules: {
- password: [{
- required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/, message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!!'
- }],
+ // password: [{
+ // required: true, pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/, message: '瀵嗙爜鐢�8浣嶆暟瀛椼�佸ぇ灏忓啓瀛楁瘝鍜岀壒娈婄鍙风粍鎴�!!'
+ // }],
confirmPassword: [
{ required: true, message: '瀵嗙爜涓嶈兘涓虹┖!'},
{ validator: this.handlePasswordCheck}
--
Gitblit v1.9.3