收付记录

src/api/crm/receivable/index.ts

@@ -10,16 +10,19 @@ export interface ReceivableVO {
   contractId?: number
   type: number
   deptId: number
+  projectId?: number
   contract?: {
     id?: number
     name?: string
     no: string
     totalPrice: number
   }
+  isDeposit: boolean
   auditStatus: number
   processInstanceId: number
   returnTime: Date
   returnType: number
+  transactionType: number // 交易类型：0-付款，1-收款
   price: number
   ownerUserId: number
   ownerUserName?: string
@@ -74,3 +77,8 @@ export const submitReceivable = async (id: number) => {
 export const getAuditReceivableCount = async () => {
   return await request.get({ url: '/crm/receivable/audit-count' })
 }
+
+// 查询收付主体汇总金额
+export const queryReceivableSummary = async () => {
+  return await request.get({ url: '/crm/receivable/query-summary' })
+}

src/api/crm/stationsite/index.ts

@@ -23,8 +23,8 @@ export interface StationSiteVO {
   managementName: string // 物管方名称
   recommenderName: string // 推荐人姓名
   recommenderContact: string // 推荐人联系方式
-  picUrls?: string // 图片
+  picUrls?: string[] // 图片
-  fileUrls?: string // 附件
+  fileUrls?: string[] // 附件
   parkingSpaces: number // 车位数
   rentPrice: number // 租金价格
   lastFollowTime?: number // 未跟进天数

src/components/AttachmentFile/index.vue

@@ -79,13 +79,12 @@
 
 <script setup lang="ts">
 import { ElMessage, ElLoading } from 'element-plus'
-import { ref } from 'vue'
 import { Document } from '@element-plus/icons-vue'
 
 const props = defineProps<{
   loading: boolean
-  picUrls: string[]
+  picUrls: string[] | undefined
-  fileUrls: string[]
+  fileUrls: string[] | undefined
 }>()
 
 // 从URL中提取文件名
@@ -121,13 +120,6 @@ const downloadFile = (url: string) => {
     }, 500)
   }
 }
-
-// 预览文件（简单实现）
-const previewFile = (url: string) => {
-  if (url.match(/\.(png|jpg|jpeg|gif|webp)$/i)) {
-    window.open(url, '_blank')
-  }
-}
 </script>
 
 <style scoped>

src/utils/dict.ts

@@ -205,6 +205,7 @@ export enum DICT_TYPE {
   CRM_BIZ_TYPE = 'crm_biz_type', // CRM 业务类型
   CRM_BUSINESS_END_STATUS_TYPE = 'crm_business_end_status_type', // CRM 商机结束状态类型
   CRM_RECEIVABLE_RETURN_TYPE = 'crm_receivable_return_type', // CRM 付款的付款方式
+  CRM_RECEIVABLE_TRANSACTION_TYPE = 'crm_receivable_transaction_type', // CRM 付款的收支方向
   CRM_RECEIVABLE_TYPE = 'crm_receivable_type', // CRM 付款类型
   CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry', // CRM 客户所属行业
   CRM_CUSTOMER_DEAL_STATUS = 'crm_customer_deal_status', // CRM 客户成交状态

src/views/crm/receivable/PaymentForm.vue

@@ -0,0 +1,339 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="收款单位" prop="deptId">
+            <el-select
+              v-model="formData.deptId"
+              :disabled="formType !== 'create'"
+              class="w-1/1"
+              filterable
+              placeholder="请选择收款单位"
+            >
+              <el-option
+                v-for="data in deptList"
+                :key="data.id"
+                :label="data.name"
+                :value="data.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="付款单位" prop="customerId">
+            <el-select
+              v-model="formData.customerId"
+              :disabled="formType !== 'create'"
+              class="w-1/1"
+              filterable
+              placeholder="请选择付款单位"
+              @change="handleCustomerChange"
+            >
+              <el-option
+                v-for="item in customerList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="收款金额" prop="price">
+            <el-input-number
+              v-model="formData.price"
+              :max="maxPayableAmount"
+              :precision="2"
+              class="!w-100%"
+              controls-position="right"
+              placeholder="请输入收款金额"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="收款日期" prop="returnTime">
+            <el-date-picker
+              v-model="formData.returnTime"
+              placeholder="选择收款日期"
+              type="date"
+              value-format="x"
+              class="!w-100%"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="收款方式" prop="returnType">
+            <el-select v-model="formData.returnType" class="w-1/1" placeholder="请选择收款方式">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_RETURN_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </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-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" v-if="showProject">
+          <el-form-item label="项目名称" prop="projectId">
+            <el-select
+              v-model="formData.projectId"
+              filterable
+              clearable
+              placeholder="请选择项目"
+              class="w-1/1"
+            >
+              <el-option
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="是否押金" prop="isDeposit">
+            <el-switch v-model="formData.isDeposit" active-text="是" inactive-text="否" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
+import * as ReceivableApi from '@/api/crm/receivable'
+import { ReceivableVO } from '@/api/crm/receivable'
+import * as UserApi from '@/api/system/user'
+import * as CustomerApi from '@/api/crm/customer'
+import * as ContractApi from '@/api/crm/contract'
+import * as ProjectApi from '@/api/crm/project'
+import * as DeptApi from '@/api/system/dept'
+import { useUserStore } from '@/store/modules/user'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref<ReceivableApi.ReceivableVO & {
+  date?: number | string
+  projectId?: number
+  isDeposit?: boolean
+}>({} as ReceivableApi.ReceivableVO)
+const formRules = reactive({
+  customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
+  returnTime: [{ required: true, message: '收款日期不能为空', trigger: 'blur' }],
+  price: [{ required: true, message: '收款金额不能为空', trigger: 'blur' }],
+  date: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
+  content: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '收支类型不能为空', trigger: 'change' }],
+  projectId: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
+  isDeposit: [{ required: true, message: '请选择是否押金', trigger: 'change' }],
+  remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const deptList = ref<DeptApi.DeptVO[]>([])
+const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
+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 === 2)
+
+/** 打开弹窗 */
+const open = async (
+  type: string,
+  id?: number,
+  receivablePlan?: ReceivablePlanApi.ReceivablePlanVO
+) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const data = (await ReceivableApi.getReceivable(id)) as ReceivableVO
+      formData.value = data
+      await handleCustomerChange(data.customerId!)
+      formData.value.contractId = data?.contract?.id
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载部门列表
+  deptList.value = await DeptApi.querySimpleDeptList(2)
+  // 获得用户列表
+  userOptions.value = await UserApi.getSimpleUserList()
+  // 获得客户列表
+  customerList.value = await CustomerApi.getCustomerSimpleList()
+  // 获得项目列表
+  projectList.value = await ProjectApi.getProjectSimpleList()
+  // 默认新建时选中自己
+  if (formType.value === 'create') {
+    formData.value.ownerUserId = useUserStore().getUser.id
+  }
+  // 从收款计划创建收款
+  if (receivablePlan) {
+    // 修复 receivablePlan.contractId 可能为 undefined 的类型问题
+    formData.value.customerId = receivablePlan.customerId
+    formData.value.period = receivablePlan.period
+    formData.value.remark = receivablePlan.remark
+    await handleCustomerChange(receivablePlan.customerId)
+    if (receivablePlan.contractId) {
+      formData.value.contractId = receivablePlan.contractId
+      await handleContractChange(receivablePlan.contractId)
+    }
+    if (receivablePlan.id) {
+      formData.value.planId = receivablePlan.id
+      formData.value.returnType = receivablePlan.returnType
+      // 计算应收款金额并赋值给收款金额
+      let paid = 0
+      if (Array.isArray(receivablePlan.receivable) && receivablePlan.receivable.length > 0) {
+        paid = receivablePlan.receivable.reduce((sum, r) => sum + (r.price || 0), 0)
+      }
+      maxPayableAmount.value = receivablePlan.price - paid
+      formData.value.price = receivablePlan.price - paid
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ReceivableApi.ReceivableVO
+    if (formType.value === 'create') {
+      await ReceivableApi.createReceivable(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ReceivableApi.updateReceivable(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {} as ReceivableApi.ReceivableVO
+  formRef.value?.resetFields()
+  formData.value.isDeposit = false // 默认不是押金
+  formData.value.transactionType = 0 // 默认收支方向为收入
+}
+
+/** 处理切换客户 */
+const handleCustomerChange = async (customerId: number) => {
+  // 重置合同编号
+  formData.value.contractId = undefined
+  // 获得合同列表
+  if (customerId) {
+    contractList.value = []
+    contractList.value = await ContractApi.getContractSimpleList(customerId)
+  }
+}
+
+/** 处理切换合同 */
+const handleContractChange = async (contractId: number) => {
+  // 重置收款计划编号
+  formData.value.planId = undefined
+  if (contractId) {
+    // 获得收款计划列表
+    receivablePlanList.value = []
+    receivablePlanList.value = await ReceivablePlanApi.getReceivablePlanSimpleList(
+      formData.value.customerId!,
+      contractId
+    )
+    // 设置金额
+    const contract = contractList.value.find((item) => item.id === contractId)
+    if (contract) {
+      formData.value.price = contract.totalPrice - contract.totalReceivablePrice
+      // 设置收款方
+      formData.value.deptId = contract.deptId
+    }
+  }
+}
+
+/** 处理切换收款计划 */
+const handleReceivablePlanChange = (planId: number) => {
+  if (!planId) {
+    return
+  }
+  const receivablePlan = receivablePlanList.value.find((item) => item.id === planId)
+  if (!receivablePlan) {
+    return
+  }
+  formData.value.price = receivablePlan.price
+  formData.value.returnType = receivablePlan.returnType
+}
+
+
+watch(
+  () => formData.value.type,
+  (val) => {
+    if (val === 1 || val === 2) {
+      formRules.projectId = [{ required: true, message: '项目名称不能为空', trigger: 'change' }]
+    } else {
+      formRules.projectId = []
+      formData.value.projectId = undefined
+    }
+  },
+  { immediate: true }
+)
+</script>

src/views/crm/receivable/ReceivableForm.vue

@@ -9,22 +9,15 @@
     >
       <el-row>
         <el-col :span="12">
-          <el-form-item label="付款期数" prop="planId">
+          <el-form-item label="付款期数" prop="period">
-            <el-select
+            <el-input
-              v-model="formData.planId"
+              v-model="formData.period"
-              :disabled="formType !== 'create' || !formData.contractId"
+              disabled
-              class="!w-1/1"
+              class="!w-100%"
-              placeholder="请选择付款期数"
+              placeholder="请输入付款期数"
-              @change="handleReceivablePlanChange"
             >
-              <el-option
+            {{ '第 ' + formData.period + ' 期' }}
-                v-for="data in receivablePlanList"
+            </el-input>
-                :key="data.id"
-                disabled
-                :label="'第 ' + data.period + ' 期'"
-                :value="data.id!"
-              />
-            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -92,7 +85,7 @@
           <el-form-item label="付款金额" prop="price">
             <el-input-number
               v-model="formData.price"
-              :min="0.01"
+              :max="maxPayableAmount"
               :precision="2"
               class="!w-100%"
               controls-position="right"
@@ -128,8 +121,8 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="收支类型" prop="incomeType">
+          <el-form-item label="收支类型" prop="type">
-            <el-select v-model="formData.incomeType" placeholder="请选择收支类型" class="w-1/1">
+            <el-select v-model="formData.type" placeholder="请选择收支类型" class="w-1/1">
               <el-option
                 v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_TYPE)"
                 :key="dict.value"
@@ -141,7 +134,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
+        <el-col :span="12" v-if="showProject">
           <el-form-item label="项目名称" prop="projectId">
             <el-select
               v-model="formData.projectId"
@@ -167,8 +160,8 @@
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="备注" prop="content">
+          <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.content" placeholder="请输入备注" type="textarea" />
+            <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -200,8 +193,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<ReceivableApi.ReceivableVO & {
   date?: number | string
-  content?: string
-  incomeType?: string
   projectId?: number
   isDeposit?: boolean
 }>({} as ReceivableApi.ReceivableVO)
@@ -212,9 +203,10 @@ const formRules = reactive({
   price: [{ required: true, message: '付款金额不能为空', trigger: 'blur' }],
   date: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
   content: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
-  incomeType: [{ required: true, message: '收支类型不能为空', trigger: 'change' }],
+  type: [{ required: true, message: '收支类型不能为空', trigger: 'change' }],
   projectId: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
   isDeposit: [{ required: true, message: '请选择是否押金', trigger: 'change' }],
+  remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deptList = ref<DeptApi.DeptVO[]>([])
@@ -222,6 +214,8 @@ const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
 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 === 2)
 
 /** 打开弹窗 */
 const open = async (
@@ -259,20 +253,25 @@ const open = async (
   }
   // 从付款计划创建付款
   if (receivablePlan) {
-    
     // 修复 receivablePlan.contractId 可能为 undefined 的类型问题
-    if (receivablePlan) {
+    formData.value.customerId = receivablePlan.customerId
-      formData.value.customerId = receivablePlan.customerId
+    formData.value.period = receivablePlan.period
-      await handleCustomerChange(receivablePlan.customerId)
+    formData.value.remark = receivablePlan.remark
-      if (receivablePlan.contractId) {
+    await handleCustomerChange(receivablePlan.customerId)
-        formData.value.contractId = receivablePlan.contractId
+    if (receivablePlan.contractId) {
-        await handleContractChange(receivablePlan.contractId)
+      formData.value.contractId = receivablePlan.contractId
-      }
+      await handleContractChange(receivablePlan.contractId)
-      if (receivablePlan.id) {
+    }
-        formData.value.planId = receivablePlan.id
+    if (receivablePlan.id) {
-        formData.value.price = receivablePlan.price
+      formData.value.planId = receivablePlan.id
-        formData.value.returnType = receivablePlan.returnType
+      formData.value.returnType = receivablePlan.returnType
+      // 计算应付款金额并赋值给付款金额
+      let paid = 0
+      if (Array.isArray(receivablePlan.receivable) && receivablePlan.receivable.length > 0) {
+        paid = receivablePlan.receivable.reduce((sum, r) => sum + (r.price || 0), 0)
       }
+      maxPayableAmount.value = receivablePlan.price - paid
+      formData.value.price = receivablePlan.price - paid
     }
   }
 }
@@ -309,6 +308,7 @@ const resetForm = () => {
   formData.value = {} as ReceivableApi.ReceivableVO
   formRef.value?.resetFields()
   formData.value.isDeposit = false // 默认不是押金
+  formData.value.transactionType = 1 // 默认收支方向为支出
 }
 
 /** 处理切换客户 */
@@ -355,4 +355,17 @@ const handleReceivablePlanChange = (planId: number) => {
   formData.value.price = receivablePlan.price
   formData.value.returnType = receivablePlan.returnType
 }
+
+watch(
+  () => formData.value.type,
+  (val) => {
+    if (val === 1 || val === 2) {
+      formRules.projectId = [{ required: true, message: '项目名称不能为空', trigger: 'change' }]
+    } else {
+      formRules.projectId = []
+      formData.value.projectId = undefined
+    }
+  },
+  { immediate: true }
+)
 </script>

src/views/crm/receivable/components/SummaryForm.vue

@@ -0,0 +1,43 @@
+<template>
+  <Dialog v-model="dialogVisible" title="金额汇总">
+    <ContentWrap class="mt-10px">
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+        <template #empty>
+          <div>当前 list: {{ list }}</div>
+        </template>
+        <el-table-column align="center" label="收付主体" prop="deptName" min-width="300px" />
+        <el-table-column
+          align="center"
+          label="汇总金额(元)"
+          prop="price"
+          :formatter="erpPriceTableColumnFormatter"
+          min-width="150px"
+        />
+      </el-table>
+    </ContentWrap>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as ReceivableApi from '@/api/crm/receivable'
+import { erpPriceTableColumnFormatter } from '@/utils'
+
+const dialogVisible = ref(false)
+const loading = ref(true)
+const list = ref([])
+
+const getList = async () => {
+  try {
+    loading.value = true
+    const data = await ReceivableApi.queryReceivableSummary()
+    list.value = data
+  } finally {
+    loading.value = false
+  }
+}
+
+const open = () => {
+  dialogVisible.value = true
+  getList()
+}
+defineExpose({ open })
+</script>

src/views/crm/receivable/index.vue

@@ -11,20 +11,22 @@
       class="-mb-15px"
       label-width="68px"
     >
-      <el-form-item label="付款编号" prop="no">
+      <el-form-item label="日期" prop="returnTime">
-        <el-input
+        <el-date-picker
-          v-model="queryParams.no"
+          v-model="queryParams.returnTime"
-          class="!w-240px"
+          value-format="YYYY-MM-DD HH:mm:ss"
-          clearable
+          type="daterange"
-          placeholder="请输入付款编号"
+          start-placeholder="开始日期"
-          @keyup.enter="handleQuery"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
         />
       </el-form-item>
-      <el-form-item label="客户名称" prop="customerId">
+      <el-form-item label="实际收付单位" prop="customerId" label-width="100px">
         <el-select
           v-model="queryParams.customerId"
           class="!w-240px"
-          placeholder="请选择客户"
+          placeholder="请选择实际收付单位"
           @keyup.enter="handleQuery"
         >
           <el-option
@@ -35,6 +37,68 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="收支类型" prop="transactionType">
+        <el-select
+          v-model="queryParams.transactionType"
+          class="!w-150px"
+          clearable
+          placeholder="请选择收支类型"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.CRM_RECEIVABLE_TRANSACTION_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="收付主体" prop="deptId">
+        <el-select
+          v-model="queryParams.deptId"
+          class="!w-240px"
+          placeholder="请选择收付主体"
+          @keyup.enter="handleQuery"
+        >
+          <el-option
+            v-for="item in deptList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="金额(元)">
+        <el-input-number
+          v-model="queryParams.priceMin"
+          :precision="2"
+          class="!w-110px mr-8px"
+          :controls="false"
+          placeholder="最小金额"
+        />
+        <span style="margin: 0 8px;">-</span>
+        <el-input-number
+          v-model="queryParams.priceMax"
+          :precision="2"
+          class="!w-110px"
+          :controls="false"
+          placeholder="最大金额"
+        />
+      </el-form-item>
+      <el-form-item label="是否押金" prop="isDeposit">
+        <el-select
+          v-model="queryParams.isDeposit"
+          class="!w-240px"
+          clearable
+          placeholder="请选择是否押金"
+        >
+           <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search" />
@@ -48,7 +112,7 @@
           v-hasPermi="['crm:receivable:create']"
           plain
           type="primary"
-          @click="openForm('create')"
+          @click="openPaymentForm('create')"
         >
           <Icon class="mr-5px" icon="ep:plus" />
           新增
@@ -63,75 +127,91 @@
           <Icon class="mr-5px" icon="ep:download" />
           导出
         </el-button>
+        <el-button plain type="warning" @click="openSummaryForm">
+          <Icon class="mr-5px" icon="ep:view" />
+          查看汇总
+        </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="我负责的" name="1" />
-      <el-tab-pane label="我参与的" name="2" />
-      <el-tab-pane label="下属负责的" name="3" />
-    </el-tabs>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" fixed="left" label="付款编号" prop="no" width="180">
+      <el-table-column
-        <template #default="scope">
+        :formatter="dateFormatter2"
-          <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
+        align="center"
-            {{ scope.row.no }}
+        label="日期"
-          </el-link>
+        prop="returnTime"
-        </template>
+        width="150px"
-      </el-table-column>
+      />
-      <el-table-column align="center" label="客户名称" prop="customerName" width="120">
+      
+      <el-table-column align="center" label="实际收付单位" prop="customerName" min-width="350px">
         <template #default="scope">
           <el-link
             :underline="false"
-            type="primary"
             @click="openCustomerDetail(scope.row.customerId)"
           >
             {{ scope.row.customerName }}
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="合同编号" prop="contractNo" width="180">
+      <el-table-column
+        align="center"
+        label="收入金额(元)"
+        prop="price"
+        width="140"
+      >
+        <template #default="scope">
+          <span v-if="scope.row.transactionType === 0">{{ erpPriceInputFormatter(scope.row.price) }}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        label="支出金额(元)"
+        prop="price"
+        width="140"
+      >
+        <template #default="scope">
+          <span v-if="scope.row.transactionType === 1">{{ erpPriceInputFormatter(scope.row.price) }}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="收付主体" prop="name" min-width="350px">
+        <template #default="scope">
+           {{ scope.row.deptName }}
+        </template>
+      </el-table-column>
+
+      <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" />
+        </template>
+      </el-table-column>
+      
+      <!-- <el-table-column align="center" label="合同编号" prop="contractNo" width="180">
         <template #default="scope">
           <el-link
+            v-if="scope.row.contract && scope.row.contract.no"
             :underline="false"
             type="primary"
             @click="openContractDetail(scope.row.contractId)"
           >
             {{ scope.row.contract.no }}
           </el-link>
+          <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :formatter="dateFormatter2"
-        align="center"
-        label="付款日期"
-        prop="returnTime"
-        width="150px"
-      />
-      <el-table-column
-        align="center"
-        label="付款金额(元)"
-        prop="price"
-        width="140"
-        :formatter="erpPriceTableColumnFormatter"
-      />
-      <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" />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="备注" prop="remark" width="200" />
       <el-table-column
         align="center"
         label="合同金额（元）"
         prop="contract.totalPrice"
         width="140"
         :formatter="erpPriceTableColumnFormatter"
-      />
+      /> -->
-      <el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
+      <!-- <el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
       <el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" />
       <el-table-column
         :formatter="dateFormatter"
@@ -152,18 +232,26 @@
         <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" fixed="right" label="操作" width="180px">
+      <el-table-column align="center" fixed="right" label="操作" min-width="180px">
         <template #default="scope">
+          <el-button
+            v-hasPermi="['crm:receivable:query']"
+            link
+            type="primary"
+            @click="openDetail(scope.row.id)"
+            >
+            查看
+          </el-button>
           <el-button
             v-hasPermi="['crm:receivable:update']"
             link
             type="primary"
-            @click="openForm('update', scope.row.id)"
+            @click="scope.row.transactionType === 1 ? openForm('update', scope.row.id) : openPaymentForm('update', scope.row.id)"
           >
             编辑
           </el-button>
-          <el-button
+          <!-- <el-button
             v-if="scope.row.auditStatus === 0"
             v-hasPermi="['crm:receivable:update']"
             link
@@ -180,7 +268,7 @@
             @click="handleProcessDetail(scope.row)"
           >
             查看审批
-          </el-button>
+          </el-button> -->
           <el-button
             v-hasPermi="['crm:receivable:delete']"
             link
@@ -203,16 +291,21 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ReceivableForm ref="formRef" @success="getList" />
+  <PaymentForm ref="paymentFormRef" @success="getList" />
+  <SummaryForm ref="summaryFormRef"  />
 </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 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 { TabsPaneContext } from 'element-plus'
-import { erpPriceTableColumnFormatter } from '@/utils'
+import { erpPriceInputFormatter } from '@/utils'
+import { is } from 'bpmn-js/lib/util/ModelUtil'
+import SummaryForm from './components/SummaryForm.vue'
 
 defineOptions({ name: 'Receivable' })
 
@@ -224,20 +317,27 @@ const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  sceneType: '1', // 默认和 activeName 相等
+  sceneType: undefined, // 默认和 activeName 相等
-  no: undefined,
+  returnTime: [], // 收付日期
-  customerId: undefined
+  customerId: undefined,
+  deptId: undefined, // 收付主体
+  type: undefined,
+  priceMin: undefined, // 金额最小值
+  priceMax: undefined, // 金额最大值
+  isDeposit: undefined, // 是否押金
+  transactionType: undefined, // 收支类型
+
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 const activeName = ref('1') // 列表 tab
 const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
-
+const deptList = ref<DeptApi.DeptVO[]>([])
-/** tab 切换 */
+const showSummaryDialog = ref(false)
-const handleTabClick = (tab: TabsPaneContext) => {
+const options = ref([
-  queryParams.sceneType = tab.paneName
+  { label: '是', value: 1 },
-  handleQuery()
+  { label: '否', value: 0 }
-}
+])
 
 /** 查询列表 */
 const getList = async () => {
@@ -260,6 +360,8 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
+  queryParams.priceMin = undefined
+  queryParams.priceMax = undefined
   handleQuery()
 }
 
@@ -268,7 +370,16 @@ const formRef = ref()
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
+const paymentFormRef = ref()
+const openPaymentForm = (type: string, id?: number) => {
+  paymentFormRef.value.open(type, id)
+}
 
+/** 汇总表单 */
+const summaryFormRef = ref()
+const openSummaryForm = () => {
+  summaryFormRef.value.open()
+}
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -331,5 +442,20 @@ onMounted(async () => {
   await getList()
   // 获得客户列表
   customerList.value = await CustomerApi.getCustomerSimpleList()
+  // 加载部门列表
+  deptList.value = await DeptApi.getSimpleDeptList()
 })
+
+watch(
+  () => queryParams.priceMax,
+  (newVal) => {
+    if (
+      queryParams.priceMin !== undefined &&
+      newVal !== undefined &&
+      newVal < queryParams.priceMin
+    ) {
+      queryParams.priceMax = queryParams.priceMin
+    }
+  }
+)
 </script>

src/views/crm/receivable/plan/ReceivablePlanForm.vue

@@ -180,9 +180,9 @@ const open = async (type: string, id?: number, customerId?: number, contractId?:
   // 获得客户列表
   customerList.value = await CustomerApi.getCustomerSimpleAllList()
   // 默认新建时选中自己
-  // if (formType.value === 'create') {
+  if (formType.value === 'create') {
-  //   formData.value.ownerUserId = useUserStore().getUser.id
+    formData.value.ownerUserId = useUserStore().getUser.id
-  // }
+  }
   // 设置 customerId 和 contractId 默认值
   if (customerId) {
     formData.value.customerId = customerId

src/views/crm/receivable/plan/index.vue

@@ -166,6 +166,7 @@
       <el-table-column align="center" fixed="right" label="操作" min-width="180px">
         <template #default="scope">
           <el-button 
+            v-if="(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) > 0)"
             v-hasPermi="['crm:receivable:create']"
             link
             type="success"
@@ -208,13 +209,12 @@
 
 <script lang="ts" setup>
 import { DICT_TYPE } from '@/utils/dict'
-import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
 import ReceivablePlanForm from './ReceivablePlanForm.vue'
 import * as CustomerApi from '@/api/crm/customer'
 import { erpPriceInputFormatter, erpPriceTableColumnFormatter } from '@/utils'
-import { TabsPaneContext } from 'element-plus'
 import ReceivableForm from '@/views/crm/receivable/ReceivableForm.vue'
 
 defineOptions({ name: 'ReceivablePlan' })

src/views/crm/stationsite/detail/StationSiteDetailsHeader.vue

@@ -4,12 +4,11 @@
       <div>
         <el-col>
           <el-row>
-            <span class="text-md font-bold">{{ stationSite.name }}</span>
+            <span class="text-md font-bold">{{ stationSite?.name }}</span>
           </el-row>
         </el-col>
       </div>
       <div>
-        <!-- 右上：按钮 -->
         <slot></slot>
       </div>
     </div>
@@ -17,37 +16,32 @@
   <ContentWrap class="mt-10px">
     <el-descriptions :column="3" direction="horizontal" class="mb-10px">
       <el-descriptions-item label="场地类型:">
-        <dict-tag :type="DICT_TYPE.CRM_STATION_SITE_TYPE" :value="stationSite.siteType ?? ''" />
+        <dict-tag :type="DICT_TYPE.CRM_STATION_SITE_TYPE" :value="stationSite?.siteType ?? ''" />
       </el-descriptions-item>
       <el-descriptions-item label="场地状态:">
-        <dict-tag :type="DICT_TYPE.CRM_STATION_SITE_STATUS" :value="stationSite.siteStatus ?? ''" />
+        <dict-tag :type="DICT_TYPE.CRM_STATION_SITE_STATUS" :value="stationSite?.siteStatus ?? ''" />
       </el-descriptions-item>
       <el-descriptions-item label="地址:">
-        {{ stationSite.areaName || '-' }}{{ stationSite.detailAddress }}
+        {{ stationSite?.areaName || '-' }}{{ stationSite?.detailAddress || '' }}
       </el-descriptions-item>
       <el-descriptions-item label="可建充电枪数:">
-        {{ stationSite.estimatedPiles ?? '-' }}
+        {{ stationSite?.estimatedPiles ?? '-' }}
       </el-descriptions-item>
-      <!-- <el-descriptions-item label="总车位数:">
-        {{ stationSite.parkingSpace ?? '-' }}
-      </el-descriptions-item> -->
       <el-descriptions-item label="业主方:">
-        {{ stationSite.ownerName || '-' }}
+        {{ stationSite?.ownerName || '-' }}
       </el-descriptions-item>
       <el-descriptions-item label="物管方:">
-        {{ stationSite.managementName || '-' }}
+        {{ stationSite?.managementName || '-' }}
       </el-descriptions-item>
       <el-descriptions-item label="责任人:">
-        {{ stationSite.ownerUserName || '-' }}
+        {{ stationSite?.ownerUserName || '-' }}
       </el-descriptions-item>
       <el-descriptions-item label="推荐人姓名:">
-        {{ stationSite.recommenderName || '-' }}
+        {{ stationSite?.recommenderName || '-' }}
       </el-descriptions-item>
       <el-descriptions-item label="推荐人联系方式:">
-        {{ stationSite.recommenderContact || '-' }}
+        {{ stationSite?.recommenderContact || '-' }}
       </el-descriptions-item>
-
-
     </el-descriptions>
     
   </ContentWrap>
@@ -58,7 +52,7 @@ import { StationSiteVO } from '@/api/crm/stationsite'
 
 defineOptions({ name: 'CrmStationSiteDetailsHeader' })
 defineProps<{
-  stationSite: StationSiteVO // 场地信息
+  stationSite?: StationSiteVO // 场地信息
   loading: boolean // 加载中
 }>()
 </script>

src/views/crm/stationsite/detail/index.vue

@@ -3,7 +3,7 @@
     <el-button
         type="primary"
         v-hasPermi="['crm:station-site:update']"
-        @click="openForm('update', stationSite.id)"
+        @click="openForm('update', stationSite?.id)"
       >
       编辑
     </el-button>
@@ -24,8 +24,8 @@
       <el-tab-pane label="附件">
         <AttachmentTab
           :loading="loading"
-          :pic-urls="stationSite.picUrls"
+          :pic-urls="stationSite?.picUrls"
-          :file-urls="stationSite.fileUrls"
+          :file-urls="stationSite?.fileUrls"
         />
       </el-tab-pane>
         <!-- <el-tabs>
@@ -51,18 +51,15 @@ import type { OperateLogVO } from '@/api/system/operatelog'
 import { getOperateLogPage } from '@/api/crm/operateLog'
 import { BizTypeEnum } from '@/api/crm/permission'
 import { useTagsViewStore } from '@/store/modules/tagsView'
-import { checkPermi } from "@/utils/permission"; // 权限判断函数
 import FollowUpList from '@/views/crm/followup/components/FollowUpList.vue'
 import StationSiteForm from '../StationSiteForm.vue'
 import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
-import { ElMessage, ElLoading } from 'element-plus'
 import AttachmentTab from '@/components/AttachmentFile/index.vue'
 
 const route = useRoute()
 const stationSiteId = ref<number>()
 const loading = ref(true)
 const message = useMessage() // 消息弹窗
-const fileUrl = ref() // 文件URL
 const { delView } = useTagsViewStore() // 视图操作
 const { push, currentRoute } = useRouter() // 路由
 
@@ -103,48 +100,6 @@ const getStationSite = async () => {
   }
 }
 
-// 从URL中提取文件名
-const extractFileName = (url) => {
-  try {
-    const path = new URL(url).pathname
-    return decodeURIComponent(path.substring(path.lastIndexOf('/') + 1))
-  } catch {
-    return decodeURIComponent(url.substring(url.lastIndexOf('/') + 1))
-  }
-}
-
-// 下载文件
-const downloadFile = (url) => {
-  const loadingInstance = ElLoading.service({
-    lock: true,
-    text: '文件下载中...',
-    background: 'rgba(0, 0, 0, 0.7)'
-  })
-  
-  try {
-    const link = document.createElement('a')
-    link.href = url
-    link.download = extractFileName(url)
-    document.body.appendChild(link)
-    link.click()
-    document.body.removeChild(link)
-    ElMessage.success('文件下载开始')
-  } catch (error) {
-    ElMessage.error('下载失败: ' + error.message)
-  } finally {
-    setTimeout(() => {
-      loadingInstance.close()
-    }, 500)
-  }
-}
-
-// 预览文件（简单实现）
-const previewFile = (url) => {
-  if (url.match(/\.(png|jpg|jpeg|gif|webp)$/i)) {
-    // 图片直接在新标签页打开
-    window.open(url, '_blank')
-  }
-}
 
 /** 客户转移 */
 const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 客户转移表单 ref