From 0c5361e2fa29762444e48874d8fee0ead2e763c4 Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Tue, 11 Mar 2025 17:32:47 +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=BF=AE=E5=A4=8D#=20=E4=B8=BB=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7-=E6=88=91=E7=9A=84=EF=BC=9A=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +--
 .../pages/clue-list/components/date-popup.vue |  6 ++--
 src/bundle/pages/clue-list/index.vue          | 27 +++++++---------
 .../personally/components/telesale-card.vue   | 24 --------------
 .../widgets/admin/personally/index.vue        |  8 ++---
 .../widgets/profile-info/profile-info.vue     | 31 ++++++++-----------
 .../widgets/summary-form/summary-form.vue     |  2 +-
 src/enums/index.ts                            |  4 +++
 8 files changed, 39 insertions(+), 67 deletions(-)

diff --git a/.env.development b/.env.development
index d4b3d31..4ad7b8f 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@
 ### 
 # 请求域名
 # VITE_APP_BASE_URL= 'http://192.168.111.5:8086'
-VITE_APP_BASE_URL="http://192.168.111.98:8086"
+# VITE_APP_BASE_URL="http://192.168.111.98:8086"
 # VITE_APP_BASE_URL="http://f35n565161.vicp.fun"
-# VITE_APP_BASE_URL="https://124.220.209.120:8086"
+VITE_APP_BASE_URL="http://124.220.209.120:8086"
 # VITE_APP_SOCKET_URL = 'wss://front.yuegoodlife.com'
\ No newline at end of file
diff --git a/src/bundle/pages/clue-list/components/date-popup.vue b/src/bundle/pages/clue-list/components/date-popup.vue
index d603abf..bb52f64 100644
--- a/src/bundle/pages/clue-list/components/date-popup.vue
+++ b/src/bundle/pages/clue-list/components/date-popup.vue
@@ -35,10 +35,10 @@ const openPopup = () => {
 }
 // 默认设置日期
 const setDefaultValue = (payload: any) => {
-    if (payload.createTimeStart || payload.createTimeEnd) {
+    if (payload.startTime || payload.endTime) {
         dropdownMenuDateList.value.value = {
-            start: formateDate(payload.createTimeStart, 'start', 'YYYY-MM-DD'),
-            end: formateDate(payload.createTimeEnd, 'end', 'YYYY-MM-DD')
+            start: formateDate(payload.startTime, 'start', 'YYYY-MM-DD'),
+            end: formateDate(payload.endTime, 'end', 'YYYY-MM-DD')
         }
         dateDropdownPickerRef.value.initData(dropdownMenuDateList.value, false, payload.dateTag)
     }
diff --git a/src/bundle/pages/clue-list/index.vue b/src/bundle/pages/clue-list/index.vue
index c951646..77f0ad3 100644
--- a/src/bundle/pages/clue-list/index.vue
+++ b/src/bundle/pages/clue-list/index.vue
@@ -43,16 +43,14 @@
 
 <script setup lang="ts">
 import { onLoad } from '@dcloudio/uni-app'
-import { ref, shallowRef } from 'vue'
+import { nextTick, ref } from 'vue'
 import clueCard from './components/clue-card.vue'
 import datePopup from './components/date-popup.vue'
-import { useZPaging } from '@/hooks/useZPaging'
 import { computed } from 'vue'
 import { debounce } from 'lodash-es'
-import { nextTick } from 'vue'
-import { formatDate, formateDate, getCurDate } from '@/utils/util'
+import { formateDate, getCurDate } from '@/utils/util'
 import { personalDetailApi } from '@/api/admin'
-import { converStatusEnum } from '@/enums'
+import { PositionEnum, converStatusEnum } from '@/enums'
 
 const queryParams = ref({
     likeWork: '',
@@ -67,12 +65,13 @@ const dataList = ref([])
 const activeTab = ref(0)
 const tabOptions: Record<string, any[]> = {
     telesale: [
-        { name: '全部', value: 0 },
+        { name: '全部', value: '' },
         { name: '未领取', value: converStatusEnum.UN_RECEIVED },
         { name: '已领取', value: converStatusEnum.CONVERTED_PROCESS },
         { name: '异常待处理', value: converStatusEnum.EXCEPTION }
     ],
     recruitsale: [
+        { name: '全部', value: '' },
         { name: '转化中', value: converStatusEnum.CONVERTED_PROCESS },
         { name: '已添加', value: converStatusEnum.ADD_RELATION },
         { name: '异常待处理', value: converStatusEnum.EXCEPTION },
@@ -112,26 +111,24 @@ const queryList = async (pageNo = 1, pageSize = 10) => {
     uni.hideLoading()
 }
 
-// const dateTagFlag = ref('')
+const dateTagFlag = ref('')
 onLoad(async options => {
     setFormData(options)
     // dateTagFlag.value = options?.dateTag ?? ''
     // await nextTick()
-    // datePopupRef.value?.setDefaultValue({ ...form.value, dateTag: dateTagFlag.value })
-    // datePopupRef.value?.setDefaultValue({ ...form.value })
-    // if (option.id) {
+    // datePopupRef.value?.setDefaultValue({ ...queryParams.value, dateTag: dateTagFlag.value })
     uni.setNavigationBarTitle({
         title:
-            options.postIds == 5 ? '电销老师：' + options.username : '招生老师：' + options.username
+            options.postIds == PositionEnum.TELESALE
+                ? '电销老师：' + decodeURIComponent(options.username)
+                : '招生老师：' + decodeURIComponent(options.username)
     })
-    type.value = options.postIds == 5 ? 'telesale' : 'recruitsale'
-    // }
+    type.value = options.postIds == PositionEnum.TELESALE ? 'telesale' : 'recruitsale'
 })
-const form = ref()
 // 设置表单数据
 const setFormData = options => {
     queryParams.value = Object.keys(options).reduce((acc, key) => {
-        if (key == 'username') {
+        if (key == 'username' || key == 'dateTag') {
             return acc
         }
         acc[key] = decodeURIComponent(options[key])
diff --git a/src/components/widgets/admin/personally/components/telesale-card.vue b/src/components/widgets/admin/personally/components/telesale-card.vue
index 2d88df3..a8e2646 100644
--- a/src/components/widgets/admin/personally/components/telesale-card.vue
+++ b/src/components/widgets/admin/personally/components/telesale-card.vue
@@ -55,9 +55,6 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import card from '../../card.vue'
-import { PositionEnum } from '@/enums'
-import { usePositions } from '@/hooks/useCommon'
-import { watch } from 'vue'
 
 const props = defineProps({
     item: {
@@ -87,22 +84,6 @@ const parsePostionText = computed(() => {
 })
 const parseText = computed(() => (key: number) => key == 5 ? '电销' : '招生')
 
-const cardMap: Record<number, Array<{ label: string; value: number }>> = {
-    5: [
-        { label: '新增跟进', value: 368 },
-        { label: '未领取', value: 368 },
-        { label: '已领取', value: 100 },
-        { label: '异常待处理', value: 368 }
-    ],
-    6: [
-        { label: '转化中', value: 368 },
-        { label: '已添加', value: 100 },
-        { label: '异常待处理', value: 368 },
-        { label: '成交客户', value: 368 },
-        { label: '战败客户', value: 368 }
-    ]
-}
-
 const data = computed(() => {
     if (!props.item) return []
     const { postIds } = props.item
@@ -154,14 +135,9 @@ const data = computed(() => {
 
 const handleCardClick = () => {
     if (containPostIds.value) return
-    // const type =
-    //     parsePostIds.value.length == 1 && parsePostIds.value.includes(5)
-    //         ? 'telesale'
-    //         : 'recruitsale'
     emit('handleCardClick', props.item)
 }
 const handleMore = (key: number) => {
-    // const type = key == 5 ? 'telesale' : 'recruitsale'
     emit('handleCardClick', { ...props.item, postIds: key.toString() })
 }
 </script>
diff --git a/src/components/widgets/admin/personally/index.vue b/src/components/widgets/admin/personally/index.vue
index 3c6d39f..2419227 100644
--- a/src/components/widgets/admin/personally/index.vue
+++ b/src/components/widgets/admin/personally/index.vue
@@ -33,17 +33,15 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, computed, onMounted, ref } from 'vue'
+import { PropType, onMounted, ref } from 'vue'
 import telesaleCard from './components/telesale-card.vue'
 import filterValue from '../filter-value.vue'
 import { useZPaging } from '@/hooks/useZPaging'
-import { apiTeleClueList } from '@/api/clue'
 import { getCurDate } from '@/utils/util'
 import dropdownPicker from './components/dropdown-picker.vue'
 import { personalListApi } from '@/api/admin'
 import { usePositions } from '@/hooks/useCommon'
 import { AdminTabEnum } from '@/enums'
-import { nextTick } from 'vue'
 
 defineProps({
     activeTab: {
@@ -85,7 +83,9 @@ const handleCardClick = (item: any) => {
         postIds: splitpostIds(postIds),
         teacherType: splitpostIds(postIds) == 5 ? 0 : 1,
         username
-        // dateTag: encodeURIComponent(dateTagFlag.value),
+        // dateTag: dateTagFlag.value,
+        // startTime: form.value.startTime,
+        // endTime: form.value.endTime
     }
     const queryString = Object.keys(params)
         .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)
diff --git a/src/components/widgets/profile-info/profile-info.vue b/src/components/widgets/profile-info/profile-info.vue
index c532b65..ba7bc71 100644
--- a/src/components/widgets/profile-info/profile-info.vue
+++ b/src/components/widgets/profile-info/profile-info.vue
@@ -24,21 +24,16 @@
                     v-for="(group, index) in parseGroupList"
                     :key="index"
                     :title="group.title"
-                    :label="group.label"
                     :url="group.url"
                     :isLink="group.isLink"
                     :border="group.border"
                     size="large"
                     @click="handleClick(group)"
                 >
-                    <!-- <template #value v-if="group.value == 'roles'">
-                        <view class="flex items-center">
-                            <text class="text-sm mr-1">{{ roles }}</text>
-                            <u-icon name="arrow-right" color="#aaacb1" size="18"></u-icon>
-                        </view>
-                    </template> -->
                     <template #label>
-                        <view class="mt-[8rpx]">{{ group.label }}</view>
+                        <view class="mt-[8rpx]">
+                            {{ group.label }}
+                        </view>
                     </template>
                     <template #value>
                         <view
@@ -60,17 +55,17 @@
 </template>
 
 <script setup lang="ts">
-import { useToggle } from '@/hooks/useLockFn'
 import { PropType, computed, onMounted, ref, unref } from 'vue'
-import { AgreementEnum } from '@/enums/agreementEnums'
-import { apiConfig } from '@/api/app'
-import { useUserStore } from '@/stores/user'
-import { navigateTo } from '@/utils/util'
-import { useTabBarStore } from '@/stores/tabbar'
-import cache from '@/utils/cache'
-import { ROLEINDEX } from '@/enums/cacheEnums'
 import RolesPopup from '@/components/roles-popup.vue'
+import { useUserStore } from '@/stores/user'
+import { useTabBarStore } from '@/stores/tabbar'
+import { useToggle } from '@/hooks/useLockFn'
+import { navigateTo } from '@/utils/util'
+import cache from '@/utils/cache'
+import { apiConfig } from '@/api/app'
+import { ROLEINDEX } from '@/enums/cacheEnums'
 import defaultAvatar from '@/static/images/avatar.jpg'
+import { MasterAccountEnum } from '@/enums'
 
 interface IGroup {
     title: string
@@ -102,10 +97,8 @@ const activeRoleId = computed(() => {
     const roleArr = userInfo.roles
     return roleArr[roleIndex.value || 0]?.id
 })
-
 const newGroupList = ref(props.groupList)
 const originGroupList = [
-    { title: '所属组织', label: userInfo.organizationName, value: '' }
     // { title: '联系客服', value: 'customer', isLink: false },
     // {
     //     title: '隐私协议',
@@ -168,6 +161,8 @@ const imageError = () => {
 }
 
 const judgeShow = () => {
+    if (userInfo.masterAccount == MasterAccountEnum.YES) return
+    newGroupList.value.push({ title: '所属组织', label: userInfo.organizationName, value: '' })
     if (userInfo?.roles.length > 1) {
         newGroupList.value.push({ title: '当前岗位', label: roles, value: 'roles', border: false })
     }
diff --git a/src/components/widgets/summary-form/summary-form.vue b/src/components/widgets/summary-form/summary-form.vue
index b7aa5bf..50ae6f7 100644
--- a/src/components/widgets/summary-form/summary-form.vue
+++ b/src/components/widgets/summary-form/summary-form.vue
@@ -10,7 +10,7 @@
                     v-for="(item, index) in modelValue"
                     :key="`unique_${index}`"
                 >
-                    <view class="prefix">{{ item.formTitle }}</view>
+                    <view>{{ item.formTitle }}</view>
                     <view>
                         <u-input
                             v-if="item.formType == 1"
diff --git a/src/enums/index.ts b/src/enums/index.ts
index a9513c7..b121256 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -25,3 +25,7 @@ export enum PositionEnum {
     TELESALE = 5, //电销
     RECRUITSALE = 6 //招生
 }
+export enum MasterAccountEnum {
+    YES = 1, //是
+    NO = 6 //否
+}