fix

src/component/Administrator/trialAllUser.vue

@@ -4,12 +4,11 @@
 			<div class="admin_state">
 			
 				<div class="admin_state_item">
-					<span>State Time:</span>
+					<span>Select Time:</span>
 					<a-range-picker
-						style="width:280px"
+						style="width:250px"
 						class="range_picker"
 						v-model:value="rangePickerValue"
-						:allowClear="false"
 						:placeholder="[
 							$t('HistoryPage.StartDate'),
 							$t('HistoryPage.EndDate'),
@@ -23,6 +22,42 @@
 						</template>
 					</a-range-picker>
 				</div>
+				<div class="admin_state_item">
+                    <span>Country:</span>
+					<a-select
+                        v-model:value="country"
+						:allowClear="true"
+						show-search
+                        style="width: 250px"
+                        :filter-option="filterOption"
+                        placeholder="Select Item..."
+                        max-tag-count="responsive"
+                        :options="allCountry"
+                    ></a-select>
+                </div>
+                <div class="admin_state_item">
+                    <span>Email:</span>
+                    <input
+                        v-model="email"
+                        placeholder="Please enter email"
+                        @keydown.enter="gettrialList"
+                        type="text"
+                        style="width: 250px"
+                    />
+                </div>
+                <div class="admin_state_item">
+                    <span>User Name:</span>
+                    <a-select
+                        v-model:value="ids"
+                        mode="multiple"
+                        style="width: 250px"
+                        :filter-option="filterOption"
+                        placeholder="Select Item..."
+                        max-tag-count="responsive"
+                        :options="allUserList"
+                        @keydown.enter="gettrialList"
+                    ></a-select>
+                </div>
 			</div>
 			<div class="admin_search">
 				<div class="admin_search_item" @click="searchHistoryList">Search</div>
@@ -67,14 +102,22 @@ export default defineComponent({
         let filter:any =  reactive({
 			dataList:[],
 			tableLoading:false,
+			allUserList: [],
+			allCountry:[]
 		})
 		let filterData:any = reactive({
 			rangePickerValue:[],
 			currentPage: 1,
             pageSize: 10,
             total: 0,
-			order: "", //'Ascending  升序 Descending 降序'
+			country: "",
+            email: "",
+            userType: "",
+            ids: [],
+            occupation: "",
+            order: "", //'Ascending  升序 Descending 降序'
 			orderBy:'',
+            userName: "",
 		})
 	
         let renameData: any = ref({}); //修改名字选中的数据
@@ -144,7 +187,7 @@ export default defineComponent({
             ];
         });
 		//改变页码
-		let changePage = (e: any, filters, sorter) => {
+		let changePage = (e: any, filters:any, sorter:any) => {
             filterData.currentPage = e.current;
             filterData.pageSize = e.pageSize;
 			if(sorter.order){
@@ -176,10 +219,16 @@ export default defineComponent({
 			let data = {
 				endTime:endDate,
 				startTime:startDate,
-				size:filterData.pageSize,
-				page:filterData.currentPage,
-				order: filterData.order,
+				size: filterData.pageSize,
+                page: filterData.currentPage,
+                country: filterData.country,
+                email: filterData.email,
+                userType: filterData.userType,
+                ids: filterData.ids,
+                occupation: filterData.occupation,
+                order: filterData.order,
                 orderBy: filterData.orderBy,
+                userName: filterData.userName,
 			}
 			Https.axiosPost(Https.httpUrls.inquiryGetTrial,data).then((rv: any) => {
 				if (rv) {
@@ -192,6 +241,10 @@ export default defineComponent({
 				}
 			})
         }
+		let filterOption = (input: any, option: any) => {
+            // 使用 option.label 进行搜索
+            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+        };
 		let lastGeTrialList = (str:string)=>{
 			let currentDate = new Date();
 			let currentTimestamp = Math.floor(currentDate.getTime()  / 1000);
@@ -204,11 +257,18 @@ export default defineComponent({
 			}else if(str == 'week'){
 				thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
 			}
-			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
-			filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
+			filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
 			gettrialList();
 		}
 		onMounted(()=>{
+			let allUserList: any = sessionStorage.getItem("allUserList");
+            if (allUserList) {
+                filter.allUserList = JSON.parse(allUserList);
+            }
+			let allCountry: any = sessionStorage.getItem("allCountry");
+            if (allCountry) {
+                filter.allCountry = JSON.parse(allCountry);
+            }
 			lastGeTrialList('month')
 		})
         return {
@@ -217,6 +277,7 @@ export default defineComponent({
             columns,
             renameData,
 			changePage,
+			filterOption,
 			searchHistoryList,
 			lastGeTrialList,
 			gettrialList,
@@ -239,4 +300,11 @@ export default defineComponent({
         
     },
 });
-</script>
+</script>
+
+<style lang="less" scoped>
+.admin_page .admin_table_search .admin_state {
+    display: flex;
+    flex-wrap: wrap;
+}
+</style>