11

src/views/hard/hard-spu-repertory/index.vue

@@ -26,6 +26,19 @@
 					></right-toolbar>
 				</div>
 			</el-row>
+			<SearchPanel v-show="showSearch" ref="queryRef" :model="state.queryForm"
+				:loading="Boolean(state.loading)" :search-text="$t('common.queryBtn')"
+				:reset-text="$t('common.resetBtn')" @search="getDataList" @reset="resetQuery">
+				<el-form-item style="width: 300px" label="上架用户" prop="userIds">
+					<select-user v-model="state.queryForm.userIds" />
+				</el-form-item>
+				<template #more>
+					<user-identity-query v-model:identity-types="state.queryForm.identityTypes"
+						v-model:student-info="state.queryForm.studentInfo"
+						v-model:teacher-info="state.queryForm.teacherInfo"
+						v-model:has-face="state.queryForm.hasFace" />
+				</template>
+			</SearchPanel>
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"
@@ -38,11 +51,14 @@
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="80" />
 				<el-table-column prop="userId" label="上架">
-					<el-table-column min-width="120" label="上架人">
+					<el-table-column min-width="280" label="上架人信息">
 						<template #default="{ row }">
-							<span> {{ row.username }}</span>
+							<user-info-cell :user="row" :show-gender="false" />
 						</template>
 					</el-table-column>
+					<el-table-column min-width="320" label="身份信息">
+						<template #default="{ row }"><user-identity-info :user="row" /></template>
+					</el-table-column>
 					<el-table-column prop="createTime" min-width="120" label="上架时间" />
 					<el-table-column label="上架类型">
 						<template #default="{ row }">
@@ -111,6 +127,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import * as hardSpuRepertory from "/@/api/hard/hard-spu-repertory"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { createEmptyUserIdentityStudentQuery, createEmptyUserIdentityTeacherQuery } from "/@/components/UserIdentityQuery/types"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -126,7 +143,12 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		identityTypes: [],
+		studentInfo: createEmptyUserIdentityStudentQuery(),
+		teacherInfo: createEmptyUserIdentityTeacherQuery(),
+		hasFace: "",
+	},
 	pageList: hardSpuRepertory.pageJoin,
 })
 

src/views/wallet/components/code-use-table.vue

@@ -9,9 +9,18 @@
 			@search="getDataList"
 			@reset="resetQuery"
 		>
+			<el-form-item style="width: 250px" label="申请用户" prop="userIds">
+				<select-user v-model="state.queryForm.userIds" />
+			</el-form-item>
 			<el-form-item style="width: 250px" label="是否使用" prop="status">
 				<dict-select v-model="state.queryForm.status" dict-code="yes_no_type" placeholder="是否使用" clearable />
 			</el-form-item>
+			<template #more>
+				<user-identity-query v-model:identity-types="state.queryForm.identityTypes"
+					v-model:student-info="state.queryForm.studentInfo"
+					v-model:teacher-info="state.queryForm.teacherInfo"
+					v-model:has-face="state.queryForm.hasFace" />
+			</template>
 		</SearchPanel>
 		<el-table
 			:data="state.dataList"
@@ -22,7 +31,12 @@
 			@sort-change="sortChangeHandle"
 		>
 			<el-table-column type="index" label="#" width="100" />
-			<el-table-column prop="username" label="申请人" />
+			<el-table-column label="申请人信息" min-width="280">
+				<template #default="{ row }"><user-info-cell :user="row" :show-gender="false" /></template>
+			</el-table-column>
+			<el-table-column label="身份信息" min-width="300">
+				<template #default="{ row }"><user-identity-info :user="row" /></template>
+			</el-table-column>
 			<el-table-column prop="code" label="二维码">
 				<template #default="{ row }">
 					<preview-image :src="row.code" />
@@ -48,13 +62,19 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { codeList } from "/@/api/wallet/wallet-code-use"
 import { useDict } from "/@/hooks/dict"
+import { createEmptyUserIdentityStudentQuery, createEmptyUserIdentityTeacherQuery } from "/@/components/UserIdentityQuery/types"
 // 定义变量内容
 const visible = ref(false)
 const queryRef = ref()
 // 定义查询字典
 const { yes_no_type } = useDict("check_status", "yes_no_type")
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		identityTypes: [],
+		studentInfo: createEmptyUserIdentityStudentQuery(),
+		teacherInfo: createEmptyUserIdentityTeacherQuery(),
+		hasFace: "",
+	},
 	pageList: codeList,
 })
 //  table hook