From 37aa1274e7e075a03dbb8726fbd2f5233c85c83b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 21 五月 2025 15:56:23 +0800
Subject: [PATCH] 1.来票登记逻辑更改 2.来票台账更改
---
src/views/procurementManagement/invoiceEntry/index.vue | 192 +++++++++++++++++++++++++-----------------------
1 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 76290f7..62aba8c 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -3,126 +3,104 @@
<div class="search_form">
<div>
<span class="search_title">閲囪喘鍚堝悓鍙凤細</span>
- <el-input
- v-model="searchForm.purchaseContractNumber"
- style="width: 240px"
- placeholder="璇疯緭鍏�"
- @change="handleQuery"
- clearable
- prefix-icon="Search"
- />
+ <el-input v-model="searchForm.purchaseContractNumber" style="width: 240px" placeholder="璇疯緭鍏�"
+ @change="handleQuery" clearable prefix-icon="Search" />
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
- <el-button type="primary" @click="openForm('add')">鏂板鐧昏</el-button>
+ <el-button type="primary" @click="handleAdd">鏂板鐧昏</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
- <el-table :data="tableData" border v-loading="tableLoading"
- @selection-change="handleSelectionChange"
- :expand-row-keys="expandedRowKeys"
- :row-key="row => row.id"
- show-summary
- :summary-method="summarizeMainTable"
- @expand-change="expandChange"
- height="calc(100vh - 18.5em)">
+ <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
+ :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary :summary-method="summarizeMainTable"
+ @expand-change="expandChange" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column type="expand">
<template #default="props">
- <el-table :data="props.row.children" border
- show-summary
- :summary-method="summarizeChildrenTable">
+ <el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
- <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber"/>
- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber"/>
- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber"/>
+ <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
<el-table-column label="鏈鏉ョエ鏁�" prop="ticketsNum" />
- <el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount" :formatter="formattedNumber"/>
+ <el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount" :formatter="formattedNumber" />
<el-table-column label="鏈潵绁ㄦ暟" prop="futureTickets" />
- <el-table-column label="鏈潵绁ㄩ噾棰�(鍏�)" prop="futureTicketsAmount" :formatter="formattedNumber"/>
+ <el-table-column label="鏈潵绁ㄩ噾棰�(鍏�)" prop="futureTicketsAmount" :formatter="formattedNumber" />
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" show-overflow-tooltip/>
- <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
- <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip/>
- <el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
- <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" show-overflow-tooltip />
+ <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip />
+ <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip />
+ <el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip />
+ <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip :formatter="formattedNumber" />
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
- :limit="page.size" @pagination="paginationChange" />
+ <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current" :limit="page.size" @pagination="paginationChange" />
</div>
- <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鏉ョエ鐧昏' : '缂栬緫鏉ョエ鐧昏'" width="80%" @close="closeDia">
+ <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鏉ョエ鐧昏' : '缂栬緫鏉ョエ鐧昏'" 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="purchaseLedgerId">
- <el-select v-model="form.purchaseLedgerId" placeholder="璇烽�夋嫨" clearable @change="setInfo" :disabled="operationType === 'edit'">
- <el-option v-for="item in purchaseLedgerList" :key="item.id" :label="item.purchaseContractNumber" :value="item.id"/>
- </el-select>
+ <el-form-item label="閲囪喘鍚堝悓鍙凤細" prop="purchaseLedgerNo">
+ <el-input v-model="form.purchaseLedgerNo" 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-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-input v-model="form.supplierName" placeholder="鑷姩濉厖" clearable disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
- <el-input v-model="form.projectName" placeholder="鑷姩濉厖" clearable disabled/>
+ <el-input v-model="form.projectName" placeholder="鑷姩濉厖" clearable disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
- <el-input v-model="form.invoiceNumber" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.invoiceNumber" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceAmount">
- <el-input type="number" :step="0.01" v-model="form.invoiceAmount" placeholder="璇疯緭鍏�" clearable/>
+ <el-input type="number" :step="0.01" v-model="form.invoiceAmount" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="寮�绁ㄤ汉锛�" prop="issUer">
- <el-input v-model="form.issUer" placeholder="璇疯緭鍏�" clearable disabled/>
+ <el-input v-model="form.issUer" placeholder="璇疯緭鍏�" clearable disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="寮�绁ㄦ棩鏈燂細" prop="issueDate">
- <el-date-picker
- disabled
- style="width: 100%"
- v-model="form.issueDate"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- type="date"
- placeholder="璇烽�夋嫨"
- clearable
- />
+ <el-date-picker disabled style="width: 100%" v-model="form.issueDate" value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -131,24 +109,29 @@
</el-form-item>
</el-row>
<el-table :data="productData" border @selection-change="productSelected" show-summary
- :summary-method="summarizeChildrenTable">
+ :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍗曚綅" prop="unit" />
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
- <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber"/>
- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber"/>
- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber"/>
+ <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
<el-table-column label="鏈鏉ョエ鏁�" prop="ticketsNum" width="170">
<template #default="scope">
- <el-input-number v-model="scope.row.ticketsNum" :precision="0" :step="1" clearable style="width: 100%" @blur="invoiceNumBlur(scope.row)"/>
+ <el-input-number v-model="scope.row.ticketsNum" :precision="0" :step="1" clearable style="width: 100%"
+ @blur="invoiceNumBlur(scope.row)" />
</template>
</el-table-column>
<el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount" :formatter="formattedNumber"></el-table-column>
- <el-table-column label="鏈潵绁ㄦ暟" prop="futureTickets"></el-table-column>
- <el-table-column label="鏈潵绁ㄩ噾棰�(鍏�)" prop="futureTicketsAmount" :formatter="formattedNumber"> </el-table-column>
+ <el-table-column label="鏈潵绁ㄦ暟" prop="futureTickets"
+ :formatter="(row) => row.futureTickets == null || row.futureTickets === '' ? row.quantity : row.futureTickets">
+ </el-table-column>
+ <el-table-column label="鏈潵绁ㄩ噾棰�(鍏�)" prop="futureTicketsAmount"
+ :formatter="(row) => (row.futureTicketsAmount !== undefined && row.futureTicketsAmount !== null && row.futureTicketsAmount !== '' ? row.futureTicketsAmount : row.taxExclusiveTotalPrice)">
+ </el-table-column>
</el-table>
</el-form>
<template #footer>
@@ -167,6 +150,8 @@
import {ElMessageBox } from "element-plus";
import {userListNoPage} from "@/api/system/user.js";
import {productList} from "@/api/procurementManagement/procurementLedger.js";
+import useUserStore from '@/store/modules/user';
+const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
const productData = ref([])
@@ -187,6 +172,7 @@
gePurchaseList,
getInfo,
getProduct,
+ getPurchaseNoById,
getRegistrationById
} from "@/api/procurementManagement/invoiceEntry.js";
@@ -199,6 +185,9 @@
},
form: {
purchaseLedgerId: '',
+ purchaseLedgerNo: '',
+ issUerId: '', // 寮�绁ㄤ汉id
+ issUer: '' ,// 寮�绁ㄤ汉濮撳悕
},
rules: {
purchaseLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -223,7 +212,7 @@
}
const getList = () => {
tableLoading.value = true
- gePurchaseList({...searchForm.value, ...page}).then(res => {
+ gePurchaseList({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
tableData.value = res.rows
tableData.value.map(item => {
@@ -251,7 +240,7 @@
if (expandedRows.length > 0) {
expandedRowKeys.value = []
try {
- productList({salesLedgerId: row.purchaseLedgerId, type: 2}).then(res => {
+ productList({ salesLedgerId: row.purchaseLedgerId, type: 2 }).then(res => {
const index = tableData.value.findIndex(item => item.id === row.id);
if (index > -1) {
tableData.value[index].children = res.rows;
@@ -274,31 +263,52 @@
};
// 瀛愯〃鍚堣鏂规硶
const summarizeChildrenTable = (param) => {
- return proxy.summarizeTable(param, ['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice', 'ticketsNum', 'ticketsAmount', 'futureTickets', 'futureTicketsAmount'],{
+ return proxy.summarizeTable(param, ['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice', 'ticketsNum', 'ticketsAmount', 'futureTickets', 'futureTicketsAmount'], {
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
-});
+ });
+};
+
+const handleAdd = () => {
+ if (selectedRows.value.length !== 1) {
+ proxy.$modal.msgWarning('璇峰厛閫変腑涓�鏉℃暟鎹�');
+ return;
+ }
+ openForm('add', selectedRows.value[0]);
}
+
// 鎵撳紑寮规
const openForm = (type, row) => {
operationType.value = type
form.value = {}
productData.value = []
fileList.value = []
- // 鏌ヨ浜哄憳鍒楄〃
+ form.value.issUerId = userStore.id
+ form.value.issUer = userStore.name
userListNoPage().then(res => {
userList.value = res.data
})
- // 鏌ヨ閲囪喘鍚堝悓鍙�
- getProduct().then(res => {
- purchaseLedgerList.value = res
- })
+ // 鏂板鏃朵紶鍏ュ綋鍓嶈id骞舵煡璇㈤噰璐悎鍚屽彿
+ if (type === 'add' && row && row.id) {
+ form.value.purchaseLedgerId = row.id
+ getPurchaseNoById({ id: row.id }).then(res => {
+ purchaseLedgerList.value = res,
+ form.value.purchaseLedgerNo = res.purchaseContractNumber;
+ form.value.invoiceAmount = res.invoiceAmount;
+ form.value.invoiceNumber = res.invoiceNumber;
+ setInfo(res.id)
+ })
+ } else {
+ getProduct().then(res => {
+ purchaseLedgerList.value = res
+ })
+ }
if (type === 'edit') {
currentId.value = row.id;
- getRegistrationById({id: row.id}).then(res => {
- form.value = {...res}
+ getRegistrationById({ id: row.id }).then(res => {
+ form.value = { ...res }
productData.value = form.value.productData
- if(form.value.salesLedgerFiles) {
+ if (form.value.salesLedgerFiles) {
fileList.value = form.value.salesLedgerFiles
} else {
fileList.value = []
@@ -309,7 +319,7 @@
}
// 閫夋嫨閲囪喘鍚堝悓鍙疯祴鍊�
const setInfo = (value) => {
- getInfo({id: value}).then(res => {
+ getInfo({ id: value }).then(res => {
form.value.salesContractNo = res.salesContractNo
form.value.projectName = res.projectName
productData.value = res.productData
@@ -336,7 +346,7 @@
}
// 濉啓鏁版嵁
const openProductEdit = (row) => {
- const index = productData.value.findIndex(item => item.id === row.id);
+ const index = productData.value.findIndex(item => item.id === row.id);
if (index > -1) {
productData.value[index].editFlag = !productData.value[index].editFlag
}
@@ -344,12 +354,12 @@
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
- '瀵煎嚭', {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
+ '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
+ '瀵煎嚭', {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
).then(() => {
proxy.download("/purchase/registration/export", {}, '鏉ョエ鐧昏.xlsx')
}).catch(() => {
@@ -366,12 +376,12 @@
return
}
ElMessageBox.confirm(
- '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
- '瀵煎嚭', {
- confirmButtonText: '纭',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- }
+ '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
+ '瀵煎嚭', {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }
).then(() => {
delRegistration(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
@@ -383,14 +393,14 @@
}
//鏈寮�绁ㄥけ鐒︽搷浣�
const invoiceNumBlur = (row) => {
- if(!row.ticketsNum){
+ if (!row.ticketsNum) {
row.ticketsNum = 0
}
- if(row.ticketsNum > row.futureTickets){
+ if (Number(row.ticketsNum) > Number(row.futureTickets)) {
proxy.$modal.msgWarning('鏈寮�绁ㄦ暟涓嶅緱澶т簬鏈紑绁ㄦ暟')
row.ticketsNum = 0
+ return
}
- row.futureTickets = row.futureTickets - row.ticketsNum
// 璁＄畻鏈寮�绁ㄩ噾棰�
row.ticketsAmount = row.ticketsNum * row.taxInclusiveUnitPrice
// 璁＄畻鏈紑绁ㄦ暟
@@ -401,6 +411,4 @@
getList()
</script>
-<style scoped lang="scss">
-
-</style>
\ No newline at end of file
+<style scoped lang="scss"></style>
\ No newline at end of file
--
Gitblit v1.9.3