huang_an vor 2 Jahren
Ursprung
Commit
313cd997e5

+ 5 - 2
src/api/warehouseManagement/outin.js

@@ -96,8 +96,11 @@ export default {
   },
 
   //库存台账-库存明细
-  getInventoryDetails: async ({ params }) => {
-    const res = await request.get(`/wms/outin/getInventoryDetails`, { params });
+
+  getInventoryDetails: async (params) => {
+    const res = await request.get(`/wms/outin/getInventoryDetails`, {
+      params
+    });
     if (res.data.code == 0) {
       return res.data.data;
     }

+ 5 - 4
src/views/warehouseManagement/stockLedger/batchDetails.vue

@@ -122,15 +122,16 @@
     methods: {
       async getDetailInfo(row) {
         console.log('===', row);
-        const res = await outin.getBasicInformation(row.id);
+        const res = await getDetails(row.id);
         this.$nextTick(() => {
           console.log(res);
-          this.$refs.baseInfoRef.getDetailInfoAugr(res); //基本信息
-          // this.$refs.warehouseConfigRef.getDetailInfoAugr(res.categoryWms);
+          this.$refs.baseInfoRef.getDetailInfoAugr(res.category); //基本信息
+          this.$refs.warehouseConfigRef.getDetailInfoAugr(res.categoryWms);
         });
         const rep = await outin.getInventoryDetails({
           pageNum: 1,
-          size: -1
+          size: -1,
+          categoryId: row.id
         });
         console.log('===', rep);
         this.stockList = rep.list;

+ 5 - 1
src/views/warehouseManagement/stockLedger/components/details/BaseInfo.vue

@@ -78,7 +78,11 @@
     methods: {
       async getDetailInfoAugr(data) {
         const dep = await this.getDepUser(data.deptLeaderId, data.deptId);
-        this.idata = { ...data, groupName: dep.groupName, name: dep.name };
+        if (data.depId) {
+          this.idata = { ...data, groupName: dep.groupName, name: dep.name };
+        } else {
+          this.idata = data;
+        }
       },
       async getDepUser(id, depId) {
         // 获取存储在 Vuex 中的用户列表数据

+ 2 - 2
src/views/warehouseManagement/stockLedger/components/details/WarehouseDetail.vue

@@ -11,7 +11,7 @@
         prop="onlyCode"
         width="200px"
       ></el-table-column> -->
-      <el-table-column label="批次号" prop="batchNum"></el-table-column>
+      <el-table-column label="批次号" prop="batchNo"></el-table-column>
       <el-table-column label="编码" prop="assetCode"></el-table-column>
       <el-table-column label="名称" prop="assetName"></el-table-column>
       <el-table-column label="牌号" prop="brandNum"></el-table-column>
@@ -19,7 +19,7 @@
       <el-table-column label="规格" prop=""></el-table-column>
       <el-table-column label="最小包装单元"> </el-table-column>
       <el-table-column label="数量" prop=""></el-table-column>
-      <el-table-column label="单价" prop="univalence">
+      <el-table-column label="单价" prop="price">
         <template slot-scope="{ row }">
           <template v-if="row.univalence || row.univalence === 0">
             {{ row.univalence }} {{ priceList[row.univalenceUnit] }}