湟水峡 1.采购模块不要项目名称 2.加一个有待回款登记的提示 3.回款登记、付款登记改成和销售订单价格关联，并且可以多个一起回款或付款 4.合同管理...

gaoluyang

6 天以前 ca1cbb4d2ffb48095d5b2625788efd4e08a5eff8

 src/views/procurementManagement/paymentEntry/index.vue

@@ -27,7 +27,8 @@
          </el-col>
          <el-col :span="4">
            <el-form-item style="float: right; margin-right: unset">
              <el-button type="primary" @click="openForm('add')">
              <el-button @click="handleExport" style="margin-right: 10px">导出</el-button>
              <el-button type="primary" @click="openForm()">
                新增付款
              </el-button>
<!--              <el-button type="danger" plain @click="handleDelete">-->
@@ -131,133 +132,68 @@
    </div>
    <el-dialog
      v-model="dialogFormVisible"
      :title="operationType === 'add' ? '新增付款登记' : '编辑付款登记'"
      width="60%"
      title="新增付款登记"
      width="80%"
      @close="closeDia"
    >
      <el-form
        :model="form"
        label-width="140px"
        label-position="top"
        :rules="rules"
        ref="formRef"
      >
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="采购合同号：" prop="purchaseContractNumber">
              <el-input
                v-model="form.purchaseContractNumber"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="销售合同号：" prop="salesContractNo">
              <el-input
                v-model="form.salesContractNo"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商名称：" prop="supplierName">
              <el-input
                v-model="form.supplierName"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="发票号：" prop="invoiceNumber">
              <el-input
                v-model="form.invoiceNumber"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="发票金额(元)：" prop="invoiceAmount">
              <el-input
                v-model="form.invoiceAmount"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="本次付款金额：" prop="currentPaymentAmount">
              <el-input-number :step="0.01" :min="0" style="width: 100%"
                                              :precision="2"
                v-model="form.currentPaymentAmount"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="付款方式：" prop="paymentMethod">
              <el-select
                v-model="form.paymentMethod"
                placeholder="请选择"
                clearable
              >
                <el-option label="电汇" value="电汇" />
                <el-option label="承兑" value="承兑" />
              </el-select>
            </el-form-item>
          </el-col>
               <el-col :span="12">
                  <el-form-item label="付款日期：" prop="paymentDate">
                     <el-date-picker
                        style="width: 100%"
                        v-model="form.paymentDate"
                        value-format="YYYY-MM-DD"
                        format="YYYY-MM-DD"
                        type="date"
                        placeholder="请选择"
                        clearable
                     />
                  </el-form-item>
               </el-col>
        </el-row>
        <el-row :gutter="30">
               <el-col :span="12">
                  <el-form-item label="登记人：" prop="registrant">
                     <el-input
                        v-model="form.registrant"
                        placeholder="请输入"
                        clearable
                        disabled
                     />
                  </el-form-item>
               </el-col>
          <el-col :span="12">
            <el-form-item label="登记日期：" prop="registrationtDate">
              <el-input
                v-model="form.registrationtDate"
                placeholder="请输入"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <el-table :data="dialogTableData" border style="width: 100%" max-height="500px">
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="采购合同号" prop="purchaseContractNumber" show-overflow-tooltip width="200" />
        <el-table-column label="供应商名称" prop="supplierName" show-overflow-tooltip width="200" />
        <el-table-column label="发票号" prop="invoiceNumber" show-overflow-tooltip width="180" />
        <el-table-column label="发票金额(元)" prop="invoiceAmount" width="150">
          <template #default="{ row }">
            {{ row.invoiceAmount ? parseFloat(row.invoiceAmount).toFixed(2) : "0.00" }}
          </template>
        </el-table-column>
        <el-table-column label="待付款金额(元)" prop="unPaymentAmountTotal" width="150">
          <template #default="{ row }">
            <el-text type="danger">
              {{ row.unPaymentAmountTotal ? parseFloat(row.unPaymentAmountTotal).toFixed(2) : "0.00" }}
            </el-text>
          </template>
        </el-table-column>
        <el-table-column label="本次付款金额(元)" width="180">
          <template #default="scope">
            <el-input-number
              :step="0.01"
              :min="0"
              :max="Number(scope.row.unPaymentAmountTotal || 0)"
              style="width: 100%"
              :precision="2"
              v-model="scope.row.currentPaymentAmount"
              placeholder="请输入"
              clearable
            />
          </template>
        </el-table-column>
        <el-table-column label="付款方式" width="150">
          <template #default="scope">
            <el-select v-model="scope.row.paymentMethod" placeholder="请选择" clearable style="width: 100%">
              <el-option label="电汇" value="电汇" />
              <el-option label="承兑" value="承兑" />
            </el-select>
          </template>
        </el-table-column>
        <el-table-column label="付款日期" width="180">
          <template #default="scope">
            <el-date-picker
              style="width: 100%"
              v-model="scope.row.paymentDate"
              value-format="YYYY-MM-DD"
              format="YYYY-MM-DD"
              type="date"
              placeholder="请选择"
              clearable
            />
          </template>
        </el-table-column>
        <el-table-column label="登记人" width="120">
          <template #default="scope">
            <el-input v-model="scope.row.registrant" placeholder="自动填充" disabled />
          </template>
        </el-table-column>
      </el-table>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
@@ -269,16 +205,12 @@
</template>

<script setup>
import { ref } from "vue";
import { ref, reactive, toRefs, getCurrentInstance, nextTick, onMounted } from "vue";
import { Search } from "@element-plus/icons-vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user.js";
import {
  byPurchaseId,
  paymentRegistrationAdd,
  paymentRegistrationDel,
  paymentRegistrationEdit,
  getTicketNo,
} from "@/api/procurementManagement/paymentEntry.js";
import {
   delPaymentRegistration,
@@ -308,6 +240,20 @@
    prop: "supplierName",
    width:240
  },
   {
      label: "付款状态",
      prop: "statusName",
      dataType: "tag",
      formatType: (params) => {
         if (params == '未完成付款') {
            return "danger";
         } else if (params == '已完成付款') {
            return "success";
         } else {
            return null;
         }
      },
   },
  {
    label: "发票号",
    prop: "invoiceNumber",
@@ -351,9 +297,9 @@
   total: 0,
});

// 用户信息表单弹框数据
const operationType = ref("");
// 弹框数据
const dialogFormVisible = ref(false);
const dialogTableData = ref([]);
const data = reactive({
  searchForm: {
    supplierNameOrContractNo: "",
@@ -392,7 +338,11 @@
const isShowSummarySon = ref(true);
const expandedRowKeys = ref([]);


const getStatusTagType = (statusName = '') => {
   const normalized = statusName.trim();
   if (!normalized) return 'info';
   return normalized === '未完成付款' ? 'danger' : 'success';
};
// 子表合计方法
const summarizeMainTable1 = (param) => {
  return proxy.summarizeTable(
@@ -473,7 +423,8 @@
      currentPaymentAmount: row.currentPaymentAmount,
      paymentMethod: row.paymentMethod,
   };
   updatePaymentRegistration(updateData).then((res) => {
   // 子表编辑保存按数组提交（与批量登记保持一致）
   updatePaymentRegistration([updateData]).then(() => {
      row.editType = !row.editType;
      getList();
      proxy.$modal.msgSuccess("提交成功");
@@ -484,57 +435,117 @@
  selectedRows.value = selection;
};
// 打开弹框
const openForm = (type, row) => {
  if (selectedRows.value.length !== 1) {
    proxy.$message.error("请选择一条发票数据");
const openForm = () => {
  // 至少选择一条数据
  if (selectedRows.value.length === 0) {
    proxy.$modal?.msgError ? proxy.$modal.msgError("请选择数据") : proxy.$message.error("请选择数据");
    return;
  }
   if (selectedRows.value[0].unPaymentAmountTotal == 0) {
      proxy.$message.warning("无需再付款");
      return;
   }
  operationType.value = type;
  form.value = {};
  form.value = { ...selectedRows.value[0] };
  form.value.ticketRegistrationId = selectedRows.value[0].id;
  form.value.id = null;
  // 查询采购合同号
  form.value.registrationtDate = getCurrentDate();
  form.value.paymentDate = getCurrentDate();
  form.value.registrant = userStore.name;

  // 校验是否为相同供应商名称
  const firstSupplierName = selectedRows.value[0].supplierName;
  const isSameSupplier = selectedRows.value.every(
    (item) => item.supplierName === firstSupplierName
  );
  if (!isSameSupplier) {
    proxy.$modal?.msgError
      ? proxy.$modal.msgError("请选择相同供应商名称的数据进行付款登记")
      : proxy.$message.error("请选择相同供应商名称的数据进行付款登记");
    return;
  }

  // 过滤出有待付款金额的记录
  const validRows = selectedRows.value.filter(
    (item) => Number(item.unPaymentAmountTotal) > 0
  );
  if (validRows.length === 0) {
    proxy.$modal?.msgWarning
      ? proxy.$modal.msgWarning("所选数据均无需再付款")
      : proxy.$message.warning("所选数据均无需再付款");
    return;
  }

  const today = getCurrentDate();
  dialogTableData.value = validRows.map((row) => {
    return {
      ...row,
      // 后端关联“来票台账/登记单”的字段（原逻辑：ticketRegistrationId = row.id）
      ticketRegistrationId: row.id,
      id: null,
      currentPaymentAmount: row.unPaymentAmountTotal || "",
      paymentMethod: "",
      paymentDate: today,
      registrationtDate: today,
      registrant: userStore.nickName || userStore.name,
    };
  });

  dialogFormVisible.value = true;
};
// 提交表单
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    if (valid) {
      if (operationType.value === "edit") {
        submitEdit();
      } else {
        submitAdd();
      }
    }
  // 校验表格数据
  const invalidRows = dialogTableData.value.filter((row) => {
    return (
      !row.currentPaymentAmount ||
      Number(row.currentPaymentAmount) <= 0 ||
      !row.paymentMethod ||
      !row.paymentDate
    );
  });
};
// 提交新增
const submitAdd = () => {
  paymentRegistrationAdd(form.value).then((res) => {
    proxy.$modal.msgSuccess("提交成功");
    closeDia();
    getList();
  if (invalidRows.length > 0) {
    proxy.$modal?.msgError
      ? proxy.$modal.msgError("请完善所有必填项：付款金额、付款方式、付款日期")
      : proxy.$message.error("请完善所有必填项：付款金额、付款方式、付款日期");
    return;
  }

  // 校验付款金额不能超过待付款金额
  const exceedRows = dialogTableData.value.filter((row) => {
    return Number(row.currentPaymentAmount) > Number(row.unPaymentAmountTotal);
  });
};
// 提交修改
const submitEdit = () => {
  paymentRegistrationEdit(form.value).then((res) => {
    proxy.$modal.msgSuccess("提交成功");
    closeDia();
    getList();
  if (exceedRows.length > 0) {
    proxy.$modal?.msgError
      ? proxy.$modal.msgError("付款金额不能超过待付款金额")
      : proxy.$message.error("付款金额不能超过待付款金额");
    return;
  }

  // 组装数组批量提交（如果后端不支持数组，会走兜底循环提交）
  const submitDataList = dialogTableData.value.map((row) => {
    return {
      ticketRegistrationId: row.ticketRegistrationId,
      purchaseLedgerId: row.purchaseLedgerId,
      purchaseContractNumber: row.purchaseContractNumber,
      salesContractNo: row.salesContractNo,
      supplierName: row.supplierName,
      invoiceNumber: row.invoiceNumber,
      invoiceAmount: row.invoiceAmount,
      taxRate: row.taxRate,
      currentPaymentAmount: row.currentPaymentAmount,
      paymentMethod: row.paymentMethod,
      paymentDate: row.paymentDate,
      registrant: row.registrant,
      registrationtDate: row.registrationtDate,
      id: null,
    };
  });

  paymentRegistrationAdd(submitDataList)
    .then(() => {
      proxy.$modal?.msgSuccess
        ? proxy.$modal.msgSuccess("提交成功")
        : proxy.$message.success("提交成功");
      closeDia();
      getList();
    })
    .catch((e) => {
      console.error("提交失败:", e);
    });
};
// 关闭弹框
const closeDia = () => {
  proxy.resetForm("formRef");
  dialogTableData.value = [];
  dialogFormVisible.value = false;
};
// 删除
@@ -567,7 +578,25 @@
  const day = String(today.getDate()).padStart(2, "0");
  return `${year}-${month}-${day}`;
}
getList();

// 导出
const handleExport = () => {
  ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {
    confirmButtonText: "确认",
    cancelButtonText: "取消",
    type: "warning",
  })
    .then(() => {
      proxy.download("/purchase/registration/exportOne", { ...searchForm, ...page }, "付款登记.xlsx");
    })
    .catch(() => {
      proxy.$modal.msg("已取消");
    });
};

onMounted(() => {
  getList();
});
</script>

<style scoped lang="scss">