From e7d8b280e4d9b0c0394f40ab56cbc37be57cb19b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 五月 2025 15:56:40 +0800
Subject: [PATCH] 来票登记-联调
---
src/views/procurementManagement/procurementLedger/index.vue | 2
src/api/procurementManagement/procurementLedger.js | 2
src/views/procurementManagement/invoiceEntry/index.vue | 413 +++++++++++++++++++++++++++++++++++++++++++++
src/views/salesManagement/invoiceRegistration/index.vue | 18 -
src/api/procurementManagement/invoiceEntry.js | 51 +++++
5 files changed, 474 insertions(+), 12 deletions(-)
diff --git a/src/api/procurementManagement/invoiceEntry.js b/src/api/procurementManagement/invoiceEntry.js
new file mode 100644
index 0000000..9a45ce8
--- /dev/null
+++ b/src/api/procurementManagement/invoiceEntry.js
@@ -0,0 +1,51 @@
+// 閲囪喘-鏉ョエ鐧昏鎺ュ彛
+import request from '@/utils/request'
+
+// 鏌ヨ閲囪喘鍚堝悓鍙�
+export function getProduct(query) {
+ return request({
+ url: '/purchase/ledger/getProduct',
+ method: 'get',
+ params: query
+ })
+}
+// 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇㈣缁嗕俊鎭�
+export function getInfo(query) {
+ return request({
+ url: '/purchase/ledger/getInfo',
+ method: 'get',
+ params: query
+ })
+}
+// 涓诲垪琛ㄦ煡璇�
+export function gePurchaseList(query) {
+ return request({
+ url: '/purchase/registration/list',
+ method: 'get',
+ params: query
+ })
+}
+// 涓诲垪琛ㄦ煡璇�
+export function getRegistrationById(query) {
+ return request({
+ url: '/purchase/registration/getRegistrationById',
+ method: 'get',
+ params: query
+ })
+}
+// 鏂板缂栬緫鏉ョエ鐧昏
+export function addOrUpdateRegistration(query) {
+ return request({
+ url: '/purchase/registration/addOrUpdateRegistration',
+ method: 'post',
+ data: query
+ })
+}
+// 鍒犻櫎鏉ョエ鐧昏
+export function delRegistration(query) {
+ return request({
+ url: '/purchase/registration/delRegistration',
+ method: 'delete',
+ data: query
+ })
+}
\ No newline at end of file
diff --git a/src/api/procurementManagement/procurementLedger.js b/src/api/procurementManagement/procurementLedger.js
index 2b8b17e..1b6fe1f 100644
--- a/src/api/procurementManagement/procurementLedger.js
+++ b/src/api/procurementManagement/procurementLedger.js
@@ -41,7 +41,7 @@
data: query
})
}
-// 鍒犻櫎
+// 鏌ヨ璇︽儏
export function getPurchaseById(query) {
return request({
url: '/purchase/ledger/getPurchaseById',
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
new file mode 100644
index 0000000..a028f15
--- /dev/null
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -0,0 +1,413 @@
+<template>
+ <div class="app-container">
+ <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-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
+ </div>
+ <div>
+ <el-button type="primary" @click="openForm('add')">鏂板鐧昏</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-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-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" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
+ <el-table-column label="鏈鏉ョエ鏁�" prop="ticketsNum" />
+ <el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount" />
+ <el-table-column label="鏈潵绁ㄦ暟" prop="futureTickets" />
+ <el-table-column label="鏈潵绁ㄩ噾棰�(鍏�)" prop="futureTicketsAmount" />
+ </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="businessPerson" show-overflow-tooltip/>
+ <el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
+ <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
+ <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" />
+ </div>
+ <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">
+ <el-option v-for="item in purchaseLedgerList" :key="item.id" :label="item.purchaseContractNumber" :value="item.id"/>
+ </el-select>
+ </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="projectName">
+ <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="businessPersonId">
+ <el-select v-model="form.businessPersonId" placeholder="鑷姩濉厖" clearable disabled>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
+ </el-form-item>
+ </el-row>
+ <el-table :data="productData" border @selection-change="productSelected">
+ <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" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
+ <el-table-column label="鏈鏉ョエ鏁�" prop="ticketsNum">
+ <template #default="scope">
+ <el-input :disabled="!scope.row.editFlag" v-model="scope.row.ticketsNum"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount">
+ <template #default="scope">
+ <el-input :disabled="!scope.row.editFlag" v-model="scope.row.ticketsAmount"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈潵绁ㄦ暟" prop="futureTickets">
+ <template #default="scope">
+ <el-input :disabled="!scope.row.editFlag" v-model="scope.row.futureTickets"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈潵绁ㄩ噾棰�(鍏�)" prop="futureTicketsAmount">
+ <template #default="scope">
+ <el-input :disabled="!scope.row.editFlag" v-model="scope.row.futureTicketsAmount"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
+ <template #default="scope">
+ <el-button v-if="!scope.row.editFlag" link type="primary" size="small" @click="openProductEdit(scope.row);">缂栬緫</el-button>
+ <el-button v-else link type="primary" size="small" @click="openProductEdit(scope.row);">淇濆瓨</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭</el-button>
+ <el-button @click="closeDia">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
+</template>
+
+<script setup>
+import pagination from '@/components/PIMTable/Pagination.vue'
+import { ref } from 'vue'
+import {ElMessageBox } from "element-plus";
+import {userListNoPage} from "@/api/system/user.js";
+import {productList} from "@/api/procurementManagement/procurementLedger.js";
+const { proxy } = getCurrentInstance()
+const tableData = ref([])
+const productData = ref([])
+const selectedRows = ref([])
+const productSelectedRows = ref([])
+const userList = ref([])
+const purchaseLedgerList = ref([])
+const tableLoading = ref(false)
+const page = reactive({
+ current: 1,
+ size: 10,
+})
+const total = ref(0)
+const fileList = ref([])
+import {
+ addOrUpdateRegistration,
+ delRegistration,
+ gePurchaseList,
+ getInfo,
+ getProduct,
+ getRegistrationById
+} from "@/api/procurementManagement/invoiceEntry.js";
+
+// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
+const operationType = ref('')
+const dialogFormVisible = ref(false)
+const data = reactive({
+ searchForm: {
+ purchaseContractNumber: '',
+ },
+ form: {
+ purchaseLedgerId: '',
+ },
+ rules: {
+ purchaseLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ }
+})
+const { searchForm, form, rules } = toRefs(data)
+// 浜у搧琛ㄥ崟寮规鏁版嵁
+const productFormVisible = ref(false)
+const productOperationType = ref('')
+const currentId = ref('')
+
+// 鏌ヨ鍒楄〃
+/** 鎼滅储鎸夐挳鎿嶄綔 */
+const handleQuery = () => {
+ page.current = 1
+ getList()
+}
+const paginationChange = ({ current, limit }) => {
+ page.current = current;
+ page.size = limit;
+ getList()
+}
+const getList = () => {
+ tableLoading.value = true
+ gePurchaseList({...searchForm.value, ...page}).then(res => {
+ tableLoading.value = false
+ tableData.value = res.rows
+ tableData.value.map(item => {
+ item.children = []
+ })
+ total.value = res.total
+ expandedRowKeys.value = []
+ }).catch(() => {
+ tableLoading.value = false
+ })
+}
+// 琛ㄦ牸閫夋嫨鏁版嵁
+const handleSelectionChange = (selection) => {
+ selectedRows.value = selection
+}
+const productSelected = (selectedRows) => {
+ productSelectedRows.value = selectedRows
+}
+const expandedRowKeys = ref([])
+// 灞曞紑琛�
+const expandChange = (row, expandedRows) => {
+ if (expandedRows.length > 0) {
+ expandedRowKeys.value = []
+ try {
+ 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;
+ }
+ expandedRowKeys.value.push(row.id)
+ })
+ } catch (error) {
+ console.log(error)
+ }
+ } else {
+ expandedRowKeys.value = []
+ }
+}
+// 涓昏〃鍚堣鏂规硶
+const summarizeMainTable = (param) => {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣';
+ return;
+ }
+ const prop = column.property;
+ if (['contractAmount'].includes(prop)) {
+ const values = data.map(item => Number(item[prop]));
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((acc, val) => (!isNaN(val) ? acc + val : acc), 0);
+ } else {
+ sums[index] = '';
+ }
+ } else {
+ sums[index] = '';
+ }
+ })
+ return sums;
+};
+// 瀛愯〃鍚堣鏂规硶
+const summarizeChildrenTable = (param) => {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣';
+ return;
+ }
+ const prop = column.property;
+ if (['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice', 'ticketsNum', 'ticketsAmount', 'futureTickets', 'futureTicketsAmount'].includes(prop)) {
+ const values = data.map(item => Number(item[prop]));
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((acc, val) => (!isNaN(val) ? acc + val : acc), 0);
+ } else {
+ sums[index] = '';
+ }
+ } else {
+ sums[index] = '';
+ }
+ });
+ return sums;
+}
+// 鎵撳紑寮规
+const openForm = (type, row) => {
+ operationType.value = type
+ form.value = {}
+ productData.value = []
+ fileList.value = []
+ // 鏌ヨ浜哄憳鍒楄〃
+ userListNoPage().then(res => {
+ userList.value = res.data
+ })
+ // 鏌ヨ閲囪喘鍚堝悓鍙�
+ getProduct().then(res => {
+ purchaseLedgerList.value = res
+ })
+ if (type === 'edit') {
+ currentId.value = row.id;
+ getRegistrationById({id: row.id}).then(res => {
+ form.value = {...res}
+ productData.value = form.value.productData
+ if(form.value.salesLedgerFiles) {
+ fileList.value = form.value.salesLedgerFiles
+ } else {
+ fileList.value = []
+ }
+ })
+ }
+ dialogFormVisible.value = true
+}
+// 閫夋嫨閲囪喘鍚堝悓鍙疯祴鍊�
+const setInfo = (value) => {
+ getInfo({id: value}).then(res => {
+ form.value.salesContractNo = res.salesContractNo
+ form.value.projectName = res.projectName
+ productData.value = res.productData
+ form.value.supplierName = res.supplierName
+ form.value.businessPersonId = res.businessPersonId
+ })
+}
+// 鎻愪氦琛ㄥ崟
+const submitForm = () => {
+ proxy.$refs["formRef"].validate(valid => {
+ if (valid) {
+ form.value.productData = proxy.HaveJson(productData.value)
+ addOrUpdateRegistration(form.value).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
+ closeDia()
+ getList()
+ })
+ }
+ })
+}
+// 鍏抽棴寮规
+const closeDia = () => {
+ proxy.resetForm("formRef")
+ dialogFormVisible.value = false
+}
+// 濉啓鏁版嵁
+const openProductEdit = (row) => {
+ const index = productData.value.findIndex(item => item.id === row.id);
+ if (index > -1) {
+ productData.value[index].editFlag = !productData.value[index].editFlag
+ }
+}
+// 瀵煎嚭
+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("宸插彇娑�")
+ })
+}
+getList()
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 03dbed7..89144a3 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -51,7 +51,6 @@
<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip/>
<el-table-column label="涓氬姟鍛�" prop="businessPerson" show-overflow-tooltip/>
- <el-table-column label="鐢佃瘽" prop="businessPerson" show-overflow-tooltip/>
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
<el-table-column label="褰曞叆浜�" prop="recorderName" show-overflow-tooltip/>
@@ -595,6 +594,7 @@
}
const submitProductEdit = () => {
productForm.value.salesLedgerId = currentId.value
+ productForm.value.type = 2
addOrUpdateSalesLedgerProduct(productForm.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeProductDia()
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 08336e5..92835df 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -130,7 +130,8 @@
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="openProductEdit('edit', scope.row);">缂栬緫</el-button>
+ <el-button v-if="!scope.row.editFlag" link type="primary" size="small" @click="openProductEdit(scope.row);">缂栬緫</el-button>
+ <el-button v-else link type="primary" size="small" @click="openProductEdit(scope.row);">淇濆瓨</el-button>
</template>
</el-table-column>
</el-table>
@@ -316,19 +317,17 @@
productData.value = form.value.productDtoList
})
}
- // currentId.value = row.id;
- // getSalesLedgerWithProducts({id: row.id}).then(res => {
- // form.value = {...res}
- // productData.value = form.value.productData
- // })
- // }
dialogFormVisible.value = true
}
// 鎻愪氦琛ㄥ崟
const submitForm = () => {
proxy.$refs["formRef"].validate(valid => {
if (valid) {
- form.value.productDtoList = productData;
+ form.value.productDtoList = proxy.HaveJson(productData.value)
+ form.value.productDtoList.forEach(item => {
+ item.id = ''
+ })
+ delete form.value.productData
invoiceRegistrationSaveOrUpdate(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
closeDia()
@@ -343,7 +342,7 @@
dialogFormVisible.value = false
}
// 鎵撳紑浜у搧寮规
-const openProductEdit = (type, row) => {
+const openProductEdit = (row) => {
const index = productData.value.findIndex(item => item.id === row.id);
if (index > -1) {
productData.value[index].editFlag = !productData.value[index].editFlag
@@ -403,7 +402,6 @@
customerId: res.customerId,
}
productData.value = form.value.productData.map(item => {
- item.id = ""
item.editFlag = false
return item
})
--
Gitblit v1.9.3