diff --git a/src/views/finance/purchasingrequisition/add.vue b/src/views/finance/purchasingrequisition/add.vue index 824fad5..f30debe 100644 --- a/src/views/finance/purchasingrequisition/add.vue +++ b/src/views/finance/purchasingrequisition/add.vue @@ -284,7 +284,7 @@ - + diff --git a/src/views/finance/purchasingrequisition/index.vue b/src/views/finance/purchasingrequisition/index.vue index f3cc766..61c1532 100644 --- a/src/views/finance/purchasingrequisition/index.vue +++ b/src/views/finance/purchasingrequisition/index.vue @@ -43,12 +43,11 @@ placeholder="请选择状态" clearable style="width: 200px"> - + - diff --git a/src/views/purchase/purchasingBusinessDept/form.vue b/src/views/purchase/purchasingBusinessDept/form.vue index c1f1308..97ef781 100644 --- a/src/views/purchase/purchasingBusinessDept/form.vue +++ b/src/views/purchase/purchasingBusinessDept/form.vue @@ -11,6 +11,26 @@ :rules="dataRules" label-width="120px" v-loading="loading"> + + + + + + + + + + - - - - - - - - - @@ -74,7 +75,7 @@ const emit = defineEmits(['refresh']); const dataFormRef = ref(); const deptList = ref([]); const userList = ref([]); -const dataForm = reactive({ +const form = reactive({ id: '', deptId: '', deptName: '', @@ -87,17 +88,17 @@ const visible = ref(false); const loading = ref(false); const dataRules = ref({ + userId: [ + { required: true, message: '请选取用户(分管负责人)', trigger: 'change' } + ], deptId: [ { required: true, message: '请选择部门', trigger: 'change' } ], - userId: [ - { required: true, message: '请选择分管负责人', trigger: 'change' } - ], name: [ - { required: true, message: '姓名不能为空', trigger: 'blur' } + { required: true, message: '请先选取用户', trigger: 'blur' } ], username: [ - { required: true, message: '用户工号不能为空', trigger: 'blur' } + { required: true, message: '请先选取用户', trigger: 'blur' } ], }); @@ -105,38 +106,38 @@ const dataRules = ref({ const handleDeptChange = (list: any[]) => { if (list && list.length > 0) { const dept = list[0]; - dataForm.deptId = dept.deptId || dept.id || ''; - dataForm.deptName = dept.name || dept.deptName || ''; + form.deptId = dept.deptId || dept.id || ''; + form.deptName = dept.name || dept.deptName || ''; } else { - dataForm.deptId = ''; - dataForm.deptName = ''; + form.deptId = ''; + form.deptName = ''; } }; -// 处理用户选择变化 +// 处理用户选择变化(选取用户后自动带出姓名、工号) const handleUserChange = (list: any[]) => { if (list && list.length > 0) { const user = list[0]; - dataForm.userId = user.userId || user.id || ''; - dataForm.username = user.username || user.userName || ''; - dataForm.name = user.name || user.realName || ''; + form.userId = user.userId || user.id || ''; + form.username = user.username || user.userName || ''; + form.name = user.name || user.realName || ''; } else { - dataForm.userId = ''; - dataForm.username = ''; - dataForm.name = ''; + form.userId = ''; + form.username = ''; + form.name = ''; } }; // 打开弹窗 const openDialog = async (id?: string) => { visible.value = true; - dataForm.id = ''; - dataForm.deptId = ''; - dataForm.deptName = ''; - dataForm.userId = ''; - dataForm.username = ''; - dataForm.name = ''; - dataForm.remark = ''; + form.id = ''; + form.deptId = ''; + form.deptName = ''; + form.userId = ''; + form.username = ''; + form.name = ''; + form.remark = ''; deptList.value = []; userList.value = []; @@ -148,7 +149,7 @@ const openDialog = async (id?: string) => { getObj({ id }).then((res: any) => { if (res.data && res.data.length > 0) { const data = res.data[0]; - Object.assign(dataForm, { + Object.assign(form, { id: data.id || '', deptId: data.deptId || '', deptName: data.deptName || '', @@ -201,17 +202,17 @@ const onSubmit = async () => { return false; } - if (dataForm.id) { - await putObj(dataForm); + if (form.id) { + await putObj(form); useMessage().success('编辑成功'); } else { - await addObj(dataForm); + await addObj(form); useMessage().success('新增成功'); } visible.value = false; emit('refresh'); } catch (err: any) { - useMessage().error(err.msg || (dataForm.id ? '编辑失败' : '新增失败')); + useMessage().error(err.msg || (form.id ? '编辑失败' : '新增失败')); } finally { loading.value = false; }