From 61c5d5c0d8d75fdd35d134e3e5276b7b1c36cbf1 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 05 六月 2025 09:51:49 +0800
Subject: [PATCH] 付款登记功能修改
---
src/views/login.vue | 2
src/views/procurementManagement/invoiceEntry/index.vue | 12 +++---
src/views/procurementManagement/paymentEntry/index.vue | 75 ++++++++++---------------------------
3 files changed, 27 insertions(+), 62 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index d8b9a9a..26391bb 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -10,7 +10,7 @@
size="large"
auto-complete="off"
placeholder="璐﹀彿"
- @input="deptListSearch"
+ @input="getUserLoginFacotryList"
>
<template #prefix><el-icon><User /></el-icon></template>
</el-input>
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index cac76ba..df97099 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -120,7 +120,7 @@
<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" placeholder="璇烽�夋嫨" :precision="0" :step="1" clearable style="width: 100%"
+ <el-input-number v-model="scope.row.ticketsNum" placeholder="璇烽�夋嫨" min="0" :step="0.1" clearable style="width: 100%"
@change="invoiceNumBlur(scope.row)" />
</template>
</el-table-column>
@@ -198,7 +198,7 @@
rules: {
invoiceNumber: [{ required: true, message: '璇疯緭鍏ュ彂绁ㄥ彿' , trigger: 'blur' },{type:"string"}],
invoiceAmount: [{ required: true, message: '璇疯緭鍏ュ彂绁ㄩ噾棰�' , trigger: 'blur'}],
-
+
}
})
const { searchForm, form, rules } = toRefs(data)
@@ -408,7 +408,7 @@
if (!row.ticketsNum || row.ticketsNum === '') {
row.ticketsNum = 0
}
- if (Number(row.ticketsNum) > Number(row.futureTickets)) {
+ if (Number(row.ticketsNum) > Number(row.tempFutureTickets)) {
proxy.$modal.msgWarning('鏈寮�绁ㄦ暟涓嶅緱澶т簬鏈紑绁ㄦ暟')
row.ticketsNum = 0
return
@@ -416,9 +416,9 @@
// 璁＄畻鏈寮�绁ㄩ噾棰�
row.ticketsAmount = row.ticketsNum * row.taxInclusiveUnitPrice
// 璁＄畻鏈紑绁ㄦ暟
- row.futureTickets = row.futureTickets - row.ticketsNum
+ row.futureTickets = row.tempFutureTickets - row.ticketsNum
// 璁＄畻鏈紑绁ㄩ噾棰�
- row.futureTicketsAmount = row.futureTickets * row.taxInclusiveUnitPrice
+ row.futureTicketsAmount = row.tempFutureTicketsAmount - row.ticketsAmount
}
// 鑾峰彇褰撳墠鏃ユ湡鍑芥暟
@@ -434,4 +434,4 @@
getList()
</script>
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss"></style>
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index edfa787..edea198 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -22,12 +22,8 @@
<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="purchaseContractNumber">
+ <el-input v-model="form.purchaseContractNumber" placeholder="鑷姩濉厖" clearable disabled />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -44,11 +40,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
- <el-select v-model="form.invoiceNumber" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'"
- @change="setInvoiceAmount">
- <el-option v-for="item in invoiceNumberList" :key="item.id" :label="item.invoiceNumber"
- :value="item.invoiceNumber" />
- </el-select>
+ <el-input v-model="form.invoiceNumber" placeholder="鑷姩濉厖" clearable disabled />
</el-form-item>
</el-col>
</el-row>
@@ -59,20 +51,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绋庣巼(%)锛�" prop="taxRate">
- <!-- <el-input type="number" :step="0.01" v-model="form.taxRate" placeholder="鑷姩濉厖" clearable/> -->
- <el-select v-model="form.taxRate" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'edit'">
- <el-option v-for="item in taxRateSelection" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
<el-form-item label="鏈浠樻閲戦锛�" prop="currentPaymentAmount">
<el-input type="number" :step="0.01" v-model="form.currentPaymentAmount" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="浠樻鏂瑰紡锛�" prop="paymentMethod">
<el-select v-model="form.paymentMethod" placeholder="璇烽�夋嫨" clearable>
@@ -81,21 +65,19 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<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-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="浠樻鏃ユ湡锛�" prop="paymentDate">
<el-date-picker disabled 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="registrationtDate">
<el-input v-model="form.registrationtDate" placeholder="璇疯緭鍏�" clearable disabled />
@@ -128,6 +110,7 @@
registrationList,
getTicketNo
} from "@/api/procurementManagement/paymentEntry.js";
+import { invoiceList } from "@/api/procurementManagement/procurementInvoiceLedger.js"
const { proxy } = getCurrentInstance()
const taxRateSelection = [
{ value: '0', label: '0%' },
@@ -159,26 +142,12 @@
prop: 'invoiceAmount'
},
{
- label: '鏈浠樻閲戦(鍏�)',
- prop: 'currentPaymentAmount'
+ label: '宸蹭粯娆鹃噾棰�(鍏�)',
+ prop: 'paymentAmountTotal'
},
{
label: '寰呬粯娆鹃噾棰�(鍏�)',
- prop: 'unPaymentAmount'
- },
- {
- dataType: "action",
- label: "鎿嶄綔",
- align: 'center',
- operation: [
- {
- name: "缂栬緫",
- type: "text",
- clickFun: (row) => {
- openForm('edit', row);
- },
- },
- ],
+ prop: 'unPaymentAmountTotal'
},
])
const tableData = ref([])
@@ -201,6 +170,7 @@
supplierNameOrContractNo: '',
},
form: {
+ purchaseContractNumber:'',
purchaseLedgerId: '',
salesContractNo: '',
supplierName: '',
@@ -236,7 +206,7 @@
}
const getList = () => {
tableLoading.value = true
- registrationList({ ...searchForm.value, ...page }).then(res => {
+ invoiceList({ ...searchForm.value, ...page }).then(res => {
tableLoading.value = false
tableData.value = res.rows
total.value = res.total
@@ -248,24 +218,19 @@
}
// 鎵撳紑寮规
const openForm = (type, row) => {
+ if(selectedRows.value.length !== 1 ) {
+ proxy.$message.error("璇烽�夋嫨涓�鏉″彂绁ㄦ暟鎹�")
+ return
+ }
operationType.value = type
form.value = {}
- invoiceNumberList.value = []
+ form.value = {...selectedRows.value[0]}
+ form.value.ticketRegistrationId = selectedRows.value[0].id
+ form.value.id = null
// 鏌ヨ閲囪喘鍚堝悓鍙�
- getPurchaseNo().then(res => {
- purchaseLedgerList.value = res
- })
form.value.registrationtDate = getCurrentDate();
form.value.paymentDate = getCurrentDate();
form.value.registrant = userStore.name
- if (type === 'edit') {
- registrationInfo(row.id).then(res => {
- form.value = { ...res.data }
- if (form.value.registrantId == userStore.id) {
- form.value.registrant = userStore.name
- }
- })
- }
dialogFormVisible.value = true
}
// 閫夋嫨鍙戠エ鍙蜂互鍚庣粰鍙戠エ閲戦璧嬪��
--
Gitblit v1.9.3