yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并冲突

pull/781/head
zy 2025-05-09 21:22:40 +08:00
parent 747be37cea c233f46dec
commit c76055af50
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/crm/productprocurementcost/index.vue
View File

@ -8,10 +8,10 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="产品ID" prop="projectId"> <el-form-item label="产品名称" prop="projectId">
<el-input <el-input
v-model="queryParams.projectId" v-model="queryParams.projectId"
placeholder="请输入产品ID" placeholder="请选择产品"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-240px"
@ -64,9 +64,12 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="产品ID" align="center" prop="projectId" /> <el-table-column label="产品名称" align="center" prop="projectId" />
<el-table-column label="产品编号" align="center" prop="projectCode" /> <el-table-column label="产品编号" align="center" prop="projectCode" />
<el-table-column label="产品类型" align="center" prop="projectCode" />
<el-table-column label="明细类型" align="center" prop="projectCode" />
<el-table-column label="客单价" align="center" prop="customerPrice" /> <el-table-column label="客单价" align="center" prop="customerPrice" />
<el-table-column label="单位" align="center" prop="projectCode" />
<el-table-column label="采购成本" align="center" prop="purchaseCost" /> <el-table-column label="采购成本" align="center" prop="purchaseCost" />
<el-table-column label="代理费前返比例/金额" align="center" prop="agentFeePreReturn" /> <el-table-column label="代理费前返比例/金额" align="center" prop="agentFeePreReturn" />
<el-table-column label="代理费后返比例/金额" align="center" prop="agentFeePostReturn" /> <el-table-column label="代理费后返比例/金额" align="center" prop="agentFeePostReturn" />