Skip to content

Commit a9e4ef9

Browse files
committed
✨ CRM:完善 CRM 相关实现(产品)
1 parent 56db6bf commit a9e4ef9

File tree

13 files changed

+26
-46
lines changed

13 files changed

+26
-46
lines changed

src/api/crm/product/index.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,11 @@ export interface ProductVO {
88
price: number
99
status: number
1010
categoryId: number
11+
categoryName?: string
1112
description: string
1213
ownerUserId: number
1314
}
1415

15-
// TODO 芋艿:待删除
16-
export interface ProductExpandVO extends ProductVO {
17-
count: number
18-
discountPercent: number
19-
totalPrice: number
20-
}
21-
2216
// 查询产品列表
2317
export const getProductPage = async (params) => {
2418
return await request.get({ url: `/crm/product/page`, params })

src/views/crm/business/components/BusinessList.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@
3838
</el-link>
3939
</template>
4040
</el-table-column>
41-
<el-table-column label="商机金额" align="center" prop="price" :formatter="fenToYuanFormat" />
41+
<el-table-column
42+
label="商机金额"
43+
align="center"
44+
prop="price"
45+
:formatter="erpPriceTableColumnFormatter"
46+
/>
4247
<el-table-column label="客户名称" align="center" prop="customerName" />
4348
<el-table-column label="商机组" align="center" prop="statusTypeName" />
4449
<el-table-column label="商机阶段" align="center" prop="statusName" />
@@ -66,8 +71,8 @@ import * as BusinessApi from '@/api/crm/business'
6671
import * as ContactApi from '@/api/crm/contact'
6772
import BusinessForm from './../BusinessForm.vue'
6873
import { BizTypeEnum } from '@/api/crm/permission'
69-
import { fenToYuanFormat } from '@/utils/formatter'
7074
import BusinessListModal from './BusinessListModal.vue'
75+
import { erpPriceTableColumnFormatter } from '@/utils'
7176
7277
const message = useMessage() // 消息
7378

src/views/crm/business/components/BusinessListModal.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
label="商机金额"
5050
align="center"
5151
prop="price"
52-
:formatter="fenToYuanFormat"
52+
:formatter="erpPriceInputFormatter"
5353
/>
5454
<el-table-column label="客户名称" align="center" prop="customerName" />
5555
<el-table-column label="商机组" align="center" prop="statusTypeName" />
@@ -75,7 +75,7 @@
7575
<script setup lang="ts">
7676
import * as BusinessApi from '@/api/crm/business'
7777
import BusinessForm from '../BusinessForm.vue'
78-
import { fenToYuanFormat } from '@/utils/formatter'
78+
import { erpPriceInputFormatter } from '@/utils'
7979
8080
const message = useMessage() // 消息弹窗
8181
const props = defineProps<{

src/views/crm/contract/components/ContractList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
label="合同金额(元)"
2424
align="center"
2525
prop="price"
26-
:formatter="fenToYuanFormat"
26+
:formatter="erpPriceInputFormatter"
2727
/>
2828
<el-table-column
2929
label="开始时间"
@@ -61,9 +61,9 @@
6161
import * as ContractApi from '@/api/crm/contract'
6262
import ContractForm from './../ContractForm.vue'
6363
import { BizTypeEnum } from '@/api/crm/permission'
64-
import { fenToYuanFormat } from '@/utils/formatter'
6564
import { dateFormatter } from '@/utils/formatTime'
6665
import { DICT_TYPE } from '@/utils/dict'
66+
import { erpPriceInputFormatter } from '@/utils'
6767
6868
defineOptions({ name: 'CrmContractList' })
6969
const props = defineProps<{

src/views/crm/contract/detail/index.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
<el-tab-pane label="产品">
2020
<ContractProductList :contract="contract" />
2121
</el-tab-pane>
22-
<!-- TODO 合同 -->
23-
<el-tab-pane label="回款"> 123 </el-tab-pane>
2422
<!-- TODO @puhui999:回款信息 -->
23+
<el-tab-pane label="回款"> 123 </el-tab-pane>
2524
<el-tab-pane label="团队成员">
2625
<PermissionList
2726
ref="permissionListRef"

src/views/crm/contract/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
245245
import download from '@/utils/download'
246246
import * as ContractApi from '@/api/crm/contract'
247247
import ContractForm from './ContractForm.vue'
248-
import { fenToYuanFormat } from '@/utils/formatter'
249248
import { DICT_TYPE } from '@/utils/dict'
250249
import { erpPriceTableColumnFormatter } from '@/utils'
251250
import * as CustomerApi from '@/api/crm/customer'

src/views/crm/product/ProductForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<script setup lang="ts">
101101
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
102102
import * as ProductApi from '@/api/crm/product'
103-
import * as ProductCategoryApi from '@/api/crm/product/productCategory'
103+
import * as ProductCategoryApi from '@/api/crm/product/category'
104104
import { defaultProps, handleTree } from '@/utils/tree'
105105
import { getSimpleUserList, UserVO } from '@/api/system/user'
106106
import { useUserStore } from '@/store/modules/user'

src/views/crm/product/category/ProductCategoryForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</Dialog>
3030
</template>
3131
<script setup lang="ts">
32-
import * as ProductCategoryApi from '@/api/crm/product/productCategory'
32+
import * as ProductCategoryApi from '@/api/crm/product/category'
3333
3434
defineOptions({ name: 'CrmProductCategoryForm' })
3535

src/views/crm/product/category/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
<script setup lang="ts">
7575
import { dateFormatter } from '@/utils/formatTime'
76-
import * as ProductCategoryApi from '@/api/crm/product/productCategory'
76+
import * as ProductCategoryApi from '@/api/crm/product/category'
7777
import ProductCategoryForm from './ProductCategoryForm.vue'
7878
import { handleTree } from '@/utils/tree'
7979

0 commit comments

Comments
 (0)