From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/crm/product/components/edit-table.vue | 71 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/src/views/crm/product/components/edit-table.vue b/src/views/crm/product/components/edit-table.vue
index 0c335c0..113080c 100644
--- a/src/views/crm/product/components/edit-table.vue
+++ b/src/views/crm/product/components/edit-table.vue
@@ -1,17 +1,17 @@
<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';
+import { nextTick, ref, watch } from 'vue';
-import { erpPriceMultiply } from '..\..\..\..\packages\utils\src';
+import { erpPriceMultiply } from '@vben/utils';
-import { InputNumber, Select } from 'ant-design-vue';
+import { InputNumber } from 'ant-design-vue';
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { BizTypeEnum } from '#/api/crm/permission';
-import { getProductSimpleList } from '#/api/crm/product';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
import { $t } from '#/locales';
import { useProductEditTableColumns } from './data';
@@ -39,34 +39,35 @@
}
/** 鍒囨崲浜у搧鏃跺悓姝ュ熀纭�淇℃伅 */
-function handleProductChange(productId: any, row: any) {
- const product = productOptions.value.find((p) => p.id === productId);
+function handleProductChange(product: MdmItemApi.Item | undefined, row: any) {
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 = product.id;
+ 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,43 +111,27 @@
}
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);
},
{
immediate: true,
},
);
-
-/** 鍒濆鍖� */
-const productOptions = ref<CrmProductApi.Product[]>([]); // 浜у搧涓嬫媺閫夐」
-onMounted(async () => {
- productOptions.value = await getProductSimpleList();
-});
</script>
<template>
<Grid class="w-full">
- <template #productId="{ row }">
- <Select
- v-model:value="row.productId"
- :options="productOptions"
- :field-names="{ label: 'name', value: 'id' }"
- class="w-full"
+ <template #itemId="{ row }">
+ <MdmItemSelect
+ :model-value="row.itemId"
+ placeholder="璇烽�夋嫨浜у搧"
+ @update:model-value="row.itemId = $event"
@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 +165,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