改价/分班bug修复

src/views/Finance/shopBalance/index.vue

@@ -22,16 +22,16 @@
             <CountTo :endVal="cardDataList[0].available" decimals="2" :style="{ fontSize: '34px' }"></CountTo>
           </a-tooltip>
         </div>
-        <div class="flex-1 text-center">
-          <a-tooltip>
-            <template #title>分账成功后，T+1到账后，增加已到账</template>
-            <div
-              >已到账(元)
-              <Icon icon="ant-design:question-circle-outlined"></Icon>
-            </div>
-            <CountTo :endVal="cardDataList[0].received" decimals="2" :style="{ fontSize: '34px' }"></CountTo>
-          </a-tooltip>
-        </div>
+<!--        <div class="flex-1 text-center">-->
+<!--          <a-tooltip>-->
+<!--            <template #title>分账成功后，T+1到账后，增加已到账</template>-->
+<!--            <div-->
+<!--              >已到账(元)-->
+<!--              <Icon icon="ant-design:question-circle-outlined"></Icon>-->
+<!--            </div>-->
+<!--            <CountTo :endVal="cardDataList[0].received" decimals="2" :style="{ fontSize: '34px' }"></CountTo>-->
+<!--          </a-tooltip>-->
+<!--        </div>-->
       </div>
     </a-card>
     <!--引用表格-->

src/views/calssGroup/calssGroupInfo/NmClassGrouping.data.ts

@@ -98,11 +98,19 @@ export const columns2: BasicColumn[] = [
     title: '学校',
     align: 'center',
     dataIndex: 'schoolName',
+    customRender: ({ record }) => {
+      if (!record.levelInfo) {
+        return '无';
+      }
+    },
   },
   {
     title: '年级+班级',
     align: 'center',
     dataIndex: 'levelInfo',
+    customRender: ({ record }) => {
+      return h(Tag, { color: 'cyan' }, record.levelInfo ? record.levelInfo : '无');
+    },
   },
 ];
 

src/views/dashboard/Analysis/index.vue

@@ -8,9 +8,9 @@
     <a-card :bordered="false" title="数据概览">
       <div class="grid xl:grid-cols-5 sm:grid-cols-1 md:grid-cols-3 lg:grid-cols-4 gap-3">
         <div v-for="item in cardData" :key="item.key" :xs="24" :sm="12" :md="12" :lg="5">
-          <GradientBg :gradient-color="getGradientColor(item.color)" class="flex-1">
+          <GradientBg v-if="item.ifsShow !== false" :gradient-color="getGradientColor(item.color)" class="flex-1">
             <a-tooltip>
-              <template #title>{{item.cardDsc}}</template>
+              <template #title>{{ item.cardDsc }}</template>
               <h3 class="text-16px">
                 {{ item.title }}
                 <Icon icon="ant-design:info-circle-outlined"></Icon>
@@ -112,6 +112,7 @@
   import { storeToRefs } from 'pinia';
   import { useUserStore } from '/@/store/modules/user';
 
+  const userStore = useUserStore();
   const storeBtn = ref(1);
   const goodsBtn = ref(1);
   const storeDataList = ref([]);
@@ -139,7 +140,7 @@
   const cardData = ref<CardData[]>([
     {
       key: 'visitCount',
-      title: '今日平台销售额',
+      title: `今日${userStore.userInfo?.orgCode == 'A01' ? '平台' : '门店'}销售额`,
       value: 9725,
       unit: '元',
       color: {
@@ -152,7 +153,7 @@
     },
     {
       key: 'turnover',
-      title: '今日平台有效订单量',
+      title: `今日${userStore.userInfo?.orgCode == 'A01' ? '平台' : '门店'}有效订单量`,
       value: 1026,
       unit: '笔',
       color: {
@@ -165,7 +166,7 @@
     },
     {
       key: 'downloadCount',
-      title: '今日平台预计收入',
+      title: `今日${userStore.userInfo?.orgCode == 'A01' ? '平台' : '门店'}预计收入`,
       value: 970925,
       unit: '元',
       color: {
@@ -178,7 +179,7 @@
     },
     {
       key: 'dealCount',
-      title: '今日平台消费人次',
+      title: `今日${userStore.userInfo?.orgCode == 'A01' ? '平台' : '门店'}消费人次`,
       value: 9527,
       unit: '人次',
       color: {
@@ -201,6 +202,7 @@
       icon: 'ant-design:user-add-outlined',
       Proportion: 8,
       cardDsc: '',
+      ifsShow: userStore.userInfo?.orgCode == 'A01',
     },
   ]);
   const chartData = ref([]);
@@ -230,13 +232,13 @@
     unref(cardData)[1].cardDsc = '成功支付的订单数量(剔除未付款/已退款)';
     unref(cardData)[2].value = res.expectedIncome;
     unref(cardData)[2].Proportion = res.expectedIncomeGrowthRate;
-    unref(cardData)[2].cardDsc = '销售额中平台预计能分的钱';
+    unref(cardData)[2].cardDsc = `销售额中${userStore.userInfo?.orgCode == 'A01' ? '平台' : '门店'}预计能分的钱`;
     unref(cardData)[3].value = res.platformConsumptionUsers;
     unref(cardData)[3].Proportion = res.platformConsumptionGrowthRate;
-    unref(cardData)[3].cardDsc = '今日平台下订单(不去除退款)的人次';
+    unref(cardData)[3].cardDsc = `今日${userStore.userInfo?.orgCode == 'A01' ? '平台' : '门店'}下订单(不去除退款)的人次`;
     unref(cardData)[4].value = res.newUsersCount;
     unref(cardData)[4].Proportion = res.newUsersGrowthRate;
-    unref(cardData)[4].cardDsc = '今日平台新增的小程序用户数';
+    unref(cardData)[4].cardDsc = `今日平台新增的小程序用户数`;
     // chartData.value = res.findByStatisticsChartVOList;
   }