From e99d0aec8aeb3438f72d5f2cd14d30f89d2270de Mon Sep 17 00:00:00 2001 From: v6ole Date: Sat, 27 Jun 2026 11:41:17 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E6=94=AF=E5=B1=80=E9=95=BF/?= =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=8F=AF=E6=8C=87=E5=AE=9A=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E5=88=9B=E5=BB=BA=E8=AE=B0=E5=BD=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a4904973bfa1481afcb3417f4a6e3e8e3d85b016. --- backend/app/api/key_visits.py | 2 +- backend/app/api/mini_business.py | 2 +- backend/app/api/work_plans.py | 2 +- backend/app/schemas/key_visit.py | 1 - backend/app/schemas/mini_business.py | 1 - backend/app/schemas/work_plan.py | 1 - frontend/src/views/desktop/KeyVisits.vue | 17 ++--------------- frontend/src/views/desktop/MiniBusiness.vue | 17 ++--------------- frontend/src/views/desktop/WorkPlans.vue | 17 ++--------------- 9 files changed, 9 insertions(+), 51 deletions(-) diff --git a/backend/app/api/key_visits.py b/backend/app/api/key_visits.py index 5d40f83..2544343 100644 --- a/backend/app/api/key_visits.py +++ b/backend/app/api/key_visits.py @@ -63,7 +63,7 @@ async def create_key_visit( planned_date=data.planned_date, planned_visitor=data.planned_visitor, visit_target=data.visit_target, - manager_id=data.manager_id or uuid.UUID(current_user["user_id"]), + manager_id=uuid.UUID(current_user["user_id"]), ) init_entry(k, current_user["name"]) db.add(k) diff --git a/backend/app/api/mini_business.py b/backend/app/api/mini_business.py index 0c35a86..7cb9fc5 100644 --- a/backend/app/api/mini_business.py +++ b/backend/app/api/mini_business.py @@ -60,7 +60,7 @@ async def create_mini_business( amount=data.amount, follow_up_detail=data.follow_up_detail, status=data.status, - manager_id=data.manager_id or uuid.UUID(current_user["user_id"]), + manager_id=uuid.UUID(current_user["user_id"]), expected_revenue_date=data.expected_revenue_date, ) init_entry(m, current_user["name"]) diff --git a/backend/app/api/work_plans.py b/backend/app/api/work_plans.py index f1b7f30..269e42a 100644 --- a/backend/app/api/work_plans.py +++ b/backend/app/api/work_plans.py @@ -58,7 +58,7 @@ async def create_work_plan( customer_id=data.customer_id, plan_content=data.plan_content, plan_date=parse_date(data.plan_date), - manager_id=data.manager_id or uuid.UUID(current_user["user_id"]), + manager_id=uuid.UUID(current_user["user_id"]), status=data.status, ) init_entry(wp, current_user["name"]) diff --git a/backend/app/schemas/key_visit.py b/backend/app/schemas/key_visit.py index 244eb12..c7d7454 100644 --- a/backend/app/schemas/key_visit.py +++ b/backend/app/schemas/key_visit.py @@ -11,7 +11,6 @@ class KeyVisitCreate(BaseModel): planned_date: str = "" planned_visitor: str = "" visit_target: str = "" - manager_id: Optional[uuid.UUID] = None class KeyVisitUpdate(BaseModel): diff --git a/backend/app/schemas/mini_business.py b/backend/app/schemas/mini_business.py index 1c1bc8c..a0719aa 100644 --- a/backend/app/schemas/mini_business.py +++ b/backend/app/schemas/mini_business.py @@ -10,7 +10,6 @@ class MiniBusinessCreate(BaseModel): follow_up_detail: str = "" status: str = "跟进中" expected_revenue_date: str = "" - manager_id: Optional[uuid.UUID] = None class MiniBusinessUpdate(BaseModel): diff --git a/backend/app/schemas/work_plan.py b/backend/app/schemas/work_plan.py index b4f640a..1816798 100644 --- a/backend/app/schemas/work_plan.py +++ b/backend/app/schemas/work_plan.py @@ -9,7 +9,6 @@ class WorkPlanCreate(BaseModel): plan_content: str = "" plan_date: str # "YYYY-MM-DD" status: str = "计划中" - manager_id: Optional[uuid.UUID] = None # director can assign to a specific manager class WorkPlanUpdate(BaseModel): diff --git a/frontend/src/views/desktop/KeyVisits.vue b/frontend/src/views/desktop/KeyVisits.vue index 0fe3473..8ffa9b8 100644 --- a/frontend/src/views/desktop/KeyVisits.vue +++ b/frontend/src/views/desktop/KeyVisits.vue @@ -10,7 +10,6 @@ const auth = useAuthStore() const loading = ref(false) const keyVisits = ref([]) const customers = ref([]) -const managers = ref([]) const allUsers = ref([]) const plannedVisitors = ref([]) @@ -37,16 +36,9 @@ const managerSummary = computed(() => { }) onMounted(async () => { - await Promise.all([loadItems(), loadCustomers(), loadUsers(), loadManagers()]) + await Promise.all([loadItems(), loadCustomers(), loadUsers()]) }) -async function loadManagers() { - try { - const res = await api.get('/users/', { params: { role: 'manager' } }) - managers.value = res.data || [] - } catch (_) {} -} - async function loadUsers() { try { const res = await api.get('/users/') @@ -74,7 +66,7 @@ async function loadItems() { function openCreate() { dialogMode.value = 'create' - form.value = { customer_id: '', urgency_level: '一般', description: '', progress_status: '未开始', planned_date: '', planned_visitor: '', visit_target: '', manager_id: '' } + form.value = { customer_id: '', urgency_level: '一般', description: '', progress_status: '未开始', planned_date: '', planned_visitor: '', visit_target: '' } plannedVisitors.value = [] dialogVisible.value = true } @@ -199,11 +191,6 @@ async function quickStatusChange(row: any, newStatus: string) { - - - - - diff --git a/frontend/src/views/desktop/MiniBusiness.vue b/frontend/src/views/desktop/MiniBusiness.vue index 51ae3e4..a75f7d3 100644 --- a/frontend/src/views/desktop/MiniBusiness.vue +++ b/frontend/src/views/desktop/MiniBusiness.vue @@ -10,7 +10,6 @@ const auth = useAuthStore() const loading = ref(false) const miniBusiness = ref([]) const customers = ref([]) -const managers = ref([]) const dialogVisible = ref(false) const dialogMode = ref<'create' | 'edit'>('create') @@ -35,16 +34,9 @@ const managerSummary = computed(() => { }) onMounted(async () => { - await Promise.all([loadItems(), loadCustomers(), loadManagers()]) + await Promise.all([loadItems(), loadCustomers()]) }) -async function loadManagers() { - try { - const res = await api.get('/users/', { params: { role: 'manager' } }) - managers.value = res.data || [] - } catch (_) {} -} - async function loadCustomers(q?: string) { try { const params: any = { page_size: 100 } @@ -65,7 +57,7 @@ async function loadItems() { function openCreate() { dialogMode.value = 'create' - form.value = { customer_id: '', product_type: '', amount: '', follow_up_detail: '', status: '跟进中', expected_revenue_date: '', manager_id: '' } + form.value = { customer_id: '', product_type: '', amount: '', follow_up_detail: '', status: '跟进中', expected_revenue_date: '' } dialogVisible.value = true } @@ -179,11 +171,6 @@ async function quickStatusChange(row: any, newStatus: string) { - - - - - diff --git a/frontend/src/views/desktop/WorkPlans.vue b/frontend/src/views/desktop/WorkPlans.vue index f250535..a11a2a1 100644 --- a/frontend/src/views/desktop/WorkPlans.vue +++ b/frontend/src/views/desktop/WorkPlans.vue @@ -10,7 +10,6 @@ const auth = useAuthStore() const loading = ref(false) const workPlans = ref([]) const customers = ref([]) -const managers = ref([]) const dialogVisible = ref(false) const dialogMode = ref<'create' | 'edit'>('create') @@ -35,16 +34,9 @@ const managerSummary = computed(() => { }) onMounted(async () => { - await Promise.all([loadPlans(), loadCustomers(), loadManagers()]) + await Promise.all([loadPlans(), loadCustomers()]) }) -async function loadManagers() { - try { - const res = await api.get('/users/', { params: { role: 'manager' } }) - managers.value = res.data || [] - } catch (_) {} -} - async function loadCustomers(q?: string) { try { const params: any = { page_size: 100 } @@ -65,7 +57,7 @@ async function loadPlans() { function openCreate() { dialogMode.value = 'create' - form.value = { customer_id: '', plan_content: '', plan_date: todayStr(), status: '计划中', manager_id: '' } + form.value = { customer_id: '', plan_content: '', plan_date: todayStr(), status: '计划中' } dialogVisible.value = true } @@ -177,11 +169,6 @@ async function quickStatusChange(row: any, newStatus: string) { - - - - -