From 7bfc398c59f73d205d9e9ed2f703c11ceb330862 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 21 Mar 2025 17:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=A3=E5=85=83=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=A1=A8=E5=8D=95=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/dept/form.vue | 13 ++++++++++---
 src/views/wallet/mch-manage/form.vue | 12 +++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/views/admin/system/dept/form.vue b/src/views/admin/system/dept/form.vue
index 5079273..6c03a0a 100644
--- a/src/views/admin/system/dept/form.vue
+++ b/src/views/admin/system/dept/form.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="dataForm.deptId ? $t('common.editBtn') : $t('common.addBtn')" v-model="visible" width="600">
-		<el-form ref="deptDialogFormRef" :model="dataForm" label-width="90px" :rules="dataRules" v-loading="loading">
+		<el-form ref="deptDialogFormRef" :model="dataForm" label-width="110px" :rules="dataRules" v-loading="loading">
 			<el-form-item :label="$t('sysdept.parentId')" prop="parentId">
 				<el-tree-select
 					v-model="dataForm.parentId"
@@ -21,6 +21,9 @@
 					<select-hard-group v-model="dataForm.hardGroupId" />
 				</el-form-item>
 			</el-col>
+			<el-form-item v-if="useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')" label="是否同步到正元" prop="isSyncZy">
+				<el-switch v-model="dataForm.isSyncZy" />
+			</el-form-item>
 			<el-form-item :label="$t('sysdept.sortOrder')" prop="sortOrder">
 				<el-input-number v-model="dataForm.sortOrder" :placeholder="$t('sysdept.inputsortOrderTip')" clearable />
 			</el-form-item>
@@ -39,6 +42,7 @@ 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 { useUserInfo } from "/@/stores/userInfo"
 
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(["refresh"])
@@ -49,6 +53,7 @@ const dataForm = reactive({
 	parentId: "",
 	deptId: "",
 	name: "",
+	isSyncZy: false,
 	sortOrder: 9999,
 	hardGroupId: "",
 })
@@ -78,7 +83,7 @@ const openDialog = (type: string, id: string) => {
 	if (type === "edit") {
 		getObj(id)
 			.then((res) => {
-				Object.assign(dataForm, res.data)
+				Object.assign(dataForm, res.data, { isSyncZy: res.data.isSyncZy == "1" ? true : false })
 			})
 			.catch((err) => {
 				useMessage().error(err.msg)
@@ -95,7 +100,9 @@ const onSubmit = async () => {
 
 	try {
 		loading.value = true
-		dataForm.deptId ? await putObj(dataForm) : await addObj(dataForm)
+		dataForm.deptId
+			? await putObj({ ...dataForm, isSyncZy: dataForm.isSyncZy ? "1" : "0" })
+			: await addObj({ ...dataForm, isSyncZy: dataForm.isSyncZy ? "1" : "0" })
 		useMessage().success(t(dataForm.deptId ? "common.editSuccessText" : "common.addSuccessText"))
 		visible.value = false
 		emit("refresh")
diff --git a/src/views/wallet/mch-manage/form.vue b/src/views/wallet/mch-manage/form.vue
index ed5f5ca..fe500d8 100644
--- a/src/views/wallet/mch-manage/form.vue
+++ b/src/views/wallet/mch-manage/form.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="110px" v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户名" prop="name">
@@ -31,6 +31,12 @@
 					</el-form-item>
 				</el-col>
 
+				<el-col :span="24" class="mb20">
+					<el-form-item v-if="useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')" label="是否同步到正元" prop="isSyncZy">
+						<el-switch v-model="form.isSyncZy" />
+					</el-form-item>
+				</el-col>
+
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户logo" prop="logoPic">
 						<upload-img v-model:imageUrl="form.logoPic" />
@@ -108,6 +114,7 @@ import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
 import { getObj, addObj, putObj } from "/@/api/wallet/mch-manage"
 const emit = defineEmits(["refresh"])
+import { useUserInfo } from "/@/stores/userInfo"
 
 // 定义变量内容
 const dataFormRef = ref()
@@ -126,6 +133,7 @@ const form = reactive({
 	logoPic: "",
 	collectMoneyCode: "",
 	swiperPic: "",
+	isSyncZy: false,
 	phone: "",
 	businessTime: "",
 	address: "",
@@ -175,6 +183,7 @@ const onSubmit = async () => {
 	if (!valid) return false
 	const _pa = {
 		...form,
+		isSyncZy: form.isSyncZy ? "1" : "0",
 		types: form.merchantType,
 		jobTime: (jobTime.morning?.join("-") || "") + "," + (jobTime.noon?.join("-") || "") + "," + (jobTime.evening?.join("-") || ""),
 	}
@@ -201,6 +210,7 @@ const getmerchantInfoData = async (id: string) => {
 			const resJobTime = res.data.jobTime && regex.test(res.data.jobTime) ? res.data.jobTime.split(",") : []
 			Object.assign(form, res.data, {
 				merchantType: res.data.types,
+				isSyncZy: res.data.isSyncZy == "1" ? true : false,
 			})
 			jobTime.morning = resJobTime[0]?.split("-") ?? []
 			jobTime.noon = resJobTime[1]?.split("-") ?? []