毛重，净重如果是0强制修改为空的逻辑处理

haoxuan

2024-04-19 4d41577c2d01648ba3e9919fbd540380279ca85f

 src/views/overview/AddOverviewDialog.vue

@@ -1044,6 +1044,8 @@
                    productId: item.productId,
                    auxiliaryUnit:item.auxiliaryUnit,
                    auxiliaryAmount:item.auxiliaryAmount,
                    totalNetWeight:item.totalNetWeight,
                    totalGrossWeight:item.totalGrossWeight,
                  });
                });
                params.details = arr;
@@ -1057,6 +1059,8 @@
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                      totalNetWeight:item.totalNetWeight,
                     totalGrossWeight:item.totalGrossWeight,
                    });
                  } else {
                    arr.push({
@@ -1066,6 +1070,8 @@
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                      totalNetWeight:item.totalNetWeight,
                     totalGrossWeight:item.totalGrossWeight,
                    });
                  }
                });
@@ -1085,6 +1091,8 @@
                    productId: item.productId,
                    auxiliaryUnit:item.auxiliaryUnit,
                    auxiliaryAmount:item.auxiliaryAmount,
                    totalNetWeight:item.totalNetWeight,
                    totalGrossWeight:item.totalGrossWeight,
                  });
                  // if(item.fromLocationId.value){
                  //   arr.push({
@@ -1196,7 +1204,7 @@
        params = {
          baseOperationType: data.baseOperationType,
          comment: data.comment || "",
          companyID: companyID,
          companyID: companyID+'',
          companyName: companyName,
          contacterID: contacterID,
          contacterName: contacterName,
@@ -1230,7 +1238,7 @@
        params = {
          baseOperationType: data.baseOperationType,
          comment: data.comment || "",
          companyID: companyID,
          companyID: companyID+'',
          companyName: companyName,
          contacterID: contacterID,
          contacterName: contacterName,
@@ -1293,13 +1301,14 @@
          {
            label: "产品名称",
            prop: "productName",
            min:150,
            productName: true,
            isRequird: true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
@@ -1313,11 +1322,11 @@
          {
            label: "产品名称",
            prop: "productName",
            min:150,
            productName: true,
            isRequird: true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          {
@@ -1326,6 +1335,7 @@
            sonLocation: true,
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
@@ -1339,11 +1349,11 @@
          {
            label: "产品名称",
            prop: "productName",
            min:150,
            productName: true,
            isRequird: true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          {
@@ -1358,6 +1368,7 @@
            toLocation: true,
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" },
          { label: "辅助数量", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' },
          { label: "辅助单位", prop: "auxiliaryUnit" },
@@ -1371,11 +1382,11 @@
          {
            label: "产品名称",
            prop: "productName",
            min:150,
            productName: true,
            isRequird: true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          {
@@ -1390,6 +1401,7 @@
            toLocation: true,
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" },
        ];
      } else if (this.workType == 5) {
@@ -1397,11 +1409,11 @@
          {
            label: "产品名称",
            prop: "productName",
            min:150,
            productName: true,
            isRequird: true,
          },
          { label: "产品编码", prop: "productId" },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "产品规格", prop: "specs" },
          { label: "产品型号", prop: "model" },
          {
@@ -1416,6 +1428,7 @@
            toLocation: true,
            isRequird: true,
          },
          { label: "数量", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" },
        ];
      }
@@ -1474,9 +1487,9 @@
            auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0,
            auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.product.grossWeight,
            grossWeight:res.product.grossWeight==0?'':res.product.grossWeight,
            totalGrossWeight:res.totalGrossWeight,
            netWeight:res.product.netWeight, 
            netWeight:res.product.netWeight==0?'':res.product.netWeight, 
            totalNetWeight:res.totalNetWeight,  
          };
        }else{
@@ -1489,9 +1502,9 @@
            auxiliaryAmount:adjunctAmount?Number(adjunctAmount)*1:0,
            auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0,
            inputFloatAuxiliaryAmount:isValue,
            grossWeight:res.grossWeight,
            grossWeight:res.grossWeight==0?'':res.grossWeight,
            totalGrossWeight:res.grossWeight?Number(res.grossWeight)*1:'',
            netWeight:res.netWeight, 
            netWeight:res.netWeight==0?'':res.netWeight, 
            totalNetWeight:res.netWeight?Number(res.netWeight)*1:'', 
          };
        }
@@ -1535,7 +1548,6 @@
      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'){
@@ -1596,7 +1608,7 @@
    },
    // 新增方式修改
    getSelectArray(val, index) {
      if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
      if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) {
        this.tableData = [];
      }
      if (index < this.tableData.length) {