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

spring

3 天以前 5709db9dc8d689cdbb7a17842998de185b4a6b91

 src/views/salesManagement/receiptPayment/index.vue

@@ -65,6 +65,7 @@
        :summary-method="summarizeMainTable"
        :expand-row-keys="expandedRowKeys"
        @expand-change="expandChange"

        height="calc(100vh - 18.5em)"
      >
        <el-table-column align="center" type="selection" width="55" />
@@ -183,7 +184,7 @@
          prop="invoiceTotal"
          show-overflow-tooltip
          :formatter="formattedNumber"
          width="150"
          width="200"
        />
        <el-table-column label="税率(%)" prop="taxRate" show-overflow-tooltip />
        <el-table-column
@@ -191,13 +192,13 @@
          prop="receiptPaymentAmountTotal"
          show-overflow-tooltip
          :formatter="formattedNumber"
          width="150"
          width="200"
        />
        <el-table-column
          label="待回款金额(元)"
          prop="noReceiptAmount"
          show-overflow-tooltip
          width="150"
          width="200"
        >
          <template #default="{ row, column }">
            <el-text type="danger">