add

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -748,7 +748,8 @@
                 count: item.outInNum,
                 minPackingCount: item.selfSum,
                 packingCount: item.outInNum,
-                outInDetailRecordAddPOList: item.warehouseLedgerDetails
+                outInDetailRecordAddPOList: item.warehouseLedgerDetails,
+                ...item
                 // position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                 // // pathIds: item.categoryLevelPathId.toString(),
 
@@ -758,6 +759,8 @@
               };
             });
             arr.forEach((item) => {
+              delete item.id;
+              delete item.warehouseLedgerDetails;
               if (item.outInDetailRecordAddPOList.length > 0) {
                 let list = item.outInDetailRecordAddPOList.map((it) => {
                   return {

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -96,12 +96,9 @@
                 </el-table-column>
                 <el-table-column
                   label="物品编码"
-                  prop="assetCode"
-                ></el-table-column>
-                <el-table-column
-                  label="物品名称"
-                  prop="assetName"
+                  prop="categoryCode"
                 ></el-table-column>
+                <el-table-column label="物品名称" prop="name"></el-table-column>
 
                 <el-table-column
                   v-for="(item, index) in tableHeader"
@@ -123,7 +120,7 @@
                       <el-col :span="9" v-if="!row.isUnpack">
                         <el-input type="text" disabled :value="row.outInNum">
                           <template slot="append">
-                            {{ row.minPackUnit }}
+                            {{ row.measuringUnit }}
                           </template>
                         </el-input>
                       </el-col>
@@ -159,7 +156,10 @@
 
         <div class="mt20">
           <header-title
-            :title="`${getDictValue('类型用途', infoData.assetType)}明细`"
+            :title="`${getDictValue(
+              '类型用途',
+              infoData.extInfo.assetType
+            )}明细`"
             size="16px"
           ></header-title>
           <el-table
@@ -173,13 +173,13 @@
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
             <el-table-column
-              :label="`${getDictValue('类型用途', infoData.assetType)}编码`"
-              prop="onlyCode"
-            ></el-table-column>
-            <el-table-column
-              label="批次号"
-              prop="sourceBatchNo"
+              :label="`${getDictValue(
+                '类型用途',
+                infoData.extInfo.assetType
+              )}编码`"
+              prop="code"
             ></el-table-column>
+            <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column label="生产日期" width="200">
               <template slot-scope="{ row }">
                 <span v-if="row.dateType === 2">
@@ -197,8 +197,8 @@
             <el-table-column align="center" label="最小包装单元">
               <template slot-scope="{ row, $index }">
                 <template v-if="!row.isUnpack">
-                  {{ row.measurementUnit }}{{ row.unit }}/{{
-                    row.minPackUnit
+                  {{ row.measurementUnit }}{{ row.measuringUnit }}/{{
+                    row.packingUnit
                   }}</template
                 >
               </template>
@@ -207,12 +207,13 @@
               label="包装编码"
               prop="packageNo"
             ></el-table-column>
-            <el-table-column label="领料部门" prop="position"></el-table-column>
+            <el-table-column label="领料部门" prop=""></el-table-column>
             <el-table-column label="货位" prop="">
               <template slot-scope="{ row }">
-                {{ row.warehouseName }}-{{ row.areaName }}-{{
+                <!-- {{ row.warehouseName }}-{{ row.areaName }}-{{
                   row.shelfCode
-                }}-{{ row.cargoSpaceCode }}
+                }}-{{ row.cargoSpaceCode }} -->
+                {{ row.position }}
               </template>
             </el-table-column>
             <el-table-column label="转消耗" prop="">
@@ -340,9 +341,9 @@
       getSceneState: useDictLabel(outputSceneState),
       getAuditStatus: useDictLabel(auditStatus),
       async _getInfo() {
-        const res = await outin.getWms(this.$route.query.id);
+        const res = await outin.getById(this.$route.query.id);
         console.log(res);
-        this.infoData = res.inOutVO;
+        this.infoData = res;
         if (res) {
           // this.warehousingMaterialList = res.warehouseLedgerInfos.map(
           //   (item) => {
@@ -359,10 +360,20 @@
           //     return item;
           //   }
           // );
-          this.warehousingMaterialList = res.warehouseLedgerInfos.ledgers;
-          this.materialCodeReqList =
-            res.warehouseLedgerInfos.warehouseLedgerDetails;
-          console.log('sasa', res.warehouseLedgerInfos.ledgers);
+          this.warehousingMaterialList = res.outInDetailVOList;
+          // this.materialCodeReqList =
+          //   res.warehouseLedgerInfos.warehouseLedgerDetails;
+          let arr = [];
+          for (const key in res.outInDetailVOList) {
+            for (const k in res.outInDetailVOList[key]
+              .outInDetailRecordVOList) {
+              arr.push({
+                ...res.outInDetailVOList[key].outInDetailRecordVOList[k]
+              });
+            }
+          }
+          this.materialCodeReqList = arr;
+          // console.log('qwqwqw', arr);
           // res.warehouseLedgerInfos.ledgers;
           // .map((i) =>
           //   (i.outInDetailRecordVOList || []).map((item) => ({