diff --git a/src/bundle/pages/clue-list/components/clue-card.vue b/src/bundle/pages/clue-list/components/clue-card.vue
index 0e2192b..dab2243 100644
--- a/src/bundle/pages/clue-list/components/clue-card.vue
+++ b/src/bundle/pages/clue-list/components/clue-card.vue
@@ -31,7 +31,7 @@
跟进时间
{{ item.followUpTime }}
-
+
招生老师
{{ item.recruitTeacherName }}
@@ -39,17 +39,33 @@
领取时间
{{ item.getTime }}
-
+
状态
{{ parseStateText }}
-
+
备注
{{ item.remark }}
-
+
成交时间
{{ item.accomplishTime }}
diff --git a/src/bundle/pages/progress_add/index.vue b/src/bundle/pages/progress_add/index.vue
index 7e066c8..eb090c2 100644
--- a/src/bundle/pages/progress_add/index.vue
+++ b/src/bundle/pages/progress_add/index.vue
@@ -115,8 +115,8 @@ const handleSubmit = () => {
}
await apiAddCluseProgress(data)
toast('添加进展成功')
- uni.navigateBack()
uni.$emit('refreshPage')
+ uni.navigateBack()
} catch (error) {}
}
})
diff --git a/src/components/widgets/admin/dropdown-picker.vue b/src/components/widgets/admin/dropdown-picker.vue
index 108cea5..982a386 100644
--- a/src/components/widgets/admin/dropdown-picker.vue
+++ b/src/components/widgets/admin/dropdown-picker.vue
@@ -68,7 +68,7 @@ const dateDropdownPickerRef = ref>()
const teamDropdownRef = ref>()
const orgDropdownRef = ref>()
const uDropdownRef = ref()
-const defaultValue = ref() //保存组织默认值
+const defaultValue = ref('') //保存组织默认值
const organizationList = ref([])
const localValue = computed({
diff --git a/src/components/widgets/admin/team/components/clue-status.vue b/src/components/widgets/admin/team/components/clue-status.vue
index b0748c6..9456fe8 100644
--- a/src/components/widgets/admin/team/components/clue-status.vue
+++ b/src/components/widgets/admin/team/components/clue-status.vue
@@ -45,12 +45,12 @@ interface ICluseStatus {
const data = ref([])
const loading = ref(false)
const dataMap: Record = {
- unclaimedCount: '待领取',
- conversionCount: '转化中',
- addedCount: '已添加',
- abnormalCount: '异常待处理',
- tradedCount: '已成交',
- failCount: '已战败'
+ unclaimed: '待领取',
+ conversion: '转化中',
+ added: '已添加',
+ abnormal: '异常待处理',
+ traded: '已成交',
+ fail: '已战败'
}
const fetchData = async (payload: IForm) => {
loading.value = true
@@ -59,7 +59,7 @@ const fetchData = async (payload: IForm) => {
data.value = Object.keys(dataMap).map(item => {
return {
label: dataMap[item],
- value: result[item] * 100 || 0
+ value: parseFloat(result[item].replace('%', '')) || 0
}
})
console.log(data.value)
diff --git a/src/components/widgets/admin/team/components/converted-overview.vue b/src/components/widgets/admin/team/components/converted-overview.vue
index 188b03e..097b27f 100644
--- a/src/components/widgets/admin/team/components/converted-overview.vue
+++ b/src/components/widgets/admin/team/components/converted-overview.vue
@@ -40,12 +40,13 @@ const fetchData = async (payload: IForm) => {
const result = await convertedSuccessApi(payload)
console.log(result)
data.value = result.map(item => {
- const { clientCount, clueCount, percentConversion } = item.leadToCustomerStatisticsVo
+ const { transactionClient, clueCount, percentConversion } =
+ item.leadToCustomerStatisticsVo
return {
name: item.organizationName,
children: [
{ label: '线索', value: clueCount ?? 0 + '个' },
- { label: '成交客户', value: clientCount ?? 0 + '个' },
+ { label: '成交客户', value: transactionClient ?? 0 + '个' },
{ label: '转化率', value: percentConversion }
]
}
diff --git a/src/components/widgets/admin/team/components/data-overview.vue b/src/components/widgets/admin/team/components/data-overview.vue
index 59f462b..02daff1 100644
--- a/src/components/widgets/admin/team/components/data-overview.vue
+++ b/src/components/widgets/admin/team/components/data-overview.vue
@@ -36,7 +36,8 @@ const loading = ref(false)
const data = ref([])
const dataMap: Record = {
followUpRecord: '新增跟进',
- newCustomer: '新增客户',
+ // newCustomer: '新增客户',
+ unclaimedQuantity: '未领取',
transactionClient: '成交客户',
convertingClient: '转化中客户',
exceptionPending: '异常待处理',
diff --git a/src/uni_modules/uview-plus/components/u-copy/u-copy.vue b/src/uni_modules/uview-plus/components/u-copy/u-copy.vue
index 7e63ded..a98164e 100644
--- a/src/uni_modules/uview-plus/components/u-copy/u-copy.vue
+++ b/src/uni_modules/uview-plus/components/u-copy/u-copy.vue
@@ -1,70 +1,69 @@
-
+
复制
-
+