zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create:钱包开卡完成

Browse Source
This commit is contained in:
dzc committed 2025-01-02 15:48:07 +08:00
1 parent 360602eaf8
commit 1c6e1ff748
10 files changed
+492 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/wallet/mch-manage.ts
+62
View File
@@ -0,0 +1,62 @@
import request from "/@/utils/request"
export function pageJoin(query?: Object) {
return request({
url: '/wallet/mch-manage/page-join',
method: 'get',
params: query
})
}
export function fetchList(query?: Object) {
return request({
url: '/wallet/mch-manage/page',
method: 'get',
params: query
})
}
export function addObj(obj?: Object) {
return request({
url: '/wallet/mch-manage',
method: 'post',
data: obj
})
}
export function getObj(id?: string) {
return request({
url: '/wallet/mch-manage/' + id,
method: 'get'
})
}
export function delObjs(ids?: Object) {
return request({
url: '/wallet/mch-manage',
method: 'delete',
data: ids
})
}
export function putObj(obj?: Object) {
return request({
url: '/wallet/mch-manage',
method: 'put',
data: obj
})
}
/**
* 商户下拉
* @param type
*/
export function selectMerchantList(type?: string) {
return request({
url: '/wallet/mch-manage/selectMerchantList',
method: 'get',
params: {
type: type
}
})
}
src/api/wallet/wallet-active.ts
+16
View File
@@ -1,5 +1,21 @@
import request from "/@/utils/request"
export function fastCreateCard(data?: Object) {
return request({
url: '/wallet/wallet-active/fast-create-card',
method: 'post',
data
})
}
export function pageJoin(query?: Object) {
return request({
url: '/wallet/wallet-active/page-join',
method: 'get',
params: query
})
}
export function fetchList(query?: Object) {
return request({
url: '/wallet/wallet-active/page',
src/components/Select/SelectDept.vue
+11 -1
View File
@@ -43,7 +43,7 @@ async function getOptions() {
...queryForm
}
const { data } = await deptApi.deptTree()
state.options = data ?? []
state.options = filterTreeData(data ?? [])
} finally {
setTimeout(() => state.loading = false, 500);
}
@@ -56,6 +56,16 @@ function remoteSearch(params: string) {
}
}
function filterTreeData(treeData: Array<any>) {
return treeData.filter(item => {
if (item.children && item.children.length) {
item.disabled = true;
item.children = filterTreeData(item.children)
}
return item
})
}
function clear() {
state.selectId = null
getOptions()
src/components/Select/SelectMerchant.vue → src/components/Select/SelectMch.vue
+2 -2
View File
@@ -17,7 +17,7 @@
<script setup lang="ts" name="select-merchant">
import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
import * as merchantApi from '/@/api/canteen/merchantInfo'
import * as mchApi from '/@/api/wallet/mch-manage'
const selectId = defineModel()
@@ -52,7 +52,7 @@ async function getOptions() {
const _pa = {
...queryForm
}
const { data } = await merchantApi.fetchList(_pa)
const { data } = await mchApi.pageJoin(_pa)
state.options = data.records ?? []
} finally {
setTimeout(() => state.loading = false, 500);
src/components/index.ts
+2 -2
View File
@@ -16,7 +16,7 @@ import PreviewImage from "/@/components/PreviewImage/index.vue"
// 业务组件
import SelectUser from '/@/components/Select/SelectUser.vue'
import SelectWalletType from '/@/components/Select/SelectWalletType.vue'
import SelectMerchant from '/@/components/Select/SelectMerchant.vue'
import SelectMch from '/@/components/Select/SelectMch.vue'
import SelectDept from '/@/components/Select/SelectDept.vue'
@@ -56,7 +56,7 @@ export default {
app.component('PreviewImage', PreviewImage)
app.component('SelectUser', SelectUser)
app.component('SelectWalletType', SelectWalletType)
app.component('SelectMerchant', SelectMerchant)
app.component('SelectMch', SelectMch)
app.component('SelectDept', SelectDept)
// 导入全部的elmenet-plus的图标
src/views/canteen/merchantInfo/form.vue
+31 -26
View File
@@ -1,20 +1,21 @@
<template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="12" class="mb20">
<el-form-item label="部门" prop="deptId">
<select-dept v-model="form.deptId" placeholder="请选择部门" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="商户名" prop="name">
<el-input v-model="form.name" placeholder="请输入商户名" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="部门" prop="deptId">
<select-dept v-model="form.deptId" placeholder="请选择部门" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商户类型" prop="merchantType">
<el-radio-group v-model="form.merchantType">
<el-radio :label="item.value" v-for="(item, index) in merchant_type" border :key="index">{{ item.label }}
@@ -23,37 +24,32 @@
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="商户logo" prop="logo">
<upload-img v-model:imageUrl="form.logo"></upload-img>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="商户收款二维码" prop="collectMoneyCode">-->
<!-- <upload-img v-model:imageUrl="form.collectMoneyCode"></upload-img>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="轮播图" prop="swiper">
<upload-img v-model:imageUrl="form.swiper"></upload-img>
<upload-imgs v-model:imageUrl="form.swiper" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="营业时间" prop="businessTime">
<el-input v-model="form.businessTime" placeholder="请输入结束营业时间" />
<el-col :span="24" class="mb20">
<el-form-item label="营业时间" prop="rangeDate">
<el-time-picker v-model="form.rangeDate" placeholder="请选择营业时间" is-range range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="HH:mm" format="HH:mm" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="24" class="mb20">
<el-form-item label="店铺地址" prop="address">
<el-input type="textarea" v-model="form.address" placeholder="请输入店铺地址" />
</el-form-item>
@@ -99,14 +95,19 @@ const form = reactive({
phone: '',
businessTime: '',
address: '',
jobStartTime: '',
rangeDate: [],
jobEndTime: [],
});
// 定义校验规则
const dataRules = ref({
name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }],
merchantType: [{ required: true, message: '商户类型(字典，1食堂 2超时)不能为空', trigger: 'blur' }],
logo: [{ required: true, message: '商户logog不能为空', trigger: 'blur' }],
swiper: [{ required: true, message: '轮播图不能为空', trigger: 'blur' }],
type: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
logo: [{ required: true, message: '请上传商户logo', trigger: 'change' }],
swiper: [{ required: true, message: '请上传商户轮播图', trigger: 'change' }],
rangeDate: [{ required: true, message: '请选择营业时间', trigger: 'change' }],
deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
})
// 打开弹窗
@@ -130,7 +131,11 @@ const openDialog = (id: string) => {
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
const _pa = { ...form }
if (_pa.rangeDate && _pa.rangeDate.length) {
_pa.jobStartTime = _pa.rangeDate[0]
_pa.jobEndTime = _pa.rangeDate[1]
}
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
src/views/wallet/mch-manage/form.vue
+180
View File
@@ -0,0 +1,180 @@
<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" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24">
<el-col :span="24" class="mb20">
<el-form-item label="商户名" prop="name">
<el-input v-model="form.name" placeholder="请输入商户名" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="部门" prop="deptId">
<select-dept v-model="form.deptId" placeholder="请选择部门" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商户类型" prop="merchantType">
<el-checkbox-group v-model="form.merchantType">
<el-checkbox :label="item.value" v-for="(item, index) in merchant_type" border :key="index">
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
</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"></upload-img>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="轮播图" prop="swiperPic">
<upload-imgs v-model:imageUrls="form.swiperPic" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="营业时间" prop="rangeDate">
<el-time-picker v-model="form.rangeDate" placeholder="请选择营业时间" is-range range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="HH:mm" format="HH:mm" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="店铺地址" prop="address">
<el-input type="textarea" v-model="form.address" placeholder="请输入店铺地址" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span>
</template>
</el-dialog>
</template>
<script setup lang="ts" name="MerchantInfoDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/wallet/mch-manage'
import { rule } from '/@/utils/validate';
import { parseTime } from '/@/utils/formatTime'
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
//定义业务变量内容
// 定义字典
const { merchant_type } = useDict('merchant_type')
// 提交表单数据
const form = reactive({
id: '',
deptId: '',
name: '',
merchantType: [],
logoPic: '',
collectMoneyCode: '',
swiperPic: [],
phone: '',
businessTime: '',
address: '',
jobStartTime: '',
jobEndTime: '',
rangeDate: [],
});
// 定义校验规则
const dataRules = ref({
name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }],
types: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
logoPic: [{ required: true, message: '请上传商户logo', trigger: 'change' }],
swiperPic: [{ required: true, message: '请上传商户轮播图', trigger: 'change' }],
rangeDate: [{ required: true, message: '请选择营业时间', trigger: 'change' }],
deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
merchantType: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true
form.id = ''
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取merchantInfo信息
if (id) {
form.id = id
getmerchantInfoData(id)
}
};
const parseDate = (timeString: string) => {
const now = new Date();
const [hours, minutes] = timeString.split(":").map(Number)
now.setHours(hours)
now.setMinutes(minutes)
now.setSeconds(0)
now.setMilliseconds(0)
return parseTime(now, "{h}:{i}:{s}")
}
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
const _pa = { ...form, types: form.merchantType.join(",") }
if (_pa.rangeDate && _pa.rangeDate.length) {
_pa.jobStartTime = parseDate(_pa.rangeDate[0])
_pa.jobEndTime = parseDate(_pa.rangeDate[1])
}
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(_pa);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
} catch (err: any) {
useMessage().error(err.msg);
} finally {
loading.value = false;
}
};
// 初始化表单数据
const getmerchantInfoData = (id: string) => {
// 获取数据
loading.value = true
getObj(id).then((res: any) => {
Object.assign(form, res.data)
}).finally(() => {
loading.value = false
})
};
// 暴露变量
defineExpose({
openDialog
});
</script>
src/views/wallet/mch-manage/index.vue
+145
View File
@@ -0,0 +1,145 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'wallet_mchManage_add'">
新 增
</el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_mchManage_del'"
@click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'wallet_mchManage_export'" @exportExcel="exportExcel"
class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="name" label="商户名" />
<el-table-column prop="logoPic" label="log">
<template #default="{ row }">
<preview-image :src="row.logoPic" />
</template>
</el-table-column>
<el-table-column prop="collectionCode" label="商户收款二维码" show-overflow-tooltip>
<template #default="{ row }">
<preview-image :src="row.collectionCode" />
</template>
</el-table-column>
<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip>
<template #default="{ row }">
<div class="flex justify-center items-center">
<div v-for="(v, i) in row.types.split(',')" :key="i" class="mr-1">
<dict-tag :options="merchant_type" :value="v" />
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="deptName" label="部门" />
<el-table-column prop="phone" label="联系电话" show-overflow-tooltip />
<el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip>
<template #default="{ row }">
<div>
<span>{{ row.jobStartTime }}</span>
<span class="mx-1">-</span>
<span>{{ row.jobStartTime }}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'"
@click="handleDelete([scope.row.id])">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
</div>
</template>
<script setup lang="ts" name="MchManage">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { pageJoin, delObjs } from '/@/api/wallet/mch-manage'
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
import { parseDate } from '/@/utils/formatTime'
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { merchant_type } = useDict('merchant_type')
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
// 多选变量
const selectObjs = ref([]) as any
const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: pageJoin
})
// table hook
const {
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
// 清空多选
selectObjs.value = []
getDataList()
}
// 导出excel
const exportExcel = () => {
downBlobFile('/canteen/merchantInfo/export', Object.assign(state.queryForm, { ids: selectObjs }), 'merchantInfo.xlsx')
}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id);
multiple.value = !objs.length;
};
// 删除操作
const handleDelete = async (ids: string[]) => {
try {
await useMessageBox().confirm('此操作将永久删除');
} catch {
return;
}
try {
await delObjs(ids);
getDataList();
useMessage().success('删除成功');
} catch (err: any) {
useMessage().error(err.msg);
}
};
</script>
src/views/wallet/wallet-active/form.vue
+4 -4
View File
@@ -5,7 +5,7 @@
<el-col :span="24" class="mb20">
<el-form-item label="商户" prop="merchantId">
<select-merchant v-model="form.merchantId" placeholder="请选择商户" />
<select-mch v-model="form.merchantId" placeholder="请选择商户" />
</el-form-item>
</el-col>
@@ -30,7 +30,7 @@
<script setup lang="ts" name="WalletActiveDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/wallet/wallet-active'
import { getObj, addObj, putObj, fastCreateCard } from '/@/api/wallet/wallet-active'
import { rule } from '/@/utils/validate';
const emit = defineEmits(['refresh']);
@@ -77,8 +77,8 @@ const onSubmit = async () => {
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
fastCreateCard(form)
useMessage().success("开卡成功");
visible.value = false;
emit('refresh');
} catch (err: any) {
src/views/wallet/wallet-active/index.vue
+39 -10
View File
@@ -1,6 +1,33 @@
<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 :gutter="24">
<el-col :span="4">
<el-form-item class="w100" label="用户" prop="userIds">
<select-user v-model="state.queryForm.userIds" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="是否激活" prop="isActiveHardware">
<dict-select v-model="state.queryForm.isActiveHardware" dict-code="yes_no_type" placeholder="是否激活" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="卡号" prop="cardNumber">
<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
</el-form-item>
</el-col>
<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="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
@@ -21,16 +48,18 @@
@sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="userId" label="用户id" show-overflow-tooltip />
<el-table-column prop="walletId" label="钱包id" show-overflow-tooltip />
<el-table-column prop="walletTypeId" label="饭卡类型id" show-overflow-tooltip />
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip />
<el-table-column prop="merchantId" label="商户id" show-overflow-tooltip />
<el-table-column prop="usernaem" label="用户" show-overflow-tooltip />
<el-table-column prop="deptName" label="部门" show-overflow-tooltip />
<el-table-column prop="merchantName" label="商户" show-overflow-tooltip />
<el-table-column prop="cardNumber" label="用户卡号" show-overflow-tooltip />
<el-table-column prop="isActiveHardware" label="饭卡是否在硬件上激活" show-overflow-tooltip />
<el-table-column prop="isActiveHardware" label="是否激活" show-overflow-tooltip>
<template #default="{ row }">
<dict-tag :options="yes_no_type" :value="row.isActiveHardware" />
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletActive_edit'"
<el-button v-if="false" icon="edit-pen" text type="primary" v-auth="'wallet_walletActive_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'wallet_walletActive_del'"
@click="handleDelete([scope.row.id])">删除</el-button>
@@ -48,14 +77,14 @@
<script setup lang="ts" name="systemWalletActive">
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObjs } from "/@/api/wallet/wallet-active";
import { fetchList, pageJoin, delObjs } from "/@/api/wallet/wallet-active";
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
const { wallet_type, yes_no_type } = useDict('wallet_type', 'yes_no_type');
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
@@ -67,7 +96,7 @@ const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
pageList: fetchList
pageList: pageJoin
})
// table hook