feat:商户交易记录搜索条件

src/views/admin/system/user/index.vue

@@ -35,7 +35,6 @@
 							<el-button plain v-auth="'sys_user_export'" class="ml10" icon="upload-filled" type="primary" @click="excelUploadRef.show()">
 								导入
 							</el-button>
-
 							<el-button
 								plain
 								v-auth="'sys_user_del'"
@@ -47,7 +46,18 @@
 							>
 								删除
 							</el-button>
-
+							<el-button
+								plain
+								v-auth="'sys_user_del'"
+								v-if="activeName == '1'"
+								:disabled="multiple"
+								class="ml10"
+								icon="VideoPlay"
+								type="primary"
+								@click="doBatchDeal"
+							>
+								审批
+							</el-button>
 							<div class="flex justify-between items-center">
 								<el-tabs class="flex-1" v-model="activeName" @tab-click="handleClickTabItem">
 									<el-tab-pane v-for="v in tabItems" :key="v.id" :label="v.label" :name="v.value" />
@@ -116,7 +126,7 @@
 							v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']"
 							label="操作"
 							min-width="300"
-							width="400"
+							width="300"
 							fixed="right"
 						>
 							<template #default="{ row }">
@@ -149,7 +159,9 @@
 									>
 										人脸管理
 									</el-button>
-									<el-button type="primary" size="small" link icon="VideoPlay" @click="deal(row)"> 开始处理 </el-button>
+									<el-button v-if="row.processStatus == 1" type="primary" size="small" link icon="VideoPlay" @click="deal(row)">
+										开始处理
+									</el-button>
 									<!-- 删除用户 -->
 									<el-tooltip content="admin 不允许被删除" :disabled="row.userId !== '1'" placement="top">
 										<span style="margin-left: 12px">
@@ -223,6 +235,7 @@ const multiple = ref(true)
 
 // 定义表格查询、后台调用的API
 const state: BasicTableProps = reactive<BasicTableProps>({
+	dataList: [],
 	queryForm: {
 		deptId: "",
 		username: "",
@@ -268,6 +281,21 @@ const deal = (row: any) => {
 	processDrawerRef.value.openProcessDrawer(row)
 }
 
+// 批量开始处理
+const doBatchDeal = () => {
+	if (!selectObjs.value.length) return useMessage().warning("流程id不存在")
+	const processIds = []
+	for (const i of selectObjs.value) {
+		for (const j of state.dataList!) {
+			if (i == j.id) {
+				processIds.push(j.processId)
+				break
+			}
+		}
+	}
+	if (!processIds.length) return useMessage().warning("流程id不存在")
+}
+
 // 审批提交事件
 const taskSubmitEvent = () => {
 	getDataList()

src/views/hard/hard-sh/index.vue

@@ -17,6 +17,12 @@
 							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
 							</el-form-item>
+							<el-form-item style="width: 300px" label="商户类型" prop="merchantType">
+								<dict-select v-model="state.queryForm.merchantType" dict-code="merchant_type" />
+							</el-form-item>
+							<el-form-item style="width: 300px" label="商户" prop="merchantId">
+								<select-mch v-model="state.queryForm.merchantId" />
+							</el-form-item>
 							<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
 								<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
 							</el-form-item>