入库出库调拨出入库明细 4个模块添加和编辑产品的时候增加辅助数量的计算逻辑,浮动值和数量相乘所得
2个文件已修改
97 ■■■■ 已修改文件
src/views/overview/AddOverviewDialog.vue 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/OverviewListView.vue 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/AddOverviewDialog.vue
@@ -1468,8 +1468,11 @@
            unit: res.product.unit,
            model:res.product.model,
            specs:res.product.specs,
            moreUnit:res.product.moreUnit,
            moreUnitList:res.product.moreUnitList,
            auxiliaryUnit:res.auxiliaryUnit,
            auxiliaryAmount:res.auxiliaryAmount,
            auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
            auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.product.grossWeight,
            totalGrossWeight:res.totalGrossWeight,
@@ -1483,7 +1486,8 @@
            productName: res.name,
            productId: res.id,
            auxiliaryUnit:adjunctUnit,
            auxiliaryAmount:Number(adjunctAmount),
            auxiliaryAmount:adjunctAmount?Number(adjunctAmount)*1:0,
            auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.grossWeight,
            totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
@@ -1494,15 +1498,50 @@
      });
        return list||[];
    },
    getAuxiligyAmount(unit,unitList){
      let adjunctUnit=''
        let adjunctAmount=''
        let isValue=false
        let moreUnit=unit?unit:''
        let moreUnitList=unitList?unitList:[]
        if(moreUnit&&moreUnitList){
          if(moreUnitList.length>0){
            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 {
          auxiliaryAmount:adjunctAmount,
          auxiliaryUnit:adjunctUnit,
        }
    },
    // 操作输入
    inputContent(val, prop, row) {
      this.countId = row.countId;
      this.tableData.map((item) => {
        if (item.id == row.id) {
          debugger
          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]):''
          }
        }
      });
src/views/overview/OverviewListView.vue
@@ -358,31 +358,31 @@
    // 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){
        //     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;
        //         }
        //       }
        //     }
        //   }
        // }
        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,
@@ -391,8 +391,8 @@
          specs:item.product.specs,
          location: arr.location.name,
          toLocation: arr.toLocation.name,
          adjunctUnit:item.auxiliaryUnit,
          adjunctAmount:item.auxiliaryAmount,
          adjunctUnit:adjunctUnit,
          adjunctAmount:adjunctAmount&&item.amount?adjunctAmount:'',
          grossWeight:item.product.grossWeight,
          totalGrossWeight:item.totalGrossWeight,
          netWeight:item.product.netWeight,