chenbo
/
finance-pay-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenbo:750922c9870d210541c04e762fe69816e0599bae
Branches Tags
chenbo:dev
..
compare: chenbo:bdc728dce663b45dfe82d05d5b20d9e483870fad
Branches Tags
chenbo:dev

No commits in common. "750922c9870d210541c04e762fe69816e0599bae" and "bdc728dce663b45dfe82d05d5b20d9e483870fad" have entirely different histories.
750922c987 ... bdc728dce6

4 changed files with 319 additions and 472 deletions
Show Stats Expand all files Collapse all files

27
admin/src/api/common.ts
View File

@ -1,27 +0,0 @@
import request from '@/utils/request'
// 省列表
export function apiProvinceList() {
return request.get({ url: '/common/province' })
}
// 市列表
export function apiCityList(params: any) {
return request.get({ url: '/common/city', params })
}
// 区列表
export function apiAreaList(params: any) {
return request.get({ url: '/common/area', params })
}
// 镇列表
export function apiStreetList(params: any) {
return request.get({ url: '/common/street', params })
}
// 村列表
export function apiVillageList(params: any) {
return request.get({ url: '/common/village', params })
}
// 队列表
export function apiBrigadeList() {
return request.get({ url: '/common/brigade' })
}

2
admin/src/config/index.ts
View File

@ -2,7 +2,7 @@ const config = {
terminal: 1, //终端 terminal: 1, //终端
title: '后台管理系统', //网站默认标题 title: '后台管理系统', //网站默认标题
version: '1.6.0', //版本号 version: '1.6.0', //版本号
baseUrl: `${import.meta.env.VITE_APP_BASE_URL || 'http://192.168.1.16:8081'}/`, //请求接口域名 baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名
urlPrefix: 'adminapi', //请求默认前缀 urlPrefix: 'adminapi', //请求默认前缀
timeout: 10 * 1000 //请求超时时长 timeout: 10 * 1000 //请求超时时长
} }

468
admin/src/views/sub_merchant/edit.vue
View File

@ -1,305 +1,163 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose"> <popup
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> ref="popupRef"
<el-form-item label="子商户名" prop="sub_merchant_name"> :title="popupTitle"
<el-input v-model="formData.sub_merchant_name" clearable placeholder="请输入子商户名" /> :async="true"
</el-form-item> width="550px"
<el-form-item label="子商户号" prop="sub_mch_id"> @confirm="handleSubmit"
<el-input v-model="formData.sub_mch_id" clearable placeholder="请输入子商户号" /> @close="handleClose"
</el-form-item> >
<el-form-item label="省" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="province"> <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-select v-model="formData.province" placeholder="请选择省" clearable @change="province_change" <el-form-item label="子商户名" prop="sub_merchant_name">
:style="{ width: '100%' }"> <el-input v-model="formData.sub_merchant_name" clearable placeholder="请输入子商户名" />
<el-option v-for="(item, index) in provinceOptions" :key="index" :label="item.province_name" </el-form-item>
:value="item.province_code"></el-option> <el-form-item label="子商户号" prop="sub_mch_id">
</el-select> <el-input v-model="formData.sub_mch_id" clearable placeholder="请输入子商户号" />
</el-form-item> </el-form-item>
<el-form-item label="省" prop="province">
<el-form-item label="市" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="city"> <el-input v-model="formData.province" clearable placeholder="请输入省" />
<el-select v-model="formData.city" placeholder="请选择市" clearable @change="city_change" </el-form-item>
:style="{ width: '100%' }"> <el-form-item label="市" prop="city">
<el-option v-for="(item, index) in cityOptions" :key="index" :label="item.city_name" <el-input v-model="formData.city" clearable placeholder="请输入市" />
:value="item.city_code"></el-option> </el-form-item>
</el-select> <el-form-item label="区/县" prop="area">
</el-form-item> <el-input v-model="formData.area" clearable placeholder="请输入区/县" />
<el-form-item label="区/县" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="area"> </el-form-item>
<el-select v-model="formData.area" placeholder="请选择区/县" clearable @change="area_change" <el-form-item label="镇" prop="street">
:style="{ width: '100%' }"> <el-input v-model="formData.street" clearable placeholder="请输入镇" />
<el-option v-for="(item, index) in areaOptions" :key="index" :label="item.area_name" </el-form-item>
:value="item.area_code"></el-option> <el-form-item label="村" prop="village">
</el-select> <el-input v-model="formData.village" clearable placeholder="请输入村" />
</el-form-item> </el-form-item>
<el-form-item label="镇" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="street"> </el-form>
<el-select v-model="formData.street" placeholder="请选择镇" clearable @change="street_change" </popup>
:style="{ width: '100%' }"> </div>
<el-option v-for="(item, index) in streetOptions" :key="index" :label="item.street_name" </template>
:value="item.street_code"></el-option>
</el-select> <script lang="ts" setup name="subMerchantEdit">
</el-form-item> import type { FormInstance } from 'element-plus'
<!-- <el-form-item label="村" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="village"> import Popup from '@/components/popup/index.vue'
<el-select v-model="formData.village" placeholder="请选择村" clearable @change="village_change" import { apiSubMerchantAdd, apiSubMerchantEdit, apiSubMerchantDetail } from '@/api/sub_merchant'
:style="{ width: '100%' }"> import { timeFormat } from '@/utils/util'
<el-option v-for="(item, index) in villageOptions" :key="index" :label="item.village_name" import type { PropType } from 'vue'
:value="item.village_code"></el-option> defineProps({
</el-select> dictData: {
</el-form-item> --> type: Object as PropType<Record<string, any[]>>,
<!-- <el-form-item label="省" prop="province"> default: () => ({})
<el-input v-model="formData.province" clearable placeholder="请输入省" /> }
</el-form-item> })
<el-form-item label="市" prop="city"> const emit = defineEmits(['success', 'close'])
<el-input v-model="formData.city" clearable placeholder="请输入市" /> const formRef = shallowRef<FormInstance>()
</el-form-item> const popupRef = shallowRef<InstanceType<typeof Popup>>()
<el-form-item label="区/县" prop="area"> const mode = ref('add')
<el-input v-model="formData.area" clearable placeholder="请输入区/县" />
</el-form-item>
<el-form-item label="镇" prop="street"> // 弹窗标题
<el-input v-model="formData.street" clearable placeholder="请输入镇" /> const popupTitle = computed(() => {
</el-form-item> return mode.value == 'edit' ? '编辑微信支付子商户表' : '新增微信支付子商户表'
<el-form-item label="村" prop="village"> })
<el-input v-model="formData.village" clearable placeholder="请输入村" />
</el-form-item> --> // 表单数据
const formData = reactive({
</el-form> id: '',
</popup> sub_merchant_name: '',
</div> sub_mch_id: '',
</template> province: '',
city: '',
<script lang="ts" setup name="subMerchantEdit"> area: '',
import type { FormInstance } from 'element-plus' street: '',
import Popup from '@/components/popup/index.vue' village: '',
import { apiSubMerchantAdd, apiSubMerchantEdit, apiSubMerchantDetail } from '@/api/sub_merchant' })
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
import { // 表单验证
apiCityList, const formRules = reactive<any>({
apiAreaList, sub_merchant_name: [{
apiStreetList, required: true,
apiProvinceList, message: '请输入子商户名',
apiVillageList, trigger: ['blur']
} from "@/api/common"; }],
defineProps({ sub_mch_id: [{
dictData: { required: true,
type: Object as PropType<Record<string, any[]>>, message: '请输入子商户号',
default: () => ({}) trigger: ['blur']
} }],
}) province: [{
const emit = defineEmits(['success', 'close']) required: true,
const formRef = shallowRef<FormInstance>() message: '请输入省',
const popupRef = shallowRef<InstanceType<typeof Popup>>() trigger: ['blur']
const mode = ref('add') }],
city: [{
required: true,
// 弹窗标题 message: '请输入市',
const popupTitle = computed(() => { trigger: ['blur']
return mode.value == 'edit' ? '编辑微信支付子商户表' : '新增微信支付子商户表' }],
}) area: [{
required: true,
// 表单数据 message: '请输入区/县',
const formData = reactive({ trigger: ['blur']
id: '', }],
sub_merchant_name: '', street: [{
sub_mch_id: '', required: true,
province: '', message: '请输入镇',
city: '', trigger: ['blur']
area: '', }],
street: '', village: [{
village: '', required: true,
message: '请输入村',
}) trigger: ['blur']
const addressList = reactive(['province', 'city', 'area', 'street', 'village']) }],
})
// 表单验证
const formRules = reactive<any>({
sub_merchant_name: [{ // 获取详情
required: true, const setFormData = async (data: Record<any, any>) => {
message: '请输入子商户名', for (const key in formData) {
trigger: ['blur'] if (data[key] != null && data[key] != undefined) {
}], //@ts-ignore
sub_mch_id: [{ formData[key] = data[key]
required: true, }
message: '请输入子商户号', }
trigger: ['blur']
}],
province: [{ }
required: true,
message: '请输入省', const getDetail = async (row: Record<string, any>) => {
trigger: ['blur'] const data = await apiSubMerchantDetail({
}], id: row.id
city: [{ })
required: true, setFormData(data)
message: '请输入市', }
trigger: ['blur']
}],
area: [{ // 提交按钮
required: true, const handleSubmit = async () => {
message: '请输入区/县', await formRef.value?.validate()
trigger: ['blur'] const data = { ...formData, }
}], mode.value == 'edit'
street: [{ ? await apiSubMerchantEdit(data)
required: true, : await apiSubMerchantAdd(data)
message: '请输入镇', popupRef.value?.close()
trigger: ['blur'] emit('success')
}], }
village: [{
required: true, //打开弹窗
message: '请输入村', const open = (type = 'add') => {
trigger: ['blur'] mode.value = type
}], popupRef.value?.open()
}) }
// 关闭回调
// 获取详情 const handleClose = () => {
const setFormData = async (data: Record<any, any>) => { emit('close')
for (const key in formData) { }
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
} defineExpose({
} open,
setFormData,
getDetail
} })
</script>
const getDetail = async (row: Record<string, any>) => {
const data = await apiSubMerchantDetail({
id: row.id
})
setFormData(data)
}
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSubMerchantEdit(data)
: await apiSubMerchantAdd(data)
popupRef.value?.close()
emit('success')
}
//打开弹窗
const open = async (type = 'add') => {
console.log(formData)
mode.value = type
popupRef.value?.open()
if (type == 'add') {
addressFn()
}
if (type == 'edit') {
await nextTick()
for (let key in formData) {
if (addressList.includes(key)) {
formData[key] = String(formData[key])
}
}
await addressFn()
await province_change()
await city_change()
await area_change()
await street_change()
}
}
// 关闭回调
const handleClose = () => {
emit('close')
}
// 地址选择
const provinceOptions = reactive([])
const cityOptions = reactive([])
const areaOptions = reactive([])
const Options = reactive([])
const streetOptions = reactive([])
const villageOptions = reactive([])
const addressFn = () => {
apiProvinceList().then(res => {
res.forEach((item: any) => {
provinceOptions.push(
// @ts-ignore
{
province_name: item.province_name,
province_code: item.province_code
})
});
})
}
const province_change = async () => {
cityOptions.splice(0, cityOptions.length)
let res = await apiCityList({ city: formData.province })
res.forEach((item: any) => {
cityOptions.push(
// @ts-ignore
{
city_name: item.city_name,
city_code: item.city_code
})
});
}
const city_change = async () => {
areaOptions.splice(0, areaOptions.length)
let res = await apiAreaList({ area: formData.city })
res.forEach((item: any) => {
areaOptions.push(
// @ts-ignore
{
area_name: item.area_name,
area_code: item.area_code
})
});
}
const area_change = async () => {
streetOptions.splice(0, streetOptions.length)
let res = await apiStreetList({ street: formData.area })
res.forEach((item: any) => {
streetOptions.push(
// @ts-ignore
{
street_name: item.street_name,
street_code: item.street_code
})
});
}
const street_change = async () => {
villageOptions.splice(0, villageOptions.length)
let res = await apiVillageList({ village: formData.street })
res.forEach((item: any) => {
villageOptions.push(
// @ts-ignore
{
village_name: item.village_name,
village_code: item.village_code
})
});
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

294
admin/src/views/sub_merchant/index.vue
View File

@ -1,139 +1,155 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline> <el-form
<el-form-item label="子商户名" prop="sub_merchant_name"> class="mb-[-16px]"
<el-input class="w-[280px]" v-model="queryParams.sub_merchant_name" clearable placeholder="请输入子商户名" /> :model="queryParams"
</el-form-item> inline
<el-form-item label="子商户号" prop="sub_mch_id"> >
<el-input class="w-[280px]" v-model="queryParams.sub_mch_id" clearable placeholder="请输入子商户号" /> <el-form-item label="子商户名" prop="sub_merchant_name">
</el-form-item> <el-input class="w-[280px]" v-model="queryParams.sub_merchant_name" clearable placeholder="请输入子商户名" />
<!-- <el-form-item label="省" prop="province"> </el-form-item>
<el-input class="w-[280px]" v-model="queryParams.province" clearable placeholder="请输入省" /> <el-form-item label="子商户号" prop="sub_mch_id">
</el-form-item> <el-input class="w-[280px]" v-model="queryParams.sub_mch_id" clearable placeholder="请输入子商户号" />
<el-form-item label="市" prop="city"> </el-form-item>
<el-input class="w-[280px]" v-model="queryParams.city" clearable placeholder="请输入市" /> <el-form-item label="省" prop="province">
</el-form-item> <el-input class="w-[280px]" v-model="queryParams.province" clearable placeholder="请输入省" />
<el-form-item label="区/县" prop="area"> </el-form-item>
<el-input class="w-[280px]" v-model="queryParams.area" clearable placeholder="请输入区/县" /> <el-form-item label="市" prop="city">
</el-form-item> <el-input class="w-[280px]" v-model="queryParams.city" clearable placeholder="请输入市" />
<el-form-item label="镇" prop="street"> </el-form-item>
<el-input class="w-[280px]" v-model="queryParams.street" clearable placeholder="请输入镇" /> <el-form-item label="区/县" prop="area">
</el-form-item> <el-input class="w-[280px]" v-model="queryParams.area" clearable placeholder="请输入区/县" />
<el-form-item label="村" prop="village"> </el-form-item>
<el-input class="w-[280px]" v-model="queryParams.village" clearable placeholder="请输入村" /> <el-form-item label="镇" prop="street">
</el-form-item> --> <el-input class="w-[280px]" v-model="queryParams.street" clearable placeholder="请输入镇" />
</el-form-item>
<el-form-item> <el-form-item label="村" prop="village">
<el-button type="primary" @click="resetPage">查询</el-button> <el-input class="w-[280px]" v-model="queryParams.village" clearable placeholder="请输入村" />
<el-button @click="resetParams">重置</el-button> </el-form-item>
</el-form-item> <el-form-item>
</el-form> <el-button type="primary" @click="resetPage">查询</el-button>
</el-card> <el-button @click="resetParams">重置</el-button>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> </el-form-item>
<el-button v-perms="['sub_merchant/add']" type="primary" @click="handleAdd"> </el-form>
<template #icon> </el-card>
<icon name="el-icon-Plus" /> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
</template> <el-button v-perms="['sub_merchant/add']" type="primary" @click="handleAdd">
新增 <template #icon>
</el-button> <icon name="el-icon-Plus" />
<el-button v-perms="['sub_merchant/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)"> </template>
删除 新增
</el-button> </el-button>
<div class="mt-4"> <el-button
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> v-perms="['sub_merchant/delete']"
<el-table-column type="selection" width="55" /> :disabled="!selectData.length"
<el-table-column label="子商户名" prop="sub_merchant_name" show-overflow-tooltip /> @click="handleDelete(selectData)"
<el-table-column label="子商户号" prop="sub_mch_id" show-overflow-tooltip /> >
<el-table-column label="省" prop="province" show-overflow-tooltip /> 删除
<el-table-column label="市" prop="city" show-overflow-tooltip /> </el-button>
<el-table-column label="区/县" prop="area" show-overflow-tooltip /> <div class="mt-4">
<el-table-column label="镇" prop="street" show-overflow-tooltip /> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<!-- <el-table-column label="村" prop="village" show-overflow-tooltip /> --> <el-table-column type="selection" width="55" />
<el-table-column label="子商户名" prop="sub_merchant_name" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="子商户号" prop="sub_mch_id" show-overflow-tooltip />
<template #default="{ row }"> <el-table-column label="省" prop="province" show-overflow-tooltip />
<el-button v-perms="['sub_merchant/edit']" type="primary" link @click="handleEdit(row)"> <el-table-column label="市" prop="city" show-overflow-tooltip />
编辑 <el-table-column label="区/县" prop="area" show-overflow-tooltip />
</el-button> <el-table-column label="镇" prop="street" show-overflow-tooltip />
<el-button v-perms="['sub_merchant/delete']" type="danger" link @click="handleDelete(row.id)"> <el-table-column label="村" prop="village" show-overflow-tooltip />
删除 <el-table-column label="操作" width="120" fixed="right">
</el-button> <template #default="{ row }">
</template> <el-button
</el-table-column> v-perms="['sub_merchant/edit']"
</el-table> type="primary"
</div> link
<div class="flex justify-end mt-4"> @click="handleEdit(row)"
<pagination v-model="pager" @change="getLists" /> >
</div> 编辑
</el-card> </el-button>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> <el-button
</div> v-perms="['sub_merchant/delete']"
</template> type="danger"
link
<script lang="ts" setup name="subMerchantLists"> @click="handleDelete(row.id)"
import { usePaging } from '@/hooks/usePaging' >
import { useDictData } from '@/hooks/useDictOptions' 删除
import { apiSubMerchantLists, apiSubMerchantDelete } from '@/api/sub_merchant' </el-button>
import { timeFormat } from '@/utils/util' </template>
import feedback from '@/utils/feedback' </el-table-column>
import EditPopup from './edit.vue' </el-table>
</div>
const editRef = shallowRef<InstanceType<typeof EditPopup>>() <div class="flex mt-4 justify-end">
// 是否显示编辑框 <pagination v-model="pager" @change="getLists" />
const showEdit = ref(false) </div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
// 查询条件 </div>
const queryParams = reactive({ </template>
sub_merchant_name: '',
sub_mch_id: '', <script lang="ts" setup name="subMerchantLists">
province: '', import { usePaging } from '@/hooks/usePaging'
city: '', import { useDictData } from '@/hooks/useDictOptions'
area: '', import { apiSubMerchantLists, apiSubMerchantDelete } from '@/api/sub_merchant'
street: '', import { timeFormat } from '@/utils/util'
village: '', import feedback from '@/utils/feedback'
}) import EditPopup from './edit.vue'
// 选中数据 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const selectData = ref<any[]>([]) // 是否显示编辑框
const showEdit = ref(false)
// 表格选择后回调事件
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id) // 查询条件
} const queryParams = reactive({
sub_merchant_name: '',
// 获取字典数据 sub_mch_id: '',
const { dictData } = useDictData('') province: '',
city: '',
// 分页相关 area: '',
const { pager, getLists, resetParams, resetPage } = usePaging({ street: '',
fetchFun: apiSubMerchantLists, village: '',
params: queryParams })
})
// 选中数据
// 添加 const selectData = ref<any[]>([])
const handleAdd = async () => {
showEdit.value = true // 表格选择后回调事件
await nextTick() const handleSelectionChange = (val: any[]) => {
editRef.value?.open('add') selectData.value = val.map(({ id }) => id)
} }
// 编辑 // 获取字典数据
const handleEdit = async (data: any) => { const { dictData } = useDictData('')
showEdit.value = true
await nextTick() // 分页相关
editRef.value?.open('edit') const { pager, getLists, resetParams, resetPage } = usePaging({
editRef.value?.setFormData(data) fetchFun: apiSubMerchantLists,
} params: queryParams
})
// 删除
const handleDelete = async (id: number | any[]) => { // 添加
await feedback.confirm('确定要删除？') const handleAdd = async () => {
await apiSubMerchantDelete({ id }) showEdit.value = true
getLists() await nextTick()
} editRef.value?.open('add')
}
getLists()
</script> // 编辑
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
// 删除
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？')
await apiSubMerchantDelete({ id })
getLists()
}
getLists()
</script>