Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-01-23 3ad02364ce97ab8188d18c52695c8b57b1e47ea6

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

@@ -37,7 +37,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -127,20 +127,20 @@
    },
  ],//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['7','8','9','10']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        }
        return ''
      })
    ]
  }
  // footerMethod ({ columns, data }) {//页脚函数
  //   let footList=['7','8','9','10']
  //   return[
  //     columns.map((column, columnIndex) => {
  //       if (columnIndex === 0) {
  //         return '合计:'
  //       }
  //       if (footList.includes(column.field)) {
  //         return sumNum(data, column.field)
  //       }
  //       return ''
  //     })
  //   ]
  // }

})

@@ -184,17 +184,17 @@
</script>

<template>
  <div class="main-div-customer">
  <div class="main-div-customer" >
    <div id="selectForm">
      <el-row :gutter="0">
        <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>
        <el-input placeholder="销售单号" v-model="form.name" value="NG23110102" style="width: 150px"/>
        &nbsp;&nbsp;
        <el-button type="primary">查询</el-button>
      </el-row>

    </div>
    <vxe-grid
        max-height="100%"
       height="400px"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"