From 1f78595570f70f672fadfe0a51af92bdb6d74ec5 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 15 Jan 2025 18:07:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A1=AC=E4=BB=B6=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/dept/form.vue     | 109 ++++++++++++-----------
 src/views/hard/hard-manager/index.vue    |   2 +-
 src/views/wallet/mch-manage/form.vue     |   4 +-
 src/views/wallet/mch-manage/index.vue    |   2 +-
 src/views/wallet/wallet-freeze/index.vue |   2 +-
 5 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/src/views/admin/system/dept/form.vue b/src/views/admin/system/dept/form.vue
index 0e5fc77..5079273 100644
--- a/src/views/admin/system/dept/form.vue
+++ b/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>
diff --git a/src/views/hard/hard-manager/index.vue b/src/views/hard/hard-manager/index.vue
index c654d7a..878782e 100644
--- a/src/views/hard/hard-manager/index.vue
+++ b/src/views/hard/hard-manager/index.vue
@@ -74,7 +74,7 @@
 				</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="是否为当前商户的取餐机器">
diff --git a/src/views/wallet/mch-manage/form.vue b/src/views/wallet/mch-manage/form.vue
index f4b3f2c..1a07d1f 100644
--- a/src/views/wallet/mch-manage/form.vue
+++ b/src/views/wallet/mch-manage/form.vue
@@ -14,11 +14,11 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<!-- <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> -->
 
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户类型" prop="merchantType">
diff --git a/src/views/wallet/mch-manage/index.vue b/src/views/wallet/mch-manage/index.vue
index d41fa2a..c15f77d 100644
--- a/src/views/wallet/mch-manage/index.vue
+++ b/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>
diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue
index 382b4f0..a1f35ef 100644
--- a/src/views/wallet/wallet-freeze/index.vue
+++ b/src/views/wallet/wallet-freeze/index.vue
@@ -82,7 +82,7 @@
 						<el-button
 							v-if="false"
 							icon="edit-pen"
-							text
+							texts
 							type="primary"
 							v-auth="'wallet_walletFreeze_edit'"
 							@click="formDialogRef.openDialog(row.id)"