采购管理: 新增采购计划相关功能及组件

文件上传: 增加拖拽上传功能并优化组件逻辑
库存管理: 移除表格固定高度以改善显示效果
采购计划: 添加类型定义文件及接口文档
This commit is contained in:
re-JZzzz
2025-09-26 20:05:38 +08:00
parent dd32d930d7
commit 086b52f88f
8 changed files with 1299 additions and 503 deletions

View File

@ -0,0 +1,56 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { CaigouPlanVO, CaigouPlanForm, CaigouPlanQuery } from '@/api/wuziguanli/caigouPlan/types';
/**
* 查询运维-物资-采购计划单列表
* @param query
* @returns {*}
*/
export const listCaigouPlan = (query?: CaigouPlanQuery): AxiosPromise<CaigouPlanVO[]> => {
return request({
url: '/ops/caigouPlan/list',
method: 'get',
params: query
});
};
/**
* 查询采购商列表
* @param query
* @returns {*}
*/
export const getSupplierList = (data:any): AxiosPromise<any> => {
return request({
url: '/ops/tenderSupplierInput/getList',
method: 'get',
params: data
});
};
/**
* 新增运维-物资-采购计划单
* @param data
* @returns {*}
*/
export const addCaigouPlan = (data: CaigouPlanForm): AxiosPromise<CaigouPlanVO> => {
return request({
url: '/ops/caigouPlan',
method: 'post',
data: data
});
};
/**
* 查询运维-物资-采购计划单详情
* @param id
* @returns {*}
*/
export const caigouPlanDetail = (id: string | number): AxiosPromise<CaigouPlanVO> => {
return request({
url: `/ops/caigouPlan/`+id,
method: 'get'
});
};

View File

@ -0,0 +1,558 @@
export interface CaigouPlanVO {
/**
* id
*/
id: string | number;
/**
* 项目id
*/
projectId: string | number;
/**
* 计划名称
*/
jihuaName: string;
/**
* 计划编号
*/
jihuaBianhao: string;
/**
* 采购单位(当前登录人部门)
*/
caigouDanwei: number;
/**
* 采购单位名称
*/
caigouDanweiName: string;
/**
* 经办人
*/
jingbanren: number;
/**
* 经办人名称
*/
jingbanrenName: string;
/**
* 合同类型
*/
hetonType: string;
/**
* 采购类型
*/
caigouType: string;
/**
* 仓库地址
*/
cangkuUrl: string;
/**
* 合同名称
*/
hetonName: string;
/**
* 供应商id
*/
gonyingshangId: string | number;
/**
* 出货时间
*/
chuhuoTime: string;
/**
* 付款条件
*/
fukuantiaojian: string;
/**
* 发票开具方式
*/
fapiaoKjfs: string;
/**
* 计划状态
*/
status: string;
/**
* 审核状态
*/
shenheStatus: string;
/**
* 预计金额
*/
yujiJine: number;
/**
* 实际采购金额
*/
shijiJine: number;
/**
* 文件id
*/
fileId: string | number;
/**
* 文件地址
*/
fileUrl: string;
/**
* 文件名称
*/
fileName: string;
/**
* 采购申请计划id
*/
caigouPlanId: string | number;
/**
* 产品名称
*/
chanpinName: string;
/**
* 产品型号
*/
chanpinType: string;
/**
* 产品单价
*/
chanpinMonovalent: number;
/**
* 购买数量
*/
goumaiNumber: number;
/**
* 单位
*/
danwei: string;
/**
* 用途
*/
yontu: string;
/**
* 总价
*/
totalPrice: number;
/**
* 申请时间
*/
createTime?: string;
/**
* 出货时间
*/
chouhuoTime?: string;
/**
* 采购申请计划文件 新增
*/
opsCaigouPlanFilesBos?: Array<any>;
/**
* 采购申请计划产品 新增
*/
opsCaigouPlanChanpinBos?:Array<any>;
/**
* 采购申请计划产品 查询
*/
opsCaigouPlanChanpinVos?: Array<any>;
/**
* 采购申请计划文件 查询
*/
opsCaigouPlanFilesVos?: Array<any>;
}
export interface CaigouPlanForm extends BaseEntity {
/**
* id
*/
id?: string | number;
/**
* 项目id
*/
projectId?: string | number;
/**
* 计划名称
*/
jihuaName?: string;
/**
* 计划编号
*/
jihuaBianhao?: string;
/**
* 采购单位(当前登录人部门)
*/
caigouDanwei?: number;
/**
* 采购单位名称
*/
caigouDanweiName?: string;
/**
* 经办人
*/
jingbanren?: number;
/**
* 经办人名称
*/
jingbanrenName?: string;
/**
* 合同类型
*/
hetonType?: string;
/**
* 采购类型
*/
caigouType?: string;
/**
* 仓库地址
*/
cangkuUrl?: string;
/**
* 合同名称
*/
hetonName?: string;
/**
* 供应商id
*/
gonyingshangId?: string | number;
/**
* 出货时间
*/
chuhuoTime?: string;
/**
* 付款条件
*/
fukuantiaojian?: string;
/**
* 发票开具方式
*/
fapiaoKjfs?: string;
/**
* 计划状态
*/
status?: string;
/**
* 审核状态
*/
shenheStatus?: string;
/**
* 预计金额
*/
yujiJine?: number;
/**
* 实际采购金额
*/
shijiJine?: number;
/**
* 采购申请计划id
*/
caigouPlanId?: string | number;
/**
* 文件id
*/
fileId?: string | number;
/**
* 文件地址
*/
fileUrl?: string;
/**
* 文件名称
*/
fileName?: string;
/**
* 产品名称
*/
chanpinName?: string;
/**
* 产品型号
*/
chanpinType?: string;
/**
* 产品单价
*/
chanpinMonovalent?: number;
/**
* 购买数量
*/
goumaiNumber?: number;
/**
* 单位
*/
danwei?: string;
/**
* 用途
*/
yontu?: string;
/**
* 总价
*/
totalPrice?: number;
/**
* 采购申请计划文件 新增
*/
opsCaigouPlanFilesBos?: Array<any>;
/**
* 采购申请计划产品 新增
*/
opsCaigouPlanChanpinBos?:Array<any>;
/**
* 采购申请计划产品 查询
*/
opsCaigouPlanChanpinVos?: Array<any>;
/**
* 采购申请计划文件 查询
*/
opsCaigouPlanFilesVos?: Array<any>;
/**
* 申请时间
*/
createTime?: string;
/**
* 出货时间
*/
chouhuoTime?: string;
}
export interface CaigouPlanQuery extends PageQuery {
/**
* 项目id
*/
projectId?: string | number;
/**
* 计划名称
*/
jihuaName?: string;
/**
* 计划编号
*/
jihuaBianhao?: string;
/**
* 采购单位(当前登录人部门)
*/
caigouDanwei?: number;
/**
* 采购单位名称
*/
caigouDanweiName?: string;
/**
* 经办人
*/
jingbanren?: number;
/**
* 经办人名称
*/
jingbanrenName?: string;
/**
* 合同类型
*/
hetonType?: string;
/**
* 采购类型
*/
caigouType?: string;
/**
* 仓库地址
*/
cangkuUrl?: string;
/**
* 合同名称
*/
hetonName?: string;
/**
* 供应商id
*/
gonyingshangId?: string | number;
/**
* 出货时间
*/
chuhuoTime?: string;
/**
* 付款条件
*/
fukuantiaojian?: string;
/**
* 发票开具方式
*/
fapiaoKjfs?: string;
/**
* 计划状态
*/
status?: string;
/**
* 审核状态
*/
shenheStatus?: string;
/**
* 预计金额
*/
yujiJine?: number;
/**
* 实际采购金额
*/
shijiJine?: number;
/**
* 日期范围参数
*/
params?: any;
/**
* 采购申请计划id
*/
caigouPlanId?: string | number;
/**
* 文件id
*/
fileId?: string | number;
/**
* 文件地址
*/
fileUrl?: string;
/**
* 文件名称
*/
fileName?: string;
/**
* 产品名称
*/
chanpinName?: string;
/**
* 产品型号
*/
chanpinType?: string;
/**
* 产品单价
*/
chanpinMonovalent?: number;
/**
* 购买数量
*/
goumaiNumber?: number;
/**
* 单位
*/
danwei?: string;
/**
* 用途
*/
yontu?: string;
/**
* 总价
*/
totalPrice?: number;
/**
* 采购申请计划文件 新增
*/
opsCaigouPlanFilesBos?: Array<any>;
/**
* 采购申请计划产品 新增
*/
opsCaigouPlanChanpinBos?:Array<any>;
/**
* 采购申请计划产品 查询
*/
opsCaigouPlanChanpinVos?: Array<any>;
/**
* 采购申请计划文件 查询
*/
opsCaigouPlanFilesVos?: Array<any>;
/**
* 申请时间
*/
createTime?: string;
/**
* 出货时间
*/
chouhuoTime?: string;
}

View File

@ -3,6 +3,7 @@
<el-upload
ref="fileUploadRef"
multiple
:drag="isDrag"
:action="uploadFileUrl"
:before-upload="handleBeforeUpload"
:file-list="fileList"
@ -17,7 +18,13 @@
v-if="!disabled"
>
<!-- 上传按钮 -->
<el-button type="primary">选取文件</el-button>
<el-button type="primary" v-if="!isDrag">选取文件</el-button>
<div v-else>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">
拖拽文件到此处 <em>点击上传</em>
</div>
</div>
</el-upload>
<!-- 上传提示 -->
<div v-if="showTip && !disabled" class="el-upload__tip">
@ -63,11 +70,13 @@ const props = defineProps({
// 是否显示提示
isShowTip: propTypes.bool.def(true),
// 禁用组件(仅查看文件)
disabled: propTypes.bool.def(false)
disabled: propTypes.bool.def(false),
// 是否开启拖拽上传
isDrag: propTypes.bool.def(false)
});
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const emit = defineEmits(['update:modelValue']);
const emit = defineEmits(['update:modelValue', 'update:fileList']);
const number = ref(0);
const uploadList = ref<any[]>([]);
@ -80,6 +89,7 @@ const showTip = computed(() => props.isShowTip && (props.fileType || props.fileS
const fileUploadRef = ref<ElUploadInstance>();
// 监听 fileType 变化,更新 fileAccept
const fileAccept = computed(() => props.fileType.map((type) => `.${type}`).join(','));
@ -164,6 +174,7 @@ const handleUploadSuccess = (res: any, file: UploadFile) => {
url: res.data.url,
ossId: res.data.ossId
});
uploadedSuccessfully();
} else {
number.value--;
@ -189,6 +200,7 @@ const uploadedSuccessfully = () => {
uploadList.value = [];
number.value = 0;
emit('update:modelValue', listToString(fileList.value));
emit('update:fileList', fileList.value);
proxy?.$modal.closeLoading();
}
};

View File

@ -5,35 +5,35 @@
<template #header>
<h3>基础信息</h3>
</template>
<el-form :model="basicInfo" label-width="120px">
<el-form :model="detailInfo" label-width="120px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="订单编号">
<el-input v-model="basicInfo.orderNo" disabled />
<el-form-item label="采购单号">
<el-input v-model="detailInfo.id" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建时间">
<el-input v-model="basicInfo.createTime" disabled />
<el-input v-model="detailInfo.createTime" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="经办人">
<el-input v-model="basicInfo.handler" disabled />
<el-input v-model="detailInfo.jingbanrenName" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="所属部门">
<el-select v-model="basicInfo.dept" placeholder="请选择">
<el-select v-model="detailInfo.caigouDanweiName" placeholder="请选择">
<el-option label="运维部" value="运维部" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采购类型">
<el-select v-model="basicInfo.purchaseType" placeholder="请选择">
<el-select v-model="detailInfo.caigouType" placeholder="请选择">
<el-option label="项目业务" value="项目业务" />
</el-select>
</el-form-item>
@ -50,18 +50,18 @@
<template #header>
<h3>供应商信息</h3>
</template>
<el-form :model="supplierInfo" label-width="120px">
<el-form :model="detailInfo" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="供应商单位">
<el-select v-model="supplierInfo.supplierName" placeholder="请选择">
<el-select v-model="detailInfo.gonyingshangId" placeholder="请选择">
<el-option label="AAAA精密仪器制造有限公司" value="AAAA精密仪器制造有限公司" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出货时间">
<el-select v-model="supplierInfo.deliveryTime" placeholder="请选择">
<el-select v-model="detailInfo.chouhuoTime" placeholder="请选择">
<el-option label="2年零4个月" value="2年零4个月" />
</el-select>
</el-form-item>
@ -75,13 +75,13 @@
<template #header>
<h3>产品信息</h3>
</template>
<el-table :data="productInfo.tableData" border style="width: 100%">
<el-table-column prop="productName" label="产品名称" />
<el-table-column prop="productModel" label="产品型号" />
<el-table-column prop="productPrice" label="产品单价" align="center" :cell-style="{ background: 'pink' }" />
<el-table-column prop="buyQuantity" label="购买数量" align="center" :cell-style="{ background: 'pink' }" />
<el-table-column prop="usage" label="用途" />
<el-table-column prop="total" label="合计" />
<el-table :data="detailInfo.opsCaigouPlanChanpinVos" border style="width: 100%">
<el-table-column prop="chanpinName" label="产品名称" />
<el-table-column prop="chanpinType" label="产品型号" />
<el-table-column prop="chanpinMonovalent" label="产品单价" align="center" :cell-style="{ background: 'pink' }" />
<el-table-column prop="goumaiNumber" label="购买数量" align="center" :cell-style="{ background: 'pink' }" />
<el-table-column prop="yontu" label="用途" />
<el-table-column prop="totalPrice" label="合计" />
</el-table>
</el-card>
@ -94,14 +94,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="付款条件">
<el-select v-model="contractInfo.paymentCondition" placeholder="请选择">
<el-select v-model="detailInfo.fukuantiaojian" placeholder="请选择">
<el-option label="银行卡" value="银行卡" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发票开具方式">
<el-select v-model="contractInfo.invoiceWay" placeholder="请选择">
<el-select v-model="detailInfo.fapiaoKjfs" placeholder="请选择">
<el-option label="请选择" value="请选择" />
</el-select>
</el-form-item>
@ -134,9 +134,39 @@
</div>
</template>
<script setup>
import { ref } from 'vue';
<script setup lang="ts">
import { ref, onMounted, getCurrentInstance, toRefs } from 'vue';
import { useRoute } from 'vue-router';
import type { ComponentInternalInstance } from 'vue';
const route = useRoute();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine } = toRefs<any>(proxy?.useDict('wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
// 存储计划详情数据
const detailInfo = ref<CaigouPlanVO>({} as CaigouPlanVO);
// 存储计划编号
const id = ref('');
const getDetailInfo = async () => {
const res = await caigouPlanDetail(id.value);
if (res.code === 200) {
detailInfo.value = res.data;
console.log(detailInfo.value);
}
}
onMounted(() => {
// 接收路由参数
id.value = route.query.id as string;
getDetailInfo();
});
// 基础信息数据
const basicInfo = ref({
orderNo: '0035455',

View File

@ -0,0 +1,261 @@
<template>
<div class="approval-form">
<!-- 基础信息 -->
<el-card class="card" shadow="hover">
<template #header>
<h3>基础信息</h3>
</template>
<el-form :model="basicInfo" label-width="120px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="订单编号">
<el-input v-model="basicInfo.orderNo" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建时间">
<el-input v-model="basicInfo.createTime" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="经办人">
<el-input v-model="basicInfo.handler" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="所属部门">
<el-select v-model="basicInfo.dept" placeholder="请选择">
<el-option label="运维部" value="运维部" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采购类型">
<el-select v-model="basicInfo.purchaseType" placeholder="请选择">
<el-option label="项目业务" value="项目业务" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="申请原因">
<el-input v-model="basicInfo.applyReason" type="textarea" :rows="2" placeholder="请输入申请原因" />
</el-form-item>
</el-form>
</el-card>
<!-- 供应商信息 -->
<el-card class="card" shadow="hover" style="margin-top: 20px">
<template #header>
<h3>供应商信息</h3>
</template>
<el-form :model="supplierInfo" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="供应商单位">
<el-select v-model="supplierInfo.supplierName" placeholder="请选择">
<el-option label="AAAA精密仪器制造有限公司" value="AAAA精密仪器制造有限公司" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出货时间">
<el-select v-model="supplierInfo.deliveryTime" placeholder="请选择">
<el-option label="2年零4个月" value="2年零4个月" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<!-- 产品信息 -->
<el-card class="card" shadow="hover" style="margin-top: 20px">
<template #header>
<h3>产品信息</h3>
</template>
<el-table :data="productInfo.tableData" border style="width: 100%">
<el-table-column prop="productName" label="产品名称" />
<el-table-column prop="productModel" label="产品型号" />
<el-table-column prop="productPrice" label="产品单价" align="center" :cell-style="{ background: 'pink' }" />
<el-table-column prop="buyQuantity" label="购买数量" align="center" :cell-style="{ background: 'pink' }" />
<el-table-column prop="usage" label="用途" />
<el-table-column prop="total" label="合计" />
</el-table>
</el-card>
<!-- 合同条款 -->
<el-card class="card" shadow="hover" style="margin-top: 20px">
<template #header>
<h3>合同条款</h3>
</template>
<el-form :model="contractInfo" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="付款条件">
<el-select v-model="contractInfo.paymentCondition" placeholder="请选择">
<el-option label="银行卡" value="银行卡" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发票开具方式">
<el-select v-model="contractInfo.invoiceWay" placeholder="请选择">
<el-option label="请选择" value="请选择" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<!-- 附件 -->
<el-card class="card" shadow="hover" style="margin-top: 20px">
<template #header>
<h3>附件</h3>
</template>
<el-upload class="upload-demo" action="#" :file-list="fileList" :auto-upload="false"
:on-preview="handlePreview">
<el-table :data="fileList" border style="width: 100%">
<el-table-column prop="name" label="文件名" width="300" />
<el-table-column prop="size" label="大小" width="100" />
<el-table-column label="操作" width="100">
<template #default="scope">
<!-- <el-link type="primary" @click="handlePreview(scope.row)"> -->
<el-link type="primary">
预览
</el-link>
</template>
</el-table-column>
</el-table>
</el-upload>
</el-card>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, getCurrentInstance, toRefs } from 'vue';
import { useRoute } from 'vue-router';
import type { ComponentInternalInstance } from 'vue';
const route = useRoute();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine } = toRefs<any>(proxy?.useDict('wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
// 存储计划编号
const id = ref('');
const getDetailInfo = async () => {
const res = await caigouPlanDetail(id.value);
if (res.code === 200) {
console.log(res);
}
}
onMounted(() => {
// 接收路由参数
id.value = route.query.id as string;
getDetailInfo();
});
// 基础信息数据
const basicInfo = ref({
orderNo: '0035455',
createTime: '2023-11-02 16:32',
handler: '李四',
dept: '运维部',
purchaseType: '项目业务',
applyReason:
'随着业务拓展光伏电站业务负责增加现有设备已运行5年部分出现效率下降情况。为保证电站正常运行计划采购一批新的逆变器替换老旧设备并补充备件库存。',
});
// 供应商信息数据
const supplierInfo = ref({
supplierName: 'AAAA精密仪器制造有限公司',
deliveryTime: '2年零4个月',
remark: '',
});
// 产品信息数据
const productInfo = ref({
tableData: [
{
productName: 'AAABBBCCC',
productModel: '15-42',
productPrice: 500,
buyQuantity: 10,
usage: '组件',
total: 5000,
},
],
remark: '',
});
// 合同条款数据
const contractInfo = ref({
paymentCondition: '银行卡',
invoiceWay: '请选择',
remark: '',
});
// 附件数据
const fileList = ref([
{
name: 'MWwwwww.jpg',
size: '30kb',
url: '',
},
{
name: '231234124w.zip',
size: '50kb',
url: '',
},
{
name: '12451asdas.doc',
size: '80kb',
url: '',
},
{
name: '21seasda.xls',
size: '29kb',
url: '',
},
{
name: '12kjaklskw.png',
size: '16kb',
url: '',
},
]);
// 预览文件
const handlePreview = (file) => {
console.log('预览文件:', file);
// 实际场景可在这里处理文件预览逻辑,如打开新窗口等
};
</script>
<style scoped>
.approval-form {
padding: 20px;
}
.card {
border-radius: 8px;
}
.error-tip {
color: red;
font-size: 12px;
margin-top: 5px;
}
::v-deep(.el-input__inner) {
color: red;
}
</style>

View File

@ -61,7 +61,7 @@
: '添加入库单' }}</el-button>
</div>
<el-table v-loading="loading" border :data="churukudanList"
style="width: 100%;margin-top: 15px;height: 1000px;">
style="width: 100%;margin-top: 15px;">
<el-table-column label="单据编号" align="center" prop="danjvNumber" />
<el-table-column label="设备类型" align="center" prop="shebeiType">
<template #default="scope">

File diff suppressed because it is too large Load Diff