haoxuan
2024-04-19 f2ca54c4037fe550253e46356cf34b446c645938
src/views/overview/OverviewListView.vue
@@ -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" }
      ]
    }
  },
@@ -355,10 +363,22 @@
        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;
                }
              }
            }
          }
@@ -367,10 +387,16 @@
          ...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
          adjunctAmount:adjunctAmount&&item.amount?adjunctAmount:'',
          grossWeight:item.product.grossWeight,
          totalGrossWeight:item.totalGrossWeight,
          netWeight:item.product.netWeight,
          totalNetWeight:item.totalNetWeight,
        }
      })
      this.productTableList.tableInfomation = list