合并冲突

src/views/crm/productprocurementcost/index.vue

@@ -8,10 +8,10 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="产品ID" prop="projectId">
+      <el-form-item label="产品名称" prop="projectId">
         <el-input
           v-model="queryParams.projectId"
-          placeholder="请输入产品ID"
+          placeholder="请选择产品"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -64,9 +64,12 @@
   <!-- 列表 -->
   <ContentWrap>
     <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="customerPrice" />
+      <el-table-column label="单位" align="center" prop="projectCode" />
       <el-table-column label="采购成本" align="center" prop="purchaseCost" />
       <el-table-column label="代理费前返比例/金额" align="center" prop="agentFeePreReturn" />
       <el-table-column label="代理费后返比例/金额" align="center" prop="agentFeePostReturn" />
@@ -208,4 +211,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>