huang_an 2 éve
szülő
commit
6c360d4643

+ 94 - 71
src/views/warehouseManagement/stockLedger/allBatchDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page">
-<!--    <div class="page-title">
+    <!--    <div class="page-title">
       <PageHeader
         :title="`${baseInfo.assetCode || ''} ${baseInfo.assetName || ''}`"
       ></PageHeader>
@@ -8,13 +8,15 @@
     <div class="content-detail">
       <el-tabs v-model="activeName">
         <el-tab-pane label="基本信息" name="zero">
-          <BaseInfo :baseInfo="baseInfo"></BaseInfo>
+          <BaseInfo ref="baseInfoRef" :baseInfo="baseInfo"></BaseInfo>
+          <warehouseConfigVue ref="warehouseConfigRef"></warehouseConfigVue>
         </el-tab-pane>
         <el-tab-pane label="库存明细" name="first">
           <WarehouseDetail
             v-if="activeName == 'first'"
             :baseInfo="baseInfo"
             :baseParams="baseParams"
+            :stockList="stockList"
           ></WarehouseDetail>
         </el-tab-pane>
         <el-tab-pane label="批次明细" name="sixth" lazy>
@@ -56,85 +58,106 @@
 </template>
 
 <script>
-// import PageHeader from '@/components/PageHeader'
-import BaseInfo from './components/details/BaseInfo.vue'
-import OutWarehouse from './components/details/OutWarehouse.vue'
-import InWarehouse from './components/details/InWarehouse.vue'
-import ReportLoss from './components/details/ReportLoss.vue'
-import InventoryAllocation from './components/details/InventoryAllocation.vue'
-import WarehouseDetail from './components/details/WarehouseDetail.vue'
-import BatchDetail from './components/details/BatchDetail.vue'
+  // import PageHeader from '@/components/PageHeader'
+  import BaseInfo from './components/details/BaseInfo.vue';
+  import OutWarehouse from './components/details/OutWarehouse.vue';
+  import InWarehouse from './components/details/InWarehouse.vue';
+  import ReportLoss from './components/details/ReportLoss.vue';
+  import InventoryAllocation from './components/details/InventoryAllocation.vue';
+  import WarehouseDetail from './components/details/WarehouseDetail.vue';
+  import BatchDetail from './components/details/BatchDetail.vue';
+  import warehouseConfigVue from './components/details/warehouseConfig.vue';
 
-export default {
-  components: {
-    // PageHeader,
-    BaseInfo,
-    InWarehouse,
-    OutWarehouse,
-    InventoryAllocation,
-    ReportLoss,
-    BatchDetail,
-    WarehouseDetail
-  },
-  data () {
-    return {
-      activeName: 'zero',
-      tableData: {
-        first: [],
-        second: [],
-        third: [],
-        fourth: [],
-        fifth: []
-      },
-      certificate: ''
-    }
-  },
-  computed: {
-    dimension () {
-      return this.$route.query.dimension
+  import { getDetails } from '@/api/classifyManage/itemInformation';
+  import outin from '@/api/warehouseManagement/outin';
+
+  export default {
+    components: {
+      // PageHeader,
+      BaseInfo,
+      InWarehouse,
+      OutWarehouse,
+      InventoryAllocation,
+      ReportLoss,
+      BatchDetail,
+      WarehouseDetail,
+      warehouseConfigVue
     },
-    baseInfo () {
-      return ( {}
+    data() {
+      return {
+        stockList: [],
+        activeName: 'zero',
+        tableData: {
+          first: [],
+          second: [],
+          third: [],
+          fourth: [],
+          fifth: []
+        },
+        certificate: ''
+      };
+    },
+    computed: {
+      dimension() {
+        return this.$route.query.dimension;
+      },
+      baseInfo() {
+        return {};
         // this.$store.state.stockManagement.stockLedgerBaseInfo[
         //   this.$route.query.key
         // ] || {}
-      )
+      },
+      baseParams() {
+        return {
+          // inventoryCode: this.baseInfo.assetCode
+          // // name: this.baseInfo.assetName,
+          // // warehousingType: _warehousingType(this.baseInfo.assetType)
+          // //   .warehousingType,
+        };
+      }
     },
-    baseParams () {
-      return {
-        // inventoryCode: this.baseInfo.assetCode
-		
-		
-        // // name: this.baseInfo.assetName,
-        // // warehousingType: _warehousingType(this.baseInfo.assetType)
-        // //   .warehousingType,
+    created() {
+      this.getDetailInfo(this.$route.query);
+    },
+    methods: {
+      async getDetailInfo(row) {
+        console.log('===', row);
+        const res = await getDetails(row.id);
+        this.$nextTick(() => {
+          console.log(res);
+          this.$refs.baseInfoRef.getDetailInfoAugr(res.category); //基本信息
+          this.$refs.warehouseConfigRef.getDetailInfoAugr(res.categoryWms);
+        });
+        const rep = await outin.getInventoryDetails({
+          pageNum: 1,
+          size: -1,
+          categoryId: row.id
+        });
+        console.log('===', rep);
+        this.stockList = rep.list;
       }
     }
-  },
-  created () {},
-  methods: {}
-}
+  };
 </script>
 
 <style lang="scss" scoped>
-.page {
-  background: #fff;
-  padding: 10px;
-  margin: 10px 0 10px 0;
-  height: calc(100vh - 80px);
-  padding: 10px;
-  overflow-y: auto;
-}
-.page-title {
-}
-.content-detail {
-  padding: 20px;
-}
-
-.certificate {
-  height: 65vh;
-  display: block;
-  margin: 10px auto;
-}
+  .page {
+    background: #fff;
+    padding: 10px;
+    margin: 10px 0 10px 0;
+    height: calc(100vh - 80px);
+    padding: 10px;
+    overflow-y: auto;
+  }
+  .page-title {
+  }
+  .content-detail {
+    padding: 20px;
+  }
 
+  .certificate {
+    height: 65vh;
+    display: block;
+    margin: 10px auto;
+  }
 </style>

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

@@ -12,7 +12,7 @@
         width="200px"
       ></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="code"></el-table-column>
       <el-table-column label="名称" prop="assetName"></el-table-column>
       <el-table-column label="牌号" prop="brandNum"></el-table-column>
       <el-table-column label="型号" prop="modelType"></el-table-column>