From 344551aecaab6762c7dc7b4b4f85bbff18898ab9 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期六, 28 六月 2025 10:55:40 +0800
Subject: [PATCH] feat: 6/28内容调整
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 4 +-
src/views/procurementManagement/invoiceEntry/index.vue | 14 +++++++
src/components/PIMTable/PIMTable.vue | 6 +-
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 17 ++++++++
src/views/salesManagement/invoiceRegistration/index.vue | 10 +++-
src/views/procurementManagement/paymentLedger/index.vue | 19 +++++----
6 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index d1b778d..fb472fb 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -207,8 +207,8 @@
</el-table-column>
</el-table>
<pagination
- v-show="total > 0"
- :total="total"
+ v-if="page.total > 0"
+ :total="page.total"
:layout="page.layout"
:page="page.current"
:limit="page.size"
@@ -245,7 +245,7 @@
},
height: {
type: [Number, String],
- default: "calc(100vh - 18.5em)",
+ default: "calc(100vh - 22em)",
},
expandRowKeys: {
type: Array,
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index 2e0f3f3..7e38af6 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -101,8 +101,18 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="褰曞叆鏃ユ湡锛�" prop="enterDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="form.enterDate"
+ type="date"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
</el-row>
- <el-form-item label="浜у搧淇℃伅锛�" prop="entryDate"> </el-form-item>
+ <el-form-item label="浜у搧淇℃伅锛�"> </el-form-item>
<PIMTable
rowKey="id"
:column="columns"
@@ -155,6 +165,7 @@
import { getPurchaseById } from "@/api/procurementManagement/procurementLedger.js";
import { getToken } from "@/utils/auth";
import useUserStore from "@/store/modules/user";
+import dayjs from "dayjs";
defineOptions({
name: "鏉ョエ鐧昏妯℃�佹",
@@ -175,6 +186,7 @@
issUer: userStore.nickName, // 褰曞叆浜�
entryDate: undefined, // 寮�绁ㄦ棩鏈�
salesContractNoId: undefined, // 寮�绁ㄦ棩鏈�
+ enterDate: dayjs().format("YYYY-MM-DD"),
productData: [], // 琛ㄦ牸
tempFileIds: [], // 鏂囦欢
});
@@ -187,6 +199,8 @@
invoiceAmount: [
{ required: true, message: "璇疯緭鍏ュ彂绁ㄩ噾棰�", trigger: "blur" },
],
+ entryDate: [{ required: true, message: "璇烽�夋嫨寮�绁ㄦ棩鏈�", trigger: "change" }],
+ enterDate: [{ required: true, message: "璇烽�夋嫨褰曞叆鏃ユ湡", trigger: "change" }],
});
const {
@@ -391,6 +405,7 @@
salesContractNoId: form.salesContractNoId,
supplierName: form.supplierName,
tempFileIds: form.tempFileIds,
+ enterDate: form.enterDate,
type: 4,
});
modalLoading.value = false;
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 3f8fcf9..c8ece35 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -42,6 +42,7 @@
:expand-row-keys="expandRowKeys"
@expand-change="expandChange"
@selection-change="handleSelectionChange"
+ @pagination="onCurrentChange"
>
<template #expand="{ row }">
<ExpandTable ref="expandTableRef" />
@@ -87,6 +88,7 @@
pagination,
getTableData,
resetFilters,
+ onCurrentChange,
} = usePaginationApi(
gePurchaseListPage,
{
@@ -99,6 +101,10 @@
slot: "expand",
},
{
+ label: "閲囪喘璁㈠崟鍙�",
+ prop: "purchaseContractNumber",
+ },
+ {
label: "閿�鍞悎鍚屽彿",
prop: "salesContractNo",
},
@@ -111,6 +117,14 @@
prop: "projectName",
},
{
+ label: "褰曞叆浜�",
+ prop: "recorderName",
+ },
+ {
+ label: "褰曞叆鏃ユ湡",
+ prop: "entryDate",
+ },
+ {
label: "鍚堝悓閲戦(鍏�)",
prop: "contractAmount",
formatData: (val) => {
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 61e6f98..258bef2 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -181,6 +181,7 @@
{
label: "搴斾粯閲戦(鍏�)",
dataType: "slot",
+ prop: "payableAmount",
slot: "payableAmountSlot",
},
]);
@@ -207,20 +208,20 @@
const summarizeMainTable1 = (param) => {
let summarizeTable = proxy.summarizeTable(
param,
- ["invoiceAmount", "currentPaymentAmount"],
+ ["invoiceAmount", "currentPaymentAmount", "payableAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
}
);
- if (originalTableDataSon.value.length > 0) {
- summarizeTable[summarizeTable.length - 1] =
- originalTableDataSon.value[
- originalTableDataSon.value.length - 1
- ].payableAmount.toFixed(2);
- } else {
- summarizeTable[summarizeTable.length - 1] = 0.0;
- }
+ // if (originalTableDataSon.value.length > 0) {
+ // summarizeTable[summarizeTable.length - 1] =
+ // originalTableDataSon.value[
+ // originalTableDataSon.value.length - 1
+ // ].payableAmount.toFixed(2);
+ // } else {
+ // summarizeTable[summarizeTable.length - 1] = 0.0;
+ // }
return summarizeTable;
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index e5565a5..2eaf02c 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -47,13 +47,13 @@
:tableLoading="loading"
:tableData="dataList"
:isSelection="true"
- height="calc(100vh - 18.5em)"
+ height="calc(100vh - 15em)"
:isShowSummary="true"
:summaryMethod="summarizeMainTable"
:page="{
current: pagination.currentPage,
size: pagination.pageSize,
- total: pagination.total,
+ total: 0,
}"
@selection-change="handleSelectionChange"
@pagination="onCurrentChange"
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 25c2f01..752c6ee 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -218,7 +218,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="褰曞叆浜�">
+ <el-form-item label="褰曞叆浜�" prop="createUer">
<el-input v-model="form.createUer" placeholder="璇疯緭鍏ュ綍鍏ヤ汉" />
</el-form-item>
</el-col>
@@ -391,6 +391,7 @@
import { invoiceRegistrationSave } from "@/api/salesManagement/invoiceRegistration.js";
import useFormData from "@/hooks/useFormData";
import useUserStore from "@/store/modules/user";
+import dayjs from "dayjs";
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
@@ -423,11 +424,14 @@
projectName: "",
productData: [],
invoiceNo: "",
- createUer: "",
- issueDate: "",
+ createUer: userStore.nickName,
+ issueDate: dayjs().format("YYYY-MM-DD"),
},
rules: {
salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ createUer: [{ required: true, message: "璇烽�夋嫨", trigger: "blur" }],
+ issueDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ createTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
const { form, rules } = toRefs(data);
--
Gitblit v1.9.3