feat: 文案修改&订阅计划字段修改

src/component/Administrator/subscriptionPlan.vue

@@ -48,7 +48,7 @@
           </a-select>
         </a-form-item>
         <a-form-item label="Admin Account">
-          <a-select
+          <!-- <a-select
             v-model:value="searchForm.adminAccId"
             allow-clear
             show-search
@@ -56,7 +56,8 @@
             placeholder="Select Account"
             style="width: 180px"
             :options="allUserList"
-          ></a-select>
+          ></a-select> -->
+          <SelectUser v-model="testuser" />
         </a-form-item>
         <a-form-item label="Status">
           <a-select
@@ -68,6 +69,18 @@
             :options="statusOption"
           />
         </a-form-item>
+        <a-form-item label="Country or Region">
+          <a-select
+            v-model:value="searchForm.country"
+            :allowClear="true"
+            show-search
+            style="width: 250px"
+            :filter-option="filterOption"
+            placeholder="Select Item..."
+            max-tag-count="responsive"
+            :options="countryList"
+          />
+        </a-form-item>
         <a-form-item>
           <a-space>
             <a-button type="primary" @click="handleSearch">Search</a-button>
@@ -279,7 +292,7 @@
           </div>
           <div class="admin_state_item">
             <span>
-              Account Num:
+              Sub-Account Num:
               <span>*</span>
             </span>
             <a-input-number
@@ -386,6 +399,7 @@ import {
   nextTick,
   useTemplateRef
 } from 'vue'
+import SelectUser from '@/component/common/SelectUser.vue'
 import { message } from 'ant-design-vue'
 import { Https } from '@/tool/https'
 import { formatTime } from '@/tool/util'
@@ -394,6 +408,8 @@ 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
@@ -413,6 +429,8 @@ const disabledDate = (current: Dayjs) => {
   return current && current < dayjs().subtract(1, 'days').endOf('day')
 }
 
+const countryList = ref([])
+
 const searchForm = reactive({
   name: '',
   startTime: '',
@@ -498,17 +516,19 @@ const columns = [
   },
   {
     title: 'Admin Account',
-    dataIndex: 'adminAccId',
-    key: 'adminAccId',
+    dataIndex: 'adminAccEmail',
+    key: 'adminAccEmail',
     align: 'center',
-    width: 180
+    width: 180,
+    ellipsis: true
   },
   {
-    title: 'Account Num',
+    title: 'Sub-Account Num',
     dataIndex: 'accountNum',
     key: 'accountNum',
     align: 'center',
-    width: 120
+    width: 120,
+    ellipsis: true
   },
   {
     title: 'Start Time',
@@ -558,6 +578,8 @@ onMounted(async () => {
   await handleSearch()
   calculateTableHeight()
   window.addEventListener('resize', handleResize)
+  const list = sessionStorage.getItem('allCountry')
+  countryList.value = list ? JSON.parse(list) : []
 })
 
 onBeforeUnmount(() => {
@@ -949,9 +971,15 @@ const filterOption = (input: string, option: any) => {
 }
 
 .subscriptionPlan_modal {
-  > .admin_state_item {
+  .form_content{
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    row-gap: 2rem;
+  }
+  .admin_state_item {
     > span {
-      width: 15rem;
+      width: 17rem !important;
     }
   }
   .modal_title_text {