From 809355178cdd17d4bf66a4eb443c56b563b68dd9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 13:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/crm/receivable/data.ts |   84 ++++++++++++++++++++++++++++++-----------
 1 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/src/views/crm/receivable/data.ts b/src/views/crm/receivable/data.ts
index c416ce0..e401e1f 100644
--- a/src/views/crm/receivable/data.ts
+++ b/src/views/crm/receivable/data.ts
@@ -1,17 +1,20 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { DICT_TYPE } from '../../../packages/constants/src';
-import { getDictOptions } from '../../../packages/effects/hooks/src';
-import { useUserStore } from '../../../packages/stores/src';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { useUserStore } from '@vben/stores';
 
 import { getContractSimpleList } from '#/api/crm/contract';
-import { getCustomerSimpleList } from '#/api/crm/customer';
+import { getInvoiceSimpleList } from '#/api/crm/invoice';
 import {
   getReceivablePlan,
   getReceivablePlanSimpleList,
 } from '#/api/crm/receivable/plan';
 import { getSimpleUserList } from '#/api/system/user';
+import CrmCustomerSelect from '#/components/crm-customer-select.vue';
+
+import { markRaw } from 'vue';
 
 /** 鏂板/淇敼鐨勮〃鍗� */
 export function useFormSchema(): VbenFormSchema[] {
@@ -55,15 +58,13 @@
     {
       fieldName: 'customerId',
       label: '瀹㈡埛鍚嶇О',
-      component: 'ApiSelect',
+      component: markRaw(CrmCustomerSelect),
       rules: 'required',
       componentProps: (_values, form) => ({
-        api: getCustomerSimpleList,
-        labelField: 'name',
-        valueField: 'id',
         placeholder: '璇烽�夋嫨瀹㈡埛',
         onChange: () => {
           form.setFieldValue('contractId', undefined);
+          form.setFieldValue('invoiceId', undefined);
           form.setFieldValue('planId', undefined);
           form.setFieldValue('price', undefined);
           form.setFieldValue('returnTime', undefined);
@@ -98,6 +99,7 @@
             })),
             placeholder: '璇烽�夋嫨鍚堝悓',
             onChange: (value: number) => {
+              form.setFieldValue('invoiceId', undefined);
               form.setFieldValue('planId', undefined);
               form.setFieldValue('returnTime', undefined);
               form.setFieldValue('returnType', undefined);
@@ -114,10 +116,53 @@
       },
     },
     {
+      fieldName: 'invoiceId',
+      label: '鍏宠仈寮�绁�',
+      component: 'Select',
+      rules: 'required',
+      dependencies: {
+        triggerFields: ['contractId', 'invoiceId'],
+        disabled: (values) => !values.contractId || !!values.id,
+        async componentProps(values, form) {
+          if (!values.contractId) {
+            return {
+              options: [],
+              placeholder: '璇峰厛閫夋嫨鍚堝悓',
+            };
+          }
+          const invoices = await getInvoiceSimpleList(values.contractId);
+          return {
+            options: invoices.map((item) => {
+              const remain = item.remainingInvoicePrice ?? item.price ?? 0;
+              return {
+                label: `${item.no} / ${item.invoiceNo ?? '-'} / 楼${item.price ?? 0} / 鍓╀綑鍙洖娆� 楼${remain.toFixed(2)}`,
+                value: item.id,
+              };
+            }),
+            placeholder: '璇烽�夋嫨鍏宠仈寮�绁�',
+            onChange: (value: number) => {
+              form.setFieldValue('planId', undefined);
+              form.setFieldValue('returnTime', undefined);
+              form.setFieldValue('returnType', undefined);
+              const invoice = invoices.find((item) => item.id === value);
+              if (invoice) {
+                form.setFieldValue(
+                  'price',
+                  invoice.remainingInvoicePrice ?? invoice.price ?? undefined,
+                );
+                form.setFieldValue('customerId', invoice.customerId);
+              }
+            },
+          } as any;
+        },
+      },
+    },
+    {
       fieldName: 'planId',
       label: '鍥炴鏈熸暟',
       component: 'Select',
       rules: 'required',
+      help: '姝ゅ弬鏁板彲鍦ㄥ洖娆捐鍒掗厤缃�',
       dependencies: {
         triggerFields: ['contractId'],
         disabled: (values) => !values.contractId || values.id,
@@ -184,7 +229,7 @@
       componentProps: {
         placeholder: '璇烽�夋嫨鍥炴鏃ユ湡',
         showTime: false,
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD',
         format: 'YYYY-MM-DD',
       },
     },
@@ -216,11 +261,8 @@
     {
       fieldName: 'customerId',
       label: '瀹㈡埛',
-      component: 'ApiSelect',
+      component: markRaw(CrmCustomerSelect),
       componentProps: {
-        api: getCustomerSimpleList,
-        labelField: 'name',
-        valueField: 'id',
         placeholder: '璇烽�夋嫨瀹㈡埛',
         allowClear: true,
       },
@@ -248,6 +290,12 @@
       field: 'contract',
       minWidth: 160,
       slots: { default: 'contractNo' },
+    },
+    {
+      title: '鍏宠仈寮�绁�',
+      field: 'invoice',
+      minWidth: 200,
+      slots: { default: 'invoiceNo' },
     },
     {
       title: '鍥炴鏃ユ湡',
@@ -307,16 +355,6 @@
       title: '鍒涘缓浜�',
       field: 'creatorName',
       minWidth: 150,
-    },
-    {
-      title: '鍥炴鐘舵��',
-      field: 'auditStatus',
-      minWidth: 100,
-      fixed: 'right',
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.CRM_AUDIT_STATUS },
-      },
     },
     {
       title: '鎿嶄綔',

--
Gitblit v1.9.3