haoxuan
2024-04-25 a90640403fec7645493fb39c26ae95c985392c8a
src/views/overview/AddOverviewDialog.vue
@@ -481,10 +481,10 @@
                @clearupProduct="clearupProduct"
              >
                <template v-if="showFooter" slot="tableButton">
                  <!--  fixed="right" -->
                  <el-table-column
                    label="操作"
                    width="60"
                    fixed="right"
                    align="center"
                  >
                    <template slot-scope="scope">
@@ -1333,6 +1333,7 @@
          {
            label: "从",
            prop: "fromLocationId",
            min:120,
            sonLocation: true,
            isRequird: true,
          },
@@ -1361,6 +1362,7 @@
            label: "从",
            prop: "fromLocationId",
            sonLocation: true,
            min:120,
            isRequird: true,
          },
          {
@@ -1393,6 +1395,7 @@
          {
            label: "从",
            prop: "fromLocationId",
            min:120,
            sonLocation: true,
            isRequird: true,
          },
@@ -1420,6 +1423,7 @@
          {
            label: "从",
            prop: "fromLocationId",
            min:120,
            sonLocation: true,
            isRequird: true,
          },
@@ -1489,25 +1493,25 @@
            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 {
            ...res,
            amount: 1,
            productName: res.name,
            productId: res.id,
            productName: res.productId?res.productName:res.name,
            productId:  res.productId?res.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==0?null:Number(res.grossWeight)*1,
            netWeight:res.netWeight==0?null:res.netWeight,
            totalNetWeight:res.netWeight==0?null:Number(res.netWeight)*1,
          };
        }
      });
@@ -1553,9 +1557,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):null
          }
        }
      });
@@ -1613,7 +1617,6 @@
    },
    // 新增方式修改
    getSelectArray(val, index) {
      debugger
      if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) {
        this.tableData = [];
      }
@@ -1662,7 +1665,7 @@
      if (this.workType == "内部调拨"||this.workType==3) {
        this.tableColumn = [
          { label: "产品", prop: "name", productName: true, isRequird: true },
          { label: "从", prop: "number", select: true },
          { label: "从", prop: "number", select: true,min:120,},
          { label: "至", prop: "amount", select: true },
          { label: "完成", prop: "total", inputFloat: true },
          { label: "计量单位", prop: "total", select: true },
@@ -1670,7 +1673,7 @@
      } else {
        this.tableColumn = [
          { label: "产品", prop: "name", productName: true, isRequird: true },
          { label: "从", prop: "number", select: true },
          { label: "从", prop: "number", select: true , min:120,},
          { label: "完成", prop: "total", inputFloat: true },
          { label: "计量单位", prop: "total", select: true },
        ];
@@ -1750,7 +1753,7 @@
              baseOperationType:
                this.editConfig.infomation.baseOperationType || undefined,
              // 1是嘉联
              cutAfterWidth:name=='jialian'?52.6:
              cutAfterWidth:name=='jialian'?53.9:
               (this.editConfig.infomation.baseOperationType == 2
                  ? 50.8
                  : 53.3),