From 5709db9dc8d689cdbb7a17842998de185b4a6b91 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 七月 2025 13:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/paymentHistory/index.vue | 5
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 19 +---
src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue | 28 ++++++
src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue | 22 ++++-
src/views/salesManagement/receiptPayment/index.vue | 6
src/views/procurementManagement/invoiceEntry/index.vue | 71 +++++++++++++++--
src/views/salesManagement/receiptPaymentLedger/index.vue | 8 ++
src/views/collaborativeApproval/approvalProcess/index.vue | 5
src/views/procurementManagement/paymentEntry/index.vue | 6
src/views/salesManagement/salesLedger/index.vue | 2
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 12 ++-
src/views/salesManagement/invoiceRegistration/index.vue | 14 ++-
src/views/procurementManagement/paymentLedger/index.vue | 5 +
src/views/procurementManagement/procurementLedger/index.vue | 2
src/views/salesManagement/invoiceLedger/index.vue | 2
src/views/procurementManagement/invoiceEntry/indexOld.vue | 8 +-
src/views/salesManagement/receiptPaymentHistory/index.vue | 2
17 files changed, 157 insertions(+), 60 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index a71d689..e4aac00 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -53,7 +53,11 @@
:key="node.id"
style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
>
- <div>鑺傜偣{{ index + 1 }} 鈫�</div>
+ <div>
+ <span v-if="index === 0">鍙戣捣</span>
+ <span v-else>瀹℃壒</span>
+ 鈫�
+ </div>
<el-select
v-model="node.userId"
placeholder="閫夋嫨浜哄憳"
@@ -126,8 +130,8 @@
approveProcessAdd, approveProcessGetInfo,
approveProcessUpdate,
getDept
-} from "../../../../api/collaborativeApproval/approvalProcess.js";
-import {userListNoPage, getUserProfile} from "../../../../api/system/user.js";
+} from "@/api/collaborativeApproval/approvalProcess.js";
+import {userListNoPageByTenantId} from "@/api/system/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
import useUserStore from "@/store/modules/user";
@@ -174,7 +178,7 @@
const openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
- userListNoPage().then((res) => {
+ userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
getProductOptions();
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 60f0c1a..1a0a2ee 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -45,9 +45,10 @@
import {ElMessageBox} from "element-plus";
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
-import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
+import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
import useUserStore from "@/store/modules/user";
const userStore = useUserStore();
+
const data = reactive({
searchForm: {
@@ -139,7 +140,7 @@
clickFun: (row) => {
openApprovalDia("approval", row);
},
- disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2
+ disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveUserCurrentId !== userStore.id
},
{
name: "璇︽儏",
diff --git a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
index aa663eb..24a368a 100644
--- a/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue
@@ -4,6 +4,8 @@
:column="columns"
:tableData="dataList"
:tableLoading="loading"
+ :summaryMethod="summarizeChildrenTable"
+ :isShowSummary="true"
height="auto"
>
</PIMTable>
@@ -13,6 +15,7 @@
import { usePaginationApi } from "@/hooks/usePaginationApi";
import { productList } from "@/api/procurementManagement/procurementLedger.js";
import { nextTick } from "vue";
+const { proxy } = getCurrentInstance();
defineOptions({
name: "鏉ョエ鐧昏鎶樺彔琛�",
@@ -56,6 +59,7 @@
{
label: "鍚◣鍗曚环(鍏�)",
prop: "taxInclusiveUnitPrice",
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : "-";
},
@@ -63,6 +67,7 @@
{
label: "鍚◣鎬讳环(鍏�)",
prop: "taxInclusiveTotalPrice",
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : "-";
},
@@ -70,6 +75,7 @@
{
label: "涓嶅惈绋庢�讳环(鍏�)",
prop: "taxExclusiveTotalPrice",
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : "-";
},
@@ -77,6 +83,7 @@
{
label: "鏈鏉ョエ閲戦(鍏�)",
prop: "ticketsAmount",
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : "-";
},
@@ -88,6 +95,7 @@
{
label: "鏈潵绁ㄩ噾棰�(鍏�)",
prop: "futureTicketsAmount",
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : "-";
},
@@ -105,7 +113,25 @@
filters.salesLedgerId = id;
getTableData();
};
-
+// 瀛愯〃鍚堣鏂规硶
+const summarizeChildrenTable = (param) => {
+ return proxy.summarizeTable(
+ param,
+ [
+ "taxInclusiveUnitPrice",
+ "taxInclusiveTotalPrice",
+ "taxExclusiveTotalPrice",
+ "ticketsNum",
+ "ticketsAmount",
+ "futureTickets",
+ "futureTicketsAmount",
+ ],
+ {
+ ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ }
+ );
+};
defineExpose({
getList,
});
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 6df2bb0..6df5636 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -24,8 +24,8 @@
<el-button type="primary" @click="handleAdd('add')">
鏂板鐧昏
</el-button>
-<!-- <el-button @click="handleOut">瀵煎嚭</el-button>-->
-<!-- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>-->
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
<PIMTable
@@ -40,6 +40,8 @@
total: pagination.total,
}"
:expand-row-keys="expandRowKeys"
+ :summaryMethod="summarizeMainTable"
+ :isShowSummary="true"
@expand-change="expandChange"
@selection-change="handleSelectionChange"
@pagination="changePage"
@@ -65,10 +67,11 @@
<script setup>
import { usePaginationApi } from "@/hooks/usePaginationApi";
-import { gePurchaseListPage } from "@/api/procurementManagement/invoiceEntry.js";
+import {delRegistration, gePurchaseListPage} from "@/api/procurementManagement/invoiceEntry.js";
import { nextTick, onMounted, getCurrentInstance } from "vue";
import ExpandTable from "./components/ExpandTable.vue";
import Modal from "./components/Modal.vue";
+import {ElMessageBox} from "element-plus";
defineOptions({
name: "鏉ョエ鐧昏",
@@ -113,7 +116,7 @@
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
- width:240
+ width:200
},
{
label: "椤圭洰鍚嶇О",
@@ -127,12 +130,12 @@
{
label: "褰曞叆鏃ユ湡",
prop: "entryDate",
- width:100
+ width:110
},
{
label: "鍚堝悓閲戦(鍏�)",
prop: "contractAmount",
- width:150,
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : 0;
},
@@ -140,7 +143,7 @@
{
label: "宸插紑绁ㄩ噾棰�(鍏�)",
prop: "receiptPaymentAmount",
- width:150,
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : 0;
},
@@ -148,7 +151,7 @@
{
label: "寰呭紑绁ㄩ噾棰�(鍏�)",
prop: "unReceiptPaymentAmount",
- width:150,
+ width:200,
formatData: (val) => {
return val ? parseFloat(val).toFixed(2) : 0;
},
@@ -182,8 +185,44 @@
modalRef.value.open(type, id);
};
-const handleOut = () => {};
-const handleDelete = () => {};
+// 瀵煎嚭
+const handleOut = () => {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ proxy.download("/purchase/registration/export", {}, "鏉ョエ鐧昏.xlsx");
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
+// 鍒犻櫎
+const handleDelete = () => {
+ let ids = [];
+ if (selectedRows.value.length > 0) {
+ ids = selectedRows.value.map((item) => item.id);
+ } else {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ delRegistration(ids).then((res) => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
+};
const expandChange = async (row, expandedRows) => {
if (expandedRows.length > 0) {
@@ -196,7 +235,17 @@
pagination.currentPage = page;
onCurrentChange(page);
};
-
+// 涓昏〃鍚堣鏂规硶
+const summarizeMainTable = (param) => {
+ return proxy.summarizeTable(
+ param,
+ ["contractAmount", "receiptPaymentAmount", "unReceiptPaymentAmount"],
+ {
+ ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ }
+ );
+};
onMounted(() => {
getTableData();
});
diff --git a/src/views/procurementManagement/invoiceEntry/indexOld.vue b/src/views/procurementManagement/invoiceEntry/indexOld.vue
index 60d5124..a31c265 100644
--- a/src/views/procurementManagement/invoiceEntry/indexOld.vue
+++ b/src/views/procurementManagement/invoiceEntry/indexOld.vue
@@ -296,19 +296,19 @@
<el-table-column label="褰曞叆鏃ユ湡" prop="createTime" width="120" />
<el-table-column
label="鍚◣鍗曚环(鍏�)"
- width="150"
+ width="200"
prop="taxInclusiveUnitPrice"
:formatter="formattedNumber"
/>
<el-table-column
label="鍚◣鎬讳环(鍏�)"
- width="150"
+ width="200"
prop="taxInclusiveTotalPrice"
:formatter="formattedNumber"
/>
<el-table-column
label="涓嶅惈绋庢�讳环(鍏�)"
- width="150"
+ width="200"
prop="taxExclusiveTotalPrice"
:formatter="formattedNumber"
/>
@@ -331,7 +331,7 @@
:min="0"
:step="0.1"
:formatter="formattedNumber"
- width="170"
+ width="200"
>
<template #default="scope">
<el-input-number
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index 5113234..0190dd5 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -72,7 +72,7 @@
@selection-change="handleSelectionChange"
:tableLoading="tableLoading"
@pagination="pagination"
- :total="total"
+ :total="page.total"
></PIMTable>
</div>
<el-dialog
@@ -278,8 +278,8 @@
const page = reactive({
current: 1,
size: 100,
+ total: 0,
});
-const total = ref(0);
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
@@ -348,7 +348,7 @@
invoiceListPage({ ...searchForm, ...page }).then((res) => {
tableLoading.value = false;
tableData.value = res.records;
- total.value = res.total;
+ page.total = res.total;
});
};
// 琛ㄦ牸閫夋嫨鏁版嵁
diff --git a/src/views/procurementManagement/paymentHistory/index.vue b/src/views/procurementManagement/paymentHistory/index.vue
index 0ef6110..714c670 100644
--- a/src/views/procurementManagement/paymentHistory/index.vue
+++ b/src/views/procurementManagement/paymentHistory/index.vue
@@ -46,7 +46,7 @@
@selection-change="handleSelectionChange"
:tableLoading="tableLoading"
@pagination="pagination"
- :total="total"
+ :total="page.total"
></PIMTable>
</div>
</div>
@@ -97,6 +97,7 @@
const page = reactive({
current: 1,
size: 100,
+ total: 0,
});
const total = ref(0);
const { form: searchForm } = useFormData({
@@ -126,7 +127,7 @@
paymentHistoryListPage({ ...rest, ...page }).then((res) => {
tableLoading.value = false;
tableData.value = res.records;
- total.value = res.total;
+ page.total = res.total;
});
};
// 瀛愯〃鍚堣鏂规硶
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 8226031..387e6b9 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -86,6 +86,7 @@
:tableLoading="tableLoadingSon"
:isShowSummary="isShowSummarySon"
:summaryMethod="summarizeMainTable1"
+ height="calc(100vh - 18.5em)"
>
<template #payableAmountSlot="{ row }">
<el-text type="danger">
@@ -164,10 +165,12 @@
{
label: "鍙戠敓鏃ユ湡",
prop: "happenTime",
+ width: 110,
},
{
label: "鍙戠エ閲戦(鍏�)",
prop: "invoiceAmount",
+ width: 200,
formatData: (params) => {
return params ? parseFloat(params).toFixed(2) : 0;
},
@@ -175,6 +178,7 @@
{
label: "浠樻閲戦(鍏�)",
prop: "currentPaymentAmount",
+ width: 200,
formatData: (params) => {
return params ? parseFloat(params).toFixed(2) : 0;
},
@@ -182,6 +186,7 @@
{
label: "搴斾粯閲戦(鍏�)",
dataType: "slot",
+ width: 200,
prop: "payableAmount",
slot: "payableAmountSlot",
},
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
index 2ce140d..12da5e7 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
@@ -12,8 +12,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚◣鎬讳环(鍏�)锛�">
- <el-text type="primary">{{ form.taxInclusiveTotalPrice }}</el-text>
+ <el-form-item label="鍚◣鍗曚环(鍏�)锛�">
+ <el-text type="primary">{{ form.taxInclusiveUnitPrice }}</el-text>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -36,6 +36,11 @@
<el-text type="success">{{ form.ticketsAmount }}</el-text>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鏈潵绁ㄦ暟锛�">
+ <el-text type="success">{{ form.futureTickets }}</el-text>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</template>
@@ -43,6 +48,7 @@
<script setup>
import useFormData from "@/hooks/useFormData";
import { getProductRecordById } from "@/api/procurementManagement/procurementInvoiceLedger";
+const { proxy } = getCurrentInstance()
defineOptions({
name: "鏉ョエ鍙拌处琛ㄥ崟",
@@ -56,7 +62,7 @@
invoiceNumber: undefined, // 鍙戠エ鍙�
ticketsNum: undefined, // 鏉ョエ鏁�
ticketsAmount: undefined, // 鏉ョエ閲戦
- taxInclusiveTotalPrice: undefined, // 鍚◣鎬讳环
+ taxInclusiveUnitPrice: undefined, // 鍚◣鍗曚环
});
const load = async (id) => {
@@ -69,12 +75,18 @@
form.invoiceNumber = data.invoiceNumber;
form.ticketsNum = data.ticketsNum;
form.ticketsAmount = data.ticketsAmount.toFixed(2);
- form.taxInclusiveTotalPrice = data.taxInclusiveTotalPrice;
+ form.taxInclusiveUnitPrice = data.taxInclusiveUnitPrice;
+ form.futureTickets = data.futureTickets;
}
};
const inputTicketsNum = (val) => {
- form.ticketsAmount = (val * form.taxInclusiveTotalPrice).toFixed(2);
+ if (Number(form.ticketsNum) > Number(form.futureTickets)) {
+ proxy.$modal.msgWarning("寮�绁ㄦ暟涓嶅緱澶т簬鏈紑绁ㄦ暟");
+ form.ticketsNum = form.futureTickets
+ return;
+ }
+ form.ticketsAmount = (val * form.taxInclusiveUnitPrice).toFixed(2);
};
defineExpose({
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 7afd3d1..f969167 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -142,45 +142,37 @@
{
label: "閲囪喘鍚堝悓鍙�",
prop: "purchaseContractNumber",
- align: "center",
width: 150,
},
{
label: "閿�鍞悎鍚屽彿",
prop: "salesContractNo",
- align: "center",
width: 150,
},
{
label: "瀹㈡埛鍚嶇О",
prop: "customerName",
- align: "center",
width: 150,
},
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
- align: "center",
width: 240,
},
{
label: "瑙勬牸鍨嬪彿",
prop: "specificationModel",
- align: "center",
width: 150,
},
{
label: "鍙戠エ鍙�",
prop: "invoiceNumber",
- align: "center",
-
width: 200,
},
{
label: "鍚堝悓閲戦(鍏�)",
prop: "taxInclusiveTotalPrice",
- align: "center",
- width: 120,
+ width: 200,
formatData: (cell) => {
return cell ? parseFloat(cell).toFixed(2) : 0;
},
@@ -188,14 +180,12 @@
{
label: "寮�绁ㄦ棩鏈�",
prop: "createdAt",
- align: "center",
- width: 100,
+ width: 110,
},
{
label: "寮�绁ㄩ噾棰�",
prop: "ticketsAmount",
- align: "center",
- width: 100,
+ width: 200,
formatData: (cell) => {
return cell ? parseFloat(cell).toFixed(2) : 0;
},
@@ -203,7 +193,6 @@
{
label: "涓嶅惈绋庨噾棰�",
prop: "unTicketsPrice",
- align: "center",
width: 100,
formatData: (cell) => {
return cell ? parseFloat(cell).toFixed(2) : 0;
@@ -212,7 +201,6 @@
{
label: "澧炲�肩◣",
prop: "invoiceAmount",
- align: "center",
width: 100,
},
{
@@ -220,6 +208,7 @@
align: "center",
prop: "commonFiles",
dataType: "slot",
+ fixed: "right",
slot: "commonFilesRef",
width: 150,
},
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 1465d16..457abe0 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -106,7 +106,7 @@
<el-table-column
label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
- width="100"
+ width="200"
show-overflow-tooltip
:formatter="formattedNumber"
/>
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 0f5eb24..70e6a70 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -38,7 +38,7 @@
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="300" show-overflow-tooltip />
<el-table-column label="鍙戠エ鍙�" prop="invoiceNo" width="200" show-overflow-tooltip />
<el-table-column label="鍙戠エ閲戦(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"
- width="120" />
+ width="200" />
<el-table-column label="绋庣巼(%)" prop="taxRate" show-overflow-tooltip />
<el-table-column label="褰曞叆浜�" prop="invoicePerson" show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡" prop="createTime" show-overflow-tooltip :formatter="formatDate" width="180" />
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 0104fd1..e9dd49e 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -151,7 +151,7 @@
prop="contractAmount"
show-overflow-tooltip
:formatter="formattedNumber"
- width="120"
+ width="220"
/>
<el-table-column
@@ -297,16 +297,18 @@
/>
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="鏁伴噺" prop="quantity" width="70" />
- <el-table-column label="绋庣巼(%)" prop="taxRate" width="70" />
+ <el-table-column label="绋庣巼(%)" prop="taxRate" width="80" />
<el-table-column
label="鍚◣鍗曚环(鍏�)"
prop="taxInclusiveUnitPrice"
:formatter="formattedNumber"
+ width="200"
/>
<el-table-column
label="鍚◣鎬讳环(鍏�)"
prop="taxInclusiveTotalPrice"
:formatter="formattedNumber"
+ width="200"
/>
<el-table-column
label="涓嶅惈绋庢�讳环(鍏�)"
@@ -314,7 +316,7 @@
:formatter="formattedNumber"
width="150"
/>
- <el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum" width="150">
+ <el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum" width="180">
<template #default="scope">
<el-input-number :step="0.1" :min="0" style="width: 100%"
v-model="scope.row.currentInvoiceNum"
@@ -325,7 +327,7 @@
<el-table-column
label="鏈寮�绁ㄩ噾棰�(鍏�)"
prop="currentInvoiceAmount"
- width="150"
+ width="180"
>
<template #default="scope">
<el-input-number :step="0.01" :min="0" style="width: 100%"
@@ -334,7 +336,7 @@
></el-input-number>
</template>
</el-table-column>
- <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" width="100">
+ <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" width="120">
<template #default="scope">
<el-input
type="number"
@@ -347,7 +349,7 @@
<el-table-column
label="鏈紑绁ㄩ噾棰�(鍏�)"
prop="noInvoiceAmount"
- width="150"
+ width="200"
>
<template #default="scope">
<el-input
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 430823e..d9048a0 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -184,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
@@ -192,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">
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index f127645..f0dc1de 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -101,7 +101,7 @@
{
label: "鍥炴閲戦锛堝厓锛�",
prop: "receiptPaymentAmount",
- width:150,
+ width:200,
formatData: (params) => {
return params ? parseFloat(params).toFixed(2) : 0;
},
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 7d61a83..fc84583 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/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">
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 7ec277f..c2ebd2c 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -64,7 +64,7 @@
<el-table-column label="涓氬姟鍛�" prop="salesman" width="100" show-overflow-tooltip />
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip />
<el-table-column label="浠樻鏂瑰紡" prop="paymentMethod" show-overflow-tooltip />
- <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="180" show-overflow-tooltip
+ <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="220" show-overflow-tooltip
:formatter="formattedNumber" />
<el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
--
Gitblit v1.9.3