Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web/pulls/4

.env.base

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径

src/views/Clue/Order/Comp/DialogOrder.vue

@@ -61,14 +61,15 @@
           </el-table>
         </div>
       </el-tab-pane>
-      <el-tab-pane
+      <el-tab-pane label="回款记录" name="returnRecord">
-        label="回款记录"
-        name="returnRecord"
-        v-if="checkPermi(['clue:order:return-list'])"
-      >
         <el-table :data="returnRecordList" border stripe>
           <el-table-column type="index" width="50" />
-          <el-table-column prop="money" label="回款金额" />
+          <el-table-column
+            v-if="checkPermi(['clue:order:return-list'])"
+            prop="money"
+            label="回款金额"
+          />
+          <el-table-column prop="personProfit" label="员工利润" />
           <el-table-column prop="applyTime" label="申请日期" />
           <el-table-column prop="isPayoff" label="是否结清" />
           <el-table-column prop="stateName" label="审核状态" />

src/views/Clue/Order/Comp/MallOrderList.vue

@@ -74,8 +74,8 @@
       @get-checked-columns="getCheckedColumns"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="60" />
+      <el-table-column type="selection" width="60" fixed="left" />
-      <el-table-column type="expand">
+      <el-table-column type="expand" fixed="left">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
             <VueDraggable
@@ -91,8 +91,8 @@
                 stripe
                 style="width: 80%; margin: 0 auto"
               >
-                <el-table-column prop="productName" label="成交产品" />
+                <el-table-column prop="productName" label="成交产品" width="120px" />
-                <el-table-column prop="specsName" label="产品规格" />
+                <el-table-column prop="specsName" label="产品规格" width="120px" />
                 <el-table-column prop="signNum" label="成交数量" width="90px" />
                 <el-table-column prop="remark" label="成交备注" width="100px" />
                 <el-table-column label="生产状态" width="160px">

src/views/Clue/Order/Comp/SchoolSettle.vue

@@ -248,6 +248,16 @@
         <el-form-item label="结算金额">
           {{ settleAmount }}
         </el-form-item>
+        <el-form-item label="结算日期">
+          <el-date-picker
+            v-model="form.settlementDate"
+            type="date"
+            placeholder="选择日期时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :clearable="false"
+          />
+        </el-form-item>
         <el-form-item label="结算备注" prop="remark">
           <Editor v-model:modelValue="form.remark" />
         </el-form-item>
@@ -270,7 +280,7 @@ import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
 import * as SettleApi from '@/api/clue/settle'
 
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import { removeNullField } from '@/utils/index'
 
 const message = useMessage() // 消息弹窗
@@ -395,6 +405,7 @@ function batchSettle() {
     showDailog.value = true
     form.value = {
       settlementIds: selectList.value.map((it) => it.settlementId),
+      settlementDate: formatDate(new Date()),
       reamrk: undefined
     }
     settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)

src/views/Clue/Set/Comp/DialogSource.vue

@@ -7,30 +7,81 @@
       :rules="formRules"
       label-width="80px"
     >
-      <el-form-item v-if="formData.parentSource" label="上级来源">
+      <el-row :gutter="20">
-        <el-input v-model="formData.parentSource" disabled />
+        <el-col v-if="formData.parentSource" :span="12" :offset="0">
-      </el-form-item>
+          <el-form-item label="上级来源">
-      <el-form-item label="来源名称" prop="sourceName">
+            <el-input v-model="formData.parentSource" disabled />
-        <el-input v-model="formData.sourceName" placeholder="请输入来源名称" />
+          </el-form-item>
-      </el-form-item>
+        </el-col>
-      <el-form-item label="排序" prop="sort">
+        <el-col :span="12" :offset="0">
-        <el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
+          <el-form-item label="来源名称" prop="sourceName">
-      </el-form-item>
+            <el-input v-model="formData.sourceName" placeholder="请输入来源名称" />
-      <el-form-item label="状态" prop="status">
+          </el-form-item>
-        <el-radio-group v-model="formData.status">
+        </el-col>
-          <el-radio :label="0"> 启用 </el-radio>
+        <el-col :span="12" :offset="0">
-          <el-radio :label="1"> 禁用 </el-radio>
+          <el-form-item label="排序" prop="sort">
-        </el-radio-group>
+            <el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
-      </el-form-item>
+          </el-form-item>
-      <el-form-item label="备注" prop="remark">
+        </el-col>
-        <el-input
+        <el-col :span="12" :offset="0">
-          type="textarea"
+          <el-form-item label="成本模式" prop="mode">
-          v-model="formData.remark"
+            <el-radio-group v-model="formData.mode">
-          placeholder="请输入备注"
+              <el-radio :label="0"> 总价 </el-radio>
-          :autosize="{ minRows: 4, maxRows: 8 }"
+              <el-radio :label="1"> 单价 </el-radio>
-        />
+            </el-radio-group>
-      </el-form-item>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" :offset="0">
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio :label="0"> 启用 </el-radio>
+              <el-radio :label="1"> 禁用 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              type="textarea"
+              v-model="formData.remark"
+              placeholder="请输入备注"
+              :autosize="{ minRows: 4, maxRows: 8 }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
+
+    <el-divider direction="horizontal" content-position="left">线索成本</el-divider>
+
+    <el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
+    <el-table :data="formData.priceVOList" border>
+      <el-table-column label="年份" width="120">
+        <template #default="{ row }">
+          <el-date-picker
+            v-model="row.year"
+            type="year"
+            placeholder="选择年份"
+            size="small"
+            format="YYYY"
+            value-format="YYYY"
+            style="width: 100%"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.monthTargetVOList[col - 1].targetPrice"
+            size="small"
+            :controls="false"
+            style="width: 100%"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -111,8 +162,27 @@ const resetForm = () => {
     sourceName: '',
     status: 0,
     sort: 1,
-    remark: ''
+    remark: '',
+    mode: 0,
+    priceVOList: []
   }
   formRef.value?.resetFields()
 }
+
+function handleAddPrice() {
+  const obj = {
+    year: undefined,
+    monthTargetVOList: []
+  }
+  for (let i = 1; i <= 12; i++) {
+    obj.monthTargetVOList.push({
+      month: i,
+      targetPrice: undefined
+    })
+  }
+  if (!formData.value.priceVOList) {
+    formData.value.priceVOList = []
+  }
+  formData.value.priceVOList.push(obj)
+}
 </script>

src/views/Home/CloseRate.vue

@@ -23,7 +23,7 @@
 
       <el-table v-loading="loading" :data="tableList" border stripe>
         <el-table-column type="index" width="50" fixed="left" />
-        <el-table-column prop="nickname" label="姓名" width="80" />
+        <el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
         <el-table-column
           v-for="(item, index) in new Date().getMonth() + 1"
           :key="index"
@@ -102,8 +102,6 @@ function totalSort(pre, cur) {
 }
 
 function monthSort(pre, cur, idx) {
-  console.log(idx)
-
   return (
     Number(pre.monthClueSignRateReportList[idx].rate) -
     Number(cur.monthClueSignRateReportList[idx].rate)

src/views/Home/Comp/SignListCard.vue

@@ -38,31 +38,42 @@
     </el-form>
     <el-table :data="tableList" border stripe show-summary :summary-method="getSummaries">
       <el-table-column label="周期" prop="period" width="110px" />
-      <el-table-column prop="signNumber" label="成交数" />
+      <el-table-column label="成交" align="center">
-      <el-table-column prop="signPrice" label="成交额" />
+        <el-table-column prop="signNumber" label="成交数" />
-      <el-table-column
+        <el-table-column prop="signPrice" label="成交额" />
-        prop="signPriceSequentialGrowth"
+        <el-table-column prop="signPriceSequentialGrowth" label="环比" :formatter="parseRate" />
-        label="成交额环比增长"
+        <el-table-column
-        :formatter="parseRate"
+          prop="signPriceSamePeriodCompareGrowth"
-      />
+          label="同比"
-      <el-table-column
+          :formatter="parseRate"
-        prop="signPriceSamePeriodCompareGrowth"
+        />
-        label="成交额同比增长"
+      </el-table-column>
-        :formatter="parseRate"
+      <el-table-column label="利润" align="center">
-      />
+        <el-table-column prop="profit">
-      <el-table-column prop="profit" label="利润" />
+          <template #header> <Tooltip message="公司利润" /> <span>利润</span> </template>
-      <el-table-column prop="profitSequentialGrowth" label="利润环比增长" :formatter="parseRate" />
+        </el-table-column>
-      <el-table-column
+        <el-table-column prop="profitSequentialGrowth" label="环比" :formatter="parseRate" />
-        prop="profitSamePeriodCompareGrowth"
+        <el-table-column prop="profitSamePeriodCompareGrowth" label="同比" :formatter="parseRate" />
-        label="利润同比增长"
+      </el-table-column>
-        :formatter="parseRate"
+
-      />
+      <el-table-column prop="notReceivedMoney">
-      <el-table-column prop="notReceivedMoney" label="未到账金额" />
+        <template #header>
-      <el-table-column prop="receivedMoney" label="已到账金额" />
+          <Tooltip message="回款列表中未审核的公司利润" /> <span>未到账</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="receivedMoney">
+        <template #header>
+          <Tooltip message="回款列表中已审核的公司利润" /> <span>已到账</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="waitSettleMoney" label="待结算金额" />
       <el-table-column prop="settledMoney" label="已结算金额" />
       <el-table-column prop="refundAmount" label="已退款金额" />
-      <el-table-column prop="remainMoney" label="结余" />
+      <el-table-column prop="remainMoney">
+        <template #header>
+          <Tooltip message="已到账金额-已结算金额-已退款金额" /> <span>结余</span>
+        </template>
+      </el-table-column>
     </el-table>
   </ContentWrap>
 </template>
@@ -129,14 +140,16 @@ function getSummaries({ columns, data }) {
       if (column.property.includes('Growth')) {
         sums[index] = ''
       } else {
-        sums[index] = values.reduce((prev, curr) => {
+        sums[index] = values
-          const value = Number(curr)
+          .reduce((prev, curr) => {
-          if (!Number.isNaN(value)) {
+            const value = Number(curr)
-            return prev + curr
+            if (!Number.isNaN(value)) {
-          } else {
+              return prev + curr
-            return prev
+            } else {
-          }
+              return prev
-        }, 0)
+            }
+          }, 0)
+          .toFixed(2)
       }
     } else {
       sums[index] = ''

src/views/Home/SalesReport.vue

@@ -0,0 +1,161 @@
+<template>
+  <ContentWrap>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.period"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="选择日期"
+          end-placeholder="选择日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.nickname" placeholder="销售姓名" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-tree-select
+          v-model="searchForm.sourceId"
+          :data="sourceOptions"
+          :props="defaultProps"
+          check-strictly
+          node-key="sourceId"
+          placeholder="请选择渠道"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.cartype" placeholder="选择驾照类型" clearable>
+          <el-option
+            v-for="item in cartypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="tableList" border stripe>
+      <el-table-column type="index" width="50" fixed="left" />
+      <el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="咨询日期在所选周期内的线索总数" />
+          <span>新线索数</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="成交数" prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="成交日期在所选周期内的成交数" />
+          <span>成交数</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="成交率" prop="" sortable min-width="100" />
+      <el-table-column label="跟进数/日" prop="" sortable min-width="100" />
+      <el-table-column label="成交数/日" prop="" sortable min-width="100" />
+      <el-table-column label="平均成交周期/天" prop="" sortable min-width="100" />
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip
+            message="平均每笔成交订单的公司利润【按照登记，不按审核到账】=总公司利润/总成交数"
+          />
+          <span>毛利/单</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip
+            message="平均每笔成交订单的额外支出（返费等）【按照登记，不按审核到账】=总支出/总成交数"
+          />
+          <span>支出/单</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="平均每条线索的成本=总线索成本/新线索条数" />
+          <span>线索成本/条</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="=（总公司利润-总支出-总线索成本）/总成交数" />
+          <span>净利润/单</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总线索成本" prop="" sortable min-width="100" />
+      <el-table-column label="总支出" prop="" sortable min-width="100" />
+      <el-table-column label="总利润" prop="" sortable min-width="100" />
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="=总利润/(总成本+总支出)" min-width="100" />
+          <span>能效</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="撞单数" prop="" sortable min-width="100" />
+      <el-table-column label="撞单成交数" prop="" sortable min-width="100" />
+    </el-table>
+  </ContentWrap>
+</template>
+
+<script setup name="SalesReport">
+import * as reportApi from '@/api/home/reportSignRate'
+import { removeNullField } from '@/utils'
+
+onMounted(() => {
+  handleReset()
+  handleSearch()
+})
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    nickname: undefined,
+    year: new Date().getFullYear() + ''
+  }
+}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data.map((item) => {
+      const count = item.monthClueSignRateReportList.reduce(
+        (pre, cur) => {
+          return {
+            signCount: pre.signCount + cur.clueSignNum,
+            clueCount: pre.clueCount + cur.followClueNum
+          }
+        },
+        { signCount: 0, clueCount: 0 }
+      )
+      const rate = count.clueCount > 0 ? ((count.signCount * 100) / count.clueCount).toFixed(2) : 0
+      return {
+        ...item,
+        totalRate: `${rate}%(${count.signCount}/${count.clueCount})`,
+        totalRateNum: rate
+      }
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+// function monthSort(pre, cur, idx) {
+
+//   return (
+//     Number(pre.monthClueSignRateReportList[idx].rate) -
+//     Number(cur.monthClueSignRateReportList[idx].rate)
+//   )
+// }
+</script>
+
+<style lang="scss" scoped></style>

src/views/MiniMall/MallSet/Comp/SupplierSet.vue

@@ -17,6 +17,7 @@
     </el-form>
     <el-table v-loading="loading" :data="tableList">
       <el-table-column prop="label" label="供应商名称" />
+      <!-- <el-table-column prop="" label="微信群名称" /> -->
       <el-table-column prop="sort" label="排序" width="100px" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column

src/views/MiniMall/Product/index.vue

@@ -49,7 +49,7 @@
 
   <!-- 列表 -->
   <el-table v-loading="loading" class="mt-20px" :data="tableList" border>
-    <el-table-column type="expand" width="30">
+    <el-table-column type="expand" width="30" fixed="left">
       <template #default="{ row }">
         <div class="pl-100px pr-100px">
           <el-table :data="row.productSpecList">
@@ -71,16 +71,16 @@
       </template>
     </el-table-column>
     <el-table-column key="productId" label="产品编码" prop="productId" />
-    <el-table-column show-overflow-tooltip label="产品名称" min-width="200" prop="productName" />
+    <el-table-column show-overflow-tooltip label="产品名称" min-width="100" prop="productName" />
-    <el-table-column label="分类" min-width="90" prop="productCategoryName" />
+    <el-table-column label="分类" width="90" prop="productCategoryName" />
-    <el-table-column label="品牌" min-width="90" prop="productBrandName" />
+    <el-table-column label="品牌" width="90" prop="productBrandName" />
     <el-table-column label="商品图" min-width="80">
       <template #default="{ row }">
         <el-image :src="row.mainImage" @click="imagePreview(row.mainImage)" class="w-30px h-30px" />
       </template>
     </el-table-column>
-    <el-table-column label="简介" min-width="70" prop="productIntro" />
+    <el-table-column label="简介" min-width="200" prop="productIntro" />
-    <el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="180" />
+    <el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="120" />
     <el-table-column v-for="item in diyFieldList" :key="item.clueParamId" :label="item.label">
       <template #default="{ row }">
         <div v-if="item.component == 'DatePicker'">