|
@@ -130,7 +130,7 @@ export default {
|
|
|
{ label: '报告份数', key: 'reportNumber', span: 1, condition: (product) => this.reportType.includes(product.product_type)},
|
|
|
{ label: '剑鱼币个数', key: 'coinCount', span: 1, condition: (product) => product.product_type && product.product_type === '剑鱼币'},
|
|
|
{ label: '购买产品', key: 'buyProductName', span: 1, condition: (product) => product.product_type && product.product_type === '结构化数据'},
|
|
|
- { label: '服务列表', key: 'bigServiceNames', span: 1, condition: (product) => product.productName && product.productName.includes('自定义') && product.product_code === 'dyh001'},
|
|
|
+ { label: '服务列表', key: 'bigServiceNamesPro', span: 1, condition: (product) => product.productName && product.productName.includes('自定义') && product.product_code === 'dyh001'},
|
|
|
{ label: '数据条数', key: 'data_count', span: 1, condition: (product) => product.data_count && product.data_count !== '-'},
|
|
|
{ label: '有效周期', key: 'validity_period', span: 1, condition: (product) => product.validity_period && product.validity_period !== '-' },
|
|
|
{ label: '合同金额', key: 'final_price', span: 3},
|
|
@@ -242,9 +242,10 @@ export default {
|
|
|
const parsedFilter = this.parseProductFilter(product);
|
|
|
const serviceIds = parsedFilter.serviceIds || [];
|
|
|
const supServiceIdsOrigin = parsedFilter.supServiceIds || [];
|
|
|
+ const bigServiceNames = parsedFilter.bigServiceNames || '';
|
|
|
// 等待异步方法完成
|
|
|
const supServiceIds = this.buildSupServiceIds(parsedFilter || []);
|
|
|
- const bigServiceNames = product.product_type === '大会员' ? await this.buildBigServiceNames(serviceIds, supServiceIdsOrigin) : '';
|
|
|
+ const bigServiceNamesPro = product.product_type === '大会员' ? await this.buildBigServiceNames(serviceIds, supServiceIdsOrigin, bigServiceNames) : '';
|
|
|
const rate = this.calculateDiscountRate(product);
|
|
|
const validityPeriod = this.calculateValidityPeriod(
|
|
|
parsedFilter,
|
|
@@ -318,7 +319,7 @@ export default {
|
|
|
mainAccountCount,
|
|
|
linkedOrder,
|
|
|
supServiceIds,
|
|
|
- bigServiceNames,
|
|
|
+ bigServiceNamesPro,
|
|
|
email,
|
|
|
final_price: finalPrice,
|
|
|
sale_final_price: finalPrice,
|
|
@@ -370,7 +371,7 @@ export default {
|
|
|
}
|
|
|
return upgradeContent.length ? upgradeContent.join('、') : '-'
|
|
|
},
|
|
|
- buildBigServiceNames(serviceIds, supServiceIds) {
|
|
|
+ buildBigServiceNames(serviceIds, supServiceIds, bigServiceNames) {
|
|
|
return new Promise((resolve) => {
|
|
|
if (!serviceIds || serviceIds.length === 0) {
|
|
|
resolve('');
|
|
@@ -380,6 +381,7 @@ export default {
|
|
|
// 避免修改原始数组,创建新的整型数组
|
|
|
const numericServiceIds = serviceIds.map(id => parseInt(id));
|
|
|
let sameValues = [], differentValues = [];
|
|
|
+ const hasBigServiceNames = bigServiceNames ? `、${bigServiceNames}` : ''
|
|
|
this.$nextTick(() => {
|
|
|
try {
|
|
|
|
|
@@ -420,14 +422,14 @@ export default {
|
|
|
// 如果有补充服务,就拼接,如果没有补充服务,就不拼接,直接返回原已购服务名连接字符串
|
|
|
const supplement = resSupServiceData ? `【补充服务】:${resSupServiceData}` : ''
|
|
|
// 最终服务字符串:补充服务名称;原已购服务名称
|
|
|
- const serviceStr = `${supplement};【原已购服务】:${baseServiceData}`
|
|
|
+ const serviceStr = `${supplement};【原已购服务】:${baseServiceData}${hasBigServiceNames}`
|
|
|
resolve(serviceStr);
|
|
|
} else {
|
|
|
if(numericServiceIds.length === 0) {
|
|
|
console.warn('numericServiceIds为空')
|
|
|
}
|
|
|
const res = serviceListRef.calcAlreadyBuyServiceNamesArr(numericServiceIds);
|
|
|
- const serviceData = Array.isArray(res) ? res.join('、') : '';
|
|
|
+ const serviceData = Array.isArray(res) ? res.join('、') + hasBigServiceNames : '';
|
|
|
resolve(serviceData);
|
|
|
}
|
|
|
} catch (error) {
|
|
@@ -629,6 +631,10 @@ export default {
|
|
|
giveResultText = giveResult.text ? `销售赠${giveResult.text},` : '';
|
|
|
return `付费${buyResult.text},活动赠${activityGiveResult.text},${giveResultText}合计<span class="color_main">${totalText}</span>${returned_opens}`;
|
|
|
}
|
|
|
+ // 如果是赠送类产品,则只显示赠送时长和合计时长, 不显示付费时长
|
|
|
+ if(product.tactics === '2') {
|
|
|
+ return `${giveResultText}合计<span class="color_main">${totalText}</span>${returned_opens}`
|
|
|
+ }
|
|
|
return `付费${buyResult.text},${giveResultText}合计<span class="color_main">${totalText}</span>${returned_opens}`;
|
|
|
},
|
|
|
getValidityPeriodHtml(product, item) {
|