mzkj
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Guan 2026-03-09 09:10:29 +08:00
parent 78af349841 75db8b128a
commit 04c2aaf512
10 changed files with 1382 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/api/app.ts
View File

@ -10,12 +10,12 @@ export function getWorkbench(params?: Record<string, any>) {
return request.get({ url: '/workbench/index', params }) return request.get({ url: '/workbench/index', params })
} }
//字典数据 //字典数据（已弃用）
export function getDictData(params: any) { export function getDictData(params: any) {
return request.get({ url: '/config/dict', params }) return request.get({ url: '/config/dict', params })
} }
// 真的字典数据 // 字典总列表数据
export function getDictList(params: any) { export function getDictList(params: any) {
return request.get({ url: '/setting.dict.dict_data/lists', params }) return request.get({ url: '/setting.dict.dict_data/lists', params })
} }

339
admin/src/views/assets/info/edit.vue → admin/src/views/assets/detailed/edit.vue
View File

@ -1,168 +1,171 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup
ref="popupRef" ref="popupRef"
:title="popupTitle" :title="popupTitle"
:async="true" :async="true"
width="550px" width="550px"
:clickModalClose="true" :clickModalClose="true"
@confirm="handleSubmit" @confirm="handleSubmit"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<el-form-item label="唯一标识" prop="id"> <el-form-item label="唯一标识" prop="id">
<el-input v-model="formData.id" placeholder="请输入唯一标识" /> <el-input v-model="formData.id" placeholder="请输入唯一标识" />
</el-form-item> </el-form-item>
<el-form-item label="资产名称" prop="assetName"> <el-form-item label="资产名称" prop="assetName">
<el-input v-model="formData.assetName" placeholder="请输入资产名称" /> <el-input v-model="formData.assetName" placeholder="请输入资产名称" />
</el-form-item> </el-form-item>
<el-form-item label="规格型号" prop="model"> <el-form-item label="规格型号" prop="model">
<el-input v-model="formData.model" placeholder="请输入规格型号" /> <el-input v-model="formData.model" placeholder="请输入规格型号" />
</el-form-item> </el-form-item>
<el-form-item label="品牌" prop="brand"> <el-form-item label="品牌" prop="brand">
<el-input v-model="formData.brand" placeholder="请输入品牌" /> <el-input v-model="formData.brand" placeholder="请输入品牌" />
</el-form-item> </el-form-item>
<el-form-item label="资产类别" prop="category"> <el-form-item label="资产类别" prop="category">
<el-input v-model="formData.category" placeholder="请输入资产类别" /> <el-input v-model="formData.category" placeholder="请输入资产类别" />
</el-form-item> </el-form-item>
<el-form-item label="是否为固定资产" prop="isFixedAsset"> <el-form-item label="是否为固定资产" prop="isFixedAsset">
<el-input v-model="formData.isFixedAsset" placeholder="请输入是否为固定资产" /> <el-radio-group v-model="formData.isFixedAsset">
</el-form-item> <el-radio label=0>固定资产</el-radio>
<el-form-item label="非固定资产库存信息ID" prop="consumableId"> <el-radio label=1>非固定资产</el-radio>
<el-input v-model="formData.consumableId" placeholder="请输入非固定资产库存信息ID" /> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="资产描述" prop="description"> <el-form-item label="非固定资产库存信息ID" prop="consumableId">
<el-input <el-input v-model="formData.consumableId" placeholder="请输入非固定资产库存信息ID" />
v-model="formData.description" </el-form-item>
placeholder="请输入资产描述" <el-form-item label="资产描述" prop="description">
type="textarea" <el-input
:autosize="{ minRows: 4, maxRows: 6 }" v-model="formData.description"
/> placeholder="请输入资产描述"
</el-form-item> type="textarea"
</el-form> :autosize="{ minRows: 4, maxRows: 6 }"
</popup> />
</div> </el-form-item>
</template> </el-form>
<script lang="ts" setup> </popup>
import type { FormInstance } from 'element-plus' </div>
import { infoEdit, infoAdd, infoDetail } from '@/api/asset/info' </template>
import Popup from '@/components/popup/index.vue' <script lang="ts" setup>
import feedback from '@/utils/feedback' import type { FormInstance } from 'element-plus'
import type { PropType } from 'vue' import { infoEdit, infoAdd, infoDetail } from '@/api/asset/info'
defineProps({ import Popup from '@/components/popup/index.vue'
dictData: { import feedback from '@/utils/feedback'
type: Object as PropType<Record<string, any[]>>, import type { PropType } from 'vue'
default: () => ({}) defineProps({
} dictData: {
}) type: Object as PropType<Record<string, any[]>>,
const emit = defineEmits(['success', 'close']) default: () => ({})
const formRef = shallowRef<FormInstance>() }
const popupRef = shallowRef<InstanceType<typeof Popup>>() })
const mode = ref('add') const emit = defineEmits(['success', 'close'])
const popupTitle = computed(() => { const formRef = shallowRef<FormInstance>()
return mode.value == 'edit' ? '编辑资产信息' : '新增资产信息' const popupRef = shallowRef<InstanceType<typeof Popup>>()
}) const mode = ref('add')
const popupTitle = computed(() => {
const formData = reactive({ return mode.value == 'edit' ? '编辑资产信息' : '新增资产信息'
id: '', })
assetName: '',
model: '', const formData = reactive({
brand: '', id: '',
category: '', assetName: '',
isFixedAsset: '', model: '',
consumableId: '', brand: '',
description: '', category: '',
}) isFixedAsset: '',
consumableId: '',
const formRules = { description: '',
id: [ })
{
required: true, const formRules = {
message: '请输入唯一标识', id: [
trigger: ['blur'] {
} required: true,
], message: '请输入唯一标识',
assetName: [ trigger: ['blur']
{ }
required: true, ],
message: '请输入资产名称', assetName: [
trigger: ['blur'] {
} required: true,
], message: '请输入资产名称',
model: [ trigger: ['blur']
{ }
required: true, ],
message: '请输入规格型号', model: [
trigger: ['blur'] {
} required: true,
], message: '请输入规格型号',
brand: [ trigger: ['blur']
{ }
required: true, ],
message: '请输入品牌', brand: [
trigger: ['blur'] {
} required: true,
], message: '请输入品牌',
category: [ trigger: ['blur']
{ }
required: true, ],
message: '请输入资产类别', category: [
trigger: ['blur'] {
} required: true,
], message: '请输入资产类别',
isFixedAsset: [ trigger: ['blur']
{ }
required: true, ],
message: '请输入是否为固定资产', isFixedAsset: [
trigger: ['blur'] {
} required: true,
], message: '请输入是否为固定资产',
consumableId: [ trigger: ['blur']
{ }
required: true, ],
message: '请输入非固定资产库存信息ID', consumableId: [
trigger: ['blur'] {
} required: true,
], message: '请输入非固定资产库存信息ID',
} trigger: ['blur']
}
const handleSubmit = async () => { ],
await formRef.value?.validate() }
const data: any = { ...formData }
mode.value == 'edit' ? await infoEdit(data) : await infoAdd(data) const handleSubmit = async () => {
popupRef.value?.close() await formRef.value?.validate()
feedback.msgSuccess('操作成功') const data: any = { ...formData }
emit('success') mode.value == 'edit' ? await infoEdit(data) : await infoAdd(data)
} popupRef.value?.close()
feedback.msgSuccess('操作成功')
const open = (type = 'add') => { emit('success')
mode.value = type }
popupRef.value?.open()
} const open = (type = 'add') => {
mode.value = type
const setFormData = async (data: Record<string, any>) => { popupRef.value?.open()
for (const key in formData) { }
if (data[key] != null && data[key] != undefined) {
//@ts-ignore const setFormData = async (data: Record<string, any>) => {
formData[key] = data[key] for (const key in formData) {
} if (data[key] != null && data[key] != undefined) {
} //@ts-ignore
} formData[key] = data[key]
}
const getDetail = async (row: Record<string, any>) => { }
const data = await infoDetail({ }
id: row.id
}) const getDetail = async (row: Record<string, any>) => {
setFormData(data) const data = await infoDetail({
} id: row.id
})
const handleClose = () => { setFormData(data)
emit('close') }
}
const handleClose = () => {
defineExpose({ emit('close')
open, }
setFormData,
getDetail defineExpose({
}) open,
</script> setFormData,
getDetail
})
</script>

138
admin/src/views/assets/detailed/index.vue Normal file
View File

@ -0,0 +1,138 @@
<template>
<div class="index-lists">
<el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="资产名称" prop="assetName">
<el-input class="w-[280px]" v-model="queryParams.assetName" />
</el-form-item>
<el-form-item label="规格型号" prop="model">
<el-input class="w-[280px]" v-model="queryParams.model" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input class="w-[280px]" v-model="queryParams.brand" />
</el-form-item>
<el-form-item label="资产类别" prop="category">
<el-select
v-model="queryParams.category"
class="w-[280px]"
clearable
>
<el-option label="全部" value="" />
<el-option
v-for="(item, index) in dictData"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="非固定资产库存信息ID" prop="consumableId">
<el-input class="w-[280px]" v-model="queryParams.consumableId" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<div>
<el-button v-perms="['info:add']" type="primary" @click="handleAdd()">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
</div>
<el-table
class="mt-4"
size="large"
v-loading="pager.loading"
:data="pager.lists"
>
<el-table-column label="资产名称" prop="assetName" min-width="100" />
<el-table-column label="规格型号" prop="model" min-width="100" />
<el-table-column label="品牌" prop="brand" min-width="100" />
<el-table-column label="资产类别" prop="category" min-width="100" />
<el-table-column label="资产描述" prop="description" min-width="100" />
<el-table-column label="记录创建时间" prop="createdTime" min-width="100" />
<el-table-column label="最后更新时间" prop="updatedTime" min-width="100" />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['info:edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['info:del']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template>
<script lang="ts" setup name="info">
import { infoDelete, infoLists } from '@/api/asset/info'
import { useDictData } from '@/hooks/useDictOptions'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const showEdit = ref(false)
const queryParams = reactive({
assetName: '',
model: '',
brand: '',
category: '',
isFixedAsset: 0,
consumableId: '',
})
const dictLoading = ref(false)
const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: infoLists,
params: queryParams
})
const { dictData } = useDictData<Array<{name: string, value: any}>>(9)
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.getDetail(data)
}
const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除？')
await infoDelete({ id })
feedback.msgSuccess('删除成功')
getLists()
}
getLists()
</script>

161
admin/src/views/assets/fixedinfo/edit.vue Normal file
View File

@ -0,0 +1,161 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
:clickModalClose="true"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<el-form-item label="唯一标识" prop="id">
<el-input v-model="formData.id" placeholder="请输入唯一标识" />
</el-form-item>
<el-form-item label="资产名称" prop="assetName">
<el-input v-model="formData.assetName" placeholder="请输入资产名称" />
</el-form-item>
<el-form-item label="规格型号" prop="model">
<el-input v-model="formData.model" placeholder="请输入规格型号" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input v-model="formData.brand" placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="资产类别" prop="category">
<el-input v-model="formData.category" placeholder="请输入资产类别" />
</el-form-item>
<el-form-item label="资产描述" prop="description">
<el-input
v-model="formData.description"
placeholder="请输入资产描述"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
/>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import { infoEdit, infoAdd, infoDetail } from '@/api/asset/info'
import Popup from '@/components/popup/index.vue'
import feedback from '@/utils/feedback'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑资产信息' : '新增资产信息'
})
const formData = reactive({
id: '',
assetName: '',
model: '',
brand: '',
category: '',
isFixedAsset: 0,
description: '',
})
const formRules = {
id: [
{
required: true,
message: '请输入唯一标识',
trigger: ['blur']
}
],
assetName: [
{
required: true,
message: '请输入资产名称',
trigger: ['blur']
}
],
model: [
{
required: true,
message: '请输入规格型号',
trigger: ['blur']
}
],
brand: [
{
required: true,
message: '请输入品牌',
trigger: ['blur']
}
],
category: [
{
required: true,
message: '请输入资产类别',
trigger: ['blur']
}
],
isFixedAsset: [
{
required: true,
message: '请输入是否为固定资产',
trigger: ['blur']
}
],
consumableId: [
{
required: true,
message: '请输入非固定资产库存信息ID',
trigger: ['blur']
}
],
}
const handleSubmit = async () => {
await formRef.value?.validate()
const data: any = { ...formData }
mode.value == 'edit' ? await infoEdit(data) : await infoAdd(data)
popupRef.value?.close()
feedback.msgSuccess('操作成功')
emit('success')
}
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
const setFormData = async (data: Record<string, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await infoDetail({
id: row.id
})
setFormData(data)
}
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

138
admin/src/views/assets/fixedinfo/index.vue Normal file
View File

@ -0,0 +1,138 @@
<template>
<div class="index-lists">
<el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="资产名称" prop="assetName">
<el-input class="w-[280px]" v-model="queryParams.assetName" />
</el-form-item>
<el-form-item label="规格型号" prop="model">
<el-input class="w-[280px]" v-model="queryParams.model" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input class="w-[280px]" v-model="queryParams.brand" />
</el-form-item>
<el-form-item label="资产类别" prop="category">
<el-select
v-model="queryParams.category"
class="w-[280px]"
clearable
>
<el-option label="全部" value="" />
<el-option
v-for="(item, index) in dictData"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="非固定资产库存信息ID" prop="consumableId">
<el-input class="w-[280px]" v-model="queryParams.consumableId" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<div>
<el-button v-perms="['info:add']" type="primary" @click="handleAdd()">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
</div>
<el-table
class="mt-4"
size="large"
v-loading="pager.loading"
:data="pager.lists"
>
<el-table-column label="资产名称" prop="assetName" min-width="100" />
<el-table-column label="规格型号" prop="model" min-width="100" />
<el-table-column label="品牌" prop="brand" min-width="100" />
<el-table-column label="资产类别" prop="category" min-width="100" />
<el-table-column label="资产描述" prop="description" min-width="100" />
<el-table-column label="记录创建时间" prop="createdTime" min-width="100" />
<el-table-column label="最后更新时间" prop="updatedTime" min-width="100" />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['info:edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['info:del']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template>
<script lang="ts" setup name="info">
import { infoDelete, infoLists } from '@/api/asset/info'
import { useDictData } from '@/hooks/useDictOptions'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const showEdit = ref(false)
const queryParams = reactive({
assetName: '',
model: '',
brand: '',
category: '',
isFixedAsset: 0,
consumableId: '',
})
const dictLoading = ref(false)
const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: infoLists,
params: queryParams
})
const { dictData } = useDictData<Array<{name: string, value: any}>>(9)
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.getDetail(data)
}
const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除？')
await infoDelete({ id })
feedback.msgSuccess('删除成功')
getLists()
}
getLists()
</script>

302
admin/src/views/assets/location/edit.vue Normal file
View File

@ -0,0 +1,302 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="80px" :rules="formRules">
<el-form-item label="菜单类型" prop="type" required>
<el-radio-group v-model="formData.type">
<el-radio :label="MenuEnum.CATALOGUE">目录</el-radio>
<el-radio :label="MenuEnum.MENU">菜单</el-radio>
<el-radio :label="MenuEnum.BUTTON">按钮</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="父级菜单" prop="pid">
<el-tree-select
class="flex-1"
v-model="formData.pid"
:data="menuOptions"
clearable
node-key="id"
:props="{
label: 'name'
}"
:default-expand-all="true"
placeholder="请选择父级菜单"
check-strictly
/>
</el-form-item>
<el-form-item label="菜单名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入菜单名称" clearable />
</el-form-item>
<el-form-item v-if="formData.type != MenuEnum.BUTTON" label="菜单图标" prop="icon">
<icon-picker class="flex-1" v-model="formData.icon" />
</el-form-item>
<el-form-item v-if="formData.type != MenuEnum.BUTTON" label="路由路径" prop="paths">
<div class="flex-1">
<el-input v-model="formData.paths" placeholder="请输入路由路径" clearable />
<div class="form-tips">
访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头
</div>
</div>
</el-form-item>
<el-form-item
v-if="formData.type == MenuEnum.MENU"
label="组件路径"
prop="component"
>
<div class="flex-1">
<el-autocomplete
class="w-full"
v-model="formData.component"
:fetch-suggestions="querySearch"
clearable
placeholder="请输入组件路径"
/>
<div class="form-tips">
访问的组件路径，如：`user/setting`，默认在`views`目录下
</div>
</div>
</el-form-item>
<el-form-item
label="选中菜单"
prop="selected"
v-if="formData.type == MenuEnum.MENU"
>
<div class="flex-1">
<el-input
v-model="formData.selected"
placeholder="请输入路由路径"
clearable
/>
<div class="form-tips">
访问详情页面，编辑页面时，菜单高亮显示，如`/consumer/lists`
</div>
</div>
</el-form-item>
<el-form-item
v-if="formData.type != MenuEnum.CATALOGUE"
label="权限字符"
prop="perms"
>
<div class="flex-1">
<el-input v-model="formData.perms" placeholder="请输入权限字符" clearable />
<div class="form-tips">
将作为server端API验权使用，如`auth.admin/user`，请谨慎修改
</div>
</div>
</el-form-item>
<el-form-item v-if="formData.type == MenuEnum.MENU" label="路由参数" prop="params">
<div>
<div class="flex-1">
<el-input
v-model="formData.params"
placeholder="请输入路由参数"
clearable
/>
</div>
<div class="form-tips">
访问路由的默认传递参数，如：`{"id": 1, "name":
"admin"}`或`id=1&name=admin`
</div>
</div>
</el-form-item>
<el-form-item
v-if="formData.type == MenuEnum.MENU"
label="是否缓存"
prop="isCache"
required
>
<div>
<el-radio-group v-model="formData.isCache">
<el-radio :label="1">缓存</el-radio>
<el-radio :label="0">不缓存</el-radio>
</el-radio-group>
<div class="form-tips">选择缓存则会被`keep-alive`缓存</div>
</div>
</el-form-item>
<el-form-item
v-if="formData.type != MenuEnum.BUTTON"
label="是否显示"
prop="isShow"
required
>
<div>
<el-radio-group v-model="formData.isShow">
<el-radio :label="1">显示</el-radio>
<el-radio :label="0">隐藏</el-radio>
</el-radio-group>
<div class="form-tips">
选择隐藏则路由将不会出现在侧边栏，但仍然可以访问
</div>
</div>
</el-form-item>
<el-form-item
v-if="formData.type != MenuEnum.BUTTON"
label="菜单状态"
prop="isDisable"
required
>
<div>
<el-radio-group v-model="formData.isDisable">
<el-radio :label="0">正常</el-radio>
<el-radio :label="1">停用</el-radio>
</el-radio-group>
<div class="form-tips">选择停用则路由将不会出现在侧边栏，也不能被访问</div>
</div>
</el-form-item>
<el-form-item label="菜单排序" prop="sort">
<div>
<el-input-number v-model="formData.sort" :min="0" :max="9999" />
<div class="form-tips">数值越大越排前</div>
</div>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import { menuAdd, menuDetail, menuEdit, menuLists } from '@/api/perms/menu'
import Popup from '@/components/popup/index.vue'
import { MenuEnum } from '@/enums/appEnums'
import { getModulesKey } from '@/router'
import { snakeToCamel } from '@/utils/format'
import { arrayToTree, treeToArray } from '@/utils/util'
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑菜单' : '新增菜单'
})
const componentsOptions = ref(getModulesKey())
const querySearch = (queryString: string, cb: any) => {
const results = queryString
? componentsOptions.value.filter((item) =>
item.toLowerCase().includes(queryString.toLowerCase())
)
: componentsOptions.value
cb(results.map((item) => ({ value: item })))
}
const formData = reactive({
id: '',
//父级id
pid: 0,
//类型
type: MenuEnum.CATALOGUE,
//图标
icon: '',
//名称
name: '',
//排序号
sort: 0,
// 路由路径
paths: '',
//权限链接
perms: '',
//前端组件
component: '',
//选中路径
selected: '',
//路由参数
params: '',
//是否缓存 0=否， 1=是
isCache: 1,
//是否显示 0=否， 1=是
isShow: 1,
//是否禁用 0=否， 1=是
isDisable: 0
})
const formRules = {
pid: [
{
required: true,
message: '请选择父级菜单',
trigger: ['blur', 'change']
}
],
name: [
{
required: true,
message: '请输入菜单名称',
trigger: 'blur'
}
],
paths: [
{
required: true,
message: '请输入路由地址',
trigger: 'blur'
}
],
component: [
{
required: true,
message: '请输入组件地址',
trigger: 'blur'
}
]
}
const menuOptions = ref<any[]>([])
const getMenu = async () => {
const data: any = await menuLists({ page_type: 0 })
const menu: any = { id: 0, name: '顶级', children: [] }
menu.children = arrayToTree(
treeToArray(data.lists).filter((item) => item.type != MenuEnum.BUTTON)
)
menuOptions.value.push(menu)
}
const handleSubmit = async () => {
await formRef.value?.validate()
mode.value == 'edit' ? await menuEdit(formData) : await menuAdd(formData)
popupRef.value?.close()
emit('success')
}
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
const setFormData = (data: Record<any, any>) => {
const camelData = snakeToCamel(data)
for (const key in formData) {
if (camelData[key] != null && camelData[key] != undefined) {
//@ts-ignore
formData[key] = camelData[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await menuDetail({
id: row.id
})
setFormData(data)
}
const handleClose = () => {
emit('close')
}
getMenu()
defineExpose({
open,
setFormData,
getDetail
})
</script>

163
admin/src/views/assets/location/index.vue Normal file
View File

@ -0,0 +1,163 @@
<template>
<div class="menu-lists">
<el-card class="!border-none" shadow="never">
<div>
<el-button v-perms="['auth.menu/add']" type="primary" @click="handleAdd()">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button @click="handleExpand"> 展开/折叠 </el-button>
</div>
<el-table
ref="tableRef"
class="mt-4"
size="large"
v-loading="pager.loading"
:data="pager.lists"
row-key="id"
:tree-props="{ children: 'children' }"
>
<el-table-column
label="位置名称"
prop="name"
min-width="150"
show-overflow-tooltip
/>
<el-table-column label="位置类型" prop="type" min-width="80">
<template #default="{ row }">
<div>
{{ dictData.find(item => item.value === row.type)?.name || '-' }}
</div>
</template>
</el-table-column>
<el-table-column
label="面积（平方米）"
prop="area"
min-width="80"
show-overflow-tooltip
/>
<el-table-column
label="可容纳人数"
prop="capacity"
min-width="150"
show-overflow-tooltip
/>
<el-table-column
label="楼层号"
prop="floorNumber"
min-width="150"
show-overflow-tooltip
/>
<el-table-column label="状态" prop="is_disable" min-width="100">
<template #default="{ row }">
<el-tag v-if="row.is_disable == 0">正常</el-tag>
<el-tag v-else type="danger">停用</el-tag>
</template>
</el-table-column>
<el-table-column label="排序" prop="sort" min-width="100" />
<el-table-column
label="更新时间"
prop="update_time"
min-width="180"
></el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<el-button
v-if="row.type !== MenuEnum.BUTTON"
v-perms="['auth.menu/add']"
type="primary"
link
@click="handleAdd(row.id)"
>
新增
</el-button>
<el-button
v-perms="['auth.menu/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['auth.menu/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="permission-menu">
import type { ElTable } from 'element-plus'
import { menuDelete, menuLists } from '@/api/perms/menu'
import { MenuEnum } from '@/enums/appEnums'
import { useDictData } from '@/hooks/useDictOptions'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const tableRef = shallowRef<InstanceType<typeof ElTable>>()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
let isExpand = false
const showEdit = ref(false)
const { pager, getLists } = usePaging({
fetchFun: menuLists,
params: {
page_type: 0
}
})
const { dictData } = useDictData<Array<{ name: string; value: string | number }>>(9)
const handleAdd = async (id?: number) => {
showEdit.value = true
await nextTick()
if (id) {
editRef.value?.setFormData({
pid: id
})
}
editRef.value?.open('add')
}
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
console.log(data.children)
editRef.value?.open('edit')
editRef.value?.getDetail(data)
}
const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除？')
await menuDelete({ id })
getLists()
}
const handleExpand = () => {
isExpand = !isExpand
toggleExpand(pager.lists, isExpand)
}
const toggleExpand = (children: any[], unfold = true) => {
for (const key in children) {
tableRef.value?.toggleRowExpansion(children[key], unfold)
if (children[key].children) {
toggleExpand(children[key].children!, unfold)
}
}
}
getLists()
</script>

165
admin/src/views/assets/unfixedinfo/edit.vue Normal file
View File

@ -0,0 +1,165 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
:clickModalClose="true"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<el-form-item label="唯一标识" prop="id">
<el-input v-model="formData.id" placeholder="请输入唯一标识" />
</el-form-item>
<el-form-item label="资产名称" prop="assetName">
<el-input v-model="formData.assetName" placeholder="请输入资产名称" />
</el-form-item>
<el-form-item label="规格型号" prop="model">
<el-input v-model="formData.model" placeholder="请输入规格型号" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input v-model="formData.brand" placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="资产类别" prop="category">
<el-input v-model="formData.category" placeholder="请输入资产类别" />
</el-form-item>
<el-form-item label="非固定资产库存信息ID" prop="consumableId">
<el-input v-model="formData.consumableId" placeholder="请输入非固定资产库存信息ID" />
</el-form-item>
<el-form-item label="资产描述" prop="description">
<el-input
v-model="formData.description"
placeholder="请输入资产描述"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
/>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup>
import type { FormInstance } from 'element-plus'
import { infoEdit, infoAdd, infoDetail } from '@/api/asset/info'
import Popup from '@/components/popup/index.vue'
import feedback from '@/utils/feedback'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑资产信息' : '新增资产信息'
})
const formData = reactive({
id: '',
assetName: '',
model: '',
brand: '',
category: '',
isFixedAsset: 1,
consumableId: '',
description: '',
})
const formRules = {
id: [
{
required: true,
message: '请输入唯一标识',
trigger: ['blur']
}
],
assetName: [
{
required: true,
message: '请输入资产名称',
trigger: ['blur']
}
],
model: [
{
required: true,
message: '请输入规格型号',
trigger: ['blur']
}
],
brand: [
{
required: true,
message: '请输入品牌',
trigger: ['blur']
}
],
category: [
{
required: true,
message: '请输入资产类别',
trigger: ['blur']
}
],
isFixedAsset: [
{
required: true,
message: '请输入是否为固定资产',
trigger: ['blur']
}
],
consumableId: [
{
required: true,
message: '请输入非固定资产库存信息ID',
trigger: ['blur']
}
],
}
const handleSubmit = async () => {
await formRef.value?.validate()
const data: any = { ...formData }
mode.value == 'edit' ? await infoEdit(data) : await infoAdd(data)
popupRef.value?.close()
feedback.msgSuccess('操作成功')
emit('success')
}
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
const setFormData = async (data: Record<string, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await infoDetail({
id: row.id
})
setFormData(data)
}
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

290
admin/src/views/assets/info/index.vue → admin/src/views/assets/unfixedinfo/index.vue
View File

@ -1,151 +1,139 @@
<template> <template>
<div class="index-lists"> <div class="index-lists">
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true"> <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="资产名称" prop="assetName"> <el-form-item label="资产名称" prop="assetName">
<el-input class="w-[280px]" v-model="queryParams.assetName" /> <el-input class="w-[280px]" v-model="queryParams.assetName" />
</el-form-item> </el-form-item>
<el-form-item label="规格型号" prop="model"> <el-form-item label="规格型号" prop="model">
<el-input class="w-[280px]" v-model="queryParams.model" /> <el-input class="w-[280px]" v-model="queryParams.model" />
</el-form-item> </el-form-item>
<el-form-item label="品牌" prop="brand"> <el-form-item label="品牌" prop="brand">
<el-input class="w-[280px]" v-model="queryParams.brand" /> <el-input class="w-[280px]" v-model="queryParams.brand" />
</el-form-item> </el-form-item>
<el-form-item label="资产类别" prop="category"> <el-form-item label="资产类别" prop="category">
<el-select <el-select
v-model="queryParams.category" v-model="queryParams.category"
class="w-[280px]" class="w-[280px]"
clearable clearable
> >
<el-option label="全部" value="" /> <el-option label="全部" value="" />
<el-option <el-option
v-for="(item, index) in dictData" v-for="(item, index) in dictData"
:key="index" :key="index"
:label="item.name" :label="item.name"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否为固定资产" prop="isFixedAsset"> <el-form-item label="非固定资产库存信息ID" prop="consumableId">
<el-select <el-input class="w-[280px]" v-model="queryParams.consumableId" />
v-model="queryParams.isFixedAsset" </el-form-item>
class="w-[280px]" <el-form-item>
clearable <el-button type="primary" @click="resetPage">查询</el-button>
> <el-button @click="resetParams">重置</el-button>
<el-option label="全部" value="" /> </el-form-item>
<el-option label="固定资产" :value="0"/> </el-form>
<el-option label="非固定资产" :value="1"/> </el-card>
</el-select> <el-card class="!border-none mt-4" shadow="never">
</el-form-item> <div>
<el-form-item label="非固定资产库存信息ID" prop="consumableId"> <el-button v-perms="['info:add']" type="primary" @click="handleAdd()">
<el-input class="w-[280px]" v-model="queryParams.consumableId" /> <template #icon>
</el-form-item> <icon name="el-icon-Plus" />
<el-form-item> </template>
<el-button type="primary" @click="resetPage">查询</el-button> 新增
<el-button @click="resetParams">重置</el-button> </el-button>
</el-form-item> </div>
</el-form> <el-table
</el-card> class="mt-4"
<el-card class="!border-none mt-4" shadow="never"> size="large"
<div> v-loading="pager.loading"
<el-button v-perms="['info:add']" type="primary" @click="handleAdd()"> :data="pager.lists"
<template #icon> >
<icon name="el-icon-Plus" /> <el-table-column label="资产名称" prop="assetName" min-width="100" />
</template> <el-table-column label="规格型号" prop="model" min-width="100" />
新增 <el-table-column label="品牌" prop="brand" min-width="100" />
</el-button> <el-table-column label="资产类别" prop="category" min-width="100" />
</div> <el-table-column label="非固定资产库存信息ID" prop="consumableId" min-width="100" />
<el-table <el-table-column label="资产描述" prop="description" min-width="100" />
class="mt-4" <el-table-column label="记录创建时间" prop="createdTime" min-width="100" />
size="large" <el-table-column label="最后更新时间" prop="updatedTime" min-width="100" />
v-loading="pager.loading" <el-table-column label="操作" width="120" fixed="right">
:data="pager.lists" <template #default="{ row }">
> <el-button
<el-table-column label="资产名称" prop="assetName" min-width="100" /> v-perms="['info:edit']"
<el-table-column label="规格型号" prop="model" min-width="100" /> type="primary"
<el-table-column label="品牌" prop="brand" min-width="100" /> link
<el-table-column label="资产类别" prop="category" min-width="100" /> @click="handleEdit(row)"
<el-table-column label="是否为固定资产" prop="isFixedAsset" min-width="100" /> >
<el-table-column label="非固定资产库存信息ID" prop="consumableId" min-width="100" /> 编辑
<el-table-column label="资产描述" prop="description" min-width="100" /> </el-button>
<el-table-column label="记录创建时间" prop="createdTime" min-width="100" /> <el-button
<el-table-column label="最后更新时间" prop="updatedTime" min-width="100" /> v-perms="['info:del']"
<el-table-column label="操作" width="120" fixed="right"> type="danger"
<template #default="{ row }"> link
<el-button @click="handleDelete(row.id)"
v-perms="['info:edit']" >
type="primary" 删除
link </el-button>
@click="handleEdit(row)" </template>
> </el-table-column>
编辑 </el-table>
</el-button> <div class="flex justify-end mt-4">
<el-button <pagination v-model="pager" @change="getLists" />
v-perms="['info:del']" </div>
type="danger" </el-card>
link <edit-popup
@click="handleDelete(row.id)" v-if="showEdit"
> ref="editRef"
删除 @success="getLists"
</el-button> @close="showEdit = false"
</template> />
</el-table-column> </div>
</el-table> </template>
<div class="flex justify-end mt-4"> <script lang="ts" setup name="info">
<pagination v-model="pager" @change="getLists" /> import { infoDelete, infoLists } from '@/api/asset/info'
</div> import { useDictData } from '@/hooks/useDictOptions'
</el-card> import { usePaging } from '@/hooks/usePaging'
<edit-popup import feedback from '@/utils/feedback'
v-if="showEdit" import EditPopup from './edit.vue'
ref="editRef" const editRef = shallowRef<InstanceType<typeof EditPopup>>()
@success="getLists" const showEdit = ref(false)
@close="showEdit = false" const queryParams = reactive({
/> assetName: '',
</div> model: '',
</template> brand: '',
<script lang="ts" setup name="info"> category: '',
import { infoDelete, infoLists } from '@/api/asset/info' isFixedAsset: 1,
import { useDictData } from '@/hooks/useDictOptions' consumableId: '',
import { usePaging } from '@/hooks/usePaging' })
import feedback from '@/utils/feedback' const dictLoading = ref(false)
import EditPopup from './edit.vue' const { pager, getLists, resetPage, resetParams } = usePaging({
const editRef = shallowRef<InstanceType<typeof EditPopup>>() fetchFun: infoLists,
const showEdit = ref(false) params: queryParams
const queryParams = reactive({ })
assetName: '',
model: '', const { dictData } = useDictData<Array<{name: string, value: any}>>(7)
brand: '',
category: '', const handleAdd = async () => {
isFixedAsset: '', showEdit.value = true
consumableId: '', await nextTick()
}) editRef.value?.open('add')
const dictLoading = ref(false) }
const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: infoLists, const handleEdit = async (data: any) => {
params: queryParams showEdit.value = true
}) await nextTick()
editRef.value?.open('edit')
const { dictData } = useDictData<Array<{name: string, value: any}>>(7) editRef.value?.getDetail(data)
}
const handleAdd = async () => {
showEdit.value = true const handleDelete = async (id: number) => {
await nextTick() await feedback.confirm('确定要删除？')
editRef.value?.open('add') await infoDelete({ id })
} feedback.msgSuccess('删除成功')
getLists()
const handleEdit = async (data: any) => { }
showEdit.value = true
await nextTick() getLists()
editRef.value?.open('edit') </script>
editRef.value?.getDetail(data)
}
const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除？')
await infoDelete({ id })
feedback.msgSuccess('删除成功')
getLists()
}
getLists()
</script>

6
admin/src/views/setting/dict/data/index.vue
View File

@ -153,8 +153,8 @@ const handleAdd = async () => {
await nextTick() await nextTick()
const type = optionsData.dict_type.find((item) => item.id == queryParams.type_id) const type = optionsData.dict_type.find((item) => item.id == queryParams.type_id)
editRef.value?.setFormData({ editRef.value?.setFormData({
type_value: type?.type, typeValue: type?.type,
type_id: type.id typeId: type.id
}) })
editRef.value?.open('add') editRef.value?.open('add')
} }
@ -168,7 +168,7 @@ const handleEdit = async (data: any) => {
const handleDelete = async (id: any[] | number) => { const handleDelete = async (id: any[] | number) => {
await feedback.confirm('确定要删除？') await feedback.confirm('确定要删除？')
await dictDataDelete({ id }) await dictDataDelete({id: Array.isArray(id) ? id : [id]})
getLists() getLists()
} }