Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

sgzb-ui/src/api/inventoryLogs/index.js

@@ -2,8 +2,10 @@ import request from '@/utils/request'
 
 
 /* 日志列表 */
-export const getLogsListApi = (data) => {
+export const getLogsListApi = (params) => {
-    return request.get('/system/bm_num_logs/list', data)
+    return request.get('/system/bm_num_logs/list', {
+        params:params
+    })
 }
 
 /* 日志详情 */

sgzb-ui/src/views/inventoryLogs/index.vue

@@ -4,10 +4,24 @@
     <el-row>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
         <el-form-item label="模块名称" prop="modelTitle">
-          <el-input v-model="queryParams.typeName" placeholder="请输入模块名称" clearable style="width: 200px" @keyup.enter.native="handleQuery" />
+          <el-input
+            v-model="queryParams.modelTitle"
+            placeholder="请输入模块名称"
+            clearable
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
-        <el-form-item label="规格名称" prop="typeName">
+        <el-form-item label="机具类型" prop="typeName">
-          <el-input v-model="queryParams.modelTitle" placeholder="请输入规格名称" clearable style="width: 200px" @keyup.enter.native="handleQuery" />
+          <el-cascader
+            placeholder="请选择机具类型"
+            :options="deviceTypeTree"
+            :props="{ checkStrictly: true, value: 'label' }"
+            @change="handleBaseValue"
+            clearable
+            filterable
+            :show-all-levels="false"
+          />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -22,7 +36,7 @@
       <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="task" label="实例" />
-      <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="description" label="描述" />
       <el-table-column show-overflow-tooltip align="center" prop="time" label="日期" />
@@ -70,6 +84,7 @@
 
 <script>
 import { getLogsListApi, getLogsDetailsApi } from '@/api/inventoryLogs'
+import { getDeviceTypeTree } from '@/api/claimAndRefund/receive'
 export default {
   name: 'myInventoryLogs',
   data() {
@@ -77,8 +92,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        modelTitle:'',  // 规格名称
+        modelTitle: '', // 模块名称
-        typeName:'' // 模块名称
+        typeName: '', // 机具名称
       },
       tableList: [],
       total: 5,
@@ -92,19 +107,20 @@ export default {
         { label: '创建人', content: 'creator' },
         { label: '请求方式', content: 'method' },
         { label: '模块名称', content: 'modelTitle' },
-        { label: '请求方式', content: 'requestMethod' }, 
+        { label: '请求地址', content: 'requestMethod' },
-        { label: '机具规格', content: 'typeId' }, 
+        { label: '机具名称', content: 'typeParentName' },
-        { label: '机具名称', content: 'id' }, 
+        { label: '机具规格', content: 'typeName' },  
-        { label: '日期', content: 'time' }, 
+        { label: '日期', content: 'time' },
-        { label: '实例', content: 'task' }, 
+        { label: '实例', content: 'task' },
-        ],
+      ],
       logsDetailsInfo: {},
+      deviceTypeTree: [], // 设备 树结构数据
     }
   },
   methods: {
     /* 查询列表 */
     async getList() {
-      const res = await getLogsListApi()
+      const res = await getLogsListApi(this.queryParams)
       this.tableList = res.rows
       this.total = res.total
     },
@@ -117,6 +133,7 @@ export default {
       this.resetForm('queryForm')
       this.queryParams.pageNum = 1
       this.queryParams.pageSize = 10
+      this.queryParams.typeName = ''
       this.getList()
     },
     /* 查看详情 */
@@ -126,9 +143,21 @@ export default {
       this.logsDetailsInfo = res
       this.logsDetailsDialogVisible = true
     },
+    async GetDeviceTypeTree() {
+      const params = {
+        level: 4,
+      }
+      const res = await getDeviceTypeTree(params)
+      this.deviceTypeTree = res.data
+    },
+    /* 获取最后一级 */
+    handleBaseValue(val) {
+      this.queryParams.typeName = val[val.length - 1]
+    }
   },
   created() {
     this.getList()
+    this.GetDeviceTypeTree()
   },
 }
 </script>