bonus
/
nwdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://192.168.0.56:3000/bonus/nwdevicemgt-ui

This commit is contained in:
BianLzhaoMin 2024-08-16 11:02:32 +08:00
parent bf02b11f33 7e2f3601df
commit b23fcef649
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/inventoryLogs/index.js
View File

@ -3,14 +3,14 @@ import request from '@/utils/request'
/* 日志列表 */ /* 日志列表 */
export const getLogsListApi = (params) => { export const getLogsListApi = (params) => {
return request.get('/system/bm_num_logs/list', { return request.get('/system/bm_storage_logs/list', {
params:params params:params
}) })
} }
/* 日志详情 */ /* 日志详情 */
export const getLogsDetailsApi = (id) => { export const getLogsDetailsApi = (id) => {
return request.get(`/system/bm_num_logs/selectByPrimaryKey`, { return request.get(`/system/bm_storage_logs/selectByPrimaryKey`, {
params: { params: {
id id
} }

41
src/views/inventoryLogs/index.vue
View File

@ -33,21 +33,28 @@
<el-table :data="tableList" border> <el-table :data="tableList" border>
<el-table-column align="center" label="序号" type="index" width="60" /> <el-table-column align="center" label="序号" type="index" width="60" />
<el-table-column align="center" prop="modelTitle" label="模块名称" show-overflow-tooltip /> <el-table-column align="center" prop="modelTitle" label="模块名称" show-overflow-tooltip />
<el-table-column show-overflow-tooltip align="center" prop="method" label="请求方式" /> <!-- <el-table-column show-overflow-tooltip align="center" prop="method" label="请求方式" />-->
<el-table-column show-overflow-tooltip align="center" prop="requestMethod" label="请求地址" /> <!-- <el-table-column show-overflow-tooltip align="center" prop="method" label="请求地址" />-->
<el-table-column show-overflow-tooltip align="center" prop="task" label="实例" /> <!-- <el-table-column show-overflow-tooltip align="center" prop="taskId" label="任务ID" />-->
<el-table-column show-overflow-tooltip align="center" prop="typeParentName" label="机具类型" /> <el-table-column show-overflow-tooltip align="center" prop="typeParentName" label="机具类型" />
<el-table-column show-overflow-tooltip align="center" prop="typeName" label="机具规格" /> <el-table-column show-overflow-tooltip align="center" prop="typeName" label="机具规格" />
<el-table-column show-overflow-tooltip align="center" prop="description" label="描述" /> <el-table-column show-overflow-tooltip align="center" prop="preStoreNum" label="操作前库存" />
<el-table-column show-overflow-tooltip align="center" prop="time" label="日期" /> <el-table-column show-overflow-tooltip align="center" prop="inNum" label="入库数量" />
<el-table-column show-overflow-tooltip align="center" prop="outNum" label="出库数量" />
<el-table-column show-overflow-tooltip align="center" prop="passNum" label="(退库)合格数量" />
<el-table-column show-overflow-tooltip align="center" prop="maintenanceNum" label="(退库)维修数量" />
<el-table-column show-overflow-tooltip align="center" prop="scrapNum" label="(退库)报废数量" />
<!-- <el-table-column show-overflow-tooltip align="center" prop="description" label="描述" />-->
<el-table-column show-overflow-tooltip align="center" prop="postStoreNum" label="操作后库存" />
<el-table-column show-overflow-tooltip align="center" prop="createTime" label="日期" />
<el-table-column align="center" label="状态"> <el-table-column align="center" label="状态">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-tag size="mini" type="success" v-if="row.status == 0">正常</el-tag> <el-tag size="mini" type="success" v-if="row.status == 0">正常</el-tag>
<el-tag size="mini" type="warning" v-else>异常</el-tag> <el-tag size="mini" type="warning" v-else>异常</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="creator" label="创建人" /> <!-- <el-table-column align="center" prop="creator" label="创建人" />-->
<el-table-column align="center" prop="remark" label="备注" /> <!-- <el-table-column align="center" prop="remark" label="备注" />-->
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button size="mini" type="text" @click="previewLogsDetails(row)">详情</el-button> <el-button size="mini" type="text" @click="previewLogsDetails(row)">详情</el-button>
@ -105,13 +112,22 @@ export default {
/* 日志详情label以及内容 */ /* 日志详情label以及内容 */
detailsLabelList: [ detailsLabelList: [
{ label: '创建人', content: 'creator' }, { label: '创建人', content: 'creator' },
{ label: '请求方式', content: 'method' },
{ label: '模块名称', content: 'modelTitle' }, { label: '模块名称', content: 'modelTitle' },
{ label: '请求地址', content: 'requestMethod' }, { label: '任务ID', content: 'taskId' },
{ label: '机具名称', content: 'typeParentName' }, { label: '机具类型', content: 'typeParentName' },
{ label: '机具规格', content: 'typeName' }, { label: '机具规格', content: 'typeName' },
{ label: '日期', content: 'time' }, { label: '日期', content: 'createTime' },
{ label: '实例', content: 'task' }, // { label: '申请数量', content: 'preNum' },
// { label: '审核数量', content: 'auditNum' },
{ label: '操作前库存', content: 'preStoreNum' },
{ label: '入库数量', content: 'inNum' },
{ label: '出库数量', content: 'outNum' },
{ label: '(退库)总数量', content: 'backNum' },
{ label: '(退库)合格数量', content: 'passNum' },
{ label: '(退库)维修数量', content: 'maintenanceNum' },
{ label: '(退库)报废数量', content: 'scrapNum' },
{ label: '操作后库存', content: 'postStoreNum' },
{ label: '请求地址', content: 'method' },
], ],
logsDetailsInfo: {}, logsDetailsInfo: {},
deviceTypeTree: [], // 设备 树结构数据 deviceTypeTree: [], // 设备 树结构数据
@ -167,3 +183,4 @@ export default {
margin-top: -15px; margin-top: -15px;
} }
</style> </style>