diff --git a/src/api/crm/product/index.ts b/src/api/crm/product/index.ts index c6d5dfdb..2d88cb09 100644 --- a/src/api/crm/product/index.ts +++ b/src/api/crm/product/index.ts @@ -41,3 +41,8 @@ export const deleteProduct = async (id: number) => { export const exportProduct = async (params) => { return await request.download({ url: `/crm/product/export-excel`, params }) } + +// 查询产品操作日志 +export const getOperateLogPage = async (params: any) => { + return await request.get({ url: '/crm/product/operate-log-page', params }) +} diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index a562ea85..da0fd34c 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -504,7 +504,8 @@ const remainingRouter: AppRouteRecordRaw[] = [ meta: { title: '客户详情', noCache: true, - hidden: true + hidden: true, + activeMenu: '/crm/customer' }, component: () => import('@/views/crm/customer/detail/index.vue') }, @@ -514,9 +515,21 @@ const remainingRouter: AppRouteRecordRaw[] = [ meta: { title: '联系人详情', noCache: true, - hidden: true + hidden: true, + activeMenu: '/crm/contact' }, component: () => import('@/views/crm/contact/detail/index.vue') + }, + { + path: 'product/detail/:id', + name: 'CrmProductDetail', + meta: { + title: '产品详情', + noCache: true, + hidden: true, + activeMenu: '/crm/product' + }, + component: () => import('@/views/crm/product/detail/index.vue') } ] } diff --git a/src/views/crm/product/ProductDetail.vue b/src/views/crm/product/ProductDetail.vue deleted file mode 100644 index f2638df0..00000000 --- a/src/views/crm/product/ProductDetail.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {{ detailData.name }} - - - {{ formatDate(detailData.createTime) }} - - - - - - {{ productCategoryList?.find((c) => c.id === detailData.categoryId)?.name }} - - - {{ detailData.no }} - - - {{ detailData.description }} - - - {{ detailData.ownerUserId }} - - - - - - {{ fenToYuan(detailData.price) }}元 - - - - - diff --git a/src/views/crm/product/ProductForm.vue b/src/views/crm/product/ProductForm.vue index 0864c8d8..e12af4c8 100644 --- a/src/views/crm/product/ProductForm.vue +++ b/src/views/crm/product/ProductForm.vue @@ -62,13 +62,13 @@ - @@ -149,7 +149,7 @@ const open = async (type: string, id?: number) => { formLoading.value = true try { formData.value = await ProductApi.getProduct(id) - formData.value.price = fenToYuan(formData.value.price) + formData.value.price = Number(fenToYuan(formData.value.price)) } finally { formLoading.value = false } diff --git a/src/views/crm/product/detail/ProductDetailsHeader.vue b/src/views/crm/product/detail/ProductDetailsHeader.vue new file mode 100644 index 00000000..356f1dbc --- /dev/null +++ b/src/views/crm/product/detail/ProductDetailsHeader.vue @@ -0,0 +1,55 @@ + + + + + + + {{ product.name }} + + + + + + + 编辑 + + + + + + + + {{ productCategoryList?.find((c) => c.id === product.categoryId)?.name }} + + + + + {{ fenToYuan(product.price) }}元 + {{ product.no }} + + + + + + diff --git a/src/views/crm/product/detail/ProductDetailsInfo.vue b/src/views/crm/product/detail/ProductDetailsInfo.vue new file mode 100644 index 00000000..85046b85 --- /dev/null +++ b/src/views/crm/product/detail/ProductDetailsInfo.vue @@ -0,0 +1,45 @@ + + + + + + 基本信息 + + + {{ product.name }} + {{ product.no }} + {{ fenToYuan(product.price) }}元 + {{ product.description }} + + {{ productCategoryList?.find((c) => c.id === product.categoryId)?.name }} + + + + + + + + + + + + + diff --git a/src/views/crm/product/detail/index.vue b/src/views/crm/product/detail/index.vue new file mode 100644 index 00000000..847e9445 --- /dev/null +++ b/src/views/crm/product/detail/index.vue @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + diff --git a/src/views/crm/product/index.vue b/src/views/crm/product/index.vue index 3f01455c..5100d7f4 100644 --- a/src/views/crm/product/index.vue +++ b/src/views/crm/product/index.vue @@ -28,8 +28,8 @@ - 搜索 - 重置 + 搜索 + 重置 新增 @@ -40,7 +40,8 @@ :loading="exportLoading" v-hasPermi="['crm:product:export']" > - 导出 + + 导出 @@ -49,8 +50,14 @@ - - + + + + {{ scope.row.name }} + + + + @@ -62,14 +69,15 @@ align="center" prop="price" :formatter="fenToYuanFormat" + width="100" /> - - + + - + - + - + - - 详情 - - -