add

src/api/classifyManage/index.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 
-export async function getSubPage (data) {
+export async function getSubPage(data) {
   const res = await request.get('/main/categoryLevel/getSubPage', {
     params: data
   });
@@ -9,7 +9,7 @@ export async function getSubPage (data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
-export async function saveOrUpdate (data) {
+export async function saveOrUpdate(data) {
   const res = await request.post('/main/categoryLevel/saveOrUpdate', data);
   if (res.data.code == 0) {
     return res.data;
@@ -18,7 +18,7 @@ export async function saveOrUpdate (data) {
 }
 
 // 根据父级id查分类树
-export async function getTreeByPid (parentId) {
+export async function getTreeByPid(parentId) {
   const res = await request.get(`/main/categoryLevel/getTreeByPid/${parentId}`);
   if (res.data.code == 0) {
     return res.data;
@@ -37,10 +37,8 @@ export async function getTreeByGroup(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
-
 // 根据类型查分类树
-export async function getTreeByType (type) {
+export async function getTreeByType(type) {
   const res = await request.get(`/main/categoryLevel/getTreeByType/${type}`);
   if (res.data.code == 0) {
     return res.data;
@@ -49,7 +47,7 @@ export async function getTreeByType (type) {
 }
 
 // 删除分类
-export async function deleteCategory (id) {
+export async function deleteCategory(id) {
   const res = await request.get(`/main/categoryLevel/delete/${id}`);
   if (res.data.code == 0) {
     return res.data;
@@ -57,7 +55,7 @@ export async function deleteCategory (id) {
   return Promise.reject(new Error(res.data.message));
 }
 //根据ID查询分类详情系信息
-export async function getInfoById (id) {
+export async function getInfoById(id) {
   const res = await request.get(`/main/categoryLevel/getById/${id}`);
   if (res.data.code == 0) {
     return res.data;
@@ -65,13 +63,12 @@ export async function getInfoById (id) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 批次明细
 
-export async function getBatchDetails (data) {
-  const res = await request.get(`/wms/outin/getBatchDetails`, {  params: data });
+export async function getBatchDetails(data) {
+  const res = await request.get(`/wms/outin/getBatchDetails`, { params: data });
   if (res.data.code == 0) {
-    return res.data;
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -1,6 +1,8 @@
 <template>
   <div>
     <!-- 数据表格 -->
+    =={{ selectedDime }}
+
     <item-search @search="reload" ref="refSeavch" @handledime="handledime">
     </item-search>
     <ele-pro-table
@@ -63,7 +65,8 @@
         searchForm: {
           dimension: 1
         },
-        isShow: false
+        isShow: false,
+        selectedDime: 1
       };
     },
     computed: {
@@ -157,44 +160,69 @@
         //   ...this.$refs.refSeavch.params,
         //   dimension: this.$refs.refSeavch.dimension
         // });
-        if (val == 2) {
-          this.handleBatchDimension(val);
-        } else if (val == 3) {
-          this.handleInventoryDimension(val);
-        }
+        // if (val == 2) {
+        //   // this.handleBatchDimension(val);
+        //   this.reload();
+        // } else if (val == 3) {
+        //   this.handleInventoryDimension(val);
+        // }else{}
+        this.reload();
+        this.selectedDime = val;
       },
+      //批次维度
       async handleBatchDimension(event) {
-        const treeId = this.$parent.$parent.$parent.current.id;
-        const params = {
-          page: 1,
-          size: 10,
-          categoryLevelId: treeId
-        };
-        const res = await getBatchDetails(params);
-        console.log(res);
+        // const treeId = this.$parent.$parent.$parent.current.id;
+        // const params = {
+        //   page: 1,
+        //   size: 10,
+        //   categoryLevelId: treeId
+        // };
+        // const res = await getBatchDetails(params);
+        // console.log(res);
         // 待完善
       },
+      //库存维度
       async handleInventoryDimension(val) {
-        const treeId = this.$parent.$parent.$parent.current.id;
-        const rep = await ouint.getInventoryDetails({
-          pageNum: 1,
-          size: 10,
-          categoryLevelId: treeId
-        });
-        console.log(rep);
+        // const treeId = this.$parent.$parent.$parent.current.id;
+        // const rep = await ouint.getInventoryDetails({
+        //   pageNum: 1,
+        //   size: 10,
+        //   categoryLevelId: treeId
+        // });
+        // console.log(rep);
         //待完善
       },
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        console.log(order);
         const dimension = this.$refs.refSeavch.dimension;
-        return ouint.getRealTimeInventory({
-          ...where,
-          ...order,
-          pageNum: page,
-          size: limit,
-          dimension: dimension
-        });
+        const treeId = this.$parent.$parent.$parent.current.id;
+        if (this.selectedDime == 1) {
+          return ouint.getRealTimeInventory({
+            ...where,
+            ...order,
+            pageNum: page,
+            size: limit,
+            dimension: dimension
+          });
+        } else if (this.selectedDime == 2) {
+          const params = {
+            categoryLevelId: treeId
+          };
+          return getBatchDetails({
+            ...params,
+            page: page,
+            size: limit
+          });
+        } else {
+          const params = {
+            categoryLevelId: treeId
+          };
+          return ouint.getInventoryDetails({
+            ...params,
+            page: page,
+            size: limit
+          });
+        }
       },
       /* 刷新表格 */
       reload(where) {