辅助数量，数量和设置多单位的数量计算公式修改

haoxuan

2024-04-19 e3cd63f449083041cbe950690f428b7108e4f6e2

 src/views/overview/AddOverviewDialog.vue

@@ -473,6 +473,7 @@
                :addTypeIdMultiple="true"
                :product-table-list="productTableList"
                :detail-enter="!showFooter"
                @selProductClick="selProductClick"
                @inputContent="inputContent"
                @addProductClick="addProductClick('操作')"
                @getSelectArray="getSelectArray"
@@ -1484,13 +1485,14 @@
            moreUnit:res.product.moreUnit,
            moreUnitList:res.product.moreUnitList,
            auxiliaryUnit:res.auxiliaryUnit,
            auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
            // auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
            auxiliaryAmount:res.auxiliaryAmount,
            auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.product.grossWeight==0?'':res.product.grossWeight,
            totalGrossWeight:res.totalGrossWeight,
            netWeight:res.product.netWeight==0?'':res.product.netWeight, 
            totalNetWeight:res.totalNetWeight,  
            grossWeight:res.product.grossWeight==0?null:res.product.grossWeight,
            totalGrossWeight:res.totalGrossWeight==0?null:Number(res.totalGrossWeight),
            netWeight:res.product.netWeight==0?null:res.product.netWeight, 
            totalNetWeight:res.totalNetWeight==0?null:Number(res.totalNetWeight),  
          };
        }else{
          return {
@@ -1499,13 +1501,13 @@
            productName: res.name,
            productId: res.id,
            auxiliaryUnit:adjunctUnit,
            auxiliaryAmount:adjunctAmount?Number(adjunctAmount)*1:0,
            auxiliaryAmount:adjunctAmount?(1/Number(adjunctAmount)).toFixed(2):0,
            auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.grossWeight==0?'':res.grossWeight,
            totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
            netWeight:res.netWeight==0?'':res.netWeight, 
            totalNetWeight:res.netWeight?Number(res.netWeight)*1:'', 
            grossWeight:res.grossWeight==0?null:res.grossWeight,
            totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:null,
            netWeight:res.netWeight==0?null:res.netWeight, 
            totalNetWeight:res.netWeight?Number(res.netWeight)*1:null, 
          };
        }
      });
@@ -1551,9 +1553,9 @@
          item[prop] = val;
          let auxiliaryAmountObject=this.getAuxiligyAmount(item.moreUnit,item.moreUnitList)
          if(prop=='amount'){
            item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):''
            item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):''
            item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?Number(auxiliaryAmountObject.auxiliaryAmount)*Number(item[prop]):''
            item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):null
            item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):null
            item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?(Number(item[prop])/Number(auxiliaryAmountObject.auxiliaryAmount)).toFixed(2):''
          }
        }
      });
@@ -1606,8 +1608,12 @@
      //   }
      // }
    },
    selProductClick(value, prop,row,scope){
      this.getSelectArray([value],scope.$index)
    },
    // 新增方式修改
    getSelectArray(val, index) {
      debugger
      if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) {
        this.tableData = [];
      }