Browse Source

新增项目信息功能

master
panxinyu-YUYwp 3 weeks ago
parent
commit
f2969bee2f
  1. 4
      src/api/project/projectAnnualFee.js
  2. 8
      src/api/project/projectContract.js
  3. 18
      src/api/project/projectMessage.js
  4. 6
      src/api/project/projectPayment.js
  5. 16
      src/api/project/projectQuotation.js
  6. 15
      src/views/modules/billing/billing-request.vue
  7. 12
      src/views/modules/finance/billing-invoice.vue
  8. 35
      src/views/modules/finance/invoice-management.vue
  9. 2492
      src/views/modules/project/project-message.vue

4
src/api/project/projectAnnualFee.js

@ -0,0 +1,4 @@
import { createAPI } from "@/utils/httpRequest.js";
export const annualFeeSave = data => createAPI(`/projectInfo/cusAnnannualFeeSave`, 'post', data)
export const annualRenewalList = data => createAPI(`/projectInfo/findAllAnnualRenewalData`, 'post', data)

8
src/api/project/projectContract.js

@ -0,0 +1,8 @@
import { createAPI } from "@/utils/httpRequest.js";
export const contractList = data => createAPI(`/projectInfo/findAllContractData`, 'post', data)
export const contractSave = data => createAPI(`/projectInfo/addContractSave`, 'post', data)
export const contractDelete = data => createAPI(`/projectInfo/delProjectContract`, 'post', data)
export const contractArchive = data => createAPI(`/projectInfo/archiveContractSave`, 'post', data)
export const contractSendSave = data => createAPI(`/projectInfo/contractSendSave`, 'post', data)
export const contractResponseSave = data => createAPI(`/projectInfo/contractResponseSave`, 'post', data)

18
src/api/project/projectMessage.js

@ -0,0 +1,18 @@
import { createAPI } from "@/utils/httpRequest.js";
// 项目信息分页查询(老 /proInfo/findProjectInfoData)
export const projectInfoData = data => createAPI(`/projectInfo/findProjectInfoData`, 'post', data)
// 项目信息新增/编辑保存(老 /proInfo/projectInfoSave)
export const projectInfoSave = data => createAPI(`/projectInfo/projectInfoSave`, 'post', data)
// 项目信息删除(老 /proInfo/projectInfoDel)
export const projectInfoDelete = data => createAPI(`/projectInfo/projectInfoDel`, 'post', data)
// 项目状态下拉(老 /proInfo/valueListItem?type=PS)。后端是 @RequestParam,type 必须走 query string
export const projectStatusList = () => createAPI(`/invoice/valueList?type=PS`, 'post')
// 客户下拉(老 /proInfo/customerName 没搬,复用案件页在用的那个)
export const projectCustomerList = () => createAPI(`/projectInfo/getCustomerList`, 'get')
// 项目日期修改(老 /proInfo/updateProjectData)
export const projectDateSave = data => createAPI(`/projectInfo/updateProjectData`, 'post', data)

6
src/api/project/projectPayment.js

@ -0,0 +1,6 @@
import { createAPI } from "@/utils/httpRequest.js";
export const paymentPlanList = data => createAPI(`/projectInfo/findPaymentPlanData`, 'post', data)
export const paymentPlanSave = data => createAPI(`/projectInfo/paymentPlanSave`, 'post', data)
// 收款计划发起开票申请(老 /proInfo/billingApplySave,后端要写 refer_id1/refer_type1='收款计划' 防重)
export const paymentApplySave = data => createAPI(`/projectInfo/billingApplySave`, 'post', data)

16
src/api/project/projectQuotation.js

@ -0,0 +1,16 @@
import { createAPI } from "@/utils/httpRequest.js";
// 报价列表(老 /proInfo/findAllQuotationData)
export const quotationList = data => createAPI(`/projectInfo/findAllQuotationData`, 'post', data)
// 报价新增/编辑(老 /proInfo/projectQuotationSave)
export const quotationSave = data => createAPI(`/projectInfo/projectQuotationSave`, 'post', data)
// 报价发出(老 /proInfo/quotationSendSendSave)
export const quotationSend = data => createAPI(`/projectInfo/quotationSendSendSave`, 'post', data)
// 报价结果(老 /proInfo/quotationResultSave)
export const quotationResult = data => createAPI(`/projectInfo/quotationResultSave`, 'post', data)
// 报价删除(老 /proInfo/projectQuoResultdel)
export const quotationDelete = data => createAPI(`/projectInfo/projectQuoResultdel`, 'post', data)

15
src/views/modules/billing/billing-request.vue

@ -48,7 +48,9 @@
<el-table-column prop="billingRate" header-align="center" align="center" min-width="70" label="税率"> <el-table-column prop="billingRate" header-align="center" align="center" min-width="70" label="税率">
<template slot-scope="scope">{{ rateText(scope.row.billingRate) }}</template> <template slot-scope="scope">{{ rateText(scope.row.billingRate) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" header-align="center" align="right" min-width="100" sortable="custom" label="开票金额"></el-table-column>
<el-table-column prop="amount" header-align="center" align="right" min-width="100" sortable="custom" label="开票金额">
<template slot-scope="scope">{{ moneyText(scope.row.amount) }}</template>
</el-table-column>
<el-table-column prop="enteredBy" header-align="center" align="center" min-width="90" label="申请人" show-overflow-tooltip></el-table-column> <el-table-column prop="enteredBy" header-align="center" align="center" min-width="90" label="申请人" show-overflow-tooltip></el-table-column>
<el-table-column prop="enteredDate" header-align="center" align="center" min-width="100" sortable="custom" label="申请时间"> <el-table-column prop="enteredDate" header-align="center" align="center" min-width="100" sortable="custom" label="申请时间">
<template slot-scope="scope">{{ d10(scope.row.enteredDate) }}</template> <template slot-scope="scope">{{ d10(scope.row.enteredDate) }}</template>
@ -117,7 +119,8 @@
</el-form-item> </el-form-item>
<el-form-item label="开票金额" required> <el-form-item label="开票金额" required>
<el-input v-model="applyForm.amount" size="small" :disabled="formDisabled" <el-input v-model="applyForm.amount" size="small" :disabled="formDisabled"
style="font-size:12px; height:30px; text-align:right" @change="onAmountChange"></el-input>
style="font-size:12px; height:30px; text-align:right"
@input="v => applyForm.amount = String(v).replace(/[^\d.]/g, '')" @change="onAmountChange"></el-input>
</el-form-item> </el-form-item>
<!-- 第3行:寄送方式(带...按钮,两档) + 收件人 + 收件人电话 --> <!-- 第3行:寄送方式(带...按钮,两档) + 收件人 + 收件人电话 -->
@ -296,7 +299,11 @@ export default {
if (v == null || v === '') return '' if (v == null || v === '') return ''
return Number(v) === 0.06 ? '6' : '13' return Number(v) === 0.06 ? '6' : '13'
}, },
moneyText(v) {
if (v == null || v === '') return ''
let n = Number(v)
return isNaN(n) ? '' : n.toFixed(2)
},
initData() { initData() {
this.fetchApplyList() this.fetchApplyList()
this.fetchCustomerOptions() this.fetchCustomerOptions()
@ -407,7 +414,7 @@ export default {
this.applyForm.shipMethod = row.shipMethod this.applyForm.shipMethod = row.shipMethod
this.applyForm.billingProject = row.billingProject this.applyForm.billingProject = row.billingProject
if (row.billingRate != null) this.applyForm.billingRate = String(row.billingRate) if (row.billingRate != null) this.applyForm.billingRate = String(row.billingRate)
this.applyForm.amount = row.amount == null ? '' : String(row.amount)
this.applyForm.amount = this.moneyText(row.amount)
this.applyForm.receiver = row.receiver this.applyForm.receiver = row.receiver
this.applyForm.receiverPhone = row.receiverPhone this.applyForm.receiverPhone = row.receiverPhone
this.applyForm.receiverAddr = row.receiverAddr this.applyForm.receiverAddr = row.receiverAddr

12
src/views/modules/finance/billing-invoice.vue

@ -47,7 +47,9 @@
<el-table-column prop="billingRate" header-align="center" align="center" min-width="70" label="税率"> <el-table-column prop="billingRate" header-align="center" align="center" min-width="70" label="税率">
<template slot-scope="scope">{{ rateText(scope.row.billingRate) }}</template> <template slot-scope="scope">{{ rateText(scope.row.billingRate) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" header-align="center" align="right" min-width="100" sortable="custom" label="开票金额"></el-table-column>
<el-table-column prop="amount" header-align="center" align="right" min-width="100" sortable="custom" label="开票金额">
<template slot-scope="scope">{{ moneyText(scope.row.amount) }}</template>
</el-table-column>
<el-table-column prop="enteredBy" header-align="center" align="center" min-width="90" label="申请人" show-overflow-tooltip></el-table-column> <el-table-column prop="enteredBy" header-align="center" align="center" min-width="90" label="申请人" show-overflow-tooltip></el-table-column>
<el-table-column prop="enteredDate" header-align="center" align="center" min-width="100" sortable="custom" label="申请时间"> <el-table-column prop="enteredDate" header-align="center" align="center" min-width="100" sortable="custom" label="申请时间">
<template slot-scope="scope">{{ d10(scope.row.enteredDate) }}</template> <template slot-scope="scope">{{ d10(scope.row.enteredDate) }}</template>
@ -284,7 +286,11 @@ export default {
if (v == null || v === '') return '' if (v == null || v === '') return ''
return Number(v) === 0.06 ? '6' : '13' return Number(v) === 0.06 ? '6' : '13'
}, },
moneyText(v) {
if (v == null || v === '') return ''
let n = Number(v)
return isNaN(n) ? '' : n.toFixed(2)
},
fetchApplyList() { fetchApplyList() {
this.searchData.page = this.pageIndex this.searchData.page = this.pageIndex
this.searchData.limit = this.pageSize this.searchData.limit = this.pageSize
@ -339,7 +345,7 @@ export default {
this.invoiceForm.billingInfoId = row.billingInfoId this.invoiceForm.billingInfoId = row.billingInfoId
this.invoiceForm.companyName = row.billingCompanyName this.invoiceForm.companyName = row.billingCompanyName
this.invoiceForm.projectName = row.projectName this.invoiceForm.projectName = row.projectName
this.invoiceForm.invoiceAmount = row.amount == null ? '' : String(row.amount)
this.invoiceForm.invoiceAmount = this.moneyText(row.amount)
this.invoiceForm.invoiceItem = row.billingProject this.invoiceForm.invoiceItem = row.billingProject
this.invoiceForm.sendMethod = row.shipMethod this.invoiceForm.sendMethod = row.shipMethod
this.invoiceForm.customerName = row.customerName this.invoiceForm.customerName = row.customerName

35
src/views/modules/finance/invoice-management.vue

@ -66,12 +66,18 @@
<template slot-scope="scope">{{ d10(scope.row.invoiceDate) }}</template> <template slot-scope="scope">{{ d10(scope.row.invoiceDate) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="invoiceNo" header-align="center" align="center" min-width="110" label="发票号码" show-overflow-tooltip></el-table-column> <el-table-column prop="invoiceNo" header-align="center" align="center" min-width="110" label="发票号码" show-overflow-tooltip></el-table-column>
<el-table-column prop="invoiceAmount" header-align="center" align="right" min-width="100" sortable="custom" label="开票金额"></el-table-column>
<el-table-column prop="invoiceAmount" header-align="center" align="right" min-width="100" sortable="custom" label="开票金额">
<template slot-scope="scope">{{ moneyText(scope.row.invoiceAmount) }}</template>
</el-table-column>
<el-table-column prop="taxRate" header-align="center" align="center" min-width="70" label="税率"> <el-table-column prop="taxRate" header-align="center" align="center" min-width="70" label="税率">
<template slot-scope="scope">{{ taxRateText(scope.row.taxRate) }}</template> <template slot-scope="scope">{{ taxRateText(scope.row.taxRate) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="untaxedAmount" header-align="center" align="right" min-width="100" label="未税金额"></el-table-column>
<el-table-column prop="paidAmount" header-align="center" align="right" min-width="100" label="已付金额"></el-table-column>
<el-table-column prop="untaxedAmount" header-align="center" align="right" min-width="100" label="未税金额">
<template slot-scope="scope">{{ moneyText(scope.row.untaxedAmount) }}</template>
</el-table-column>
<el-table-column prop="paidAmount" header-align="center" align="right" min-width="100" label="已付金额">
<template slot-scope="scope">{{ moneyText(scope.row.paidAmount) }}</template>
</el-table-column>
<el-table-column header-align="center" align="right" min-width="100" label="未付金额"> <el-table-column header-align="center" align="right" min-width="100" label="未付金额">
<template slot-scope="scope">{{ unpaidAmount(scope.row) }}</template> <template slot-scope="scope">{{ unpaidAmount(scope.row) }}</template>
</el-table-column> </el-table-column>
@ -335,11 +341,11 @@ export default {
'开票项目': 'invoiceItem', '开票项目': 'invoiceItem',
'开票日期': { field: 'invoiceDate', callback: (v) => (v || '').substring(0, 10) }, '开票日期': { field: 'invoiceDate', callback: (v) => (v || '').substring(0, 10) },
'发票号码': 'invoiceNo', '发票号码': 'invoiceNo',
'开票金额': 'invoiceAmount',
'开票金额': { field: 'invoiceAmount', callback: (v) => this.excelMoney(v) },
'税率': { field: 'taxRate', callback: (v) => (v == null || v === '' ? '' : Number((Number(v) * 100).toFixed(2))) }, '税率': { field: 'taxRate', callback: (v) => (v == null || v === '' ? '' : Number((Number(v) * 100).toFixed(2))) },
'未税金额': 'untaxedAmount',
'已付金额': 'paidAmount',
'未付金额': { callback: (row) => this.unpaidAmount(row) },
'未税金额': { field: 'untaxedAmount', callback: (v) => this.excelMoney(v) },
'已付金额': { field: 'paidAmount', callback: (v) => this.excelMoney(v) },
'未付金额': { callback: (row) => this.excelMoney(this.unpaidAmount(row)) },
'计划收款日期': { field: 'planPayDate', callback: (v) => (v || '').substring(0, 10) }, '计划收款日期': { field: 'planPayDate', callback: (v) => (v || '').substring(0, 10) },
'开票人': 'receiver', '开票人': 'receiver',
'寄送方式': 'sendMethod', '寄送方式': 'sendMethod',
@ -451,6 +457,16 @@ export default {
if (v == null || v === '') return '' if (v == null || v === '') return ''
return Number((Number(v) * 100).toFixed(2)) return Number((Number(v) * 100).toFixed(2))
}, },
moneyText(v) {
if (v == null || v === '') return ''
let n = Number(v)
return isNaN(n) ? '' : n.toFixed(2)
},
excelMoney(v) {
if (v == null || v === '') return ''
let n = Number(v)
return isNaN(n) ? '' : '="' + n.toFixed(2) + '"'
},
unpaidAmount(row) { unpaidAmount(row) {
return ((Number(row.invoiceAmount) || 0) - (Number(row.paidAmount) || 0)).toFixed(2) return ((Number(row.invoiceAmount) || 0) - (Number(row.paidAmount) || 0)).toFixed(2)
}, },
@ -593,6 +609,8 @@ export default {
this.invoiceForm.sendDate = this.d10(row.sendDate) this.invoiceForm.sendDate = this.d10(row.sendDate)
this.invoiceForm.planPayDate = this.d10(row.planPayDate) this.invoiceForm.planPayDate = this.d10(row.planPayDate)
this.invoiceForm.cancelledDate = row.cancelledDate || null this.invoiceForm.cancelledDate = row.cancelledDate || null
this.invoiceForm.invoiceAmount = this.moneyText(row.invoiceAmount)
this.invoiceForm.untaxedAmount = this.moneyText(row.untaxedAmount)
if (row.taxRate != null) this.invoiceForm.taxRate = String(row.taxRate) if (row.taxRate != null) this.invoiceForm.taxRate = String(row.taxRate)
if (row.customerId) this.fetchCompanyNameOptions(row.customerId) if (row.customerId) this.fetchCompanyNameOptions(row.customerId)
this.showInvoiceModal = true this.showInvoiceModal = true
@ -708,6 +726,9 @@ export default {
// 并把三个日期和 taxRate 归一化,详情要显示的就是这些 // 并把三个日期和 taxRate 归一化,详情要显示的就是这些
this.editInvoice(row) this.editInvoice(row)
this.detailMode = true this.detailMode = true
this.invoiceForm.invoiceAmount = this.moneyText(row.invoiceAmount)
this.invoiceForm.untaxedAmount = this.moneyText(row.untaxedAmount)
this.invoiceForm.paidAmount = this.moneyText(row.paidAmount)
}, },
// 老 addExpress(row) 的预填:公司=companyName,地址=sendAddr,收件人=custReceiver,电话=custReceiverPhone // 老 addExpress(row) 的预填:公司=companyName,地址=sendAddr,收件人=custReceiver,电话=custReceiverPhone

2492
src/views/modules/project/project-message.vue
File diff suppressed because it is too large
View File

Loading…
Cancel
Save