|
@@ -39,7 +39,7 @@
|
|
|
</template>
|
|
|
|
|
|
<!--用户信息弹窗-->
|
|
|
- <HcDialog bgColor="#ffffff" isToBody isTable :show="formModal" saveText="确定创建" :title="formModel.id ? '编辑账户' : '创建账户'"
|
|
|
+ <HcDialog bgColor="#ffffff" isToBody isTable :show="formModal" :saveText="formModel.id ? '提交保存' : '确定创建'" :title="formModel.id ? '编辑账户' : '创建账户'"
|
|
|
@save="formModalSave" @close="formModalClose" widths="51rem"
|
|
|
>
|
|
|
<HcCardItem ui="hac-bg-grey" class="h-auto">
|
|
@@ -48,7 +48,7 @@
|
|
|
</template>
|
|
|
<el-form ref="formRef" :model="formModel" :rules="formRules" size="large" label-width="auto" label-position="left">
|
|
|
<el-form-item label="登录账号:" prop="account">
|
|
|
- <el-input v-model="formModel.account" placeholder="仅支持英文或拼音" autocomplete="new-password"/>
|
|
|
+ <el-input v-model="formModel.account" placeholder="仅支持英文或拼音" autocomplete="new-password" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="登录密码:" :prop="formModel.id?'':'password'">
|
|
|
<el-input v-model="formModel.password" placeholder="请输入密码" autocomplete="new-password" show-password type="password"/>
|
|
@@ -130,12 +130,13 @@
|
|
|
|
|
|
<script setup>
|
|
|
import {ref, onMounted} from "vue";
|
|
|
-import {arrIndex, arrToId, formValidate, isPhone} from "js-fast-way"
|
|
|
import mainApi from '~api/system/user';
|
|
|
import organizationApi from '~api/system/organization';
|
|
|
-import {getArrValue} from "js-fast-way"
|
|
|
+import {arrIndex, arrToId, formValidate, isPhone, getArrValue} from "js-fast-way"
|
|
|
import {Plus, Delete} from '@element-plus/icons-vue'
|
|
|
import {delMessage} from "~uti/tools";
|
|
|
+import {useAppStore} from "~src/store";
|
|
|
+const useAppState = useAppStore();
|
|
|
|
|
|
onMounted(() => {
|
|
|
getTableData()
|
|
@@ -233,6 +234,7 @@ const formRules = {
|
|
|
deptId: [{required: true, message: '请选择选择部门', trigger: 'change'}],
|
|
|
postId: [{required: true, message: '请选择选择岗位', trigger: 'change'}],
|
|
|
isLader: [{required: true, message: '请选择是否为部门负责人', trigger: 'change'}],
|
|
|
+ account: [{required: true, message: '请输入登录账号', trigger: 'blur'}],
|
|
|
phone: {
|
|
|
required: true,
|
|
|
validator: (rule, value, callback) => {
|
|
@@ -246,17 +248,6 @@ const formRules = {
|
|
|
},
|
|
|
trigger: "blur"
|
|
|
},
|
|
|
- account: {
|
|
|
- required: true,
|
|
|
- validator: (rule, value, callback) => {
|
|
|
- if (!value) {
|
|
|
- callback(new Error('请输入登录账号'))
|
|
|
- } else {
|
|
|
- callback()
|
|
|
- }
|
|
|
- },
|
|
|
- trigger: "blur"
|
|
|
- },
|
|
|
password: {
|
|
|
required: true,
|
|
|
validator: (rule, value, callback) => {
|
|
@@ -285,6 +276,7 @@ const formRules = {
|
|
|
const addUserClick = () => {
|
|
|
formModel.value = {
|
|
|
deptList: [{}],
|
|
|
+ tenantId: useAppState.tenantId
|
|
|
}
|
|
|
postData.value = [{}]
|
|
|
formModal.value = true
|
|
@@ -296,6 +288,7 @@ const rowEidtClick = (row) => {
|
|
|
row.password = ''
|
|
|
const deptList = getArrValue(row.deptList)
|
|
|
row.deptList = deptList
|
|
|
+ row.tenantId = useAppState.tenantId
|
|
|
if (deptList.length > 0){
|
|
|
deptList.forEach(() => {
|
|
|
postData.value.push({})
|