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

spring

3 天以前 5709db9dc8d689cdbb7a17842998de185b4a6b91

 src/views/salesManagement/receiptPaymentLedger/index.vue

@@ -38,23 +38,27 @@
            label="客户名称"
            prop="customerName"
            show-overflow-tooltip
                  width="200"
          />
          <el-table-column
            label="开票金额(元)"
            prop="invoiceTotal"
            show-overflow-tooltip
            :formatter="formattedNumber"
                  width="200"
          />
          <el-table-column
            label="回款金额(元)"
            prop="receiptPaymentAmount"
            show-overflow-tooltip
            :formatter="formattedNumber"
                  width="200"
          />
          <el-table-column
            label="应收金额(元)"
            prop="unReceiptPaymentAmount"
            show-overflow-tooltip
                  width="200"
          >
            <template #default="{ row, column }">
              <el-text type="danger">
@@ -91,23 +95,27 @@
            label="发生日期"
            prop="happenTime"
            show-overflow-tooltip
                  width="110"
          />
          <el-table-column
            label="开票金额(元)"
            prop="invoiceAmount"
            show-overflow-tooltip
            :formatter="formattedNumber"
                  width="200"
          />
          <el-table-column
            label="回款金额(元)"
            prop="receiptAmount"
            show-overflow-tooltip
            :formatter="formattedNumber"
                  width="200"
          />
          <el-table-column
            label="应收金额(元)"
            prop="unReceiptAmount"
            show-overflow-tooltip
                  width="200"
          >
            <template #default="{ row, column }">
              <el-text type="danger">