Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/views/admin/system/dept/form.vue

@@ -16,103 +16,112 @@
 			<el-form-item :label="$t('sysdept.name')" prop="name">
 				<el-input v-model="dataForm.name" :placeholder="$t('sysdept.inputnameTip')" clearable />
 			</el-form-item>
+			<el-col v-if="dataForm.parentId == '0'" :span="24" class="mb20">
+				<el-form-item label="硬件分组" prop="hardGroupId">
+					<select-hard-group v-model="dataForm.hardGroupId" />
+				</el-form-item>
+			</el-col>
 			<el-form-item :label="$t('sysdept.sortOrder')" prop="sortOrder">
 				<el-input-number v-model="dataForm.sortOrder" :placeholder="$t('sysdept.inputsortOrderTip')" clearable />
 			</el-form-item>
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button @click="visible = false">{{ $t('common.cancelButtonText') }}</el-button>
-				<el-button type="primary" @click="onSubmit" :disabled="loading">{{ $t('common.confirmButtonText') }}</el-button>
+				<el-button @click="visible = false">{{ $t("common.cancelButtonText") }}</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">{{ $t("common.confirmButtonText") }}</el-button>
 			</span>
 		</template>
 	</el-dialog>
 </template>
 
 <script setup lang="ts" name="systemDeptDialog">
-import { useI18n } from 'vue-i18n';
-import { getObj, deptTree, addObj, putObj } from '/@/api/admin/dept';
-import { useMessage } from '/@/hooks/message';
-import {rule} from "/@/utils/validate";
+import { useI18n } from "vue-i18n"
+import { getObj, deptTree, addObj, putObj } from "/@/api/admin/dept"
+import { useMessage } from "/@/hooks/message"
+import { rule } from "/@/utils/validate"
 
 // 定义子组件向父组件传值/事件
-const emit = defineEmits(['refresh']);
-const { t } = useI18n();
+const emit = defineEmits(["refresh"])
+const { t } = useI18n()
 // 定义变量内容
-const deptDialogFormRef = ref();
+const deptDialogFormRef = ref()
 const dataForm = reactive({
-	parentId: '',
-	deptId: '',
-	name: '',
+	parentId: "",
+	deptId: "",
+	name: "",
 	sortOrder: 9999,
-});
-const parentData = ref<any[]>([]);
-const visible = ref(false);
-const loading = ref(false);
+	hardGroupId: "",
+})
+const parentData = ref<any[]>([])
+const visible = ref(false)
+const loading = ref(false)
 
 const dataRules = ref({
-	parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
-	name: [{ validator: rule.overLength, trigger: 'blur' },{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
-	sortOrder: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
-});
+	parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
+	name: [
+		{ validator: rule.overLength, trigger: "blur" },
+		{ required: true, message: "部门名称不能为空", trigger: "blur" },
+	],
+	sortOrder: [{ required: true, message: "排序不能为空", trigger: "blur" }],
+})
 
 // 打开弹窗
 const openDialog = (type: string, id: string) => {
-	visible.value = true;
-	dataForm.deptId = '';
+	visible.value = true
+	dataForm.deptId = ""
 
 	nextTick(() => {
-		deptDialogFormRef.value?.resetFields();
-		dataForm.parentId = id;
-	});
+		deptDialogFormRef.value?.resetFields()
+		dataForm.parentId = id
+	})
 
-	if (type === 'edit') {
+	if (type === "edit") {
 		getObj(id)
 			.then((res) => {
-				Object.assign(dataForm, res.data);
+				Object.assign(dataForm, res.data)
 			})
 			.catch((err) => {
-				useMessage().error(err.msg);
-			});
+				useMessage().error(err.msg)
+			})
 	}
 
-	getDeptData();
-};
+	getDeptData()
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await deptDialogFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await deptDialogFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
 	try {
-		loading.value = true;
-		dataForm.deptId ? await putObj(dataForm) : await addObj(dataForm);
-		useMessage().success(t(dataForm.deptId ? 'common.editSuccessText' : 'common.addSuccessText'));
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		dataForm.deptId ? await putObj(dataForm) : await addObj(dataForm)
+		useMessage().success(t(dataForm.deptId ? "common.editSuccessText" : "common.addSuccessText"))
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-		loading.value = false;
+		loading.value = false
 	}
-};
+}
 
 // 从后端获取菜单信息
 const getDeptData = async () => {
 	deptTree().then((res) => {
-		parentData.value = [];
+		parentData.value = []
 		const dept = {
-			id: '0',
-			name: '根部门',
+			id: "0",
+			name: "根部门",
 			children: [] as any[],
-		};
-		dept.children = res.data;
-		parentData.value.push(dept);
-	});
-};
+		}
+		dept.children = res.data
+		parentData.value.push(dept)
+	})
+}
 
 // 暴露变量
 defineExpose({
 	openDialog,
-});
+})
 </script>

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

@@ -113,11 +113,6 @@
 								<el-tag v-for="(item, index) in scope.row.roleList" :key="index">{{ item.roleName }}</el-tag>
 							</template>
 						</el-table-column>
-						<el-table-column width="80" label="人脸">
-							<template #default="{ row }">
-								<preview-image :src="row.faceImgs" />
-							</template>
-						</el-table-column>
 						<el-table-column :label="$t('sysuser.lockFlag')" show-overflow-tooltip>
 							<template #default="scope">
 								<el-switch
@@ -128,6 +123,22 @@
 								></el-switch>
 							</template>
 						</el-table-column>
+						<el-table-column width="80" label="人脸">
+							<template #default="{ row }">
+								<preview-image :src="row.faceImgs" />
+							</template>
+						</el-table-column>
+						<el-table-column label="全局人脸" show-overflow-tooltip>
+							<template #default="{ row }">
+								<el-switch
+									v-if="row.isGlobalFace"
+									v-model="row.isGlobalFace"
+									@change="changeGlobalFaceSwitch(row)"
+									active-value="1"
+									inactive-value="0"
+								/>
+							</template>
+						</el-table-column>
 						<el-table-column :label="$t('common.action')" width="300" fixed="right">
 							<template #default="scope">
 								<div style="display: flex">
@@ -180,11 +191,8 @@
 				</div>
 			</pane>
 		</splitpanes>
-
 		<user-form ref="userDialogRef" @refresh="getDataList(false)" :deptId="state.queryForm.deptId" />
-
 		<face-manage ref="faceManageRef" @refresh="getDataList(false)" />
-
 		<upload-excel
 			ref="excelUploadRef"
 			:title="$t('sysuser.importUserTip')"
@@ -197,6 +205,7 @@
 
 <script lang="ts" name="systemUser" setup>
 import { delObj, pageList, putObj } from "/@/api/admin/user"
+import { putGlobalFace } from "/@/api/admin/userFace"
 import { deptTree } from "/@/api/admin/dept"
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { useMessage, useMessageBox } from "/@/hooks/message"
@@ -299,6 +308,14 @@ const changeSwitch = async (row: any) => {
 	getDataList()
 }
 
+const changeGlobalFaceSwitch = async (row: any) => {
+	if (!row.isGlobalFace) return
+	// 不修改密码
+	await putGlobalFace({ userId: row.userId, isGlobalFace: row.isGlobalFace })
+	useMessage().success(t("common.optSuccessText"))
+	getDataList()
+}
+
 //修改用户密码
 const changePassword = async (row: any) => {
 	if (!inputPassword.value || inputPassword.value.length < 6 || inputPassword.value.length > 20) {

src/views/hard/hard-group/form.vue

@@ -0,0 +1,98 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="分组名" prop="name">
+						<el-input v-model="form.name" placeholder="请输入分组名" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="HardGroupDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/hard/hard-group"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	deptId: "",
+	name: "",
+})
+
+// 定义校验规则
+const dataRules = ref({
+	name: [{ required: true, message: "分组名不能为空", trigger: "blur" }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+
+	// 获取hardGroup信息
+	if (id) {
+		form.id = id
+		gethardGroupData(id)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	try {
+		loading.value = true
+		form.id ? await putObj(form) : await addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const gethardGroupData = (id: string) => {
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

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

@@ -0,0 +1,154 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row :gutter="24">
+					<el-col :span="4">
+						<el-form-item class="w100" label="分组名" prop="name">
+							<el-input v-model="state.queryForm.name" placeholder="分组名" />
+						</el-form-item>
+					</el-col>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'hard_hardGroup_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'hard_hardGroup_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="id" label="编号" />
+				<el-table-column prop="name" label="分组名" />
+				<el-table-column v-if="false" prop="deptName" label="部门" />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'hard_hardGroup_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'hard_hardGroup_del'"
+							@click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemHardGroup">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { pageJoin, delObjs } from "/@/api/hard/hard-group"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: pageJoin,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/hard/hardGroup/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardGroup.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>

src/views/hard/hard-manager/form.vue

@@ -14,6 +14,12 @@
 					</el-form-item>
 				</el-col>
 
+				<el-col v-if="false" :span="24" class="mb20">
+					<el-form-item label="分组" prop="hardGroupId">
+						<select-hard-group v-model="form.hardGroupId" placeholder="分组" />
+					</el-form-item>
+				</el-col>
+
 				<el-col :span="24" class="mb20">
 					<el-form-item label="设备类型" prop="type">
 						<dict-select v-model="form.type" dict-code="hard_type" clearable />
@@ -49,6 +55,7 @@ const form = reactive({
 	merchantId: "",
 	deptId: "",
 	name: "",
+	hardGroupId: "",
 	type: "",
 })
 
@@ -56,6 +63,7 @@ const form = reactive({
 const dataRules = ref({
 	name: [{ required: true, message: "设备名不能为空", trigger: "blur" }],
 	merchantId: [{ required: true, message: "商户不能为空", trigger: "change" }],
+	hardGroupId: [{ required: true, message: "分组不能为空", trigger: "change" }],
 	type: [{ required: true, message: "设备类型不能为空", trigger: "change" }],
 })
 

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

@@ -72,8 +72,9 @@
 						<dict-tag :options="hard_type" :value="row.type" />
 					</template>
 				</el-table-column>
+				<el-table-column prop="hardGroupName" width="200" label="分类" />
 				<el-table-column prop="merchantName" width="100" label="商户" />
-				<el-table-column prop="deptName" width="100" label="部门" />
+				<el-table-column prop="deptName" width="200" label="部门" />
 				<el-table-column prop="uniqueCode" width="200" label="设备唯一编号" />
 				<el-table-column prop="mainTopic" width="350" label="topic" />
 				<el-table-column prop="isTakeFood" width="200" label="是否为当前商户的取餐机器">

src/views/wallet/mch-manage/form.vue

@@ -14,6 +14,12 @@
 					</el-form-item>
 				</el-col>
 
+				<!-- <el-col :span="24" class="mb20">
+					<el-form-item label="硬件分组" prop="hardGroupId">
+						<select-hard-group v-model="form.hardGroupId" />
+					</el-form-item>
+				</el-col> -->
+
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户类型" prop="merchantType">
 						<el-checkbox-group v-model="form.merchantType">
@@ -105,6 +111,7 @@ const form = reactive({
 	jobStartTime: "",
 	jobEndTime: "",
 	rangeDate: [],
+	hardGroupId: "",
 })
 
 // 定义校验规则
@@ -116,6 +123,7 @@ const dataRules = ref({
 	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
 	deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
 	merchantType: [{ required: true, message: "请选择商户类型", trigger: "change" }],
+	hardGroupId: [{ required: true, message: "请选择硬件分组", trigger: "change" }],
 })
 
 // 打开弹窗

src/views/wallet/mch-manage/index.vue

@@ -49,7 +49,7 @@
 						<preview-image :src="row.logoPic" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="collectionCode" width="80" label="商户收款二维码" show-overflow-tooltip>
+				<el-table-column prop="collectionCode" width="150" label="商户收款二维码" show-overflow-tooltip>
 					<template #default="{ row }">
 						<preview-image :src="row.collectionCode" />
 					</template>

src/views/wallet/wallet-active/index.vue

@@ -69,9 +69,9 @@
 			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="usernaem" label="用户" show-overflow-tooltip />
+				<el-table-column prop="username" label="用户" show-overflow-tooltip />
+				<el-table-column prop="userMobile" label="手机号" show-overflow-tooltip />
 				<el-table-column prop="deptName" label="部门" show-overflow-tooltip />
-				<el-table-column prop="merchantName" label="商户" show-overflow-tooltip />
 				<el-table-column prop="cardNumber" label="用户卡号" show-overflow-tooltip />
 				<el-table-column prop="isActiveHardware" label="是否激活" show-overflow-tooltip>
 					<template #default="{ row }">

src/views/wallet/wallet-freeze/index.vue

@@ -78,13 +78,11 @@
 				<el-table-column prop="createTime" label="创建时间" />
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
-						<el-button v-if="row.processStatus != 1" icon="Promotion" text type="primary" @click="doInfo(row)">
-							查看审批
-						</el-button>
+						<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
 						<el-button
 							v-if="false"
 							icon="edit-pen"
-							text
+							texts
 							type="primary"
 							v-auth="'wallet_walletFreeze_edit'"
 							@click="formDialogRef.openDialog(row.id)"

src/views/wallet/wallet-manage/index.vue

@@ -91,7 +91,7 @@
 						<dict-tag :options="yes_no_type" :value="row.isFreeze" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="activeBindStatus" width="120" label="饭卡绑定状态" />
+				<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
 				<el-table-column prop="createTime" width="200" label="创建时间" />
 				<el-table-column label="操作" fixed="right" width="200">
 					<template #default="{ row }">

src/views/wallet/wallet-recharge-apply/preview-excel.vue

@@ -7,7 +7,7 @@
 				</div>
 			</el-row>
 			<el-table :data="data.list" v-loading="state.loading" border :header-cell-style="tableStyle.headerCellStyle">
-				<el-table-column type="index" label="#" align="center" width="40" />
+				<el-table-column type="index" label="#" align="center" width="60" />
 				<el-table-column prop="username" label="用户" align="center" />
 				<el-table-column prop="userAvatar" label="头像" align="center">
 					<template #default="{ row }">
@@ -107,7 +107,11 @@ const currentChangeHandle = (e: any) => {
 const getList = async () => {
 	state.loading = true
 	try {
-		const { data: pageData } = await walletRechargeApplyApi.comparePageJoin(state.queryForm)
+		const _pa = {
+			...state.pagination,
+			...state.queryForm,
+		}
+		const { data: pageData } = await walletRechargeApplyApi.comparePageJoin(_pa)
 		data.list = pageData.page.records
 		data.total = pageData.page.total
 		data.tableList = pageData.tableList