diff --git a/admin/src/api/app.ts b/admin/src/api/app.ts
index a6a2408a..58fee361 100644
--- a/admin/src/api/app.ts
+++ b/admin/src/api/app.ts
@@ -10,12 +10,12 @@ export function getWorkbench(params?: Record<string, any>) {
     return request.get({ url: '/workbench/index', params })
 }
 
-//字典数据
+//字典数据（已弃用）
 export function getDictData(params: any) {
     return request.get({ url: '/config/dict', params })
 }
 
-// 真的字典数据
+// 字典总列表数据
 export function getDictList(params: any) {
     return request.get({ url: '/setting.dict.dict_data/lists', params })
 }
diff --git a/admin/src/views/assets/info/edit.vue b/admin/src/views/assets/detailed/edit.vue
similarity index 94%
rename from admin/src/views/assets/info/edit.vue
rename to admin/src/views/assets/detailed/edit.vue
index 2f3ec001..505116b8 100644
--- a/admin/src/views/assets/info/edit.vue
+++ b/admin/src/views/assets/detailed/edit.vue
@@ -1,168 +1,171 @@
-<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="isFixedAsset">
-                    <el-input v-model="formData.isFixedAsset" 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: '',
-    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>
+<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="isFixedAsset">
+                    <el-radio-group v-model="formData.isFixedAsset">
+                        <el-radio label=0>固定资产</el-radio>
+                        <el-radio label=1>非固定资产</el-radio>
+                    </el-radio-group>
+                </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: '',
+    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>
diff --git a/admin/src/views/assets/detailed/index.vue b/admin/src/views/assets/detailed/index.vue
new file mode 100644
index 00000000..e722861f
--- /dev/null
+++ b/admin/src/views/assets/detailed/index.vue
@@ -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>
diff --git a/admin/src/views/assets/fixedinfo/edit.vue b/admin/src/views/assets/fixedinfo/edit.vue
new file mode 100644
index 00000000..7fad1b4a
--- /dev/null
+++ b/admin/src/views/assets/fixedinfo/edit.vue
@@ -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>
diff --git a/admin/src/views/assets/fixedinfo/index.vue b/admin/src/views/assets/fixedinfo/index.vue
new file mode 100644
index 00000000..e722861f
--- /dev/null
+++ b/admin/src/views/assets/fixedinfo/index.vue
@@ -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>
diff --git a/admin/src/views/assets/location/edit.vue b/admin/src/views/assets/location/edit.vue
new file mode 100644
index 00000000..dca71a33
--- /dev/null
+++ b/admin/src/views/assets/location/edit.vue
@@ -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>
diff --git a/admin/src/views/assets/location/index.vue b/admin/src/views/assets/location/index.vue
new file mode 100644
index 00000000..20cb319a
--- /dev/null
+++ b/admin/src/views/assets/location/index.vue
@@ -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>
diff --git a/admin/src/views/assets/unfixedinfo/edit.vue b/admin/src/views/assets/unfixedinfo/edit.vue
new file mode 100644
index 00000000..b851cf02
--- /dev/null
+++ b/admin/src/views/assets/unfixedinfo/edit.vue
@@ -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>
diff --git a/admin/src/views/assets/info/index.vue b/admin/src/views/assets/unfixedinfo/index.vue
similarity index 87%
rename from admin/src/views/assets/info/index.vue
rename to admin/src/views/assets/unfixedinfo/index.vue
index b13e6de2..1e366c62 100644
--- a/admin/src/views/assets/info/index.vue
+++ b/admin/src/views/assets/unfixedinfo/index.vue
@@ -1,151 +1,139 @@
-<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="是否为固定资产" prop="isFixedAsset">
-                    <el-select
-                        v-model="queryParams.isFixedAsset"
-                        class="w-[280px]"
-                        clearable
-                    >
-                        <el-option label="全部" value="" />
-                        <el-option label="固定资产" :value="0"/>
-                        <el-option label="非固定资产" :value="1"/>
-                    </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="isFixedAsset" min-width="100" />
-                <el-table-column label="非固定资产库存信息ID" prop="consumableId" 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: '',
-    consumableId: '',
-})
-const dictLoading = ref(false)
-const { pager, getLists, resetPage, resetParams } = usePaging({
-    fetchFun: infoLists,
-    params: queryParams
-})
-
-const { dictData } = useDictData<Array<{name: string, value: any}>>(7)
-
-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>
+<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="非固定资产库存信息ID" prop="consumableId" 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: 1,
+    consumableId: '',
+})
+const dictLoading = ref(false)
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: infoLists,
+    params: queryParams
+})
+
+const { dictData } = useDictData<Array<{name: string, value: any}>>(7)
+
+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>
diff --git a/admin/src/views/setting/dict/data/index.vue b/admin/src/views/setting/dict/data/index.vue
index fd5f63d6..abdfa4f4 100644
--- a/admin/src/views/setting/dict/data/index.vue
+++ b/admin/src/views/setting/dict/data/index.vue
@@ -153,8 +153,8 @@ const handleAdd = async () => {
     await nextTick()
     const type = optionsData.dict_type.find((item) => item.id == queryParams.type_id)
     editRef.value?.setFormData({
-        type_value: type?.type,
-        type_id: type.id
+        typeValue: type?.type,
+        typeId: type.id
     })
     editRef.value?.open('add')
 }
@@ -168,7 +168,7 @@ const handleEdit = async (data: any) => {
 
 const handleDelete = async (id: any[] | number) => {
     await feedback.confirm('确定要删除？')
-    await dictDataDelete({ id })
+    await dictDataDelete({id: Array.isArray(id) ? id : [id]})
     getLists()
 }