From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/crm/contract/data.ts |  116 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 85 insertions(+), 31 deletions(-)

diff --git a/src/views/crm/contract/data.ts b/src/views/crm/contract/data.ts
index 1a2ced1..5ea024f 100644
--- a/src/views/crm/contract/data.ts
+++ b/src/views/crm/contract/data.ts
@@ -1,15 +1,16 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { DICT_TYPE } from '..\..\..\packages\constants\src';
-import { useUserStore } from '..\..\..\packages\stores\src';
-import { erpPriceInputFormatter, erpPriceMultiply } from '..\..\..\packages\utils\src';
+import { useUserStore } from '@vben/stores';
+import { erpPriceInputFormatter, erpPriceMultiply } from '@vben/utils';
 
 import { z } from '#/adapter/form';
 import { getSimpleBusinessList } from '#/api/crm/business';
 import { getSimpleContactList } from '#/api/crm/contact';
-import { getCustomerSimpleList } from '#/api/crm/customer';
 import { getSimpleUserList } from '#/api/system/user';
+import CrmCustomerSelect from '#/components/crm-customer-select.vue';
+
+import { markRaw } from 'vue';
 
 /** 鏂板/淇敼鐨勮〃鍗� */
 export function useFormSchema(): VbenFormSchema[] {
@@ -60,13 +61,26 @@
     {
       fieldName: 'customerId',
       label: '瀹㈡埛鍚嶇О',
-      component: 'ApiSelect',
+      component: markRaw(CrmCustomerSelect),
       rules: 'required',
       componentProps: {
-        api: getCustomerSimpleList,
-        labelField: 'name',
-        valueField: 'id',
         placeholder: '璇烽�夋嫨瀹㈡埛',
+      },
+      dependencies: {
+        triggerFields: ['customerId'],
+        disabled: (values) => !!values.customerId,
+      },
+    },
+    {
+      fieldName: 'orderDate',
+      label: '涓嬪崟鏃ユ湡',
+      component: 'DatePicker',
+      rules: 'required',
+      componentProps: {
+        showTime: false,
+        format: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        placeholder: '璇烽�夋嫨涓嬪崟鏃ユ湡',
       },
     },
     {
@@ -78,9 +92,15 @@
         placeholder: '璇烽�夋嫨鍟嗘満',
       },
       dependencies: {
-        triggerFields: ['customerId'],
-        disabled: (values) => !values.customerId,
+        triggerFields: ['customerId', 'businessId'],
+        disabled: (values) => !!values.businessId || !values.customerId,
         async componentProps(values) {
+          if (values.businessId && values.businessName) {
+            return {
+              options: [{ label: values.businessName, value: values.businessId }],
+              placeholder: '璇烽�夋嫨鍟嗘満',
+            };
+          }
           if (!values.customerId) {
             return {
               options: [],
@@ -99,18 +119,6 @@
             placeholder: '璇烽�夋嫨鍟嗘満',
           };
         },
-      },
-    },
-    {
-      fieldName: 'orderDate',
-      label: '涓嬪崟鏃ユ湡',
-      component: 'DatePicker',
-      rules: 'required',
-      componentProps: {
-        showTime: false,
-        format: 'YYYY-MM-DD',
-        valueFormat: 'x',
-        placeholder: '璇烽�夋嫨涓嬪崟鏃ユ湡',
       },
     },
     {
@@ -134,6 +142,18 @@
         valueFormat: 'x',
         placeholder: '璇烽�夋嫨鍚堝悓缁撴潫鏃堕棿',
       },
+    },
+    {
+      fieldName: 'depositPrice',
+      label: '瀹氶噾閲戦锛堝厓锛�',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        min: 0,
+        precision: 2,
+        placeholder: '璇疯緭鍏ュ畾閲戦噾棰�',
+      },
+      rules: z.number().min(0).optional(),
     },
     {
       fieldName: 'signUserId',
@@ -269,12 +289,35 @@
     {
       fieldName: 'customerId',
       label: '瀹㈡埛',
-      component: 'ApiSelect',
+      component: markRaw(CrmCustomerSelect),
       componentProps: {
-        api: getCustomerSimpleList,
-        labelField: 'name',
-        valueField: 'id',
         placeholder: '璇烽�夋嫨瀹㈡埛',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'auditStatus',
+      label: '鍚堝悓鐘舵��',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '鏈彁浜�', value: 0 },
+          { label: '瀹℃壒涓�', value: 10 },
+          { label: '瀹℃牳閫氳繃', value: 20 },
+          { label: '瀹℃牳涓嶉�氳繃', value: 30 },
+          { label: '宸插彇娑�', value: 40 },
+          { label: '宸蹭綔搴�', value: 50 },
+        ],
+        placeholder: '璇烽�夋嫨鍚堝悓鐘舵��',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'orderNo',
+      label: '鍏宠仈璁㈠崟',
+      component: 'Input',
+      componentProps: {
+        placeholder: '璇疯緭鍏ヨ鍗曞彿',
         allowClear: true,
       },
     },
@@ -288,6 +331,7 @@
       field: 'no',
       minWidth: 180,
       fixed: 'left',
+      slots: { default: 'no' },
     },
     {
       title: '鍚堝悓鍚嶇О',
@@ -311,6 +355,12 @@
     {
       title: '鍚堝悓閲戦锛堝厓锛�',
       field: 'totalPrice',
+      minWidth: 140,
+      formatter: 'formatAmount2',
+    },
+    {
+      title: '瀹氶噾閲戦锛堝厓锛�',
+      field: 'depositPrice',
       minWidth: 140,
       formatter: 'formatAmount2',
     },
@@ -402,16 +452,20 @@
       field: 'auditStatus',
       fixed: 'right',
       minWidth: 120,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.CRM_AUDIT_STATUS },
-      },
+      slots: { default: 'auditStatus' },
+    },
+    {
+      title: '鍏宠仈璁㈠崟',
+      field: 'orderNo',
+      fixed: 'right',
+      minWidth: 150,
+      slots: { default: 'orderNo' },
     },
     {
       title: '鎿嶄綔',
       field: 'actions',
       fixed: 'right',
-      minWidth: 130,
+      minWidth: 220,
       slots: { default: 'actions' },
     },
   ];

--
Gitblit v1.9.3