Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-03 60059736395d7f0efe7bfffe5e186001d7b157b4

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -222,20 +222,38 @@
  },
  data: [],//table body实际数据
  //脚部求和

  weighAllAmount(data) {
    let count = 0
    data.forEach(row => {
      count += row.weight
    })
    return count
  },
  footerMethod ({ columns, data }) {//页脚函数
    let count = 0

    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["baiscQuantity",'computeGrossArea','weight','perimeter']

        const List = ["baiscQuantity",'computeGrossArea']
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
        if (column.field === 'weight'){
          data.forEach(row => {
            count += weightSum(row)
          })
          return  parseFloat(count.toFixed(2))
        }

        return ''
      })
    ]
  }
  },

})

@@ -289,7 +307,7 @@
    },
    {
      field: 'landingSequence',
      title: '落架顺序',
      title: t('processCard.landingSequence'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
@@ -325,7 +343,7 @@
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'goodsQuantity','area','perimeter']
        const List = ["quantity",'goodsQuantity','area']
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }