From 1d966f3d10141116e6bf8a82a29ac461942ac104 Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Fri, 7 Mar 2025 21:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8B=9B=E7=94=9F=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E3=80=91=20=E4=BC=98=E5=8C=96#=20=E4=B8=BB=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7-=E5=9B=A2=E9=98=9F=EF=BC=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=AE=80=E6=8A=A5=E7=A7=BB=E9=99=A4=E6=96=B0=E5=A2=9E=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BA=BF=E7=B4=A2=E6=9C=AA?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/clue-list/components/clue-card.vue  | 24 +++++-
 src/bundle/pages/progress_add/index.vue       |  2 +-
 .../widgets/admin/dropdown-picker.vue         |  2 +-
 .../admin/team/components/clue-status.vue     | 14 ++--
 .../team/components/converted-overview.vue    |  5 +-
 .../admin/team/components/data-overview.vue   |  3 +-
 .../uview-plus/components/u-copy/u-copy.vue   | 83 +++++++++----------
 7 files changed, 75 insertions(+), 58 deletions(-)

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 @@
                 <text class="text-muted w-[128rpx]">跟进时间</text>
                 <text class="flex-1">{{ item.followUpTime }}</text>
             </view>
-            <view class="flex gap-[20rpx] mb-[16rpx]">
+            <view class="flex gap-[20rpx] mb-[16rpx]" v-if="item.recruitTeacherId !== null">
                 <text class="text-muted w-[128rpx]">招生老师</text>
                 <text class="flex-1">{{ item.recruitTeacherName }}</text>
             </view>
@@ -39,17 +39,33 @@
                 <text class="text-muted w-[128rpx]">领取时间</text>
                 <text class="flex-1">{{ item.getTime }}</text>
             </view>
-            <view class="flex gap-[20rpx] mb-[16rpx]">
+            <view
+                class="flex gap-[20rpx] mb-[16rpx]"
+                v-if="
+                    (item.situation == converStatusEnum.ADD_RELATION ||
+                        item.situation == converStatusEnum.EXCEPTION) &&
+                    item.state !== null
+                "
+            >
                 <text class="text-muted w-[128rpx]">状态</text>
                 <text class="flex-1 text-orage">{{ parseStateText }}</text>
             </view>
-            <view class="flex gap-[20rpx] mb-[16rpx]">
+            <view
+                class="flex gap-[20rpx] mb-[16rpx]"
+                v-if="
+                    item.situation == converStatusEnum.CONVERTED ||
+                    item.situation == converStatusEnum.FAILED
+                "
+            >
                 <text class="text-muted w-[128rpx]">备注</text>
                 <view class="flex gap-[12rpx] flex-1">
                     <text class="text-error">{{ item.remark }}</text>
                 </view>
             </view>
-            <view class="flex gap-[20rpx] mb-[16rpx]">
+            <view
+                class="flex gap-[20rpx] mb-[16rpx]"
+                v-if="item.situation == converStatusEnum.CONVERTED"
+            >
                 <text class="text-muted w-[128rpx]">成交时间</text>
                 <text class="flex-1">{{ item.accomplishTime }}</text>
             </view>
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<InstanceType<typeof dateDropdownPicker>>()
 const teamDropdownRef = ref<InstanceType<typeof selectDropdown>>()
 const orgDropdownRef = ref<InstanceType<typeof selectDropdown>>()
 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<ICluseStatus[]>([])
 const loading = ref(false)
 const dataMap: Record<string, string> = {
-    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<DataItem[]>([])
 const dataMap: Record<string, string> = {
     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 @@
 <template>
-	<view @click="handleClick">
+    <view @click.stop="handleClick">
         <slot>复制</slot>
     </view>
 </template>
 <script>
 export default {
-    name: "xy-copy",
+    name: 'xy-copy',
     props: {
         content: {
             type: String,
             default: ''
         },
-		alertStyle: {
-			type: String,
-			default: 'toast'
-		},
-		notice: {
-			type: String,
-			default: '复制成功'
-		}
+        alertStyle: {
+            type: String,
+            default: 'toast'
+        },
+        notice: {
+            type: String,
+            default: '复制成功'
+        }
     },
-	emits: ['success'],
+    emits: ['success'],
     methods: {
         handleClick() {
-            let content = this.content;
-			if (!content) {
-				uni.showToast({
-				    title: '暂无',
-				    icon: 'none',
-				    duration: 2000,
-				});
-				return false;
-			}
+            let content = this.content
+            if (!content) {
+                uni.showToast({
+                    title: '暂无',
+                    icon: 'none',
+                    duration: 2000
+                })
+                return false
+            }
             content = typeof content === 'string' ? content : content.toString() // 复制内容，必须字符串，数字需要转换为字符串
             /**
-			* 小程序端 和 app端的复制逻辑
-			*/
-			let that = this;
+             * 小程序端 和 app端的复制逻辑
+             */
+            let that = this
             uni.setClipboardData({
                 data: content,
-                success: function() {
-					if (that.alertStyle == 'modal') {
-						uni.showModal({
-							title: '提示',
-							content: that.notice
-						});
-					} else {
-						uni.showToast({
-						    title: that.notice,
-						    icon: 'none'
-						});
-					}
-					that.$emit('success');
+                success: function () {
+                    if (that.alertStyle == 'modal') {
+                        uni.showModal({
+                            title: '提示',
+                            content: that.notice
+                        })
+                    } else {
+                        uni.showToast({
+                            title: that.notice,
+                            icon: 'none'
+                        })
+                    }
+                    that.$emit('success')
                 },
-                fail:function(){
+                fail: function () {
                     uni.showToast({
                         title: '复制失败',
                         icon: 'none',
-                        duration:3000,
-                    });
+                        duration: 3000
+                    })
                 }
-            });
+            })
         }
     }
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>