taoge_xiaodi/maintenance_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(采购管理): 新增供应商名称字段并优化表单校验

Browse Source 
refactor(出入库管理): 添加产品ID字段并调整默认单据类型

fix(备品配件): 修正库存数量输入类型为数字并移除调试日志

feat(文件上传): 支持后端文件格式转换并暴露清空方法

style(库存管理): 调整单据类型默认值及表单字段顺序

perf(采购计划): 优化供应商选择及文件上传处理逻辑
This commit is contained in:
re-JZzzz
2025-09-29 20:09:20 +08:00
parent 321c3fce49
commit 6ee935ccb6
7 changed files with 172 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/views/materialManagement/procurementPlan.vue
View File

@ -193,12 +193,9 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="供应商单位">
<el-select v-model="form.danwei" placeholder="请选择">
<!-- <el-option v-for="option in supplierList" :key="option.value" :label="option.label"
:value="option.value" /> -->
<el-option label="供应商1" value="供应商1" />
<el-option label="供应商1" value="供应商1" />
<el-option label="供应商1" value="供应商1" />
<el-select v-model="form.gonyingshangId" placeholder="请选择">
<el-option v-for="option in supplierList" :key="option.id" :label="option.supplierName"
:value="option.id" />
</el-select>
</el-form-item>
</el-col>
@ -289,7 +286,7 @@
<div class="form-section">
<h3>附件上传</h3>
<!-- 附件 -->
<el-table :data="form.opsCaigouPlanFilesBos || []" border v-if="currentOperation === 'update'">
<!-- <el-table :data="form.opsCaigouPlanFilesBos || []" border v-if="currentOperation === 'update'">
<el-table-column prop="fileName" label="文件名" align="center" />
<el-table-column label="文件类型" align="center">
<template #default="scope">
@ -306,10 +303,10 @@
</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
<file-upload ref="fileUploadRef" :isDrag="true" :file-list="form.opsCaigouPlanFilesBos"
:is-show-tip="false" @update:file-list="handleUpdateFileList"
<file-upload ref="fileUploadRef" :isDrag="true" v-model="form.opsCaigouPlanFilesBos"
:is-show-tip="false"
:file-type="['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf', 'png', 'jpg', 'jpeg']" />
</div>
</div>
@ -411,6 +408,8 @@ import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/
import { useRouter } from 'vue-router';
const router = useRouter();
import FileUpload from '@/components/FileUpload/index.vue';
// 导入用户store
import { useUserStore } from '@/store/modules/user';
@ -421,6 +420,8 @@ const caigouPlanList = ref<CaigouPlanVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const total = ref(0);
// 文件上传组件引用
const fileUploadRef = ref<InstanceType<typeof FileUpload>>();
// 标签页状态变量
const activeTab = ref('all');
@ -454,7 +455,7 @@ const initFormData: CaigouPlanForm = {
caigouType: undefined,
cangkuUrl: undefined,
hetonName: undefined,
gonyingshangId: 1,
gonyingshangId: undefined,
chuhuoTime: undefined,
fukuantiaojian: undefined,
fapiaoKjfs: undefined,
@ -492,7 +493,7 @@ const data = reactive<PageData<CaigouPlanForm, CaigouPlanQuery>>({
caigouType: undefined,
cangkuUrl: undefined,
hetonName: undefined,
gonyingshangId: 1,
gonyingshangId: undefined,
chuhuoTime: undefined,
fukuantiaojian: undefined,
fapiaoKjfs: undefined,
@ -535,7 +536,6 @@ const getYearlyAmount = async () => {
yearlyAmount.value.yujiJine = res.data.yujiJine;
}
} catch (error) {
console.error('获取年度金额失败:', error);
ElMessage({ message: '获取年度金额失败，请重试', type: 'error' });
}
}
@ -571,7 +571,6 @@ const getList = async () => {
caigouPlanList.value = filteredRes.rows;
} catch (error) {
console.error('获取采购计划列表失败:', error);
ElMessage({ message: '获取数据失败，请重试', type: 'error' });
} finally {
loading.value = false;
@ -580,8 +579,31 @@ const getList = async () => {
// 新增采购计划单提交函数
const addCaigouPlanSubmit = async () => {
buttonLoading.value = true; // 显示按钮加载状态
const submitData = JSON.parse(JSON.stringify(form.value));
// 转换文件列表格式为后端期望的格式：[{fileName, fileId, fileUrl}]
if (submitData.opsCaigouPlanFilesBos && submitData.opsCaigouPlanFilesBos.length > 0) {
submitData.opsCaigouPlanFilesBos = submitData.opsCaigouPlanFilesBos.map(file => ({
fileName: file.name,
fileId: file.ossId,
fileUrl: file.url
}));
}
const res = await addCaigouPlan(submitData);
try {
const res = await addCaigouPlan(form.value);
// 创建表单数据的深拷贝，避免直接修改原表单数据
const submitData = JSON.parse(JSON.stringify(form.value));
// 转换文件列表格式为后端期望的格式：[{fileName, fileId, fileUrl}]
if (submitData.opsCaigouPlanFilesBos && submitData.opsCaigouPlanFilesBos.length > 0) {
submitData.opsCaigouPlanFilesBos = submitData.opsCaigouPlanFilesBos.map(file => ({
fileName: file.name,
fileId: file.ossId,
fileUrl: file.url
}));
}
const res = await addCaigouPlan(submitData);
if (res.code === 200) {
ElMessage({ message: '采购申请单已成功提交，等待审批！', type: 'success' });
@ -613,7 +635,6 @@ const addCaigouPlanSubmit = async () => {
});
}
} catch (error) {
console.error('新增采购计划单失败:', error);
ElMessage({ message: '操作失败', type: 'error' });
} finally {
buttonLoading.value = false; // 无论成功失败，都关闭加载状态
@ -624,14 +645,13 @@ const addCaigouPlanSubmit = async () => {
const updateCaigouPlanSubmit = async () => {
buttonLoading.value = true; // 显示按钮加载状态
try {
console.log(form.value);
const res = await updateCaigouPlan(form.value);
// 创建表单数据的深拷贝，避免直接修改原表单数据
const submitData = JSON.parse(JSON.stringify(form.value));
const res = await updateCaigouPlan(submitData);
if (res.code === 200) {
ElMessage({ message: '采购申请单已成功更新！', type: 'success' });
// 刷新列表数据
getList();
// 关闭对话框并重置表单
resetNewProcurementForm();
isDialogVisible.value = false;
@ -643,7 +663,6 @@ const updateCaigouPlanSubmit = async () => {
});
}
} catch (error) {
console.error('更新采购计划单失败:', error);
ElMessage({ message: '操作失败', type: 'error' });
} finally {
buttonLoading.value = false; // 无论成功失败，都关闭加载状态
@ -658,7 +677,8 @@ const getSupplierLists = async () => {
const res = await getSupplierList({
projectId: userStore.selectedProject.id
});
supplierList.value = res.rows;
supplierList.value = res.data;
}
// 获取文件类型（后缀名）
@ -784,10 +804,14 @@ const handleUpdate = async (row) => {
delete form.value.opsCaigouPlanChanpinVos;
}
if (form.value.opsCaigouPlanFilesVos) {
form.value.opsCaigouPlanFilesBos = form.value.opsCaigouPlanFilesVos;
// 转换文件数据格式为FileUpload组件期望的格式
form.value.opsCaigouPlanFilesBos = form.value.opsCaigouPlanFilesVos.map(file => ({
ossId: file.fileId,
name: file.fileName,
url: file.fileUrl
}));
delete form.value.opsCaigouPlanFilesVos;
}
console.log(form.value);
// 确保产品列表和附件列表有默认值
if (!form.value.opsCaigouPlanChanpinBos || form.value.opsCaigouPlanChanpinBos.length === 0) {
form.value.opsCaigouPlanChanpinBos = [{
@ -809,7 +833,6 @@ const handleUpdate = async (row) => {
ElMessage({ message: res.msg || '获取采购计划详情失败', type: 'error' });
}
} catch (error) {
console.error('获取采购计划详情失败:', error);
ElMessage({ message: '获取采购计划详情失败', type: 'error' });
} finally {
buttonLoading.value = false;
@ -864,6 +887,9 @@ const resetNewProcurementForm = () => {
form.value.chuhuoTime = '';
form.value.fukuantiaojian = '';
form.value.fapiaoKjfs = '';
form.value.gonyingshangId = '';
form.value.gonyingshangName = '';
form.value.reason = '';
form.value.opsCaigouPlanChanpinBos = [{
chanpinName: '',
chanpinType: '',
@ -874,6 +900,10 @@ const resetNewProcurementForm = () => {
totalPrice: ''
}];
form.value.opsCaigouPlanFilesBos = [];
// 清空文件上传组件中的文件列表
if (fileUploadRef.value) {
fileUploadRef.value.clearAllFiles();
}
};
// 表单校验函数
@ -904,7 +934,7 @@ const validateForm = () => {
return false;
}
if (!form.value.danwei) {
if (!form.value.gonyingshangId) {
ElMessage({ message: '请选择供应商单位', type: 'error' });
return false;
}
@ -912,6 +942,12 @@ const validateForm = () => {
ElMessage({ message: '请填写申请原因', type: 'error' });
return false;
}
// 附件校验
if (!form.value.opsCaigouPlanFilesBos || form.value.opsCaigouPlanFilesBos.length === 0) {
ElMessage({ message: '请至少上传一个附件', type: 'error' });
return false;
}
// 产品信息校验
const hasValidProduct = form.value.opsCaigouPlanChanpinBos.some(product => {
return product.chanpinName &&
@ -996,7 +1032,6 @@ const submitAddProcurement = async () => {
} catch (error) {
// 处理用户取消或其他错误
if (error !== 'cancel') {
console.error('提交采购申请单时发生错误:', error);
ElMessage({ message: '提交过程中发生错误，请重试', type: 'error' });
}
}
@ -1032,20 +1067,12 @@ const submitUpdateProcurement = async () => {
} catch (error) {
// 处理用户取消或其他错误
if (error !== 'cancel') {
console.error('更新采购申请单时发生错误:', error);
ElMessage({ message: '更新过程中发生错误，请重试', type: 'error' });
}
}
}
// 处理文件上传完成后获取完整文件列表
const handleUpdateFileList = (fileList) => {
form.value.opsCaigouPlanFilesBos = fileList.map(file => ({
fileId: file.ossId,
fileName: file.name,
fileUrl: file.url,
}));
};
// 检查表单是否有内容
const hasFormContent = () => {
@ -1140,7 +1167,6 @@ const saveDraft = async () => {
// 关闭对话框
isDialogVisible.value = false;
} catch (error) {
console.error('保存草稿失败:', error);
ElMessage({ message: '草稿保存失败，请重试', type: 'error' });
} finally {
buttonLoading.value = false;