吴羡
14 小时以前 ab3cb96ebe3b3134e897b002d1c0b3576f8aaa37
Merge branch 'dev_天津_君歌化工new' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_君歌化工new

# Conflicts:
# src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
已修改1个文件
12 ■■■■■ 文件已修改
src/views/salesManagement/receiptPaymentLedger/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -131,8 +131,8 @@
          <el-date-picker style="width:100%" v-model="receiptForm.paymentDate" value-format="YYYY-MM-DD" type="date" placeholder="请选择回款日期" clearable />
        </el-form-item>
        <el-form-item label="回款金额:" prop="paymentAmount">
          <el-input-number style="width:100%" v-model="receiptForm.paymentAmount" :precision="2" :min="0" :max="Math.max(0,(Number(currentRow.receiptableAmount)||0)-(Number(currentRow.receiptPaymentAmount)||0))" placeholder="请输入回款金额" controls-position="right" />
          <div style="color:#e6a23c;font-size:12px;margin-top:4px">当前可回款余额:{{ formattedNumber(null,null,Math.max(0,(Number(currentRow.receiptableAmount)||0)-(Number(currentRow.receiptPaymentAmount)||0))) }} 元</div>
          <el-input-number style="width:100%" v-model="receiptForm.paymentAmount" :precision="2" :min="0" :max="receiptableBalance" placeholder="请输入回款金额" controls-position="right" />
          <div style="color:#e6a23c;font-size:12px;margin-top:4px">当前可回款余额:{{ receiptableBalance.toFixed(2) }} 元</div>
        </el-form-item>
        <el-form-item label="回款方式:" prop="paymentMethod">
          <el-select v-model="receiptForm.paymentMethod" placeholder="请选择回款方式" style="width:100%" clearable>
@@ -149,7 +149,7 @@
</template>
<script setup>
  import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
  import { onMounted, ref, reactive, toRefs, computed, getCurrentInstance } from "vue";
  import {
    customewTransactions,
    customewTransactionsDetails,
@@ -184,9 +184,11 @@
  const currentRow = ref({});
  const receiptFormRef = ref(null);
  const receiptForm = reactive({ paymentDate:"", paymentAmount:undefined, paymentMethod:"", remark:"" });
  // 应收金额后端已按「合同金额 - 已回款」算好,即为当前可回款余额
  const receiptableBalance = computed(() => Math.max(0, Number(currentRow.value.receiptableAmount) || 0));
  const validatePaymentAmount = (_,v,cb) => {
    if(!v) return cb(new Error("请输入回款金额"));
    const max = Math.max(0,(Number(currentRow.value.receiptableAmount)||0)-(Number(currentRow.value.receiptPaymentAmount)||0));
    const max = receiptableBalance.value;
    if(v > max) return cb(new Error(`回款金额不能超过可回款余额 ${max.toFixed(2)} 元`));
    cb();
  };
@@ -237,7 +239,7 @@
  const summarizeMainTable = param => {
    return proxy.summarizeTable(
      param,
      ["invoiceTotal", "receiptPaymentAmount", "unReceiptPaymentAmount"],
      ["contractAmounts", "receiptPaymentAmount", "receiptableAmount"],
      {
        ticketsNum: { noDecimal: true }, // 不保留小数
        futureTickets: { noDecimal: true }, // 不保留小数