From 7ed87f59ee89db5bc6150cc2721448b01bf12e59 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Wed, 7 Jan 2026 14:30:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E8=AE=A2=E9=98=85=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=A1=A8=E6=A0=BC=E6=98=BE=E7=A4=BA=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E6=88=96=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Administrator/subscriptionPlan.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/component/Administrator/subscriptionPlan.vue b/src/component/Administrator/subscriptionPlan.vue index 78e3edac..19c88477 100644 --- a/src/component/Administrator/subscriptionPlan.vue +++ b/src/component/Administrator/subscriptionPlan.vue @@ -527,6 +527,14 @@ const columns = [ width: 120, ellipsis: true }, + { + title: 'Country or Region', + dataIndex: 'countryOrRegion', + key: 'countryOrRegion', + align: 'center', + width: 120, + ellipsis: true + }, { title: 'Start Time', dataIndex: 'currentPeriodStart', @@ -649,6 +657,7 @@ const openEdit = (record: SubscriptionPlan) => { formState.accountNum = (record as any).accountNum || null formState.status = record.status formState.id = record.id + formState.countryOrRegion = (record as any).countryOrRegion || null // 检查组织ID是否在已加载的组织列表中，如果不在，则添加临时项 if (record.organizationId) { From 45af83d0b27e983d7ae513052b2696b2c4305bf0 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Wed, 7 Jan 2026 15:06:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?bugfix:=20=E7=BC=96=E8=BE=91=E6=97=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=9B=9E=E6=98=BE=E7=94=A8=E6=88=B7=E9=82=AE?= =?UTF-8?q?=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administrator/subscriptionPlan.vue | 16 ++++++--- src/component/common/SelectUser.vue | 35 ++++++++++++++++++- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/component/Administrator/subscriptionPlan.vue b/src/component/Administrator/subscriptionPlan.vue index 19c88477..64e4b87d 100644 --- a/src/component/Administrator/subscriptionPlan.vue +++ b/src/component/Administrator/subscriptionPlan.vue @@ -245,7 +245,7 @@ Admin Account: * - +
@@ -403,8 +403,6 @@ import type { FormInstance, Rule } from 'ant-design-vue/es/form' import { debounce } from 'lodash-es' import dayjs, { Dayjs } from 'dayjs' -const testuser = ref('') - type PlanStatus = 'PENDING' | 'ACTIVE' | 'EXPIRED' interface SubscriptionPlan { id: number @@ -425,6 +423,7 @@ const disabledDate = (current: Dayjs) => { } const countryList = ref([]) +const userRef = ref(null) const searchForm = reactive({ name: '', @@ -667,7 +666,6 @@ const openEdit = (record: SubscriptionPlan) => { String(org.id) === String(record.organizationId) ) if (!orgExists) { - // 从表格数据中获取组织名称，如果存在则添加临时项 const orgName = (record as any).organizationName if (orgName) { organizationOptions.value = [ @@ -680,6 +678,16 @@ const openEdit = (record: SubscriptionPlan) => { } } } + if (record.adminAccId) { + console.log(userRef.value) + nextTick(() => { + userRef.value.patchList({ + label: record.name, + value: record.adminAccId, + email: record.adminAccEmail + }) + }) + } modalVisible.value = true } diff --git a/src/component/common/SelectUser.vue b/src/component/common/SelectUser.vue index a9d4ccf5..5c2de832 100644 --- a/src/component/common/SelectUser.vue +++ b/src/component/common/SelectUser.vue @@ -18,7 +18,7 @@ From 2b273ec70aae6182469de79f61c42551b96d53fb Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Wed, 7 Jan 2026 15:37:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?bugfix:=20=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Administrator/SE/allUser/index.vue | 2 +- .../Administrator/SE/designDetailList/index.vue | 13 ++----------- .../Administrator/SE/recentActiveChart.vue | 12 +++--------- src/component/Administrator/TestClickData.vue | 12 +++++------- src/component/Administrator/recentActiveChart.vue | 11 +---------- src/component/Administrator/trialAllUser.vue | 12 +----------- 6 files changed, 13 insertions(+), 49 deletions(-) diff --git a/src/component/Administrator/SE/allUser/index.vue b/src/component/Administrator/SE/allUser/index.vue index dd4dfd4e..b514df07 100644 --- a/src/component/Administrator/SE/allUser/index.vue +++ b/src/component/Administrator/SE/allUser/index.vue @@ -18,7 +18,7 @@
{{ $t('admin.UserName') }}: - +
diff --git a/src/component/Administrator/SE/designDetailList/index.vue b/src/component/Administrator/SE/designDetailList/index.vue index 91a8b1ed..8f2e8599 100644 --- a/src/component/Administrator/SE/designDetailList/index.vue +++ b/src/component/Administrator/SE/designDetailList/index.vue @@ -36,18 +36,9 @@
{{ $t("admin.Email") }}: - -
-
- {{ $t("admin.UserName") }}: - +
+
Organization Name:
{{ $t('admin.UserName') }}: - +
@@ -78,8 +70,10 @@ import { LabelLayout } from 'echarts/features'; import { useStore } from "vuex"; import { CanvasRenderer } from 'echarts/renderers'; import { useI18n } from 'vue-i18n' +import SelectUser from '@/component/common/SelectUser.vue' export default defineComponent({ components: { + SelectUser }, setup() { const {t} = useI18n() diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue index 140dc115..b44bf828 100644 --- a/src/component/Administrator/TestClickData.vue +++ b/src/component/Administrator/TestClickData.vue @@ -32,18 +32,16 @@
Email: - -
-
- User Name: - + /> --> +
+
Organization Name:
User: - - +
diff --git a/src/component/Administrator/trialAllUser.vue b/src/component/Administrator/trialAllUser.vue index 5af73f57..a6a98f5f 100644 --- a/src/component/Administrator/trialAllUser.vue +++ b/src/component/Administrator/trialAllUser.vue @@ -37,17 +37,7 @@
Email: - -
-
- User Name: - +
From 1fa60557dfef2818edd1589085f8daeb1bb0e782 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Wed, 7 Jan 2026 16:17:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=8F=AA=E6=9C=89PENDING=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?&=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E4=B9=8B=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SE/designDetailList/index.vue | 2 +- .../SE/getGenerateFrequency/index.vue | 2 +- src/component/Administrator/allUser.vue | 2 +- .../Administrator/subscriptionPlan.vue | 75 ++++++++++++++++--- 4 files changed, 69 insertions(+), 12 deletions(-) diff --git a/src/component/Administrator/SE/designDetailList/index.vue b/src/component/Administrator/SE/designDetailList/index.vue index 8f2e8599..2c6e4a9e 100644 --- a/src/component/Administrator/SE/designDetailList/index.vue +++ b/src/component/Administrator/SE/designDetailList/index.vue @@ -230,7 +230,7 @@ endTime: endDate, startTime: startDate, ids: ids, - email: this.email.trim(), + email: this.email?.trim(), organizationName: this.organizationName, }; Https.axiosGet(Https.httpUrls.getDesignStatistic, { diff --git a/src/component/Administrator/SE/getGenerateFrequency/index.vue b/src/component/Administrator/SE/getGenerateFrequency/index.vue index 230d8e13..068b2e9d 100644 --- a/src/component/Administrator/SE/getGenerateFrequency/index.vue +++ b/src/component/Administrator/SE/getGenerateFrequency/index.vue @@ -220,7 +220,7 @@ export default defineComponent({ changeEvent:this.changeEvent, size:this.pageSize, page:this.currentPage, - email:this.email.trim(), + email:this.email?.trim(), } Https.axiosPost(Https.httpUrls.getGenerateFrequency,data).then((rv: any) => { if (rv) { diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index c81fb75b..481ec0f6 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -423,7 +423,7 @@ export default defineComponent({ page: filterData.currentPage, systemUser: filterData.systemUser, country: filterData.country, - email: filterData.email.trim(), + email: filterData.email?.trim(), userType: filterData.userType, ids: filterData.ids, occupation: filterData.occupation, diff --git a/src/component/Administrator/subscriptionPlan.vue b/src/component/Administrator/subscriptionPlan.vue index 64e4b87d..d6dff723 100644 --- a/src/component/Administrator/subscriptionPlan.vue +++ b/src/component/Administrator/subscriptionPlan.vue @@ -11,13 +11,13 @@ - + { - return current && current < dayjs().subtract(1, 'days').endOf('day') -} - const countryList = ref([]) const userRef = ref(null) @@ -492,6 +491,65 @@ const statusOption = ref([ } ]) +const disabledDate = (current: Dayjs) => { + return current && current < dayjs().subtract(1, 'days').endOf('day') +} + +const disableEndDate = (current: Dayjs) => { + if (isEditMode.value) { + const specificTime = dayjs(formState.currentPeriodEnd) + return current && current < dayjs(formState.currentPeriodEnd * 1000).startOf('day') + } + return disabledDate(current) +} +const range = (start: number, end: number) => { + const result = [] + for (let i = start; i < end; i++) { + result.push(i) + } + return result +} +const disableEndTime = date => { + if (!formState.currentPeriodEnd || !isEditMode.value) + return { + disabledHours: () => [], + disabledMinutes: () => [], + disabledSeconds: () => [] + } + + const specificTime = dayjs.unix(formState.currentPeriodEnd) + + if (date && date.isSame(specificTime, 'day')) { + // 如果是指定日期当天，禁用时间戳之前的时间 + const hour = specificTime.hour() + const minute = specificTime.minute() + const second = specificTime.second() + + return { + disabledHours: () => Array.from({ length: hour }, (_, i) => i), // 禁用小时之前 + disabledMinutes: selectedHour => { + if (selectedHour === hour) { + return Array.from({ length: minute }, (_, i) => i) // 同小时，禁用分钟之前 + } + return [] + }, + disabledSeconds: (selectedHour, selectedMinute) => { + if (selectedHour === hour && selectedMinute === minute) { + return Array.from({ length: second }, (_, i) => i) // 同小时分钟，禁用秒之前 + } + return [] + } + } + } + + return { + disabledHours: () => [], + disabledMinutes: () => [], + disabledSeconds: () => [] + } +} + + const normalizeStatus = (status?: string): PlanStatus | undefined => { if (!status) return undefined const upper = status.toUpperCase() as PlanStatus @@ -633,7 +691,7 @@ const handleReset = () => { searchForm.adminAccId = undefined searchForm.status = [] searchForm.id = '' - searchForm.countryOrRegion = '' + searchForm.countryOrRegion = null handleSearch() } @@ -679,7 +737,6 @@ const openEdit = (record: SubscriptionPlan) => { } } if (record.adminAccId) { - console.log(userRef.value) nextTick(() => { userRef.value.patchList({ label: record.name, From 3fa7d407d23cd72c3f626a6c34f933f7dc4b26da Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Wed, 7 Jan 2026 16:43:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bugfix:=20=E7=BC=96=E8=BE=91=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E5=91=98=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=82=AE=E7=AE=B1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Administrator/subscriptionPlan.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/component/Administrator/subscriptionPlan.vue b/src/component/Administrator/subscriptionPlan.vue index d6dff723..2ba9f564 100644 --- a/src/component/Administrator/subscriptionPlan.vue +++ b/src/component/Administrator/subscriptionPlan.vue @@ -549,7 +549,6 @@ const disableEndTime = date => { } } - const normalizeStatus = (status?: string): PlanStatus | undefined => { if (!status) return undefined const upper = status.toUpperCase() as PlanStatus @@ -736,6 +735,7 @@ const openEdit = (record: SubscriptionPlan) => { } } } + modalVisible.value = true if (record.adminAccId) { nextTick(() => { userRef.value.patchList({ @@ -745,8 +745,6 @@ const openEdit = (record: SubscriptionPlan) => { }) }) } - - modalVisible.value = true } const validateForm = (): boolean => {