From 10d3e0692742ed809aebb4db32f713b390569ead Mon Sep 17 00:00:00 2001 From: quu Date: Sun, 27 Apr 2025 12:12:50 +0900 Subject: [PATCH] =?UTF-8?q?crm=20=E6=8A=A5=E4=BB=B7=20=E5=95=86=E6=9C=BA?= =?UTF-8?q?=20=E5=90=88=E5=90=8C=20=E4=B8=89=E5=9D=97=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/crm/business/index.ts | 1 - src/api/crm/contractaauthorizedcompany/index.ts | 2 +- src/api/crm/contractaauthorizedperson/index.ts | 2 +- src/api/crm/contractbauthorizedperson/index.ts | 2 +- src/api/crm/product/index.ts | 3 +++ src/views/crm/business/BusinessForm.vue | 4 +--- .../business/components/BusinessProductForm.vue | 4 ++-- .../crm/business/detail/BusinessProductList.vue | 3 +-- .../components/ContractAAuthorizedCompanyForm.vue | 7 ------- .../components/ContractAAuthorizedPersonForm.vue | 15 +++++++-------- .../components/ContractBAuthorizedPersonForm.vue | 15 +++++++-------- .../crm/contract/detail/ContractProductList.vue | 3 +-- src/views/crm/quotation/QuotationForm.vue | 6 +++++- 13 files changed, 30 insertions(+), 37 deletions(-) diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts index 242042551..5361cdb59 100644 --- a/src/api/crm/business/index.ts +++ b/src/api/crm/business/index.ts @@ -21,7 +21,6 @@ export interface BusinessVO { dealTime: Date totalProductPrice: number totalPrice: number - discountPercent: number remark: string creator: string // 创建人 creatorName?: string // 创建人名称 diff --git a/src/api/crm/contractaauthorizedcompany/index.ts b/src/api/crm/contractaauthorizedcompany/index.ts index 12386c307..b7560f75e 100644 --- a/src/api/crm/contractaauthorizedcompany/index.ts +++ b/src/api/crm/contractaauthorizedcompany/index.ts @@ -11,7 +11,7 @@ export interface ContractAAuthorizedCompanyVO { companyBank: string // 开户行 companyAccount: string // 开户账号 companyAddress: string // 通讯地址 - deletedFlag: number // 删除标记：1-正常，-1-已删除 + deleted: number // 删除标记：1-正常，-1-已删除 } // 合同甲方关联单位 API diff --git a/src/api/crm/contractaauthorizedperson/index.ts b/src/api/crm/contractaauthorizedperson/index.ts index 7a9a25340..c8ffa47a4 100644 --- a/src/api/crm/contractaauthorizedperson/index.ts +++ b/src/api/crm/contractaauthorizedperson/index.ts @@ -11,7 +11,7 @@ export interface ContractAAuthorizedPersonVO { wechat: string // 微信号 idNumber: string // 身份证号 email: string // 电子邮箱 - deletedFlag: number // 删除标记：1-正常，-1-已删除 + deleted: number // 删除标记：1-正常，-1-已删除 } // 合同甲方授权人信息 API diff --git a/src/api/crm/contractbauthorizedperson/index.ts b/src/api/crm/contractbauthorizedperson/index.ts index 55d0762a4..cd1104653 100644 --- a/src/api/crm/contractbauthorizedperson/index.ts +++ b/src/api/crm/contractbauthorizedperson/index.ts @@ -13,7 +13,7 @@ export interface ContractBAuthorizedPersonVO { phoneNumber: string // 手机号 wechat: string // 微信号 email: string // 电子邮箱 - deletedFlag: number // 删除标记：1-正常，-1-已删除 + deleted: number // 删除标记：1-正常，-1-已删除 } // 合同乙方授权人信息 API diff --git a/src/api/crm/product/index.ts b/src/api/crm/product/index.ts index f0c232891..36a9ca77d 100644 --- a/src/api/crm/product/index.ts +++ b/src/api/crm/product/index.ts @@ -8,6 +8,9 @@ export interface ProductVO { price: number status: number categoryId: number + offlinePrice: number + onlinePrice: number + totalPrice: number categoryName?: string description: string ownerUserId: number diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue index 81a73dcfa..6b8c53bc4 100644 --- a/src/views/crm/business/BusinessForm.vue +++ b/src/views/crm/business/BusinessForm.vue @@ -217,11 +217,10 @@ - + @@ -271,7 +270,6 @@ const formData = ref({ onlinePrice: undefined, offlinePrice: undefined, totalProductPrice: undefined, - discountPercent: undefined, totalPrice: undefined, saleStage: undefined, paymentTerm: undefined, diff --git a/src/views/crm/business/components/BusinessProductForm.vue b/src/views/crm/business/components/BusinessProductForm.vue index a14c2f1cc..e8ff22258 100644 --- a/src/views/crm/business/components/BusinessProductForm.vue +++ b/src/views/crm/business/components/BusinessProductForm.vue @@ -130,10 +130,10 @@ watch( } // 循环处理 val.forEach((item) => { - if (item.businessPrice != null && item.count != null) { + if (item.offlinePrice != null && item.onlinePrice != null) { item.totalPrice = item.offlinePrice + item.onlinePrice } else { - item.totalPrice = undefined + item.totalPrice = 0 } }) }, diff --git a/src/views/crm/business/detail/BusinessProductList.vue b/src/views/crm/business/detail/BusinessProductList.vue index 9a316659f..f98ca5175 100644 --- a/src/views/crm/business/detail/BusinessProductList.vue +++ b/src/views/crm/business/detail/BusinessProductList.vue @@ -48,9 +48,8 @@ /> - 整单折扣：{{ erpPriceInputFormatter(business.discountPercent) }}% - 产品总金额：{{ erpPriceInputFormatter(business.totalProductPrice) }} 元 + 总金额：{{ erpPriceInputFormatter(business.totalPrice) }} 元 diff --git a/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue b/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue index 09db797b1..8b58a9aef 100644 --- a/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue +++ b/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue @@ -58,13 +58,6 @@ - - - - - -