src/components/makepager/CommonFormTableView.vue

@@ -89,7 +89,7 @@
                    size="mini"
                    @select="
                      (val) => {
                        handleSelectClient(val, item.prop, scope.row)
                        handleSelectClient(val, item.prop, scope.row,scope)
                      }
                    "
                  ></el-autocomplete>
@@ -588,8 +588,8 @@
      })
    },
    // 下拉搜索
    async handleSelectClient(value, item) {
      this.$emit("selProductClick", value, item)
    async handleSelectClient(value, item,row,scope) {
      this.$emit("selProductClick", value, item,row,scope)
      if (value === "product") {
        if (item.categoryId === 0 || item.categoryName === "") {
          this.productTypeNameOptions = []

 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"
@@ -1044,6 +1045,8 @@
                    productId: item.productId,
                    auxiliaryUnit:item.auxiliaryUnit,
                    auxiliaryAmount:item.auxiliaryAmount,
                    totalNetWeight:item.totalNetWeight,
                    totalGrossWeight:item.totalGrossWeight,
                  });
                });
                params.details = arr;
@@ -1057,6 +1060,8 @@
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                      totalNetWeight:item.totalNetWeight,
                     totalGrossWeight:item.totalGrossWeight,
                    });
                  } else {
                    arr.push({
@@ -1066,6 +1071,8 @@
                      productId: item.productId,
                      auxiliaryUnit:item.auxiliaryUnit,
                      auxiliaryAmount:item.auxiliaryAmount,
                      totalNetWeight:item.totalNetWeight,
                     totalGrossWeight:item.totalGrossWeight,
                    });
                  }
                });
@@ -1085,6 +1092,8 @@
                    productId: item.productId,
                    auxiliaryUnit:item.auxiliaryUnit,
                    auxiliaryAmount:item.auxiliaryAmount,
                    totalNetWeight:item.totalNetWeight,
                    totalGrossWeight:item.totalGrossWeight,
                  });
                  // if(item.fromLocationId.value){
                  //   arr.push({
@@ -1476,12 +1485,13 @@
            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,
            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 +1504,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 +1550,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'){
@@ -1599,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 = [];
      }

 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,11 +391,11 @@
          specs:item.product.specs,
          location: arr.location.name,
          toLocation: arr.toLocation.name,
          adjunctUnit:adjunctUnit,
          adjunctAmount:adjunctAmount&&item.amount?adjunctAmount:'',
          grossWeight:item.product.grossWeight,
          adjunctUnit:item.auxiliaryUnit,
          adjunctAmount:item.auxiliaryAmount,
          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