Merge remote-tracking branch 'origin/dev' into dev

spring

5 天以前 4538de1fa692cf5454ae7b1b061a8c298be96821

 src/views/procurementManagement/paymentHistory/index.vue

@@ -69,12 +69,13 @@
  {
    label: "供应商名称",
    prop: "supplierName",
    width:240
  },
  {
    label: "付款金额",
    prop: "currentPaymentAmount",
    formatData: (params) => {
      return parseFloat(params).toFixed(2);
      return params ? parseFloat(params).toFixed(2) : 0;
    },
  },
  {