Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm

00762362 · puhui999 · ae53ca6f · f55c9b72 · 00762362 · 00762362
Commit 00762362 authored Apr 25, 2024 by puhui999
14 changed files
--- a/.env.dev
+++ b/.env.dev
@@ -12,9 +12,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
-# 接口前缀
-VITE_API_BASEPATH=/dev-api
 # 接口地址
 VITE_API_URL=/admin-api

--- a/.env.local-dev
+++ b/.env.local-dev
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
-# 接口前缀
-VITE_API_BASEPATH=/dev-api
 # 接口地址
 VITE_API_URL=/admin-api

--- a/.env.prod
+++ b/.env.prod
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
-# 接口前缀
-VITE_API_BASEPATH=
 # 接口地址
 VITE_API_URL=/admin-api

--- a/.env.stage
+++ b/.env.stage
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
-# 接口前缀
-VITE_API_BASEPATH=
 # 接口地址
 VITE_API_URL=/admin-api

--- a/.env.test
+++ b/.env.test
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
-# 接口前缀
-VITE_API_BASEPATH=
 # 接口地址
 VITE_API_URL=/admin-api

--- a/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
-<!-- 客户总量统计 -->
+<!-- 员工业绩统计 -->
+<!-- TODO @scholar:参考 ReceivablePricePerformance 建议改 -->
 <template>
  <!-- Echarts图 -->
  <el-card shadow="never">
@@ -7,7 +8,7 @@
    </el-skeleton>
  </el-card>
-  <!-- 统计列表 TODO @scholar：统计列表的展示不对 -->
+  <!-- 统计列表 -->
  <el-card shadow="never" class="mt-16px">
    <el-table v-loading="loading" :data="tableData">
      <el-table-column
@@ -186,6 +187,7 @@ const loadData = async () => {
  // 2.2 更新列表数据
  list.value = performanceList
+  convertListData()
  loading.value = false
 }
@@ -199,9 +201,10 @@ const tableData = reactive([
  { title: '环比增长率（%）' }
 ])
-// 定义 init 方法
+// 定义 convertListData 方法，数据行列转置，展示每月数据
-const init = () => {
+const convertListData = () => {
  const columnObj = { label: '日期', prop: 'title' }
+  columnsData.splice(0, columnsData.length) //清空数组
  columnsData.push(columnObj)
  list.value.forEach((item, index) => {
@@ -211,9 +214,9 @@ const init = () => {
    tableData[1]['prop' + index] = item.lastMonthCount
    tableData[2]['prop' + index] = item.lastYearCount
    tableData[3]['prop' + index] =
-      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] =
      item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] =
+      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
  })
 }
@@ -222,6 +225,5 @@ defineExpose({ loadData })
 /** 初始化 */
 onMounted(async () => {
  await loadData()
-  init()
 })
 </script>
--- a/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
-<!-- 客户总量统计 -->
+<!-- 员工业绩统计 -->
+<!-- TODO @scholar:参考 ReceivablePricePerformance 建议改 -->
 <template>
  <!-- Echarts图 -->
  <el-card shadow="never">
@@ -7,7 +8,7 @@
    </el-skeleton>
  </el-card>
-  <!-- 统计列表 TODO @scholar：统计列表的展示不对 -->
+  <!-- 统计列表 -->
  <el-card shadow="never" class="mt-16px">
    <el-table v-loading="loading" :data="tableData">
      <el-table-column
@@ -186,6 +187,7 @@ const loadData = async () => {
  // 2.2 更新列表数据
  list.value = performanceList
+  convertListData()
  loading.value = false
 }
@@ -200,8 +202,9 @@ const tableData = reactive([
 ])
 // 定义 init 方法
-const init = () => {
+const convertListData = () => {
  const columnObj = { label: '日期', prop: 'title' }
+  columnsData.splice(0, columnsData.length) //清空数组
  columnsData.push(columnObj)
  list.value.forEach((item, index) => {
@@ -211,9 +214,9 @@ const init = () => {
    tableData[1]['prop' + index] = item.lastMonthCount
    tableData[2]['prop' + index] = item.lastYearCount
    tableData[3]['prop' + index] =
-      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] =
      item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] =
+      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
  })
 }
@@ -222,6 +225,5 @@ defineExpose({ loadData })
 /** 初始化 */
 onMounted(async () => {
  await loadData()
-  init()
 })
 </script>
--- a/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
-<!-- 客户总量统计 -->
+<!-- 员工业绩统计 -->
 <template>
  <!-- Echarts图 -->
  <el-card shadow="never">
@@ -7,7 +7,7 @@
    </el-skeleton>
  </el-card>
-  <!-- 统计列表 TODO @scholar：统计列表的展示不对 -->
+  <!-- 统计列表 -->
  <el-card shadow="never" class="mt-16px">
    <el-table v-loading="loading" :data="tableData">
      <el-table-column
@@ -17,6 +17,7 @@
        :prop="item.prop"
        align="center"
      >
+        <!-- TODO @scholar：IDEA 爆红的处理 -->
        <template #default="scope">
          {{ scope.row[item.prop] }}
        </template>
@@ -120,6 +121,7 @@ const echartsOption = reactive<EChartsOption>({
      type: 'value',
      name: '',
      axisTick: {
+        // TODO @scholar：IDEA 爆红的处理
        alignWithLabel: true,
        lineStyle: {
          width: 0
@@ -186,11 +188,13 @@ const loadData = async () => {
  // 2.2 更新列表数据
  list.value = performanceList
+  convertListData()
  loading.value = false
 }
 // 初始化数据
-const columnsData = reactive([])
+// TODO @scholar：加个 as any[]，避免 idea 爆红
+const columnsData = reactive([] as any[])
 const tableData = reactive([
  { title: '当月回款金额统计（元）' },
  { title: '上月回款金额统计（元）' },
@@ -200,8 +204,9 @@ const tableData = reactive([
 ])
 // 定义 init 方法
-const init = () => {
+const convertListData = () => {
  const columnObj = { label: '日期', prop: 'title' }
+  columnsData.splice(0, columnsData.length) //清空数组
  columnsData.push(columnObj)
  list.value.forEach((item, index) => {
@@ -210,10 +215,11 @@ const init = () => {
    tableData[0]['prop' + index] = item.currentMonthCount
    tableData[1]['prop' + index] = item.lastMonthCount
    tableData[2]['prop' + index] = item.lastYearCount
+    // TODO @scholar：百分比，使用 erpCalculatePercentage 直接计算；如果是 0，则返回 0，统一就好哈；
    tableData[3]['prop' + index] =
-      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] =
      item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] =
+      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
  })
 }
@@ -222,6 +228,5 @@ defineExpose({ loadData })
 /** 初始化 */
 onMounted(async () => {
  await loadData()
-  init()
 })
 </script>
--- a/src/views/crm/statistics/performance/index.vue
+++ b/src/views/crm/statistics/performance/index.vue
-<!-- 数据统计 - 员工客户分析 -->
+<!-- 数据统计 - 员工业绩分析 -->
 <template>
  <ContentWrap>
    <!-- 搜索工作栏 -->
@@ -9,16 +9,13 @@
      :inline="true"
      label-width="68px"
    >
-      <el-form-item label="时间范围" prop="orderDate">
+      <el-form-item label="选择年份" prop="orderDate">
        <el-date-picker
-          v-model="queryParams.times"
+          v-model="queryParams.times[0]"
-          :shortcuts="defaultShortcuts"
          class="!w-240px"
-          end-placeholder="结束日期"
+          type="year"
-          start-placeholder="开始日期"
+          value-format="YYYY"
-          type="daterange"
+          :default-time="[new Date().getFullYear()]"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
        />
      </el-form-item>
      <el-form-item label="归属部门" prop="deptId">
@@ -62,7 +59,7 @@
        <ContractPricePerformance :query-params="queryParams" ref="ContractPricePerformanceRef" />
      </el-tab-pane>
      <!-- 员工回款金额统计 -->
-      <el-tab-pane label="员工回款金额统计" name="followupType" lazy>
+      <el-tab-pane label="员工回款金额统计" name="ReceivablePricePerformance" lazy>
        <ReceivablePricePerformance
          :query-params="queryParams"
          ref="ReceivablePricePerformanceRef"
@@ -76,21 +73,20 @@
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
-import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime'
+import { beginOfDay, formatDate } from '@/utils/formatTime'
 import { defaultProps, handleTree } from '@/utils/tree'
 import ContractCountPerformance from './components/ContractCountPerformance.vue'
 import ContractPricePerformance from './components/ContractPricePerformance.vue'
 import ReceivablePricePerformance from './components/ReceivablePricePerformance.vue'
-defineOptions({ name: 'CrmStatisticsPerformance' })
+defineOptions({ name: 'CrmStatisticsCustomer' })
 const queryParams = reactive({
  deptId: useUserStore().getUser.deptId,
  userId: undefined,
  times: [
-    // 默认显示最近一周的数据
+    // 默认显示当年的数据
-    formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7))),
+    formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)))
-    formatDate(endOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24)))
  ]
 })
@@ -104,6 +100,7 @@ const userListByDeptId = computed(() =>
    : []
 )
+// TODO @scholar：改成尾注释，保证 vue 内容短一点；变量名小写
 // 活跃标签
 const activeTab = ref('ContractCountPerformance')
 // 1.员工合同数量统计
@@ -115,6 +112,19 @@ const ReceivablePricePerformanceRef = ref()
 /** 搜索按钮操作 */
 const handleQuery = () => {
+  // 从 queryParams.times[0] 中获取到了年份
+  const selectYear = parseInt(queryParams.times[0])
+  // 创建一个新的 Date 对象，设置为指定的年份的第一天
+  const fullDate = new Date(selectYear, 0, 1, 0, 0, 0)
+  // 将完整的日期时间格式化为需要的字符串形式，比如 2004-01-01 00:00:00
+  // TODO @scholar：看看，是不是可以使用 year 哈
+  queryParams.times[0] = `${fullDate.getFullYear()}-${String(fullDate.getMonth() + 1).padStart(
+    2,
+    '0'
+  )}-${String(fullDate.getDate()).padStart(2, '0')} ${String(fullDate.getHours()).padStart(2, '0')}:${String(fullDate.getMinutes()).padStart(2, '0')}:${String(fullDate.getSeconds()).padStart(2, '0')}`
  switch (activeTab.value) {
    case 'ContractCountPerformance':
      ContractCountPerformanceRef.value?.loadData?.()

--- a/src/views/mp/components/wx-reply/components/TabImage.vue
+++ b/src/views/mp/components/wx-reply/components/TabImage.vue
@@ -63,7 +63,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Reply } from './types'
 const message = useMessage()
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 const props = defineProps<{

--- a/src/views/mp/components/wx-reply/components/TabMusic.vue
+++ b/src/views/mp/components/wx-reply/components/TabMusic.vue
@@ -67,7 +67,7 @@ import { Reply } from './types'
 const message = useMessage()
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 const props = defineProps<{

--- a/src/views/mp/components/wx-reply/components/TabVideo.vue
+++ b/src/views/mp/components/wx-reply/components/TabVideo.vue
@@ -58,7 +58,7 @@ import { Reply } from './types'
 const message = useMessage()
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() }
 const props = defineProps<{

--- a/src/views/mp/components/wx-reply/components/TabVoice.vue
+++ b/src/views/mp/components/wx-reply/components/TabVoice.vue
@@ -61,7 +61,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Reply } from './types'
 const message = useMessage()
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 const props = defineProps<{

--- a/types/env.d.ts
+++ b/types/env.d.ts
@@ -17,7 +17,6 @@ interface ImportMetaEnv {
  readonly VITE_APP_DOCALERT_ENABLE: string
  readonly VITE_BASE_URL: string
  readonly VITE_UPLOAD_URL: string
-  readonly VITE_API_BASEPATH: string
  readonly VITE_API_URL: string
  readonly VITE_BASE_PATH: string
  readonly VITE_DROP_DEBUGGER: string