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

src/views/Home/Comp/DialogSalerReportDetail.vue

@@ -24,7 +24,7 @@
           @change="sourceChange"
         />
       </el-form-item>
-      <el-form-item>
+      <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
         <el-select v-model="searchForm.licenseType" placeholder="选择驾照类型" clearable>
           <el-option
             v-for="item in props.licenseTypeOptions"
@@ -47,7 +47,13 @@
           <el-table-column prop="sourceName" label="渠道名称" width="100" fixed="left" />
           <el-table-column prop="newClueNumber" label="新线索数" sortable min-width="100" />
           <el-table-column prop="signNumber" label="成交数" sortable min-width="100" />
-          <el-table-column prop="signRate" label="成交率" sortable min-width="100" />
+          <el-table-column
+            prop="signRate"
+            label="成交率"
+            sortable
+            min-width="100"
+            :formatter="(row) => row.signRate + '%'"
+          />
           <el-table-column prop="averageSignPeriod" label="成交周期" sortable min-width="100" />
           <el-table-column
             prop="grossProfitOfSingleSign"
@@ -81,7 +87,7 @@
               <Echart :options="echart1Option" width="100%" :height="400" />
             </el-skeleton>
           </el-col>
-          <el-col :span="12" :offset="0">
+          <el-col :span="12" :offset="0" v-if="appStore.getAppInfo?.instanceType == 1">
             <Echart :options="echart2Option" width="100%" :height="400" />
           </el-col>
           <el-col :span="24" :offset="0">
@@ -98,6 +104,9 @@ import { set } from 'lodash-es'
 import * as reportApi from '@/api/home/reportSaler'
 import { getIntDictOptions } from '@/utils/dict'
 import { removeNullField } from '@/utils'
+import { useAppStore } from '@/store/modules/app'
+
+const appStore = useAppStore()
 
 const props = defineProps({
   licenseTypeOptions: {
@@ -362,7 +371,7 @@ const setReportData = async (data) => {
             personDetail.payPriceOfSingleSign,
             personDetail.costOfSingleClue,
             personDetail.netProfitOfSingleSign,
-            averageDetail.signRate
+            personDetail.signRate
             // personDetail.clueCostTotal,
             // personDetail.payPriceTotal,
             // personDetail.profitTotal

src/views/Home/SalesReport.vue

@@ -26,7 +26,7 @@
           placeholder="请选择渠道"
         />
       </el-form-item>
-      <el-form-item>
+      <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
         <el-select v-model="searchForm.licenseType" placeholder="选择驾照类型" clearable>
           <el-option
             v-for="item in licenseTypeOptions"
@@ -64,7 +64,13 @@
           <span>成交数</span>
         </template>
       </el-table-column>
-      <el-table-column label="成交率" prop="signRate" sortable min-width="100" />
+      <el-table-column
+        label="成交率"
+        prop="signRate"
+        sortable
+        min-width="100"
+        :formatter="(row) => row.signRate + '%'"
+      />
       <el-table-column label="跟进数/日" prop="dayFollowNumber" sortable min-width="100" />
       <el-table-column label="成交数/日" prop="daySignNumber" sortable min-width="100" />
       <el-table-column label="平均成交周期" prop="averageSignPeriod" sortable min-width="100">
@@ -132,7 +138,9 @@ import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
 import { handleTree } from '@/utils/tree'
 import { getIntDictOptions } from '@/utils/dict'
+import { useAppStore } from '@/store/modules/app'
 
+const appStore = useAppStore()
 onMounted(() => {
   getOptions()
   handleReset()