From 1392d8f3def2c21e7a6fc15cf3f68fc1056ec0b6 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:01:20 +0800
Subject: [PATCH] 三不原则
---
src/views/system/modules/UserModal.vue | 52 +++++++++-------------------------------------------
1 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 740580c..dae612f 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -82,10 +82,6 @@
<a-input-search :readOnly="true" v-model="model.eamEquipmentIds" @search="eamDeviceSearch" enter-button placeholder="璇烽�夋嫨EAM璁惧" :disabled="!model.selectedBaseFactory"/>
</a-form-model-item>
- <a-form-model-item label="缁翠慨閮ㄩ棬/鐝粍鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!repairDepartDisabled">
- <j-select-repair-depart v-model="model.selectedRepairDeparts" :multi="true" @back="backRepairDepartInfo" :backRepairDepart="true" :treeRepairDepartOpera="true"/>
- </a-form-model-item>
-
<a-form-model-item label="璐熻矗閮ㄩ棬" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow==true">
<j-multi-select-tag :disabled="disableSubmit" v-model="model.departIds" :options="nextDepartOptions" placeholder="璇烽�夋嫨璐熻矗閮ㄩ棬"/>
</a-form-model-item>
@@ -115,7 +111,7 @@
import { disabledAuthFilter } from '@/utils/authFilter'
import { duplicateCheck } from '@/api/api'
import JSelectProduction from '../../../components/jeecgbiz/JSelectProduction'
- import JSelectRepairDepart from '../../../components/jeecgbiz/JSelectRepairDepart'
+ // import JSelectRepairDepart from '../../../components/jeecgbiz/JSelectRepairDepart'
import { mapActions } from 'vuex'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import SelectDeviceModal from './SelectDeviceModal'
@@ -128,7 +124,7 @@
JSelectBaseFactory,
SelectDeviceModal,
JSelectProduction,
- JSelectRepairDepart,
+ // JSelectRepairDepart,
SelectEamDeviceModal
},
data() {
@@ -136,7 +132,7 @@
departDisabled: false, //鏄惁鏄垜鐨勯儴闂ㄨ皟鐢ㄨ椤甸潰
productionDisabled: false, //鏄惁鏄垜鐨勮溅闂磋皟鐢ㄨ椤甸潰
roleDisabled: false, //鏄惁鏄鑹茬淮鎶よ皟鐢ㄨ椤甸潰
- repairDepartDisabled: false, //鏄惁鏄垜鐨勭淮淇儴闂ㄧ彮缁勮皟鐢ㄨ椤甸潰
+ // repairDepartDisabled: false, //鏄惁鏄垜鐨勭淮淇儴闂ㄧ彮缁勮皟鐢ㄨ椤甸潰
modalWidth: 800,
drawerWidth: 700,
modaltoggleFlag: true,
@@ -147,12 +143,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: '璇疯緭鍏ョ敤鎴峰悕绉�!' }],
@@ -200,7 +196,6 @@
isDepartType: '',
model: {
selectedProduction: '',
- selectedRepairDeparts: '',
selectedBaseFactory:'',
}
}
@@ -287,7 +282,6 @@
selecteddeparts: '',
selectedProduction: '',
selectedBaseFactory:'',
- selectedRepairDeparts: ''
})
},
edit(record) {
@@ -309,7 +303,6 @@
that.getUserRoles(record.id)
that.getUserDeparts(record.id)
that.getUserProductions(record.id)
- that.getUserRepairDeparts(record.id)
this.getUserBaseFactorys(record.id)
}
},
@@ -405,27 +398,7 @@
}
})
},
- getUserRepairDeparts(userid) {
- let that = this
- // 鑾峰彇缁翠慨閮ㄩ棬/鐝粍鍒嗛厤
- getAction(that.url.userRepairDepartList, { userId: userid }).then((res) => {
- if (res.success) {
- let repairDepartOptions = []
- let selectedRepairDepartKeys = []
- for (let i = 0; i < res.result.length; i++) {
- selectedRepairDepartKeys.push(res.result[i].key)
- //鏂板璐熻矗缁翠慨閮ㄩ棬/鐝粍閫夋嫨涓嬫媺妗�
- repairDepartOptions.push({
- value: res.result[i].key,
- label: res.result[i].title
- })
- }
- this.$set(this.model, 'selectedRepairDeparts', selectedRepairDepartKeys.join(','))
- that.nextRepairDepartOptions = repairDepartOptions
- }
- })
- },
getUserBaseFactorys(userid) {
let that = this
// 鑾峰彇EAM涓績/宸ュ尯/宸ユ鍒嗛厤
@@ -464,13 +437,6 @@
backBaseFactoryInfo(info) {
this.model.eamFactoryIds = this.model.selectedBaseFactory
this.nextBaseFactoryOptions = info.map((item, index, arr) => {
- let c = { label: item.text, value: item.value + '' }
- return c
- })
- },
- backRepairDepartInfo(info) {
- this.model.repairDepartIds = this.model.selectedRepairDeparts
- this.nextRepairDepartOptions = info.map((item, index, arr) => {
let c = { label: item.text, value: item.value + '' }
return c
})
--
Gitblit v1.9.3