1

src/locales/lang/en/routes/equity.ts

@@ -19,7 +19,7 @@ export default {
   giveType: 'Methods',
   nickName: 'Nickname',
   userName1: 'Account',
-  userCreateTime: 'Account registration time',
+  userCreateTime: 'Registration time',
   email: 'Email',
   userCount: 'Authorized Quantity',
   incrementType: {

src/views/device/index.vue

@@ -121,7 +121,7 @@
           dataIndex: 'subAgentName',
           ellipsis: true,
           width: 160,
-          ifShow: hasPermission([RoleEnum.SUPER]),
+          // ifShow: hasPermission([RoleEnum.SUPER]),
           customRender({ record }) {
             return record.subAgentName || '-';
           }

src/views/finance/GrowCard.vue

@@ -5,6 +5,7 @@
         size="small"
         :loading="loading"
         :title="item.name"
+        v-if="index < 6"
         class="md:w-1/6 w-full !md:mt-0 !mt-6"
         :class="[index + 1 < 6 && '!md:mr-6']"
         :canExpan="false"

src/views/finance/data.tsx

@@ -220,6 +220,39 @@ export const searchForm: Partial<FormProps> = {
         xxl: 9,
       },
     },
+    {
+      field: 'timeListUser',
+      label: t('routes.equity.userCreateTime'),
+      component: 'RangePicker',
+      componentProps: {
+        maxLength: 100,
+        valueFormat: 'YYYY-MM-DD',
+        format: 'YYYY-MM-DD',
+        onCalendarChange: (date) => {
+          console.log('current', date);
+          selectPriceDate.value = date[0];
+        },
+        onOpenChange: (status) => {
+          if (!status) {
+            selectPriceDate.value = '';
+          }
+        },
+        disabledDate: (current) => {
+          if (selectPriceDate.value) {
+            return (
+              current > dayjs(selectPriceDate.value).add(3, 'year') ||
+              current < dayjs(selectPriceDate.value).subtract(3, 'year')
+            );
+          } else {
+            return false;
+          }
+        },
+      },
+      colProps: {
+        xl: 9,
+        xxl: 9,
+      },
+    },
   ],
 };
 export const InvoiceSchemas: FormSchema[] = [

src/views/finance/index.vue

@@ -27,6 +27,7 @@
   import EditModal from './EditModal.vue';
   import { usePermissionStore } from '/@/store/modules/permission';
   import { useLocaleStore } from '/@/store/modules/locale';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
   interface apiDataParam {
     orderSn?: string;
@@ -34,6 +35,8 @@
     payTimeEnd?: string;
     invoiceTimeStart?: string;
     invoiceTimeEnd?: string;
+    endTimeUser?: string;
+    startTimeUser?: string;
     orderBy?: string;
     sortBy?: string;
   }
@@ -61,6 +64,7 @@
     setup() {
       const { t } = useI18n();
       const loading = ref(true);
+      const { hasPermission } = usePermission();
       const growCardList = ref<GrowCardItem[]>([]);
       const localeStore = useLocaleStore();
       const isEn = computed(() => localeStore.getLocale === 'en');
@@ -134,6 +138,8 @@
         payTimeEnd: '',
         invoiceTimeStart: '',
         invoiceTimeEnd: '',
+        userCreateTimeStart: '',
+        userCreateTimeEnd: '',
         orderBy: '',
         sortBy: '',
       });
@@ -161,12 +167,16 @@
             payTimeEnd: params.payTime && params.payTime[1],
             invoiceTimeStart: params.invoiceTime && params.invoiceTime[0],
             invoiceTimeEnd: params.invoiceTime && params.invoiceTime[1],
+            userCreateTimeStart: params.timeListUser && params.timeListUser[0],
+            userCreateTimeEnd: params.timeListUser && params.timeListUser[1],
           };
           apiData.orderSn = searchData.orderSn;
           apiData.payTimeStart = searchData.payTimeStart;
           apiData.payTimeEnd = searchData.payTimeEnd;
           apiData.invoiceTimeStart = searchData.invoiceTimeStart;
           apiData.invoiceTimeEnd = searchData.invoiceTimeEnd;
+          apiData.startTimeUser = searchData.userCreateTimeStart;
+          apiData.endTimeUser = searchData.userCreateTimeEnd;
           return {
             ...params,
             ...searchData,