提交

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/analysis/components/TrendCard.vue

@@ -8,10 +8,10 @@
         }}</span>
         {{ unit }}
       </div>
-      <div>
-        <span>较上月 </span>
+      <div v-if="selectVal?.date != 'ignore'">
+        <span>较{{ valArray[selectVal?.date] }} </span>
         <span
-          class="text-xs text-red-600 inline-flex items-center"
+          class="text-xs text-red-600 inline-flex items-center ml-2"
           v-if="compare"
         >
           <span>{{ compare.includes('-') ? compare.slice(1) : compare }}</span>
@@ -40,8 +40,11 @@ type Props = {
   compare?: string;
   title: string;
   number?: number;
+  selectVal?: any;
   unit: '个' | '人' | '元';
 };
 
 defineProps<Props>();
+
+const valArray = ['上月', '上周', '上年']
 </script>

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/analysis/index.vue

@@ -232,42 +232,49 @@ watchEffect(() => {
           <TrendCard
             title="新增客户"
             unit="人"
+            :selectVal="bulletinPrompt"
             :number="requestData?.bulletin?.custom.customCount"
             :compare="requestData?.bulletin?.custom.customPromote"
           />
           <TrendCard
             title="新增联系人"
             unit="人"
+            :selectVal="bulletinPrompt"
             :number="requestData?.bulletin?.contacts.contactsCount"
             :compare="requestData?.bulletin?.contacts.contactsPromote"
           />
           <TrendCard
             title="新增商机"
             unit="个"
+            :selectVal="bulletinPrompt"
             :number="requestData?.bulletin?.businessOpportunity.businessOpportunityCount"
             :compare="requestData?.bulletin?.businessOpportunity.businessOpportunityPromote"
           />
           <TrendCard
             title="新增销售订单"
             unit="个"
+            :selectVal="bulletinPrompt"
             :number="requestData?.bulletin?.salesOrder.salesOrderCount"
             :compare="requestData?.bulletin?.salesOrder.salesOrderPromote"
           />
           <TrendCard
             title="销售订单金额"
             unit="元"
+            :selectVal="bulletinPrompt"
             :number="requestData?.bulletin?.salesOrdersPrice.salesOrdersPrice"
             :compare="requestData?.bulletin?.salesOrdersPrice.salesOrderPricePromote"
           />
           <TrendCard
             title="商机金额"
             unit="元"
+            :selectVal="bulletinPrompt"
             :number="requestData?.bulletin?.businessOpportunityPrice.businessOpportunityPrice"
             :compare="requestData?.bulletin?.businessOpportunityPrice.businessOpportunityPromote"
           />
           <TrendCard
             title="新增线索"
             unit="个"
+            :selectVal="bulletinPrompt"
             :number="requestData?.bulletin?.clue.clueCount"
             :compare="requestData?.bulletin?.clue.cluePromote"
           />