From f10cf167372f2d8c4c0e14f42f361d7ab96d8347 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 七月 2026 13:59:00 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0

---
 src/views/crm/contract/data.ts |   84 +++++++++++++++++++++++++++++++++---------
 1 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/src/views/crm/contract/data.ts b/src/views/crm/contract/data.ts
index 454afe8..1efd63c 100644
--- a/src/views/crm/contract/data.ts
+++ b/src/views/crm/contract/data.ts
@@ -1,7 +1,6 @@
 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';
 
@@ -70,6 +69,18 @@
       },
     },
     {
+      fieldName: 'orderDate',
+      label: '涓嬪崟鏃ユ湡',
+      component: 'DatePicker',
+      rules: 'required',
+      componentProps: {
+        showTime: false,
+        format: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        placeholder: '璇烽�夋嫨涓嬪崟鏃ユ湡',
+      },
+    },
+    {
       fieldName: 'businessId',
       label: '鍟嗘満鍚嶇О',
       component: 'Select',
@@ -102,18 +113,6 @@
       },
     },
     {
-      fieldName: 'orderDate',
-      label: '涓嬪崟鏃ユ湡',
-      component: 'DatePicker',
-      rules: 'required',
-      componentProps: {
-        showTime: false,
-        format: 'YYYY-MM-DD',
-        valueFormat: 'x',
-        placeholder: '璇烽�夋嫨涓嬪崟鏃ユ湡',
-      },
-    },
-    {
       fieldName: 'startTime',
       label: '鍚堝悓寮�濮嬫椂闂�',
       component: 'DatePicker',
@@ -134,6 +133,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',
@@ -278,6 +289,32 @@
         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 +325,7 @@
       field: 'no',
       minWidth: 180,
       fixed: 'left',
+      slots: { default: 'no' },
     },
     {
       title: '鍚堝悓鍚嶇О',
@@ -311,6 +349,12 @@
     {
       title: '鍚堝悓閲戦锛堝厓锛�',
       field: 'totalPrice',
+      minWidth: 140,
+      formatter: 'formatAmount2',
+    },
+    {
+      title: '瀹氶噾閲戦锛堝厓锛�',
+      field: 'depositPrice',
       minWidth: 140,
       formatter: 'formatAmount2',
     },
@@ -402,16 +446,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