yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debug 项目 付款优化

pull/853/head
wersd 2025-07-20 09:54:16 +08:00
parent f44bf8fe4c
commit 6c1472dbb4
13 changed files with 267 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/crm/project/index.ts
View File

@ -21,6 +21,7 @@ export interface ProjectVO {
supplementaryMaterials: string // 其他补充材料文件路径
type: number // 类型
partners: []
RevenueSharePartners: []
projectStatus: number // 状态
estimatedPiles: number //枪数
}

4
src/api/crm/receivable/index.ts
View File

@ -8,8 +8,10 @@ export interface ReceivableVO {
customerId?: number
customerName?: string
contractId?: number
type: number
receivableType: number
paymentType: number
deptId: number
deptName?: string
projectId?: number
contract?: {
id?: number

2
src/views/crm/contract/ContractForm.vue
View File

@ -205,7 +205,7 @@
<UploadImgs v-model="formData.picUrls" :fileType="['image/jpeg', 'image/png']" />
</el-form-item>
<el-form-item label="附件" prop="fileUrls">
<UploadFile v-model="formData.fileUrls" :fileType="['pdf']"/>
<UploadFile v-model="formData.fileUrls" :file-size="20" :fileType="['pdf']"/>
</el-form-item>
</el-form>
<template #footer>

29
src/views/crm/project/ProjectForm.vue
View File

@ -9,7 +9,7 @@
>
<el-row>
<el-col :span="12">
<el-form-item label="部门" prop="deptId">
<el-form-item label="项目名称" prop="deptId">
<el-select
filterable
clearable
@ -158,7 +158,7 @@
<el-col>
<el-tabs v-if="formData.type === 2" v-model="subTabsName" class="-mt-15px mb-10px">
<el-tab-pane label="合伙人明细" name="partner">
<ProjectPartnetForm
<ProjectPartnerForm
ref="partnerFormRef"
:partners="formData.partners"
:disabled="formLoading"
@ -166,6 +166,15 @@
/>
</el-tab-pane>
</el-tabs>
<el-tabs v-if="formData.type === 3" v-model="subTabsName" class="-mt-15px mb-10px">
<el-tab-pane label="分成方明细" name="partner">
<ProjectRevenueSharePartnerForm
ref="revenueSharePartnerFromRef"
:partners="formData.revenueSharePartners"
:disabled="formLoading"
/>
</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
<el-divider>附件</el-divider>
@ -176,6 +185,7 @@
v-model="formData.buildPermit"
:isShowTip="false"
:limit="1"
:file-size="20"
:file-type="['pdf']"
/>
</el-form-item>
@ -186,6 +196,7 @@
v-model="formData.ownershipProof"
:isShowTip="false"
:limit="1"
:file-size="20"
:file-type="['pdf']"
/>
</el-form-item>
@ -198,6 +209,7 @@
v-model="formData.projectRecord"
:isShowTip="false"
:limit="1"
:file-size="20"
:file-type="['pdf']"
/>
</el-form-item>
@ -208,6 +220,7 @@
v-model="formData.supplementaryMaterials"
:isShowTip="false"
:limit="5"
:file-size="20"
:file-type="['pdf']"
/>
</el-form-item>
@ -220,6 +233,7 @@
v-model="formData.investmentAgreement"
:isShowTip="false"
:limit="1"
:file-size="20"
:file-type="['pdf']"
/>
</el-form-item>
@ -230,6 +244,7 @@
v-model="formData.powerSupplyReply"
:isShowTip="false"
:limit="1"
:file-size="20"
:file-type="['pdf']"
/>
</el-form-item>
@ -248,7 +263,8 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as DeptApi from '@/api/system/dept'
import * as ContractApi from '@/api/crm/contract'
import * as StationSiteApi from '@/api/crm/stationsite'
import ProjectPartnetForm from './component/ProjectPartnetForm.vue'
import ProjectPartnerForm from './component/ProjectPartnerForm.vue'
import ProjectRevenueSharePartnerForm from './component/ProjectRevenueSharePartnerForm.vue'
import { totalCountFormat } from '@/views/mall/promotion/coupon/formatter'
import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
@ -278,6 +294,7 @@ const formData = ref({
investmentAgreement: undefined,
supplementaryMaterials: [],
partners:[],
revenueSharePartners:[],
type: undefined,
projectStatus: undefined,
powerSupplyType: undefined
@ -300,6 +317,7 @@ const deptList = ref<DeptApi.DeptVO[]>([])
const contractOptions = ref<ContractApi.ContractVO[]>([]) // 合同列表
const siteOptions = ref<StationSiteApi.StationSiteVO[]>([]) // 场地列表
const partnerFormRef = ref()
const revenueSharePartnerFromRef = ref()
const estimatedPiles = ref<number | undefined>(undefined)
/** 子表的表单 */
const subTabsName = ref('partner')
@ -355,6 +373,10 @@ const submitForm = async () => {
message.error('请完善合伙人明细')
return
}
if (revenueSharePartnerFromRef.value && !(await revenueSharePartnerFromRef.value.validate())) {
message.error('请完善分成方明细')
return
}
// 提交请求
formLoading.value = true
try {
@ -391,6 +413,7 @@ const resetForm = () => {
investmentAgreement: undefined,
supplementaryMaterials: [],
partners:[],
revenueSharePartners:[],
type: undefined,
projectStatus: undefined,
powerSupplyType: undefined

10
src/views/crm/project/component/ProjectPartnetForm.vue → src/views/crm/project/component/ProjectPartnerForm.vue
View File

@ -13,9 +13,9 @@
<el-table-column label="序号" type="index" align="center" width="60" />
<el-table-column label="项目合伙人" min-width="180">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.customerId`" :rules="formRules.customerId" class="mb-0px!">
<el-form-item :prop="`${$index}.userId`" :rules="formRules.userId" class="mb-0px!">
<el-select
v-model="row.customerId"
v-model="row.userId"
filterable
clearable
placeholder="请选择"
@ -80,12 +80,12 @@ const userOptions = ref<any[]>([])
const formData = ref([])
const formRules = reactive({
customerId: [
userId: [
{ required: true, message: '项目合伙人不能为空', trigger: 'blur' },
{
validator: (_rule: any, value: string, callback: any) => {
// 检查合伙人是否重复
const count = formData.value.filter(item => item.customerId === value).length
const count = formData.value.filter(item => item.userId === value).length
if (value && count > 1) {
callback(new Error('项目合伙人不能重复'))
} else {
@ -108,7 +108,7 @@ onMounted(async () => {
const handleAdd = () => {
formData.value.push()
const row = {
customerId: undefined,
userId: undefined,
ratio: undefined,
investment: undefined
}

140
src/views/crm/project/component/ProjectRevenueSharePartnerForm.vue Normal file
View File

@ -0,0 +1,140 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
v-loading="formLoading"
label-width="0px"
:inline-message="true"
:disabled="disabled"
>
<el-table :data="formData" style="width: 100%">
<el-table-column label="序号" type="index" align="center" width="60" />
<el-table-column label="项目分成方" min-width="180">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.customerId`" :rules="formRules.customerId" class="mb-0px!">
<el-select
v-model="row.customerId"
filterable
clearable
placeholder="请选择"
style="width: 150px"
>
<el-option
v-for="user in customerOptions"
:key="user.id"
:label="user.name"
:value="user.id"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="比例(%)" min-width="200">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.ratio`" :rules="formRules.ratio" class="mb-0px!">
<el-input-number
v-model="row.ratio"
:min="0"
:step="1"
:max="getMaxRatio($index)"
:precision="4"
placeholder="请输入比例"
class="w-1/1"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="60">
<template #default="{ $index }">
<el-button @click="handleDelete($index)" link>—</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<el-row justify="center" class="mt-3" v-if="!disabled">
<el-button @click="handleAdd" round>+ 添加分成方</el-button>
</el-row>
</template>
<script setup lang="ts">
import * as CustomerApi from '@/api/crm/customer'
import { ElMessage } from 'element-plus'
const props = defineProps<{
partners: any[]
disabled: boolean
}>()
const emit = defineEmits(['update:partners'])
const formLoading = ref(false)
const customerOptions = ref<any[]>([])
const formData = ref([])
const formRules = reactive({
customerId: [
{ required: true, message: '项目合伙人不能为空', trigger: 'blur' },
{
validator: (_rule: any, value: string, callback: any) => {
// 检查合伙人是否重复
const count = formData.value.filter(item => item.customerId === value).length
if (value && count > 1) {
callback(new Error('项目合伙人不能重复'))
} else {
callback()
}
},
trigger: 'change',
},
],
ratio: [{ required: true, message: '比例不能为空', trigger: 'blur' }],
})
const formRef = ref<any>(null)
onMounted(async () => {
// 获取客户列表
customerOptions.value = await CustomerApi.getCustomerSimpleAllList()
})
const handleAdd = () => {
formData.value.push()
const row = {
customerId: undefined,
ratio: undefined,
investment: undefined
}
formData.value.push(row)
}
const handleDelete = (index: number) => {
formData.value.splice(index, 1)
}
const validate = async () => {
const valid = await formRef.value?.validate?.()
if (!valid) return false
// 校验所有合伙人比例之和不能超过100
const totalRatio = formData.value.reduce((sum, item) => sum + (Number(item.ratio) || 0), 0)
if (totalRatio > 100) {
ElMessage.error('所有合伙人比例之和不能超过100%')
return false
}
return true
}
const getMaxRatio = (index: number) => {
// 计算除当前行外，其他合伙人已占用的比例
const used = formData.value.reduce((sum, item, idx) => idx !== index ? sum + (Number(item.ratio) || 0) : sum, 0)
return Math.max(0, 100 - used)
}
watch(
() => props.partners,
(val) => {
formData.value = val || []
},
{ immediate: true }
)
defineExpose({ validate })
</script>

8
src/views/crm/receivable/PaymentForm.vue
View File

@ -87,8 +87,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="收入类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择收入类型" class="w-1/1">
<el-form-item label="收入类型" prop="paymentType">
<el-select v-model="formData.paymentType" placeholder="请选择收入类型" class="w-1/1">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PAYMENT_TYPE)"
:key="dict.value"
@ -171,7 +171,7 @@ const contractList = ref<ContractApi.ContractVO[]>([]) // 合同列表
const receivablePlanList = ref<ReceivablePlanApi.ReceivablePlanVO[]>([]) // 收款计划列表
const projectList = ref<ProjectApi.ProjectVO[]>([]) // 项目列表
const maxPayableAmount = ref(Infinity)
const showProject = computed(() => formData.value.type >= 11 && formData.value.type <= 14)
const showProject = computed(() => formData.value.paymentType >= 11 && formData.value.paymentType <= 14)
/** 打开弹窗 */
const open = async (
@ -316,7 +316,7 @@ const handleReceivablePlanChange = (planId: number) => {
watch(
() => formData.value.type,
() => formData.value.paymentType,
(val) => {
if (val === 11 || val === 12 || val === 13 || val === 14) {
formRules.projectId = [{ required: true, message: '项目名称不能为空', trigger: 'change' }]

11
src/views/crm/receivable/ReceivableForm.vue
View File

@ -122,8 +122,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="支出类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择支出类型" class="w-1/1">
<el-form-item label="支出类型" prop="receivableType">
<el-select v-model="formData.receivableType" placeholder="请选择支出类型" class="w-1/1">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_TYPE)"
:key="dict.value"
@ -191,7 +191,7 @@ const formData = ref<ReceivableApi.ReceivableVO & {
}>({} as ReceivableApi.ReceivableVO)
const formRules = reactive({
customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
contractId: [{ required: true, message: '合同不能为空', trigger: 'blur' }],
// contractId: [{ required: true, message: '合同不能为空', trigger: 'blur' }],
returnTime: [{ required: true, message: '付款日期不能为空', trigger: 'blur' }],
price: [{ required: true, message: '付款金额不能为空', trigger: 'blur' }],
date: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
@ -207,7 +207,7 @@ const contractList = ref<ContractApi.ContractVO[]>([]) // 合同列表
const receivablePlanList = ref<ReceivablePlanApi.ReceivablePlanVO[]>([]) // 付款计划列表
const projectList = ref<ProjectApi.ProjectVO[]>([]) // 项目列表
const maxPayableAmount = ref(Infinity)
const showProject = computed(() => formData.value.type >= 1 && formData.value.type <= 7)
const showProject = computed(() => formData.value.receivableType >= 1 && formData.value.receivableType <= 7)
/** 打开弹窗 */
const open = async (
@ -249,6 +249,7 @@ const open = async (
formData.value.customerId = receivablePlan.customerId
formData.value.period = receivablePlan.period
formData.value.remark = receivablePlan.remark
formData.value.deptId = receivablePlan.deptId
await handleCustomerChange(receivablePlan.customerId)
if (receivablePlan.contractId) {
formData.value.contractId = receivablePlan.contractId
@ -349,7 +350,7 @@ const handleReceivablePlanChange = (planId: number) => {
}
watch(
() => formData.value.type,
() => formData.value.receivableType,
(val) => {
if (val === 1 || val === 2 || val === 3 || val === 4 || val === 5 || val === 6 || val === 7) {
formRules.projectId = [{ required: true, message: '项目名称不能为空', trigger: 'change' }]

53
src/views/crm/receivable/index.vue
View File

@ -27,6 +27,7 @@
v-model="queryParams.customerId"
class="!w-240px"
placeholder="请选择实际收付单位"
filterable
@keyup.enter="handleQuery"
>
<el-option
@ -37,7 +38,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="收支类型" prop="transactionType">
<!-- <el-form-item label="收支类型" prop="transactionType">
<el-select
v-model="queryParams.transactionType"
class="!w-150px"
@ -51,10 +52,10 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="queryParams.transactionType === 0" label="收入类型" prop="type">
</el-form-item> -->
<el-form-item label="收入类型" prop="type">
<el-select
v-model="queryParams.type"
v-model="queryParams.paymentType"
class="!w-150px"
clearable
placeholder="请选择收入类型"
@ -67,9 +68,9 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="queryParams.transactionType === 1" label="支出类型" prop="type">
<el-form-item label="支出类型" prop="type">
<el-select
v-model="queryParams.type"
v-model="queryParams.receivableType "
class="!w-150px"
clearable
placeholder="请选择支出类型"
@ -82,6 +83,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="项目名称" prop="projectId">
<el-select
v-model="queryParams.projectId"
class="!w-240px"
placeholder="请选择项目名称"
filterable
@keyup.enter="handleQuery"
>
<el-option
v-for="item in projectList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="收付主体" prop="deptId">
<el-select
v-model="queryParams.deptId"
@ -201,9 +218,21 @@
</template>
</el-table-column>
<el-table-column align="center" label="收支方式" prop="returnType" width="130px">
<el-table-column align="center" label="收款类型" prop="returnType" width="130px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_RECEIVABLE_RETURN_TYPE" :value="scope.row.returnType" />
<dict-tag :type="DICT_TYPE.CRM_PAYMENT_TYPE" :value="scope.row.paymentType" />
</template>
</el-table-column>
<el-table-column align="center" label="付款类型" prop="receivableType" width="130px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_RECEIVABLE_TYPE" :value="scope.row.receivableType" />
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" prop="projectName" min-width="350px">
<template #default="scope">
{{ scope.row.projectName }}
</template>
</el-table-column>
@ -318,6 +347,7 @@ import * as ReceivableApi from '@/api/crm/receivable'
import ReceivableForm from './ReceivableForm.vue'
import * as CustomerApi from '@/api/crm/customer'
import * as DeptApi from '@/api/system/dept'
import * as ProjectApi from '@/api/crm/project'
import { TabsPaneContext } from 'element-plus'
import { erpPriceInputFormatter } from '@/utils'
import { is } from 'bpmn-js/lib/util/ModelUtil'
@ -337,8 +367,10 @@ const queryParams = reactive({
sceneType: undefined, // 默认和 activeName 相等
returnTime: [], // 收付日期
customerId: undefined,
projectId: undefined,
deptId: undefined, // 收付主体
type: undefined,
paymentType: undefined,
receivableType: undefined,
priceMin: undefined, // 金额最小值
priceMax: undefined, // 金额最大值
isDeposit: undefined, // 是否押金
@ -350,6 +382,7 @@ const exportLoading = ref(false) // 导出的加载中
const activeName = ref('1') // 列表 tab
const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
const deptList = ref<DeptApi.DeptVO[]>([])
const projectList = ref<ProjectApi.ProjectVO[]>([])
const showSummaryDialog = ref(false)
const options = ref([
{ label: '是', value: 1 },
@ -461,6 +494,8 @@ onMounted(async () => {
customerList.value = await CustomerApi.getCustomerSimpleList()
// 加载部门列表
deptList.value = await DeptApi.querySimpleDeptList(2)
// 加载项目列表
projectList.value = await ProjectApi.getProjectSimpleList()
})
watch(

9
src/views/crm/receivable/plan/ReceivablePlanForm.vue
View File

@ -16,7 +16,7 @@
<el-col :span="12">
<el-form-item label="付款单位">
<el-select
v-model="formData.contractId"
v-model="formData.deptId"
disabled
class="w-1/1"
filterable
@ -24,9 +24,9 @@
>
<el-option
v-for="data in contractList"
:key="data.id"
:key="data.deptId"
:label="data.deptName"
:value="data.id!"
:value="data.deptId"
/>
</el-select>
</el-form-item>
@ -190,6 +190,9 @@ const open = async (type: string, id?: number, customerId?: number, contractId?:
}
if (contractId) {
formData.value.contractId = contractId
const contractData = await ContractApi.getContract(contractId)
formData.value.deptId = contractData.deptId
formData.value.deptName = contractData.deptName
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗

4
src/views/crm/receivable/plan/index.vue
View File

@ -207,14 +207,14 @@
>
创建付款
</el-button>
<el-button
<!-- <el-button
v-hasPermi="['crm:receivable-plan:update']"
link
type="primary"
@click="openForm('update', scope.row.id)"
>
编辑
</el-button>
</el-button> -->
<el-button
v-hasPermi="['crm:receivable-plan:delete']"
link

2
src/views/crm/receivable/request/RequestForm.vue
View File

@ -132,7 +132,7 @@ const open = async (type: string, id?: number, customerId?: number, contractId?:
// 获得用户列表
userOptions.value = await UserApi.getSimpleUserList()
// 加载部门列表
deptList.value = await DeptApi.querySimpleDeptList(3)
deptList.value = await DeptApi.querySimpleDeptList(2)
// 获得客户列表
customerList.value = await CustomerApi.getCustomerSimpleAllList()
// 默认新建时选中自己

33
src/views/crm/receivable/request/index.vue
View File

@ -26,6 +26,23 @@
/>
</el-select>
</el-form-item>
<el-form-item label="类型" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择类型"
clearable
class="!w-240px"
@keyup.enter="handleQuery"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_PLAN_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">
@ -95,7 +112,7 @@
>
<template #default="scope">
<el-text v-if="scope.row.receivable">
{{ erpPriceInputFormatter(scope.row.receivable.price) }}
{{ erpPriceInputFormatter((scope.row.receivable && Array.isArray(scope.row.receivable) && scope.row.receivable.length > 0) ? scope.row.receivable.reduce((sum, r) => sum + (r.price || 0), 0) : 0) }}
</el-text>
<el-text v-else>{{ erpPriceInputFormatter(0) }}</el-text>
</template>
@ -115,16 +132,21 @@
>
<template #default="scope">
<el-text v-if="scope.row.receivable">
{{ erpPriceInputFormatter(scope.row.price - scope.row.receivable.price) }}
{{ erpPriceInputFormatter(scope.row.price - ((scope.row.receivable && Array.isArray(scope.row.receivable) && scope.row.receivable.length > 0) ? scope.row.receivable.reduce((sum, r) => sum + (r.price || 0), 0) : 0)) }}
</el-text>
<el-text v-else>{{ erpPriceInputFormatter(scope.row.price) }}</el-text>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" width="90" prop="auditStatus">
<el-table-column align="center" label="类型" prop="status" width="160">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_RECEIVABLE_PLAN_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<!-- <el-table-column label="审核状态" align="center" width="90" prop="auditStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
</template>
</el-table-column>
</el-table-column> -->
<el-table-column align="center" label="创建人" prop="creatorName" width="150">
<template #default="scope">
{{ scope.row.creatorName }}
@ -175,7 +197,7 @@
</template>
<script lang="ts" setup>
import { DICT_TYPE } from '@/utils/dict'
import { DICT_TYPE,getIntDictOptions } from '@/utils/dict'
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import download from '@/utils/download'
import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
@ -197,6 +219,7 @@ const queryParams = reactive({
pageSize: 10,
sceneType: undefined, // 默认和 activeName 相等
type: 1,
status: undefined,
customerId: undefined,
contractNo: undefined
})