From f10cf167372f2d8c4c0e14f42f361d7ab96d8347 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 七月 2026 13:59:00 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/crm/product/components/edit-table.vue | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/src/views/crm/product/components/edit-table.vue b/src/views/crm/product/components/edit-table.vue
index 3866712..55d608d 100644
--- a/src/views/crm/product/components/edit-table.vue
+++ b/src/views/crm/product/components/edit-table.vue
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import type { CrmBusinessApi } from '#/api/crm/business';
import type { CrmContractApi } from '#/api/crm/contract';
-import type { CrmProductApi } from '#/api/crm/product';
+import type { MdmItemApi } from '#/api/mdm/item';
import { nextTick, onMounted, ref, watch } from 'vue';
@@ -11,7 +11,7 @@
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { BizTypeEnum } from '#/api/crm/permission';
-import { getProductSimpleList } from '#/api/crm/product';
+import { getItemPage } from '#/api/mdm/item';
import { $t } from '#/locales';
import { useProductEditTableColumns } from './data';
@@ -39,34 +39,36 @@
}
/** 鍒囨崲浜у搧鏃跺悓姝ュ熀纭�淇℃伅 */
-function handleProductChange(productId: any, row: any) {
- const product = productOptions.value.find((p) => p.id === productId);
+function handleProductChange(itemId: any, row: any) {
+ const product = productOptions.value.find((p) => p.id === itemId);
if (!product) {
return;
}
- row.productUnit = product.unit;
- row.productNo = product.no;
- row.productPrice = product.price;
- row.sellingPrice = product.price;
- row.count = 0;
- row.totalPrice = 0;
+ row.itemId = itemId;
+ row.itemName = product.name;
+ row.itemCode = product.code;
+ row.itemBarCode = product.barCode;
+ row.itemUnitName = product.unitMeasureName;
+ row.itemUnitName2 = product.unitMeasureName2;
+ row.itemUnitName3 = product.unitMeasureName3;
+ row.itemSpecification = product.specification;
+ row.itemPrice = product.salesPrice;
+ row.contractPrice = product.salesPrice;
+ row.count = row.count || 1;
+ row.totalPrice = erpPriceMultiply(row.contractPrice, row.count) ?? 0;
handleUpdateValue(row);
}
/** 閲戦鍙樺姩鏃堕噸鏂拌绠楀悎璁� */
function handlePriceChange(row: any) {
- row.totalPrice = erpPriceMultiply(row.sellingPrice, row.count) ?? 0;
+ row.totalPrice = erpPriceMultiply(row.contractPrice, row.count) ?? 0;
handleUpdateValue(row);
}
/** 灏嗘渶鏂版暟鎹啓鍥炲苟閫氱煡鐖剁粍浠� */
function handleUpdateValue(row: any) {
const index = tableData.value.findIndex((item) => item.id === row.id);
- if (props.bizType === BizTypeEnum.CRM_BUSINESS) {
- row.businessPrice = row.sellingPrice;
- } else if (props.bizType === BizTypeEnum.CRM_CONTRACT) {
- row.contractPrice = row.sellingPrice;
- }
+ row.totalPrice = erpPriceMultiply(row.contractPrice, row.count) ?? 0;
if (index === -1) {
row.id = tableData.value.length + 1;
tableData.value.push(row);
@@ -110,15 +112,6 @@
}
await nextTick();
tableData.value = products;
- if (props.bizType === BizTypeEnum.CRM_BUSINESS) {
- tableData.value.forEach((item) => {
- item.sellingPrice = item.businessPrice;
- });
- } else if (props.bizType === BizTypeEnum.CRM_CONTRACT) {
- tableData.value.forEach((item) => {
- item.sellingPrice = item.contractPrice;
- });
- }
await gridApi.grid.reloadData(tableData.value);
},
{
@@ -127,26 +120,27 @@
);
/** 鍒濆鍖� */
-const productOptions = ref<CrmProductApi.Product[]>([]); // 浜у搧涓嬫媺閫夐」
+const productOptions = ref<MdmItemApi.Item[]>([]); // 鐗╂枡涓嬫媺閫夐」
onMounted(async () => {
- productOptions.value = await getProductSimpleList();
+ const res = await getItemPage({ pageNo: 1, pageSize: 100, status: 0 });
+ productOptions.value = res.list || [];
});
</script>
<template>
<Grid class="w-full">
- <template #productId="{ row }">
+ <template #itemId="{ row }">
<Select
- v-model:value="row.productId"
+ v-model:value="row.itemId"
:options="productOptions"
:field-names="{ label: 'name', value: 'id' }"
class="w-full"
@change="handleProductChange($event, row)"
/>
</template>
- <template #sellingPrice="{ row }">
+ <template #contractPrice="{ row }">
<InputNumber
- v-model:value="row.sellingPrice"
+ v-model:value="row.contractPrice"
:min="0.001"
:precision="2"
@change="handlePriceChange(row)"
@@ -180,7 +174,7 @@
type: 'link',
danger: true,
popConfirm: {
- title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+ title: $t('ui.actionMessage.deleteConfirm', [row.itemName]),
confirm: handleDelete.bind(null, row),
},
},
--
Gitblit v1.9.3