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

# Conflicts:
#	src/views/wallet/mch-manage/form.vue
#	src/views/wallet/mch-manage/index.vue

src/views/mch/mch-dept-user/index.vue

@@ -1,6 +1,22 @@
 <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>
+					<el-form-item style="width: 300px" label="商户" prop="merchantName">
+						<el-input v-model="state.queryForm.merchantName" placeholder="商户" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</el-form-item>
+					<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="RefreshLeft" type="primary" class="ml10" @click="syncAll"> 同步全部 </el-button>
@@ -37,42 +53,15 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="mchId" label="商户">
-					<template #default="{ row }">
-						<div class="status">
-							<span>商户id</span>
-							<span>1111</span>
-						</div>
-						<div class="status">
-							<span>商户名</span>
-							<span>1111</span>
-						</div>
-					</template>
+				<el-table-column type="index" label="#" width="80" />
+				<el-table-column label="商户">
+					<el-table-column prop="merchantId" label="商户id" />
+					<el-table-column prop="merchantName" label="商户名" />
 				</el-table-column>
-				<el-table-column prop="userId" label="用户">
-					<template #default="{ row }">
-						<div class="status">
-							<span>用户id</span>
-							<span>1111</span>
-						</div>
-						<div class="status">
-							<span>用户名</span>
-							<span>1111</span>
-						</div></template
-					>
-				</el-table-column>
-				<el-table-column prop="userId" label="用户部门">
-					<template #default="{ row }">
-						<div class="status">
-							<span>用户部门id</span>
-							<span>1111</span>
-						</div>
-						<div class="status">
-							<span>用户部门</span>
-							<span>1111</span>
-						</div>
-					</template>
+				<el-table-column label="用户">
+					<el-table-column prop="userId" label="用户id" />
+					<el-table-column prop="username" label="用户" />
+					<el-table-column prop="userMobile" label="用户手机号" />
 				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
@@ -103,6 +92,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import * as mchDeptUserApi from "/@/api/wallet/mch-dept-user"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { ro } from "element-plus/es/locale"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -128,7 +118,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, do
 // 同步全部
 const syncAll = async () => {
 	try {
-		await useMessageBox().confirm("是否同步全部")
+		await useMessageBox().confirm("是否同步全部,会先删除")
 	} catch {
 		return
 	}
@@ -172,3 +162,29 @@ const handleDelete = async (ids: string[]) => {
 	}
 }
 </script>
+
+<style scoped lang="scss">
+.status {
+	display: flex;
+	align-items: center;
+	margin-bottom: 2px;
+
+	span {
+		display: inline-block;
+	}
+
+	span:nth-child(1) {
+		min-width: 60px;
+		max-width: 100px;
+		text-align: left;
+	}
+
+	span:nth-child(2) {
+		flex: 1;
+		min-width: 50px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+</style>