haoxuan
2024-04-19 4d41577c2d01648ba3e9919fbd540380279ca85f
毛重,净重如果是0强制修改为空的逻辑处理
3个文件已修改
23 ■■■■■ 已修改文件
src/views/overview/AddOverviewDialog.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/OverviewListView.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/monthboundDetail/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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({
@@ -1479,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{
@@ -1494,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:'', 
          };
        }
@@ -1540,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'){
src/views/overview/OverviewListView.vue
@@ -393,9 +393,9 @@
          toLocation: arr.toLocation.name,
          adjunctUnit:adjunctUnit,
          adjunctAmount:adjunctAmount&&item.amount?adjunctAmount:'',
          grossWeight:item.product.grossWeight,
          grossWeight:item.product.grossWeight==0?'':item.product.grossWeight,
          totalGrossWeight:item.totalGrossWeight,
          netWeight:item.product.netWeight,
          netWeight:item.product.netWeight==0?'':item.product.netWeight,
          totalNetWeight:item.totalNetWeight,  
        }
      })
src/views/reportForm/monthboundDetail/index.vue
@@ -1,7 +1,7 @@
<template>
  <div class="rightContent">
    <div class="top">
      <SearchCommonView :add-title="'新建'" :showAdd="false" :placeholder="'请根据关键词进行搜索'" :amount-view="false"
      <SearchCommonView :add-title="'新建'" :showAdd="false" :placeholder="'请输入产品编码/产品名称搜索'" :amount-view="false"
         @searchClick="getList" >
        <template slot="leftButton">
          <el-date-picker