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

Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

Browse Source 
# Conflicts:
#	.env.development
This commit is contained in:
zjf committed 2025-01-02 15:46:52 +08:00
2 parents 6a8598cd9f 360602eaf8
commit 8b374508ef
9 files changed
+274 -154
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env.development
+4 -4
View File
@@ -8,12 +8,12 @@ VITE_OPEN = true
ENV = 'development' ENV = 'development'
# ADMIN 服务地址 # ADMIN 服务地址
#VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
VITE_ADMIN_PROXY_PATH = http://127.0.0.1:9999 VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 图片访问基础地址 # 图片访问基础地址
#VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
VITE_IMAGE_BASE_PATH = http://localhost:9999 VITE_IMAGE_BASE_PATH = http://localhost:9999
# 代码生成服务地址 # 代码生成服务地址
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
src/components/Select/SelectDept.vue
+63
View File
@@ -0,0 +1,63 @@
<template>
<el-tree-select class="w100" v-model="state.selectId" :data="state.options"
@visible-change="(e: boolean) => e && getOptions()"
:props="{ value: 'id', label: 'name', children: 'children' }" clearable check-strictly
:render-after-expand="false" :placeholder="props.placeholder" />
</template>
<script setup lang="ts" name="select-dept">
import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
import * as deptApi from "/@/api/admin/dept";
const selectId = defineModel()
export type Props = {
placeholder?: string,
}
const props = withDefaults(defineProps<Props>(), {
placeholder: "请选择",
})
const queryForm = reactive<any>({
name: "",
current: 1,
size: 10,
})
const state = reactive<any>({
loading: true,
selectId: selectId,
options: []
})
watch(selectId, (newVal, oldValue) => {
if (newVal == oldValue) return
state.selectId = newVal
getOptions()
}, { immediate: true })
async function getOptions() {
try {
state.loading = true
const _pa = {
...queryForm
}
const { data } = await deptApi.deptTree()
state.options = data ?? []
} finally {
setTimeout(() => state.loading = false, 500);
}
}
function remoteSearch(params: string) {
if (params != queryForm.name) {
queryForm.name = params
getOptions()
}
}
function clear() {
state.selectId = null
getOptions()
}
</script>
src/components/Select/SelectMerchant.vue
+73
View File
@@ -0,0 +1,73 @@
<template>
<el-select style="width: 100%;" v-model="state.selectId" :placeholder="props.placeholder" clearable
remote-show-suffix filterable remote :remote-method="remoteSearch" :loading="state.loading"
@visible-change="(e: boolean) => e && getOptions()">
<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
<div class="flex items-center">
<div class="color-primary">{{ v.name }}</div>
<div class="flex items-center just ml5">
<el-tag size="small">
{{ v.deptName }}
</el-tag>
</div>
</div>
</el-option>
</el-select>
</template>
<script setup lang="ts" name="select-merchant">
import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
import * as merchantApi from '/@/api/canteen/merchantInfo'
const selectId = defineModel()
export type Props = {
placeholder?: string,
}
const props = withDefaults(defineProps<Props>(), {
placeholder: "请选择",
})
const queryForm = reactive<any>({
name: "",
current: 1,
size: 10,
})
const state = reactive<any>({
loading: true,
selectId: selectId,
options: []
})
watch(selectId, (newVal, oldValue) => {
if (newVal == oldValue) return
state.selectId = newVal
getOptions()
}, { immediate: true })
async function getOptions() {
try {
state.loading = true
const _pa = {
...queryForm
}
const { data } = await merchantApi.fetchList(_pa)
state.options = data.records ?? []
} finally {
setTimeout(() => state.loading = false, 500);
}
}
function remoteSearch(params: string) {
if (params != queryForm.name) {
queryForm.name = params
getOptions()
}
}
function clear() {
state.selectId = null
getOptions()
}
</script>
src/components/index.ts
+4
View File
@@ -16,6 +16,8 @@ import PreviewImage from "/@/components/PreviewImage/index.vue"
// 业务组件 // 业务组件
import SelectUser from '/@/components/Select/SelectUser.vue' import SelectUser from '/@/components/Select/SelectUser.vue'
import SelectWalletType from '/@/components/Select/SelectWalletType.vue' import SelectWalletType from '/@/components/Select/SelectWalletType.vue'
import SelectMerchant from '/@/components/Select/SelectMerchant.vue'
import SelectDept from '/@/components/Select/SelectDept.vue'
// 第三方组件 // 第三方组件
@@ -54,6 +56,8 @@ export default {
app.component('PreviewImage', PreviewImage) app.component('PreviewImage', PreviewImage)
app.component('SelectUser', SelectUser) app.component('SelectUser', SelectUser)
app.component('SelectWalletType', SelectWalletType) app.component('SelectWalletType', SelectWalletType)
app.component('SelectMerchant', SelectMerchant)
app.component('SelectDept', SelectDept)
// 导入全部的elmenet-plus的图标 // 导入全部的elmenet-plus的图标
for (const [key, component] of Object.entries(ElementPlusIconsVue)) { for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
src/views/canteen/merchantInfo/form.vue
+87 -104
View File
@@ -1,83 +1,73 @@
<template> <template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
:close-on-click-modal="false" draggable> <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading"> <el-row :gutter="24">
<el-row :gutter="24"> <el-col :span="12" class="mb20">
<el-col :span="12" class="mb20"> <el-form-item label="部门" prop="deptId">
<el-form-item label="绑定部门" prop="parentId"> <select-dept v-model="form.deptId" placeholder="请选择部门" />
<el-tree-select </el-form-item>
v-model="form.deptId" </el-col>
:data="parentData"
:props="{ value: 'id', label: 'name', children: 'children' }"
class="w100"
clearable
check-strictly
:render-after-expand="false"
placeholder="请选择要绑定的部门"
/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商户名" prop="name"> <el-form-item label="商户名" prop="name">
<el-input v-model="form.name" placeholder="请输入商户名"/> <el-input v-model="form.name" placeholder="请输入商户名" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商户类型" prop="merchantType"> <el-form-item label="商户类型" prop="merchantType">
<el-radio-group v-model="form.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 }} <el-radio :label="item.value" v-for="(item, index) in merchant_type" border :key="index">{{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商户logo" prop="logo"> <el-form-item label="商户logo" prop="logo">
<upload-img v-model:imageUrl="form.logo"></upload-img> <upload-img v-model:imageUrl="form.logo"></upload-img>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12" class="mb20">--> <!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="商户收款二维码" prop="collectMoneyCode">--> <!-- <el-form-item label="商户收款二维码" prop="collectMoneyCode">-->
<!-- <upload-img v-model:imageUrl="form.collectMoneyCode"></upload-img>--> <!-- <upload-img v-model:imageUrl="form.collectMoneyCode"></upload-img>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="轮播图" prop="swiper"> <el-form-item label="轮播图" prop="swiper">
<upload-img v-model:imageUrl="form.swiper"></upload-img> <upload-img v-model:imageUrl="form.swiper"></upload-img>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话"/> <el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="营业时间" prop="businessTime"> <el-form-item label="营业时间" prop="businessTime">
<el-input v-model="form.businessTime" placeholder="请输入结束营业时间"/> <el-input v-model="form.businessTime" placeholder="请输入结束营业时间" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="店铺地址" prop="address"> <el-form-item label="店铺地址" prop="address">
<el-input type="textarea" v-model="form.address" placeholder="请输入店铺地址"/> <el-input type="textarea" v-model="form.address" placeholder="请输入店铺地址" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button> <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
<script setup lang="ts" name="MerchantInfoDialog"> <script setup lang="ts" name="MerchantInfoDialog">
@@ -85,7 +75,7 @@ import { useDict } from '/@/hooks/dict';
import { useMessage } from "/@/hooks/message"; import { useMessage } from "/@/hooks/message";
import { getObj, addObj, putObj } from '/@/api/canteen/merchantInfo' import { getObj, addObj, putObj } from '/@/api/canteen/merchantInfo'
import { rule } from '/@/utils/validate'; import { rule } from '/@/utils/validate';
import {deptTree} from "/@/api/admin/dept"; import { deptTree } from "/@/api/admin/dept";
const emit = defineEmits(['refresh']); const emit = defineEmits(['refresh']);
// 定义变量内容 // 定义变量内容
@@ -93,30 +83,30 @@ const dataFormRef = ref();
const visible = ref(false) const visible = ref(false)
const loading = ref(false) const loading = ref(false)
//定义业务变量内容 //定义业务变量内容
const parentData = ref<any[]>([]);
// 定义字典 // 定义字典
const { merchant_type } = useDict('merchant_type') const { merchant_type } = useDict('merchant_type')
// 提交表单数据 // 提交表单数据
const form = reactive({ const form = reactive({
id:'', id: '',
deptId: '', deptId: '',
name: '', name: '',
merchantType: '', merchantType: '',
logo: '', logo: '',
collectMoneyCode: '', collectMoneyCode: '',
swiper: '', swiper: '',
phone: '', phone: '',
businessTime: '', businessTime: '',
address: '', address: '',
}); });
// 定义校验规则 // 定义校验规则
const dataRules = ref({ const dataRules = ref({
name: [{required: true, message: '商户名不能为空', trigger: 'blur'}], name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }],
merchantType: [{required: true, message: '商户类型(字典，1食堂 2超时)不能为空', trigger: 'blur'}], merchantType: [{ required: true, message: '商户类型(字典，1食堂 2超时)不能为空', trigger: 'blur' }],
logo: [{required: true, message: '商户logog不能为空', trigger: 'blur'}], logo: [{ required: true, message: '商户logog不能为空', trigger: 'blur' }],
swiper: [{required: true, message: '轮播图不能为空', trigger: 'blur'}], swiper: [{ required: true, message: '轮播图不能为空', trigger: 'blur' }],
}) })
// 打开弹窗 // 打开弹窗
@@ -125,32 +115,31 @@ const openDialog = (id: string) => {
form.id = '' form.id = ''
// 重置表单数据 // 重置表单数据
nextTick(() => { nextTick(() => {
dataFormRef.value?.resetFields(); dataFormRef.value?.resetFields();
}); });
// 获取merchantInfo信息 // 获取merchantInfo信息
if (id) { if (id) {
form.id = id form.id = id
getmerchantInfoData(id) getmerchantInfoData(id)
} }
getDeptData()
}; };
// 提交 // 提交
const onSubmit = async () => { const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {}); const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false; if (!valid) return false;
try { try {
loading.value = true; loading.value = true;
form.id ? await putObj(form) : await addObj(form); form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功'); useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false; visible.value = false;
emit('refresh'); emit('refresh');
} catch (err: any) { } catch (err: any) {
useMessage().error(err.msg); useMessage().error(err.msg);
} finally { } finally {
loading.value = false; loading.value = false;
} }
}; };
@@ -171,10 +160,4 @@ const getmerchantInfoData = (id: string) => {
defineExpose({ defineExpose({
openDialog openDialog
}); });
// 从后端获取菜单信息
const getDeptData = async () => {
deptTree().then((res) => {
parentData.value=res.data;
});
};
</script> </script>
src/views/canteen/merchantInfo/index.vue
+28 -21
View File
@@ -7,39 +7,46 @@
v-auth="'canteen_merchantInfo_add'"> v-auth="'canteen_merchantInfo_add'">
新 增 新 增
</el-button> </el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary" <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'canteen_merchantInfo_del'"
v-auth="'canteen_merchantInfo_del'" @click="handleDelete(selectObjs)"> @click="handleDelete(selectObjs)">
删除 删除
</el-button> </el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'canteen_merchantInfo_export'" <right-toolbar v-model:showSearch="showSearch" :export="'canteen_merchantInfo_export'"
@exportExcel="exportExcel" class="ml10 mr20" style="float: right;" @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
@queryTable="getDataList"></right-toolbar> @queryTable="getDataList"></right-toolbar>
</div> </div>
</el-row> </el-row>
<el-table :data="state.dataList" v-loading="state.loading" border <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle" :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"> @sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" /> <el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" /> <el-table-column type="index" label="#" width="40" />
<el-table-column prop="deptName" label="部门" show-overflow-tooltip/> <!-- <el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip>
<el-table-column prop="name" label="商户名" show-overflow-tooltip/> <template #default="scope">
<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip> <dict-tag :options="merchant_type" :value="scope.row.merchantType"></dict-tag>
<template #default="scope"> </template>
<dict-tag :options="merchant_type" :value="scope.row.merchantType"></dict-tag> </el-table-column> -->
</template> <el-table-column prop="name" label="商户名" />
</el-table-column> <el-table-column prop="logo" label="log">
<el-table-column prop="logo" label="商户logog" show-overflow-tooltip/> <template #default="{ row }">
<el-table-column prop="collectMoneyCode" label="商户收款二维码" show-overflow-tooltip/> <preview-image :src="row.logo" />
<el-table-column prop="phone" label="联系电话" show-overflow-tooltip/> </template>
<el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip/> </el-table-column>
<el-table-column prop="address" label="店铺地址" show-overflow-tooltip/> <el-table-column prop="deptName" label="部门" />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip/> <el-table-column prop="collectMoneyCode" label="商户收款二维码" show-overflow-tooltip>
<template #default="{ row }">
<preview-image :src="row.logo" />
</template>
</el-table-column>
<el-table-column prop="phone" label="联系电话" show-overflow-tooltip />
<el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template #default="scope"> <template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'canteen_merchantInfo_edit'" <el-button icon="edit-pen" text type="primary" v-auth="'canteen_merchantInfo_edit'"
@click="formDialogRef.openDialog(scope.row.id)">编辑</el-button> @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
<el-button icon="delete" text type="primary" v-auth="'canteen_merchantInfo_del'" @click="handleDelete([scope.row.id])">删除</el-button> <el-button icon="delete" text type="primary" v-auth="'canteen_merchantInfo_del'"
@click="handleDelete([scope.row.id])">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -84,7 +91,7 @@ const {
sizeChangeHandle, sizeChangeHandle,
sortChangeHandle, sortChangeHandle,
downBlobFile, downBlobFile,
tableStyle tableStyle
} = useTable(state) } = useTable(state)
// 清空搜索条件 // 清空搜索条件
src/views/wallet/wallet-active/form.vue
+13 -23
View File
@@ -1,28 +1,18 @@
<template> <template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable> <el-dialog title="开卡" width="30%" 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-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12" class="mb20">
<el-form-item label="用户id" prop="userId"> <el-col :span="24" class="mb20">
<el-input v-model="form.userId" placeholder="请输入用户id" /> <el-form-item label="商户" prop="merchantId">
<select-merchant v-model="form.merchantId" placeholder="请选择商户" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="24" class="mb20">
<el-form-item label="钱包id" prop="walletId"> <el-form-item label="生成数量" prop="count">
<el-input v-model="form.walletId" placeholder="请输入钱包id" /> <el-input-number style="width: 100%" v-model="form.count" :max="200" placeholder="请输入生成数量" :min="0"
</el-form-item> controls-position="right" />
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="用户卡号" prop="cardNumber">
<el-input v-model="form.cardNumber" placeholder="请输入用户卡号" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="饭卡是否在硬件上激活" prop="isActiveHardware">
<el-input v-model="form.isActiveHardware" placeholder="请输入饭卡是否在硬件上激活" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -53,14 +43,14 @@ const loading = ref(false)
// 提交表单数据 // 提交表单数据
const form = reactive({ const form = reactive({
id: '', id: '',
userId: '', merchantId: '',
walletId: '', count: '',
cardNumber: '',
isActiveHardware: '',
}); });
// 定义校验规则 // 定义校验规则
const dataRules = ref({ const dataRules = ref({
merchantId: [{ required: true, message: '请选择商户', trigger: 'change' }],
count: [{ required: true, message: '生成数量不能为空', trigger: 'blur' }],
}) })
// 打开弹窗 // 打开弹窗
src/views/wallet/wallet-active/index.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="mb8" style="width: 100%"> <div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'wallet_walletActive_add'"> v-auth="'wallet_walletActive_add'">
新 增 开 卡
</el-button> </el-button>
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletActive_del'" <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletActive_del'"
@click="handleDelete(selectObjs)"> @click="handleDelete(selectObjs)">
src/views/wallet/wallet-freeze/index.vue
+1 -1
View File
@@ -45,7 +45,7 @@
<script setup lang="ts" name="systemWalletFreeze"> <script setup lang="ts" name="systemWalletFreeze">
import { BasicTableProps, useTable } from "/@/hooks/table"; import { BasicTableProps, useTable } from "/@/hooks/table";
import { getObj, addObj, putObj } from '/@/api/wallet/wallet-active' import { getObj, addObj, putObj, fetchList } from '/@/api/wallet/wallet-active'
import { useMessage, useMessageBox } from "/@/hooks/message"; import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict'; import { useDict } from '/@/hooks/dict';