fix : 修复角色分配用户单个添加时报错

This commit is contained in:
2024-10-03 17:06:27 +08:00
parent 9f2df9b3aa
commit 20f1b568fa
2 changed files with 51 additions and 24 deletions

View File

@@ -22,7 +22,7 @@ steps:
- export NODE_MODULES_PATH=`pwd`/node_modules - export NODE_MODULES_PATH=`pwd`/node_modules
# - npm config set registry https://registry.npmmirror.com # - npm config set registry https://registry.npmmirror.com
- set NODE_OPTIONS=--openssl-legacy-provider - set NODE_OPTIONS=--openssl-legacy-provider
# - npm install - npm install
- npm run build - npm run build
- echo $NODE_MODULES_PATH - echo $NODE_MODULES_PATH
- cp -r dist /app/build/$DRONE_REPO_NAME - cp -r dist /app/build/$DRONE_REPO_NAME

View File

@@ -1,7 +1,9 @@
<template> <template>
<fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm> <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
<fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable> <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
<fvFormDialog v-if="showAddOrEditUserDialog" ref="formDialogRef" :title="dialogTitle" :form-schema="formSchema" :form-rules="formRules" @dialogCancel="handleCancel" @dialogSubmit="handleSubmit"></fvFormDialog> <fvFormDialog ref="formDialogRef" :title="dialogTitle" :dialogType="dialogType"
:form-schema="formSchema" :form-rules="formRules"
@dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
</template> </template>
<script setup> <script setup>
@@ -11,6 +13,7 @@ import {useCacheStore} from "@/stores/cache.js";
const tableIns = ref() const tableIns = ref()
const formDialogRef = ref() const formDialogRef = ref()
const dialogType = ref("");
const showAddOrEditUserDialog = ref(false) const showAddOrEditUserDialog = ref(false)
const dialogTitle = ref(""); const dialogTitle = ref("");
const searchConfig = reactive([ const searchConfig = reactive([
@@ -68,7 +71,7 @@ const tableConfig = reactive({
api: '/user', api: '/user',
params: {}, params: {},
btns: [ btns: [
{name: '导入', key: 'add', type: 'primary'}, {name: '新增', key: 'add', type: 'primary'},
] ]
}) })
const formRules = reactive({ const formRules = reactive({
@@ -179,36 +182,60 @@ const headBtnClick = (key) => {
} }
//新增用户 //新增用户
const handleAdd = () => { const handleAdd = () => {
// showAddOrEditUserDialog.value = true showAddOrEditUserDialog.value = true
// formRules.value.password[0].required = true // formRules.value.password[0].required = true
// restForm(); // restForm();
// dialogTitle.value = "新增用户"; dialogTitle.value = "新增用户";
// nextTick(()=>{ dialogType.value = "add";
// // 清空校验 nextTick(() => {
// formDialogRef.value.getFormInstance().clearValidate() // formDialogRef.value.getFormInstance().setValues({})
// formDialogRef.value.getFormInstance().resetFields() // 清空校验
// }) formDialogRef.value.getFormInstance().clearValidate()
formDialogRef.value.getFormInstance().resetFields()
})
}; };
const handleEdit = (row) => {
formDialogRef.value.openOrCloseDialog(true)
getDetail(row)
dialogTitle.value = "编辑用户";
dialogType.value = "edit";
}
const getDetail = (row) => {
getUserDetail(row.userId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
nextTick(() => {
formDialogRef.value.getFormInstance().setValues(res.data)
// 清空校验
formDialogRef.value.getFormInstance().clearValidate()
})
} else {
}
})
}
//取消 //取消
const handleCancel = () => { const handleCancel = () => {
showAddOrEditUserDialog.value = false; showAddOrEditUserDialog.value = false;
}; };
//提交 //提交
const handleSubmit = async (formInstance) => { const handleSubmit = async (formInstance) => {
if (!formInstance) return; if (!formInstance) return;
formInstance.validate(async (valid) => { let validate = await formInstance.validate()
if (!valid) return; if (!validate.isValidate) return;
// if (title.value === "新增用户") { if (dialogType.value === "add") {
// addUser(userForm.value).then(res => { addUser(formInstance.getValues()).then(res => {
// if (res.code === 1000) { if (res.code === 1000) {
// ElMessage.success(res.msg); ElMessage.success(res.msg);
// isVisited.value = false; tableIns.value.refresh()
// } else { formDialogRef.value.openOrCloseDialog(false)
// ElMessage.error(res.msg); } else {
// } ElMessage.error(res.msg);
// }); }
// } });
}) }
// editUser
} }
</script> </script>