huang_an 2 anos atrás
pai
commit
1b0cd6e145

+ 11 - 1
src/views/warehouseManagement/stockLedger/allBatchDetails.vue

@@ -133,7 +133,17 @@
           size: -1,
           categoryId: row.id
         });
-        console.log('===', rep);
+        const list = this.$store.state.userPage.userList;
+        console.log('===', list);
+        for (const key in list) {
+          for (const k in rep.list) {
+            if (list[key].id == rep.list[k].createUserId) {
+              const name = list[key].name;
+              rep.list[k].createUserName = name;
+            }
+          }
+        }
+        console.log('qqq', rep.list);
         this.stockList = rep.list;
       }
     }

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

@@ -13,12 +13,13 @@
       ></el-table-column> -->
       <el-table-column label="批次号" prop="batchNo"></el-table-column>
       <el-table-column label="编码" prop="code"></el-table-column>
-      <el-table-column label="名称" prop="assetName"></el-table-column>
+      <el-table-column label="名称" prop="name"></el-table-column>
       <el-table-column label="牌号" prop="brandNum"></el-table-column>
       <el-table-column label="型号" prop="modelType"></el-table-column>
-      <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="specification"></el-table-column>
+      <el-table-column label="最小包装单元" prop="packingUnit">
+      </el-table-column>
+      <el-table-column label="数量" prop="countNo"></el-table-column>
       <el-table-column label="单价" prop="price">
         <template slot-scope="{ row }">
           <template v-if="row.univalence || row.univalence === 0">
@@ -27,7 +28,7 @@
         </template></el-table-column
       >
       <el-table-column label="质保期" prop="expirationDate"></el-table-column>
-      <el-table-column label="入库人" prop=""></el-table-column>
+      <el-table-column label="入库人" prop="createUserName"></el-table-column>
       <el-table-column label="入库时间" prop="createTime"></el-table-column>
     </el-table>
     <Pagination