huang_an 2 лет назад
Родитель
Сommit
d8387eb67e
1 измененных файлов с 25 добавлено и 27 удалено
  1. 25 27
      src/views/warehouseManagement/stockManagement/details.vue

+ 25 - 27
src/views/warehouseManagement/stockManagement/details.vue

@@ -111,7 +111,7 @@
             <div class="mt10">
             <div class="mt10">
               <el-table
               <el-table
                 ref="multipleTable"
                 ref="multipleTable"
-                :data="warehousingMaterialList"
+                :data="warehousingMaterialList.ledgers"
                 tooltip-effect="dark"
                 tooltip-effect="dark"
                 :key="infoData.assetType"
                 :key="infoData.assetType"
                 style="width: 100%"
                 style="width: 100%"
@@ -201,14 +201,14 @@
                   :show-overflow-tooltip="true"
                   :show-overflow-tooltip="true"
                 >
                 >
                   <template slot-scope="{ row, $index }">
                   <template slot-scope="{ row, $index }">
-                    {{
-                      calcSum(
-                        row.outInNum,
-                        row.measurementUnit,
-                        row.univalence,
-                        row
-                      )
-                    }}
+                    <!-- // calcSum(
+                      //   row.outInNum,
+                      //   row.univalenceUnit,
+                      //   row.univalence,
+                      //   row
+                      // ) -->
+                    {{ row.univalence }}
+                    {{ row.univalenceUnit }}
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
@@ -234,9 +234,7 @@
                   :show-overflow-tooltip="true"
                   :show-overflow-tooltip="true"
                 >
                 >
                   <template slot-scope="{ row, $index }">
                   <template slot-scope="{ row, $index }">
-                    {{ row.warehouseName }}-{{ row.areaName }}-{{
-                      row.shelfCode
-                    }}-{{ row.cargoSpaceCode }}
+                    {{ row.position }}
                   </template>
                   </template>
                 </el-table-column>
                 </el-table-column>
               </el-table>
               </el-table>
@@ -332,7 +330,7 @@
       return {
       return {
         auditStatus,
         auditStatus,
         infoData: {},
         infoData: {},
-        warehousingMaterialList: [],
+        warehousingMaterialList: {},
         tableData2: [],
         tableData2: [],
         activeName: 'a',
         activeName: 'a',
         num: 1,
         num: 1,
@@ -384,20 +382,21 @@
     },
     },
     computed: {
     computed: {
       ...mapGetters(['getDictValue']),
       ...mapGetters(['getDictValue']),
-      // curDateType() {
-      //   return this.materialCodeReqList[0]?.manufactureTime
-      //     ? 'manufactureTime'
-      //     : 'procurementTime';
-      // },
-      // tableHeader() {
-      //   return tableHeader(this.infoData.assetType);
-      // },
-      // emergencyState() {
-      //   return useDict(emergencyState)(this.infoData.emergencyState);
-      // },
+      curDateType() {
+        console.log(this.materialCodeReqList[0]);
+        return this.materialCodeReqList[0].manufactureTime
+          ? 'manufactureTime'
+          : 'procurementTime';
+      },
+      tableHeader() {
+        return tableHeader(this.infoData.assetType);
+      },
+      emergencyState() {
+        return useDict(emergencyState)(this.infoData.emergencyState);
+      },
       // 条码信息
       // 条码信息
       materialCodeReqList() {
       materialCodeReqList() {
-        return this.warehousingMaterialList.flat();
+        return this.warehousingMaterialList.warehouseLedgerDetails;
       }
       }
     },
     },
     created() {
     created() {
@@ -426,8 +425,7 @@
         const res = await outin.getWms(this.$route.query.id);
         const res = await outin.getWms(this.$route.query.id);
         if (res) {
         if (res) {
           this.infoData = res.inOutVO;
           this.infoData = res.inOutVO;
-          this.warehousingMaterialList =
-            res.warehouseLedgerInfos.warehouseLedgerDetails;
+          this.warehousingMaterialList = res.warehouseLedgerInfos;
         }
         }
       },
       },
       calcSum(a, b, c, row) {
       calcSum(a, b, c, row) {