From f388ea8993f8e1a0673d291a301b9eb78d61e86d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 25 八月 2025 16:13:45 +0800
Subject: [PATCH] 采购管理修改
---
src/views/procurementManagement/paymentHistory/index.vue | 4 ++
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 14 ++++++-
src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue | 13 +++---
src/views/procurementManagement/paymentEntry/index.vue | 46 +++++++++++-----------
4 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index 107ee30..0749292 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -221,31 +221,31 @@
</el-select>
</el-form-item>
</el-col>
- <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="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="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-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
diff --git a/src/views/procurementManagement/paymentHistory/index.vue b/src/views/procurementManagement/paymentHistory/index.vue
index 714c670..7c71979 100644
--- a/src/views/procurementManagement/paymentHistory/index.vue
+++ b/src/views/procurementManagement/paymentHistory/index.vue
@@ -63,6 +63,10 @@
const isShowSummarySon = ref(true);
const tableColumn = ref([
{
+ label: "閲囪喘鍚堝悓鍙�",
+ prop: "purchaseContractNumber",
+ },
+ {
label: "浠樻鏃ユ湡",
prop: "paymentDate",
},
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
index 77789c4..f939be4 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
@@ -53,7 +53,7 @@
defineOptions({
name: "鏉ョエ鍙拌处琛ㄥ崟",
});
-
+const temFutureTickets = ref(0)
const { form, resetForm } = useFormData({
id: undefined,
purchaseContractNumber: undefined, // 閲囪喘鍚堝悓鍙�
@@ -77,6 +77,7 @@
form.ticketsAmount = data.ticketsAmount.toFixed(2);
form.taxInclusiveUnitPrice = data.taxInclusiveUnitPrice;
form.futureTickets = data.futureTickets;
+ temFutureTickets.value = data.futureTickets;
}
};
@@ -86,16 +87,14 @@
proxy.$modal.msgWarning("鍚◣鍗曚环涓嶈兘涓洪浂鎴栨湭瀹氫箟");
return;
}
-
- if (Number(form.ticketsNum) > Number(form.futureTickets)) {
+ if (Number(form.ticketsNum) > Number(temFutureTickets.value)) {
proxy.$modal.msgWarning("寮�绁ㄦ暟涓嶅緱澶т簬鏈紑绁ㄦ暟");
- form.ticketsNum = form.futureTickets
- return;
+ form.ticketsNum = temFutureTickets.value
}
// 纭繚鎵�鏈夋暟鍊奸兘杞崲涓烘暟瀛楃被鍨嬭繘琛岃绠�
- const ticketsAmount = Number(val) * Number(form.taxInclusiveUnitPrice);
- const futureTickets = Number(form.futureTickets) - Number(val);
+ const ticketsAmount = Number(form.ticketsNum) * Number(form.taxInclusiveUnitPrice);
+ const futureTickets = Number(temFutureTickets.value) - Number(form.ticketsNum);
form.futureTickets = Number(futureTickets.toFixed(2));
form.ticketsAmount = Number(ticketsAmount.toFixed(2));
};
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 439837b..8ad8799 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -172,6 +172,11 @@
width: 240,
},
{
+ label: "浜у搧澶х被",
+ prop: "productCategory",
+ width: 150,
+ },
+ {
label: "瑙勬牸鍨嬪彿",
prop: "specificationModel",
width: 150,
@@ -190,12 +195,17 @@
},
},
{
- label: "寮�绁ㄦ棩鏈�",
+ label: "鏈鏉ョエ鏁�",
+ prop: "ticketsNum",
+ width: 110,
+ },
+ {
+ label: "鏉ョエ鏃ユ湡",
prop: "createdAt",
width: 110,
},
{
- label: "寮�绁ㄩ噾棰�",
+ label: "鏉ョエ閲戦(鍏�)",
prop: "ticketsAmount",
width: 200,
formatData: (cell) => {
--
Gitblit v1.9.3