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

src/components/Select/SelectMch.vue

@@ -30,19 +30,21 @@ import * as mchApi from "/@/api/wallet/mch-manage"
 
 const selectId = defineModel()
 
-export type Props = {
+const props = withDefaults(
-	placeholder?: string
+	defineProps<{
-	apiParams?: any
+		placeholder?: string
-}
+		apiParams?: any
-const props = withDefaults(defineProps<Props>(), {
+	}>(),
-	placeholder: "请选择",
+	{
-	apiParams: {},
+		placeholder: "请选择",
-})
+		apiParams: {},
+	},
+)
 
 const queryForm = reactive<any>({
 	name: null,
 	current: 1,
-	size: 10,
+	size: 9999,
 })
 
 const state = reactive<any>({

src/views/mch/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-dialog :title="form.id ? '编辑' : '新增'" width="50%" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="110px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="120px" v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户名：" prop="name">
@@ -13,8 +13,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
-					<el-form-item label="商户类型：" prop="merchantType">
+					<el-form-item label="商户类型：" prop="types">
-						<el-radio-group v-model="form.merchantType">
+						<el-radio-group v-model="form.types">
 							<el-radio
 								:label="item.value"
 								:disabled="merchantTypeRadioDisabled"
@@ -28,35 +28,26 @@
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.merchantType == '2'" :span="24" class="mb20">
+				<el-col v-if="form.types == '2'" :span="24" class="mb20">
-					<el-form-item label="超市类型：" prop="supType">
+					<el-form-item label="合作商家类型：" prop="supType">
-						<el-radio-group v-model="form.supType" @change="(value:number) => form.supType = value">
+						<el-radio-group v-model="form.supType" @change="(value:string) => form.supType = value">
 							<el-radio border :label="item.value" v-for="(item, index) in wallet_mch_sup_type" :key="index">{{ item.label }}</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.merchantType == '2' && form.supType == 20" :span="24" class="mb20">
+				<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
 					<el-form-item label="合作状态：" prop="cooperationStatus">
 						<el-radio-group v-model="form.cooperationStatus">
 							<el-radio border :label="item.value" v-for="(item, index) in yes_no_type" :key="index">{{ item.label }}</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.merchantType == '2' && form.supType == 20" :span="24" class="mb20">
+				<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
 					<el-form-item label="品牌：" prop="parentId">
-						<el-tree-select
+						<select-mch v-model="form.parentId" :apiParams="{ types: '2', supType: '10' }" />
-							v-model="form.parentId"
-							:data="merchantTree"
-							:props="{ value: 'id', label: 'name', children: 'children', disabled: 'isLock' }"
-							check-strictly
-							class="w100"
-							clearable
-							filterable
-							placeholder="请选择主店"
-						/>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.merchantType == '2' && form.supType == 20" :span="24" class="mb20">
+				<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
 					<el-form-item label="优惠价格：" prop="discountsPrice">
 						<el-input v-model="form.discountsPrice" />
 					</el-form-item>
@@ -141,7 +132,7 @@
 <script setup lang="ts" name="MerchantInfoDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { pageJoin, getObj, addObj, putObj } from "/@/api/wallet/mch-manage"
+import { getObj, addObj, putObj } from "/@/api/wallet/mch-manage"
 const emit = defineEmits(["refresh"])
 
 // 定义变量内容
@@ -157,7 +148,7 @@ const form = reactive({
 	id: "",
 	deptId: "",
 	name: "",
-	merchantType: "",
+	types: "",
 	logoPic: "",
 	collectMoneyCode: "",
 	swiperPic: "",
@@ -167,12 +158,11 @@ const form = reactive({
 	businessTime: "",
 	addressDes: "",
 	sort: 0,
-	supType: 1,
+	supType: "10",
 	cooperationStatus: "1",
 	parentId: "",
-	discountsPrice: null,
+	discountsPrice: "",
 })
-const merchantTree = ref<any[]>([])
 const jobTime = reactive<{
 	[key: string]: string[]
 }>({
@@ -183,16 +173,32 @@ const jobTime = reactive<{
 const merchantTypeRadioDisabled = ref(false)
 
 // 定义校验规则
-const dataRules = ref({
+const dataRulesArr = {
-	name: [{ required: true, message: "商户名不能为空", trigger: "blur" }],
+	name: [{ required: true, message: "商户名不能为空", trigger: "change" }],
-	types: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
+	types: [{ required: true, message: "请选择商户类型", trigger: "change" }],
-	logoPic: [{ required: true, message: "请上传商户logo", trigger: "blur" }],
+	logoPic: [{ required: true, message: "请上传商户logo", trigger: "change" }],
-	swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "blur" }],
+	swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "change" }],
-	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
+	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
-	deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
+	deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
-	merchantType: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
+	sort: [{ required: true, message: "请输入排序", trigger: "change" }],
-	sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
+}
-	// jobTime: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
+const dataRules = computed(() => {
+	if (form.types == "2" && form.supType == "20") {
+		return {
+			...dataRulesArr,
+			supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
+			cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
+			parentId: [{ required: true, message: "请选择品牌", trigger: "change" }],
+			discountsPrice: [{ required: true, message: "请输入优惠价格", trigger: "change" }],
+		}
+	} else if (form.types == "2") {
+		return {
+			...dataRulesArr,
+			supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
+		}
+	} else {
+		return dataRulesArr
+	}
 })
 
 // 打开弹窗
@@ -211,27 +217,16 @@ const openDialog = async (id: string) => {
 		form.id = id
 		await getmerchantInfoData(id)
 	}
-
-	await getMerchantTreeData()
-}
-
-// 获取商户树数据
-const getMerchantTreeData = async () => {
-	const res = await pageJoin({ current: 1, size: 9999 })
-	if (res.code == 0) {
-		merchantTree.value = res.data.records
-	} else {
-		merchantTree.value = []
-	}
 }
 
 watch(
-	() => form.merchantType,
+	() => form.types,
 	(newVal) => {
 		if (newVal != "2") {
-			form.supType = 1
+			form.supType = "10"
 			form.cooperationStatus = "1"
 			form.parentId = ""
+			form.discountsPrice = ""
 		}
 	},
 )
@@ -243,7 +238,6 @@ const onSubmit = async () => {
 	const _pa = {
 		...form,
 		isSyncZy: form.isSyncZy ? "1" : "0",
-		types: form.merchantType,
 		jobTime: (jobTime.morning?.join("-") || "") + "," + (jobTime.noon?.join("-") || "") + "," + (jobTime.evening?.join("-") || ""),
 	}
 	try {
@@ -268,7 +262,6 @@ const getmerchantInfoData = async (id: string) => {
 			const regex = /^.*?,.*?,.*?$/
 			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("-") ?? []
@@ -284,8 +277,8 @@ const getmerchantInfoData = async (id: string) => {
 
 // 点击商户类型单选按钮
 const handleClickRadio = (radioItemValue: string) => {
-	if (radioItemValue === form.merchantType) {
+	if (radioItemValue == form.types) {
-		form.merchantType = ""
+		form.types = ""
 		merchantTypeRadioDisabled.value = true
 		setTimeout(() => {
 			merchantTypeRadioDisabled.value = false

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

@@ -51,24 +51,23 @@
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"
-				:cell-style="tableStyle.cellStyle"
 				:header-cell-style="tableStyle.headerCellStyle"
+				:row-class-name="tableRowClassName"
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
 				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-				:indent="20"
 				:default-expand-all="false"
 				row-key="id"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="50" />
+				<el-table-column type="index" label="#" width="50" align="center" />
 				<el-table-column prop="name" label="商户名" align="left" min-width="120" />
-				<el-table-column prop="logoPic" label="logo">
+				<el-table-column prop="logoPic" label="logo" align="center">
 					<template #default="{ row }">
 						<preview-image :src="row.logoPic" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="collectionCode" width="150" label="商户收款二维码" show-overflow-tooltip>
+				<el-table-column prop="collectionCode" width="150" align="center" label="商户收款二维码" show-overflow-tooltip>
 					<template #default="{ row }">
 						<div class="flex flex-col justify-center items-center">
 							<preview-image :src="row.collectionCode" />
@@ -76,7 +75,7 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip :min-width="100">
+				<el-table-column prop="merchantType" label="商户类型" align="center" show-overflow-tooltip :min-width="100">
 					<template #default="{ row }">
 						<div class="flex justify-center items-center">
 							<div v-for="(v, i) in row.types?.split(',')" :key="i" class="mr-1">
@@ -85,7 +84,7 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column width="200" label="支付默认钱包">
+				<el-table-column width="200" label="支付默认钱包" align="center">
 					<template #default="{ row }">
 						<div class="flex items-center justify-center">
 							<div class="color-primary">{{ row.walletTypeName }}</div>
@@ -95,28 +94,28 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="deptName" label="部门" show-overflow-tooltip align="center" min-width="100" />
-				<el-table-column prop="phone" label="联系电话" :min-width="120" />
+				<el-table-column prop="phone" label="联系电话" :min-width="120" align="center" />
-				<el-table-column prop="sort" label="排序" :min-width="100">
+				<el-table-column prop="sort" label="排序" :min-width="100" align="center">
 					<template #default="{ row }">
 						<span class="color-success">{{ row.sort }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="mchCount" label="分店数量" :min-width="100">
+				<el-table-column prop="mchCount" label="分店数量" :min-width="100" align="center">
 					<template #default="{ row }">
 						<span class="color-primary">{{ row.mchCount || 0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="businessTime" label="营业时间" :min-width="160">
+				<el-table-column prop="businessTime" label="营业时间" :min-width="160" align="center">
 					<template #default="{ row }">
 						<div>{{ row.jobTime?.split(",")[0] ? "早上：" + row.jobTime?.split(",")[0] : "" }}</div>
 						<div>{{ row.jobTime?.split(",")[1] ? "中午：" + row.jobTime?.split(",")[1] : "" }}</div>
 						<div>{{ row.jobTime?.split(",")[2] ? "晚上：" + row.jobTime?.split(",")[2] : "" }}</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="addressDes" label="地址" show-overflow-tooltip :min-width="160" />
+				<el-table-column prop="addressDes" label="地址" show-overflow-tooltip :min-width="160" align="center" />
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" align="center" />
-				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120">
+				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120" align="center">
 					<template #default="{ row }">
 						<el-switch
 							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
@@ -127,7 +126,7 @@
 						/>
 					</template>
 				</el-table-column>
-				<el-table-column label="是否在移动端展示" min-width="150">
+				<el-table-column label="是否在移动端展示" min-width="150" align="center">
 					<template #default="{ row }">
 						<el-switch
 							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
@@ -138,7 +137,7 @@
 						/>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" fixed="right" min-width="300">
+				<el-table-column label="操作" fixed="right" min-width="300" align="center">
 					<template #default="{ row }">
 						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'" @click="refreshQrcode(row)">
 							刷新二维码
@@ -191,20 +190,13 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	pageList: mchManangeApi.pageJoinTree,
 })
 
-//  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
-// watch(
+const tableRowClassName = ({ row, rowIndex }: { row: any; rowIndex: number }) => {
-// 	() => state.dataList,
+	if (row.parentId) {
-// 	(newData: any) => {
+		return "success-row"
-// 		state.dataList = newData.map((item: any, index: number) => {
+	}
-// 			return {
+}
-// 				...item,
-// 				index: index + 1,
-// 			}
-// 		})
-// 	},
-// )
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -215,7 +207,7 @@ const resetQuery = () => {
 	getDataList()
 }
 
-// 重新生成正元二位啊吗
+// 重新生成正元二维码
 const refreshQrcode = async (row: any) => {
 	try {
 		await useMessageBox().confirm("是否重新生成正元二维码")
@@ -312,4 +304,7 @@ const downloadCollectionCode = (row: any) => {
 		text-overflow: ellipsis;
 	}
 }
+::v-deep .el-table .success-row {
+	--el-table-tr-bg-color: var(--el-color-success-light-9);
+}
 </style>