src/views/overview/OverviewListView.vue
@@ -1,8 +1,8 @@
<template>
  <div class="rightContent">
    <!-- <div class="label-fixed-element">
    <div class="label-fixed-element">
      <span>{{ params.name }}</span>
    </div> -->
    </div>
    <div class="top">
      <SearchCommonView
        :add-title="'新建'"
@@ -120,7 +120,7 @@
      numberLabel: "单号",
      TabsIndex: "0",
      productTableList: {},
      showBottomCol: ["产品编号", "产品名称", "产品规格", "产品型号", "计量单位", "调出位置", "调入位置", "数量","主管","会计","保管员",'辅助数量','辅助单位'],
      showBottomCol: ["产品编号", "产品名称", "产品规格", "产品型号", "计量单位", "调出位置", "调入位置", "数量","主管","会计","保管员",'辅助数量','辅助单位','毛重','总毛重','净重','总净重'],
      tableBottomColumn: [],
      selectRow: {},
      productColumn: [
@@ -131,7 +131,11 @@
        { label: "数量", prop: "amount" },
        { label: "计量单位", prop: "unit" },
        { label: "辅助数量", prop: "adjunctAmount" },
        { label: "辅助单位", prop: "adjunctUnit" }
        { label: "辅助单位", prop: "adjunctUnit" },
        { label: "毛重", prop: "grossWeight" },
        { label: "总毛重", prop: "totalGrossWeight" },
        { label: "净重", prop: "netWeight" },
        { label: "总净重", prop: "totalNetWeight" }
      ],
      allotProductColumn: [
        { label: "产品编号", prop: "id", default: true },
@@ -143,7 +147,11 @@
        { label: "调入位置", prop: "toLocation" },
        { label: "数量", prop: "amount" },
        { label: "辅助数量", prop: "adjunctAmount" },
        { label: "辅助单位", prop: "adjunctUnit" }
        { label: "辅助单位", prop: "adjunctUnit" },
        { label: "毛重", prop: "grossWeight" },
        { label: "总毛重", prop: "totalGrossWeight" },
        { label: "净重", prop: "netWeight" },
        { label: "总净重", prop: "totalNetWeight" }
      ]
    }
  },
@@ -350,27 +358,45 @@
    // bottom产品信息数据处理
    bottomProductData(arr) {
      const list = arr.details.map((item) => {
        let adjunctUnit=''
        let adjunctAmount=''
        if(item.product.moreUnit&&item.product.moreUnitList){
          let moreUnitList=item.product.moreUnitList
          if(moreUnitList.length>0){
            for(let j in moreUnitList){
              if(moreUnitList[j].floating){
                adjunctUnit=moreUnitList[j].unit
                adjunctAmount=moreUnitList[j].amount
              }
            }
          }
        }
        // let adjunctUnit=''
        // let adjunctAmount=''
        // if(item.product.moreUnit&&item.product.moreUnitList){
        //   let moreUnitList=item.product.moreUnitList
        //   if(moreUnitList.length>0){
        //     let isValue=false
        //     for(let j in moreUnitList){
        //       if(moreUnitList[j].floating){
        //         isValue=true;
        //         adjunctUnit=moreUnitList[j].unit
        //         adjunctAmount=moreUnitList[j].amount
        //         break;
        //       }
        //     }
        //     if(!isValue){
        //       for(let j in moreUnitList){
        //          if(moreUnitList[j].unit){
        //           adjunctUnit=moreUnitList[j].unit
        //           adjunctAmount=moreUnitList[j].amount
        //           break;
        //         }
        //       }
        //     }
        //   }
        // }
        return {
          ...item,
          productName: item.product.name,
          unit: item.product.unit,
          model:item.product.model,
          specs:item.product.specs,
          location: arr.location.name,
          toLocation: arr.toLocation.name,
          adjunctUnit:adjunctUnit,
          adjunctAmount:adjunctAmount
          adjunctUnit:item.auxiliaryUnit,
          adjunctAmount:item.auxiliaryAmount,
          grossWeight:item.product.grossWeight==0?'':item.product.grossWeight,
          totalGrossWeight:item.totalGrossWeight==0?'':item.totalGrossWeight,
          netWeight:item.product.netWeight==0?'':item.product.netWeight,
          totalNetWeight:item.totalNetWeight==0?'':item.totalNetWeight,
        }
      })
      this.productTableList.tableInfomation = list
@@ -498,7 +524,7 @@
  overflow: hidden;
  .body {
    box-sizing: border-box;
    padding: 10px 20px;
    padding: 10px 0px;
    border-radius: 12px;
    height: calc(100% - 70px);
    .content-top {
@@ -557,8 +583,8 @@
  }
}
.label-fixed-element {
  background: #e6ecf2;
  position: fixed;
  background:#f8f8f9;
  font-size: 14px;
  width: calc(100% - 530px);
  height: 45px;