Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/wallet/wallet-setting/components/recharge-package/index.vue

@@ -33,6 +33,7 @@
 					></right-toolbar>
 				</div>
 			</el-row>
+
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"
@@ -71,12 +72,7 @@
 							@click="formDialogRef.openDialog(scope.row.id)"
 							>编辑</el-button
 						>
-						<el-button
+						<el-button icon="delete" text type="primary" v-auth="'wallet_walletRechargePackage_del'" @click="handleDelete([scope.row.id])"
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'wallet_walletRechargePackage_del'"
-							@click="handleDelete([scope.row.id])"
 							>删除</el-button
 						>
 					</template>
@@ -116,8 +112,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
-	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -130,11 +125,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
+	downBlobFile("/wallet/wallet-recharge-package/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargePackage.xlsx")
-		"/wallet/wallet-recharge-package/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"walletRechargePackage.xlsx",
-	)
 }
 
 // 多选事件

src/views/wallet/wallet-setting/components/third-zy/index.vue

@@ -1,6 +1,16 @@
 <template>
-	<div class="w100">
+	<div class="w-full">
-		<div class="layout-padding-auto layout-padding-view">
+		<div v-loading="syncLoading" class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button type="primary" :disabled="syncLoading" @click="merchantInfoSync">商户信息同步</el-button>
+					<el-button type="primary" :disabled="syncLoading" @click="unitOfAccountSync">记账单位同步</el-button>
+					<el-button type="primary" :disabled="syncLoading" @click="accountInfoSync">账户信息同步</el-button>
+					<el-button type="primary" :disabled="syncLoading" @click="identityInfoSync">身份信息同步</el-button>
+					<el-button type="primary" :disabled="syncLoading" @click="transactionDataSync">交易数据同步</el-button>
+				</div>
+			</el-row>
+
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"
@@ -8,8 +18,9 @@
 				:cell-style="tableStyle.cellStyle"
 				:header-cell-style="tableStyle.headerCellStyle"
 				@sort-change="sortChangeHandle"
+				max-height="calc(100vh - 200px)"
 			>
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="50" />
 				<el-table-column prop="apiUrl" label="apiUrl" show-overflow-tooltip />
 				<el-table-column prop="bizType" label="同步类型" show-overflow-tooltip>
 					<template #default="{ row }">
@@ -41,10 +52,6 @@
 				<el-table-column label="操作" width="120">
 					<template #default="{ row }">
 						<el-button text type="primary" v-auth="'third_thirdZyLog_edit'" @click="formDialogRef.openDialog(row.id)">编辑</el-button>
-						<el-button text type="primary" @click="merchantInfoSync(row)">商户信息同步</el-button>
-						<el-button text type="primary" @click="unitOfAccountSync(row)">记账单位同步</el-button>
-						<el-button text type="primary" @click="accountInfoSync(row)">账户信息同步</el-button>
-						<el-button text type="primary" @click="identityInfoSync(row)">身份信息同步</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -69,6 +76,8 @@ import { fetchList } from "/@/api/wallet/third-zy-log"
 import { useDict } from "/@/hooks/dict"
 import VueJsonPretty from "vue-json-pretty"
 import "vue-json-pretty/lib/styles.css"
+import { syncAllDept, syncAllMch, syncAllRole, syncAllUser } from "/@/api/wallet/mch-thrid-zy"
+import { useMessage } from "/@/hooks/message"
 
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
@@ -80,6 +89,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
 })
+const syncLoading = ref<boolean>()
 
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, tableStyle } = useTable(state)
 
@@ -90,11 +100,78 @@ const handleClickJsonView = (json: any) => {
 }
 
 // 商户信息同步
-const merchantInfoSync = (row: any) => {}
+const merchantInfoSync = async () => {
+	syncLoading.value = true
+	try {
+		const res = await syncAllMch()
+		if (res.code === 0) {
+			return useMessage().success("同步成功")
+		}
+		useMessage().error("同步失败")
+	} catch (error) {
+		useMessage().error("错误")
+	} finally {
+		syncLoading.value = false
+	}
+}
 // 记账单位同步
-const unitOfAccountSync = (row: any) => {}
+const unitOfAccountSync = async () => {
+	syncLoading.value = true
+	try {
+		const res = await syncAllDept()
+		if (res.code === 0) {
+			return useMessage().success("同步成功")
+		}
+		useMessage().error("同步失败")
+	} catch (error) {
+		useMessage().error("错误")
+	} finally {
+		syncLoading.value = false
+	}
+}
 // 账户信息同步
-const accountInfoSync = (row: any) => {}
+const accountInfoSync = async () => {
+	syncLoading.value = true
+	try {
+		const res = await syncAllRole()
+		if (res.code === 0) {
+			return useMessage().success("同步成功")
+		}
+		useMessage().error("同步失败")
+	} catch (error) {
+		useMessage().error("错误")
+	} finally {
+		syncLoading.value = false
+	}
+}
 // 身份信息同步
-const identityInfoSync = (row: any) => {}
+const identityInfoSync = async () => {
+	syncLoading.value = true
+	try {
+		const res = await syncAllUser()
+		if (res.code === 0) {
+			return useMessage().success("同步成功")
+		}
+		useMessage().error("同步失败")
+	} catch (error) {
+		useMessage().error("错误")
+	} finally {
+		syncLoading.value = false
+	}
+}
+// 交易数据同步
+const transactionDataSync = async () => {
+	// 	syncLoading.value = true
+	// 	try {
+	// 		const res = await ()
+	// 		if (res.code === 0) {
+	// 			return useMessage().success("同步成功")
+	// 		}
+	// 		useMessage().error("同步失败")
+	// 	} catch (error) {
+	// 		useMessage().error("错误")
+	// 	} finally {
+	// 		syncLoading.value = false
+	// 	}
+}
 </script>