add

src/views/warehouseManagement/common.js

@@ -1,41 +1,46 @@
-export const tableHeader = selectEquiType => {
+export const tableHeader = (selectEquiType) => {
   switch (+selectEquiType) {
     case 3:
-      return [{ label: '牌号', prop: 'brandNum' }]
+      return [{ label: '牌号', prop: 'brandNum' }];
     case 8:
       return [
         { label: '型号', prop: 'modelType' },
         { label: '规格', prop: 'specification' }
-      ]
+      ];
     case 4:
       return [
         { label: '牌号', prop: 'brandNum' },
         { label: '型号', prop: 'modelType' }
-      ]
+      ];
+    case 9:
+      return [
+        { label: '牌号', prop: 'brandNum' },
+        { label: '型号', prop: 'modelType' }
+      ];
     case 5: //'周转车'
       return [
         { label: '规格', prop: 'specification' },
         {
           label: '材质',
           prop: 'texture',
-          formatter (row) {
-            if (!row?.extendField) return ''
-            const extendField = JSON.parse(row.extendField)
-            return extendField.texture
+          formatter(row) {
+            if (!row?.extendField) return '';
+            const extendField = JSON.parse(row.extendField);
+            return extendField.texture;
           }
         },
         {
           label: '长宽高',
           prop: '',
-          formatter (row) {
-            if (!row?.extendField) return ''
-            const extendField = JSON.parse(row.extendField)
+          formatter(row) {
+            if (!row?.extendField) return '';
+            const extendField = JSON.parse(row.extendField);
             return `${extendField.length || '-'}*${extendField.width || '-'}*${
               extendField.high || '-'
-            }`
+            }`;
           }
         }
-      ]
+      ];
     case 2: //'舟皿'
       return [
         { label: '规格', prop: 'specification' },
@@ -43,20 +48,20 @@ export const tableHeader = selectEquiType => {
         {
           label: '长宽高',
           prop: '',
-          formatter (row) {
-            if (!row?.extendField) return ''
-            const extendField = JSON.parse(row.extendField)
+          formatter(row) {
+            if (!row?.extendField) return '';
+            const extendField = JSON.parse(row.extendField);
             return `${extendField.length || '-'}*${extendField.width || '-'}*${
               extendField.high || '-'
-            }`
+            }`;
           }
         }
-      ]
+      ];
     case 1: //'设备'
       return [
         { label: '型号', prop: 'modelType' },
         { label: '规格', prop: 'specification' }
-      ]
+      ];
     case 6: //'模具'
       return [
         { label: '牌号', prop: 'brandNum' },
@@ -64,19 +69,19 @@ export const tableHeader = selectEquiType => {
         {
           label: '收缩系数',
           prop: '',
-          formatter (row) {
-            if (!row?.extendField) return ''
-            const extendField = JSON.parse(row.extendField)
-            return extendField.shrinkageCoefficient
+          formatter(row) {
+            if (!row?.extendField) return '';
+            const extendField = JSON.parse(row.extendField);
+            return extendField.shrinkageCoefficient;
           }
         }
-      ]
+      ];
     case 7: //'备品备件'
       return [
         { label: '规格', prop: 'specification' },
         { label: '型号', prop: 'modelType' }
-      ]
+      ];
   }
 
-  return []
-}
+  return [];
+};

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -114,6 +114,7 @@
           dimension: 1
         },
         isShow: false,
+        isPack: false,
         selectedDime: 1
       };
     },
@@ -157,7 +158,7 @@
             sortable: 'custom',
             showOverflowTooltip: true,
             width: 130,
-            align: 'right'
+            align: 'center'
           },
           {
             prop: 'minUnit',
@@ -170,7 +171,7 @@
             sortable: 'custom',
             showOverflowTooltip: true,
             width: 130,
-            align: 'right'
+            align: 'center'
           },
           {
             prop: 'measuringUnit',
@@ -243,12 +244,21 @@
             obj.splice(index, 1);
           }
         }
+        if (this.isPack) {
+          obj.splice(1, 0, {
+            slot: 'batchNum',
+            prop: 'batchNum',
+            label: '批次号',
+            showOverflowTooltip: true
+          });
+        }
         return obj;
       }
     },
     methods: {
       handledime(val) {
         this.$set(this, 'isShow', val == 2);
+        this.$set(this, 'isPack', val == 3);
         // this.reload({
         //   ...this.$refs.refSeavch.params,
         //   dimension: this.$refs.refSeavch.dimension
@@ -297,12 +307,13 @@
             size: limit,
             dimension: dimension
           });
-          return data.then((res) => {
-            let item = res.list.map((item) => {
-              return { ...item, paths: item.pathName.split(',')[0] };
-            });
-            return item;
-          });
+          return data;
+          // data.then((res) => {
+          //   let item = res.list.map((item) => {
+          //     return { ...item, paths: item.pathName.split(',')[0] };
+          //   });
+          //   return item;
+          // });
         } else if (this.selectedDime == 2) {
           const params = {
             categoryLevelId: treeId,
@@ -316,12 +327,13 @@
             size: limit
           });
 
-          return data.then((res) => {
-            let item = res.list.map((item) => {
-              return { ...item, minUnit: item.packingUnit };
-            });
-            return item;
-          });
+          return data;
+          // data.then((res) => {
+          //   let item = res.list.map((item) => {
+          //     return { ...item, minUnit: item.packingUnit };
+          //   });
+          //   return item;
+          // });
         } else {
           const params = {
             categoryLevelId: treeId,
@@ -334,16 +346,18 @@
             page: page,
             size: limit
           });
-          return data.then((res) => {
-            let item = res.list.map((item) => {
-              return {
-                ...item,
-                minUnit: item.packingUnit,
-                paths: item.pathName.split(',')[0]
-              };
-            });
-            return item;
-          });
+          return data;
+          // return data.then((res) => {
+          //   let item = res.list.map((item) => {
+          //     return {
+          //       ...item,
+          //       minUnit: item.packingUnit,
+          //       paths: item.pathName.split(',')[0]
+          //     };
+          //   });
+          //   console.log('item', item);
+          //   return item;
+          // });
         }
       },
       /* 刷新表格 */

src/views/warehouseManagement/stockManagement/add.vue

@@ -357,12 +357,12 @@
                 label="编码"
                 prop="assetCode"
                 align="center"
-                width="150"
+                width="130"
               ></el-table-column>
               <el-table-column
                 label="名称"
                 align="center"
-                width="150"
+                width="200"
                 prop="assetName"
               ></el-table-column>
 
@@ -424,7 +424,7 @@
               <el-table-column
                 label="批次号"
                 prop="batchNo"
-                width="150"
+                width="70"
                 align="center"
               >
                 <template slot-scope="{ row, $index }">
@@ -495,10 +495,7 @@
                   >
                     <el-input
                       v-model="row.outInNum"
-                      @input="
-                        (value) =>
-                          (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''))
-                      "
+                      @input="packNum(row, $event)"
                     >
                       <template slot="append">
                         {{ row.minPackUnit ? row.minPackUnit : '/' }}
@@ -515,20 +512,21 @@
               <el-table-column
                 label="计量单位"
                 prop="batchNo"
-                width="150"
+                width="100"
                 align="center"
-                v-if="formData.extInfo.assetType == 1"
               >
+                <!-- v-if="formData.extInfo.assetType == 1" -->
+
                 <template slot-scope="{ row, $index }">
                   <template>
                     {{ row.measuringUnit }}
                   </template>
                 </template>
               </el-table-column>
-              <el-table-column
+              <!-- <el-table-column
                 label="计量单位"
                 prop="batchNo"
-                width="150"
+                width="100"
                 align="center"
                 v-if="formData.extInfo.assetType == 4"
               >
@@ -537,7 +535,7 @@
                     {{ row.measuringUnit }}
                   </template>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
 
               <!-- <el-table-column
                 label="数量"
@@ -572,7 +570,7 @@
               >
                 <!-- v-if="formData.extInfo.assetType == 1" -->
                 <template slot-scope="{ row, $index }">
-                  {{ weightTotal(row) }}
+                  {{ row.weight }}
                   <template slot="append">
                     {{ handleRowUnit(row) }}
                     <!-- {{
@@ -755,13 +753,17 @@
         <div class="mt20">
           <header-title :title="`包装明细`">
             <div class="switch_right">
-              拆分物料明细<el-switch
-                v-model="isDetail"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-                @change="handleIsDetail"
-              >
-              </el-switch>
+              <span v-if="materialCodeReqList.length != 0">
+                分拆<el-switch
+                  v-model="isDetail"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  @change="handleIsDetail"
+                  style="margin-left: 10px"
+                >
+                </el-switch>
+              </span>
+
               <el-button
                 style="margin-left: 20px"
                 type="text"
@@ -795,14 +797,31 @@
             </el-table-column>
             <el-table-column label="序号" type="index" width="50">
             </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="batchNo"></el-table-column>
+            <el-table-column
+              label="编码"
+              prop="assetCode"
+              width="130"
+            ></el-table-column>
+            <el-table-column
+              label="名称"
+              prop="assetName"
+              width="150"
+            ></el-table-column>
+            <el-table-column
+              label="批次号"
+              prop="batchNo"
+              width="70"
+            ></el-table-column>
             <el-table-column
               :label="`包装编码`"
               prop="onlyCode"
+              width="130"
+            ></el-table-column>
+            <el-table-column
+              label="包装数量"
+              prop="packingCount"
+              width="80"
             ></el-table-column>
-            <el-table-column label="包装数量" prop="packNum"></el-table-column>
             <el-table-column
               label="包装单位"
               prop="packingUnit"
@@ -821,7 +840,11 @@
               prop="materielCode"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.materielCode"></el-input>
+                <el-input
+                  v-if="!row.isPack"
+                  v-model="row.materielCode"
+                ></el-input>
+                <span v-else>{{ row.materielCode }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -830,7 +853,11 @@
               prop="clientCode"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.clientCode"></el-input>
+                <el-input
+                  v-if="!row.isPack"
+                  v-model="row.clientCode"
+                ></el-input>
+                <span v-else> {{ row.clientCode }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -839,16 +866,19 @@
               prop="engrave"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.engrave"></el-input>
+                <el-input v-if="!row.isPack" v-model="row.engrave"></el-input>
+                <span v-else>{{ row.engrave }}</span>
               </template>
             </el-table-column>
             <el-table-column
               v-if="formData.bizType == 2 || formData.bizType == 1"
               label="重量"
               prop="weight"
+              width="100"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight"></el-input>
+                <el-input v-if="!row.isPack" v-model="row.weight"></el-input>
+                <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -857,11 +887,7 @@
               prop="weightUtil"
             >
               <template slot-scope="{ row }">
-                <DictSelection
-                  dictName="重量单位"
-                  clearable
-                  v-model="row.weightUtil"
-                />
+                {{ row.weightUtil }}
               </template>
             </el-table-column>
 
@@ -889,6 +915,7 @@
                 </template>
                 <el-date-picker
                   v-else
+                  :disabled="row.ispack"
                   size="small"
                   v-model="row[curDateType]"
                   type="datetime"
@@ -910,6 +937,13 @@
                 width="200"
               ></el-table-column>
             </template>
+            <el-table-column label="操作" width="80">
+              <template slot-scope="{ row }">
+                <el-button type="text" @click="packCout(row)">
+                  {{ !row.isPack ? '保存' : '编辑' }}
+                </el-button>
+              </template>
+            </el-table-column>
           </el-table>
           <!-- </el-tab-pane>
         </el-tabs> -->
@@ -918,7 +952,7 @@
           <header-title :title="`物料明细`"> </header-title>
           <el-table
             ref="multipleTable"
-            :data="materialCodeReqList"
+            :data="resultArray"
             tooltip-effect="dark"
             :key="formData.bizType"
             :header-cell-style="rowClass"
@@ -930,18 +964,33 @@
             <el-table-column label="序号" type="index" width="50">
             </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="batchNo"></el-table-column>
+            <el-table-column
+              label="名称"
+              prop="assetName"
+              width="200"
+            ></el-table-column>
+            <el-table-column
+              label="批次号"
+              prop="batchNo"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="物料编码"
+              prop="no"
+              width="200"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="minPackingCount"
+              width="90"
             ></el-table-column>
             <el-table-column
+              width="80"
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
             <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
+              v-if="formData.bizType == 2"
               label="物料代号"
               prop="materielCode"
             >
@@ -959,49 +1008,33 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量"
-              prop="weight"
+              v-if="formData.bizType == 1"
+              label="刻码"
+              prop="engrave"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight"></el-input>
+                <el-input v-model="row.engrave"></el-input>
               </template>
             </el-table-column>
             <el-table-column
+              width="100"
               v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量单位"
-              prop="weightUtil"
+              label="重量"
+              prop="weight"
             >
               <template slot-scope="{ row }">
-                <DictSelection
-                  dictName="重量单位"
-                  clearable
-                  v-model="row.weightUtil"
-                />
+                <el-input v-model="row.weight"></el-input>
               </template>
             </el-table-column>
             <el-table-column
-              v-if="formData.bizType == 1"
-              label="刻码"
-              prop="engrave"
+              v-if="formData.bizType == 2 || formData.bizType == 1"
+              label="重量单位"
+              prop="weightUnit"
             >
               <template slot-scope="{ row }">
-                <el-input v-model="row.engrave"></el-input>
+                {{ row.weightUnit }}
               </template>
             </el-table-column>
-
-            <el-table-column label="最小包装单元" prop="modelType">
-              <el-table-column label="" prop="minPackingCount" width="100">
-                <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount }}
-                </template>
-              </el-table-column>
-              <el-table-column label="" prop="minPackingCount">
-                <template slot-scope="{ row, $index }">
-                  {{ handleRowUnit(row) }} /{{ row.minPackUnit }}
-                </template>
-              </el-table-column>
-            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -1091,6 +1124,7 @@
     },
     data() {
       return {
+        resultArray: [],
         isDetail: false,
         contactList: [],
         pickerRow: {},
@@ -1183,7 +1217,68 @@
     methods: {
       handleIsDetail(event) {
         if (event) {
+          const list = this.materialCodeReqList;
+          console.log(list);
+          let resultArray = [];
+          list.forEach((item) => {
+            for (let i = 1; i <= Number(item.minPackingCount); i++) {
+              resultArray.push({
+                onlyCode: item.onlyCode,
+                no: item.onlyCode + i.toString().padStart(4, '0'),
+                assetCode: item.assetCode,
+                assetName: item.assetName,
+                batchNo: item.batchNo,
+                minPackingCount: 1,
+                measuringUnit: item.measuringUnit,
+                materielCode: item.materielCode,
+                clientCode: item.clientCode,
+                weight: item.netWeight,
+                weightUnit: item.weightUnit
+              });
+            }
+          });
+          this.resultArray = resultArray;
+        } else {
+          this.resultArray = [];
+        }
+      },
+      //包装明细保存
+      packCout(row) {
+        console.log(row);
+        console.log('is', !row.isPack);
+        //true保存==》反之
+        if (!row.isPack) {
+          row.isPack = true;
+          const code = row.assetCode;
+          const list = this.warehousingMaterialList;
+          this.warehousingMaterialList.forEach((item) => {
+            if (item.assetCode == code) {
+              // item.
+            }
+          });
+          // for (const k in list) {
+          //   if (list[k].assetCode == code) {
+          //     const weight = this.weightTotal(list[k]);
+          //     console.log('we', weight);
+          //     console.log('当前重量', list[k]);
+          //   }
+          // }
+        } else {
+          row.isPack = false;
+        }
+      },
+      packNum(row, value) {
+        const total = {
+          packingCount: Number(row.minPackingCount),
+          outInNum: Number(row.outInNum)
+        };
+        if (row.measuringUnit == row.weightUnit) {
+          row.weight = total.packingCount * 1 * total.outInNum.toFixed(2);
+        } else {
+          const totals = total.packingCount * total.outInNum;
+          row.weight = totals * row.netWeight.toFixed(2);
         }
+        return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));
       },
       async searchContact(id) {
         const data = await contactlink({ contactId: id });
@@ -1236,28 +1331,18 @@
           return row;
         }
       },
-      //计算重量
-      weightTotal(row) {
-        console.log(row);
-        const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
-        };
-        if (row.measuringUnit == row.weightUnit) {
-          return total.packingCount * total.outInNum * 1;
-        } else {
-          const totals = total.packingCount * total.outInNum;
-          return totals * row.netWeight;
-        }
-      },
+
       //计算金额
       calcSumTotal(PackingCount, outInNum, univalence) {
         //最小包装单元,包装数量,单价
         const total = {
           PackingCount: Number(PackingCount),
           outInNum: Number(outInNum),
-          univalence: Number(univalence)
+          univalence: Number(univalence == undefined ? 0 : univalence)
         };
+        console.log(PackingCount);
+        console.log(outInNum);
+        console.log(univalence);
         return total.PackingCount * total.outInNum * total.univalence;
       },
       handleRowUnit(row) {
@@ -1510,6 +1595,8 @@
       //入库明细删除
       listDel(row, index) {
         this.warehousingMaterialList.splice(index, 1);
+        this.resultArray = [];
+        this.isDetail = false;
       },
       // 入库明细生成条码信息
       async createMaterialCode(row) {
@@ -1601,13 +1688,23 @@
               if (item.warehouseLedgerDetails?.length) {
                 item.warehouseLedgerDetails.forEach((i, index) => {
                   this.$set(i, 'num', num);
-                  this.$set(i, 'weight', item.netWeight);
+                  if (item.measuringUnit == item.weightUnit) {
+                    this.$set(i, 'weight', item.minPackingCount);
+                  } else {
+                    this.$set(
+                      i,
+                      'weight',
+                      1 * item.minPackingCount * item.netWeight
+                    );
+                  }
+
                   this.$set(i, 'weightUtil', item.weightUnit);
 
-                  this.$set(i, 'packNum', 1);
+                  this.$set(i, 'packingCount', 1);
                   this.$set(i, 'packingUnit ', item.packingUnit);
                   this.$set(i, 'minPackingCount ', item.minPackingCount);
                   this.$set(i, 'measuringUnit', item.measuringUnit);
+                  this.$set(i, 'isPack', false);
 
                   if (!item.isUnpack) {
                     if (index < item.warehouseLedgerDetails.length - 1) {
@@ -1769,7 +1866,7 @@
                   this.warehousingMaterialList[key].houseList[k].num;
               }
             }
-            console.log('===', this.warehousingMaterialList);
+            console.log('===123', this.warehousingMaterialList);
             let arr = this.warehousingMaterialList.map((item) => {
               return {
                 num: item.num,
@@ -1794,7 +1891,8 @@
                   item.outInNum * item.minPackingCount * item.univalence,
                 weightUnit: item.weightUnit,
                 customCode: item.customCode,
-                supplierCode: item.supplierCode
+                supplierCode: item.supplierCode,
+                weight: item.weight
               };
             });
             arr.forEach((item) => {
@@ -1814,7 +1912,9 @@
                     materielCode: it.materielCode,
                     weight: it.weight,
                     weightUtil: it.weightUtil,
-                    engrave: it.engrave
+                    engrave: it.engrave,
+                    materialDetails: this.materialDetails(it.onlyCode),
+                    packingCount: it.packingCount
                   };
                 });
                 item.outInDetailRecordAddPOList = list;
@@ -1838,6 +1938,9 @@
           }
         });
       },
+      materialDetails(onlyCode) {
+        return this.resultArray.filter((item) => item.onlyCode === onlyCode);
+      },
       async getOrderCode() {
         const data = await getCode('in_warehouse');
         return data;

src/views/warehouseManagement/stockManagement/details.vue

@@ -118,7 +118,7 @@
           </div>
         </div>
         <div class="content-detail mt20">
-          <header-title title="入库信息" size="16px"></header-title>
+          <header-title title="物品信息" size="16px"></header-title>
 
           <div class="mt20">
             <div class="mt10">
@@ -134,7 +134,7 @@
                 <el-table-column label="序号" type="index" width="50">
                 </el-table-column>
                 <el-table-column
-                  label="物品编码"
+                  label="编码"
                   prop="categoryCode"
                   align="center"
                   width="150"
@@ -163,7 +163,7 @@
                 <el-table-column
                   label="批次号"
                   prop="batchNo"
-                  width="150"
+                  width="70"
                   align="center"
                 >
                 </el-table-column>
@@ -171,7 +171,7 @@
                   label="最小包装单元"
                   align="center"
                   prop="minPackingCount"
-                  width="100"
+                  width="300"
                 >
                   <!-- <el-table-column label="" prop="measurementUnit" width="100">
                     <template slot-scope="{ row, $index }">
@@ -182,18 +182,20 @@
                     label=""
                     prop="measurementUnit"
                     align="center"
+                    width="110"
                   >
                     <template slot-scope="{ row, $index }">
-                      {{ row.minPackingCount }} {{ handleRowUnit(row) }} /{{
+                      {{ row.minPackingCount }} {{ row.measuringUnit }} /{{
                         row.packingUnit
                       }}
                     </template>
                   </el-table-column>
                 </el-table-column>
+
                 <el-table-column
                   label="包装数量"
                   prop="packingCount"
-                  width="150"
+                  width="100"
                   align="center"
                 >
                   <template slot-scope="{ row, $index }">
@@ -201,148 +203,83 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="总数"
-                  prop="count"
-                  width="150"
-                  align="center"
-                >
-                  <template slot-scope="{ row, $index }">
-                    {{ row.count }}/{{ handleRowUnit(row) }}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="单价"
-                  prop="univalence"
-                  width="150"
-                  align="center"
-                  v-if="extInfo.assetType == 1"
-                >
-                  <template slot-scope="{ row }">
-                    <template>
-                      {{ row.price + '元' }}/{{ row.weightUnit }}
-                      <!-- {{ { yuan: '元', wanyuan: '万元' }[row.univalenceUnit] }} -->
-                    </template>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="单价"
-                  prop="univalence"
-                  width="150"
-                  align="center"
-                  v-if="extInfo.assetType == 4"
-                >
-                  <template slot-scope="{ row }">
-                    <template>
-                      {{ row.price + '元' }}/{{ row.measuringUnit }}
-                      <!-- {{ { yuan: '元', wanyuan: '万元' }[row.univalenceUnit] }} -->
-                    </template>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="金额"
-                  align="center"
-                  prop="contentImage"
-                  :show-overflow-tooltip="true"
-                >
-                  <template slot-scope="{ row, $index }">
-                    <!-- // calcSum(
-                      //   row.outInNum,
-                      //   row.univalenceUnit,
-                      //   row.univalence,
-                      //   row
-                      // ) -->
-                    {{ row.totalMoney }}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="数量"
+                  label="计量数量"
                   prop="batchNo"
-                  width="150"
-                  align="center"
-                  v-if="extInfo.assetType == 1"
-                >
-                  <template slot-scope="{ row, $index }">
-                    <template> {{ row.packingCount }} </template>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="数量"
-                  prop="batchNo"
-                  width="150"
+                  width="100"
                   align="center"
-                  v-if="extInfo.assetType == 4"
                 >
                   <template slot-scope="{ row, $index }">
                     <template>
-                      {{ row.packingCount }}
+                      {{ row.minPackingCount * row.packingCount }}
                     </template>
                   </template>
                 </el-table-column>
                 <el-table-column
                   label="计量单位"
                   prop="batchNo"
-                  width="150"
+                  width="100"
                   align="center"
-                  v-if="extInfo.assetType == 1"
                 >
                   <template slot-scope="{ row, $index }">
                     <template>
-                      {{ row.minPackUnit }}
+                      {{ row.measuringUnit }}
                     </template>
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="计量单位"
-                  prop="batchNo"
-                  width="150"
+                  label="重量"
+                  prop="count"
+                  width="100"
                   align="center"
-                  v-if="extInfo.assetType == 4"
                 >
                   <template slot-scope="{ row, $index }">
-                    <template>
-                      {{ row.measuringUnit }}
-                    </template>
+                    {{ row.weight }}
                   </template>
                 </el-table-column>
-
                 <el-table-column
-                  label="重量"
+                  label="重量单位"
+                  prop="count"
+                  width="100"
                   align="center"
-                  prop="contentImage"
-                  :show-overflow-tooltip="true"
-                  v-if="extInfo.assetType == 1"
                 >
                   <template slot-scope="{ row, $index }">
-                    <!-- {{ weightTotal(row.outInNum, row.minPackingCount) }} -->
+                    {{ row.weightUnit }}
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="重量"
+                  label="单价"
+                  prop="univalence"
+                  width="100"
                   align="center"
-                  prop="contentImage"
-                  :show-overflow-tooltip="true"
-                  v-if="extInfo.assetType == 4"
                 >
-                  <template slot-scope="{ row, $index }">
-                    <!-- {{
-                      deviceWeight(
-                        row.roughWeight,
-                        row.minPackingCount * row.outInNum
-                      )
-                    }} -->
+                  <template slot-scope="{ row }">
+                    <template>
+                      {{ row.price ? row.price : '-' + '元' }}/{{
+                        row.weightUnit
+                      }}
+                      <!-- {{ { yuan: '元', wanyuan: '万元' }[row.univalenceUnit] }} -->
+                    </template>
                   </template>
                 </el-table-column>
 
                 <el-table-column
-                  label="重量单位"
+                  label="金额"
                   align="center"
                   prop="contentImage"
                   :show-overflow-tooltip="true"
+                  width="100"
                 >
                   <template slot-scope="{ row, $index }">
-                    {{ row.weightUnit }}
+                    <!-- // calcSum(
+                      //   row.outInNum,
+                      //   row.univalenceUnit,
+                      //   row.univalence,
+                      //   row
+                      // ) -->
+                    {{ row.totalMoney ? row.totalMoney : 0 }}
                   </template>
                 </el-table-column>
+
                 <el-table-column
                   label="货位"
                   prop="warehouseName"
@@ -358,10 +295,8 @@
         </div>
         <div class="mt20">
           <!-- =={{ getDictValue('类型用途', infoData.assetType) }} -->
-          <header-title
-            :title="`${handleAssetType(extInfo.assetType)}明细`"
-            size="16px"
-          ></header-title>
+          <!-- ${handleAssetType(extInfo.assetType)} -->
+          <header-title :title="`包装明细`" size="16px"></header-title>
 
           <el-table
             ref="multipleTable"
@@ -373,11 +308,27 @@
           >
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
+            <el-table-column label="编码" prop="categoryCode"></el-table-column>
+            <el-table-column label="名称" prop="name"></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="`${handleAssetType(extInfo.assetType)}编码`"
-              prop="code"
+              label="包装数量"
+              prop="packingCount"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
+            <el-table-column
+              label="计量数量"
+              prop="minPackingCount"
+            ></el-table-column>
+            <el-table-column
+              label="计量单位"
+              prop="measuringUnit"
             ></el-table-column>
-
             <el-table-column
               v-if="infoData.bizType == 2 || infoData.bizType == 1"
               label="物料代号"
@@ -396,20 +347,12 @@
                 {{ row.clientCode }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="infoData.bizType == 2 || infoData.bizType == 1"
-              label="重量"
-              prop="weight"
-            >
+            <el-table-column label="重量" prop="weight">
               <template slot-scope="{ row }">
                 {{ row.weight }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="infoData.bizType == 2 || infoData.bizType == 1"
-              label="重量单位"
-              prop="weightUtil"
-            >
+            <el-table-column label="重量单位" prop="weightUtil">
               <template slot-scope="{ row }">
                 {{ row.weightUtil }}
               </template>
@@ -425,36 +368,90 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="日期" prop="createTime" width="200">
+              <template slot="header" slot-scope="scope">
+                {{ dateTypes == 1 ? '采购日期' : '生产日期' }}
+              </template>
+              <template slot-scope="{ row }">
+                {{ row.createTime }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="mt20">
+          <header-title :title="`物料明细`" size="16px"> </header-title>
+          <el-table
+            ref="multipleTable"
+            :data="metailList"
+            tooltip-effect="dark"
+            :header-cell-style="rowClass"
+            style="width: 100%"
+            stripe
+            height="300px"
+          >
+            <el-table-column label="序号" type="index" width="50">
+            </el-table-column>
+            <el-table-column label="编码" prop="assetCode"></el-table-column>
             <el-table-column
-              label="包装编码"
-              prop="packageNo"
+              label="名称"
+              prop="assetName"
+              width="200"
             ></el-table-column>
-            <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column
-              label="物品编码"
-              prop="categoryCode"
+              label="批次号"
+              prop="batchNo"
+              width="80"
             ></el-table-column>
-            <el-table-column label="名称" prop="name"></el-table-column>
-            <el-table-column label="最小包装单元" prop="modelType">
-              <!-- <el-table-column label="" prop="minPackingCount" width="100">
-                <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount }}
-                </template>
-              </el-table-column> -->
-              <el-table-column label="" prop="measurementUnit">
-                <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount }}{{ handleRowUnit(row) }} /{{
-                    row.packingUnit
-                  }}
-                </template>
-              </el-table-column>
+            <el-table-column
+              label="物料编码"
+              prop="no"
+              width="200"
+            ></el-table-column>
+            <el-table-column
+              label="计量数量"
+              prop="minPackingCount"
+              width="90"
+            ></el-table-column>
+            <el-table-column
+              width="80"
+              label="计量单位"
+              prop="measuringUnit"
+            ></el-table-column>
+            <el-table-column
+              v-if="infoData.bizType == 2"
+              label="物料代号"
+              prop="materielCode"
+            >
+              <template slot-scope="{ row }">
+                {{ row.materielCode }}
+              </template>
             </el-table-column>
-            <el-table-column label="日期" prop="createTime" width="200">
-              <template slot="header" slot-scope="scope">
-                {{ dateTypes == 1 ? '采购日期' : '生产日期' }}
+            <el-table-column
+              v-if="infoData.bizType == 2 || infoData.bizType == 1"
+              label="客户代号"
+              prop="clientCode"
+            >
+              <template slot-scope="{ row }">
+                {{ row.clientCode }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="infoData.bizType == 1"
+              label="刻码"
+              prop="engrave"
+            >
+              <template slot-scope="{ row }">
+                {{ row.engrave }}
               </template>
+            </el-table-column>
+            <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                {{ row.createTime }}
+                {{ row.weight }}
+              </template>
+            </el-table-column>
+            <el-table-column label="重量单位" prop="weightUnit">
+              <template slot-scope="{ row }">
+                {{ row.weightUnit }}
               </template>
             </el-table-column>
           </el-table>
@@ -489,6 +486,7 @@
     components: { StatusStep, PageHeader },
     data() {
       return {
+        metailList: [],
         dateTypes: 1,
         detailList: [],
         extInfo: {},
@@ -619,6 +617,13 @@
           }
           this.dateTypes = arr[0].dateType;
           this.detailList = arr;
+          let iArr = [];
+          arr.forEach((item) => {
+            item.outInDetailRecordMaterialDetailVOList.forEach((ele) => {
+              iArr.push({ ...ele });
+            });
+          });
+          this.metailList = iArr;
         }
         const { data } = await getTreeByPid(0);
         this.codeList = data.map((item) => {