From 4f18a1b8bfafc4d7333c587bfeafa250b4ad2628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= <email@sample.com>
Date: Thu, 18 Sep 2025 11:34:11 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit c5ec4bb5e1bb66751fa7458cbbbb6c594864fe18
Author: 浅念 <email@sample.com>
Date:   Thu Sep 18 11:31:22 2025 +0800

    修改kpi

commit 9e260ddcd85c2e5431328f9b6ac65ba96975d4fd
Author: 浅念 <email@sample.com>
Date:   Thu Sep 18 09:49:33 2025 +0800

    修改 kpi

commit 6feb3ace75df218d063448a777ec56aa77a5f473
Author: 浅念 <email@sample.com>
Date:   Thu Sep 18 09:42:44 2025 +0800

    kpi 统计

commit ec257a246d0548b9e63c72f7a5871f0f4e9aee19
Author: 浅念 <email@sample.com>
Date:   Wed Sep 17 17:04:35 2025 +0800

    修改 弹框表格

commit fa764852ab88e624640585e1cf18e552629a69aa
Author: 浅念 <email@sample.com>
Date:   Wed Sep 17 15:54:35 2025 +0800

    添加 账户简称

commit 65f7f4a123a1b2cbd76fd17636240312ff3579a0
Author: 浅念 <email@sample.com>
Date:   Wed Sep 17 15:10:28 2025 +0800

    品牌加热门  修改 仪表盘接口

commit 922cfec81d771e09b0a915ad83de0f59b722ef11
Author: 浅念 <email@sample.com>
Date:   Tue Sep 16 15:57:17 2025 +0800

    调整备货单  crm 端页面

commit 5c8df36f127b56bdec379316445bf684972e620c
Author: 浅念 <email@sample.com>
Date:   Mon Sep 15 17:14:38 2025 +0800

    调整备货单 及各页面名称

commit 5503a14408fb24e6c04c8aa301d26b0ce64ae8d2
Author: 浅念 <email@sample.com>
Date:   Fri Sep 12 18:10:03 2025 +0800

    账户添加公司

commit 3439b45d9ab833c35cbcfaa7e64b3e2d4fccb93b
Author: 浅念 <email@sample.com>
Date:   Fri Sep 12 17:53:26 2025 +0800

    修改终版备货单

commit 045d13eb7b9982058150351e5046ab56b9ac7269
Author: 浅念 <email@sample.com>
Date:   Fri Sep 12 17:49:07 2025 +0800

    修改备货单 等页面

commit da690dfa06b5b01216c6a5c2d53a725dd2fd865b
Author: 浅念 <email@sample.com>
Date:   Thu Sep 11 17:44:37 2025 +0800

    修改 备货单 详情

commit 853e9591b3420658e074d0fcbc287ee843d5ef72
Author: 浅念 <email@sample.com>
Date:   Wed Sep 10 18:11:39 2025 +0800

    修改 备货单页面

commit 9052bd1027956b2860972fb372bbc5a5d60e054a
Author: 浅念 <email@sample.com>
Date:   Tue Sep 9 20:53:30 2025 +0800

    备货单  审核功能

commit 079d9babb8c0ef61b4df75d265c0a61f877d0c3d
Merge: ebd7479 91d810b
Author: 浅念 <email@sample.com>
Date:   Tue Sep 9 14:51:43 2025 +0800

    Merge branch 'feature/crm_pc' of http://219.157.255.213:25311/xinyouhe/art-design into feature/crm_vehicle

commit ebd7479573f3dc64acb7e86da8f87ea9ff5c137f
Merge: 64e53b6 459d306
Author: 浅念 <email@sample.com>
Date:   Tue Sep 9 13:57:28 2025 +0800

    Merge branch 'feature/crm_pc' of http://219.157.255.213:25311/xinyouhe/art-design into feature/crm_vehicle

commit 64e53b6ee9855f2221d1f9eacd5a56b94354df3d
Author: 浅念 <email@sample.com>
Date:   Mon Sep 8 19:09:55 2025 +0800

    备货单 加 审批流程

commit 9bd7c89cb425141f4645d4f7bd2ef4ad2a001f3b
Author: 浅念 <email@sample.com>
Date:   Thu Sep 4 15:09:17 2025 +0800

    车辆信息，备货单  等页面

# Conflicts:
#	src/views/admin/kpi/kpi_annual.vue
---
 src/views/admin/kpi/kpi_annual.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/admin/kpi/kpi_annual.vue b/src/views/admin/kpi/kpi_annual.vue
index ffd921e..6424f5d 100644
--- a/src/views/admin/kpi/kpi_annual.vue
+++ b/src/views/admin/kpi/kpi_annual.vue
@@ -42,11 +42,11 @@
         @current-change="handleCurrentChange"
       >
         <template #default>
-          <ElTableColumn label="公司" prop="corp_id">
+          <!-- <ElTableColumn label="公司" prop="corp_id">
             <template #default="scope">
               <p> {{ scope.row.corp_name ? scope.row.corp_name : '' }}</p>
             </template>
-          </ElTableColumn>
+          </ElTableColumn> -->
           <ElTableColumn label="年份" prop="year" />
           <ElTableColumn label="业务员" prop="user_name" />
           <ElTableColumn label="年度目标数" prop="annual_target" />
@@ -94,7 +94,8 @@
           </ElSelect>
         </ElFormItem> -->
         <ElFormItem label="年份" prop="year">
-          <ElInputNumber v-model="form.year" :min="1970" :max="2999" style="width: 100%" />
+          <el-input v-model="form.year" placeholder="请输入年份" />
+          <!-- <ElInputNumber v-model="form.year" :min="1970" :max="2999" style="width: 100%" /> -->
         </ElFormItem>
         <ElFormItem label="业务员" prop="user_id">
           <ElSelect v-model="form.user_id" filterable placeholder="请选择业务员">
@@ -108,7 +109,7 @@
           <el-text class="mx-1" type="warning">不选业务员表示公司年度总目标</el-text>
         </ElFormItem>
         <ElFormItem label="年度目标数" prop="annual_target">
-          <ElInputNumber v-model="form.annual_target" :min="0" :max="999" style="width: 100%" />
+          <ElInputNumber v-model="form.annual_target" :min="0" :max="9999999" style="width: 100%" />
         </ElFormItem>
       </ElForm>
       <template #footer>
@@ -153,11 +154,10 @@
   // 表单数据
   const form = reactive<any>({
     id: '',
-    year: '',
+    year: new Date().getFullYear(),
     user_id: '',
     annual_target: 0
   })
-
   // 表单验证规则
   const rules = reactive<FormRules>({
     year: [{ required: true, message: '请输入年份', trigger: 'blur' }],
@@ -201,8 +201,8 @@
       tableData.value = records || []
       Object.assign(pagination, { currentPage: current, pageSize: size, total })
     } catch (error) {
-      console.error('获取颜色列表失败:', error)
-      ElMessage.error('获取颜色列表失败')
+      console.error('获取列表失败:', error)
+      ElMessage.error('获取列表失败')
     } finally {
       loading.value = false
     }