feat：【antd】调整 formatNumber 为 formatAmount3 保留 3 位，formatAmount2 保留 2 位

apps/web-antd/src/adapter/vxe-table.ts

@@ -332,13 +332,13 @@ setupVbenVxeTable({
       },
     });
 
-    // add by 星语：数量格式化，例如说：金额
+    // add by 星语：数量格式化，保留 3 位
-    vxeUI.formats.add('formatNumber', {
+    vxeUI.formats.add('formatAmount3', {
       tableCellFormatMethod({ cellValue }) {
         return erpCountInputFormatter(cellValue);
       },
     });
-
+    // add by 星语：数量格式化，保留 2 位
     vxeUI.formats.add('formatAmount2', {
       tableCellFormatMethod({ cellValue }, digits = 2) {
         return `${erpNumberFormatter(cellValue, digits)}`;

apps/web-antd/src/views/crm/product/components/data.ts

@@ -43,7 +43,7 @@ export function useDetailListColumns(
     {
       field: 'count',
       title: '数量',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount3',
     },
     {
       field: 'totalPrice',

apps/web-antd/src/views/erp/purchase/in/data.ts

@@ -452,18 +452,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '应付金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'paymentPrice',
       title: '已付金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
@@ -564,23 +565,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'inCount',
       title: '入库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];

apps/web-antd/src/views/erp/purchase/order/data.ts

@@ -379,34 +379,37 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'inCount',
       title: '入库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'depositPrice',
       title: '支付订金',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {

apps/web-antd/src/views/erp/purchase/return/data.ts

@@ -452,6 +452,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
@@ -572,28 +573,31 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'inCount',
       title: '入库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];

apps/web-antd/src/views/erp/sale/order/data.ts

@@ -409,34 +409,37 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'outCount',
       title: '出库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'depositPrice',
       title: '收取订金',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {

apps/web-antd/src/views/erp/sale/out/data.ts

@@ -197,7 +197,7 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
       componentProps: {
         precision: 2,
         min: 0,
-        disabled: true
+        disabled: true,
       },
       rules: z.number().min(0).optional(),
     },
@@ -456,18 +456,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '应收金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'receiptPrice',
       title: '已收金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
@@ -505,7 +506,6 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         placeholder: '请输入订单单号',
         allowClear: true,
-        disabled: true,
       },
     },
     {
@@ -528,10 +528,8 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
       label: '订单时间',
       component: 'RangePicker',
       componentProps: {
-        placeholder: ['开始时间', '结束时间'],
+        ...getRangePickerDefaultProps(),
-        showTime: true,
+        allowClear: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
       },
     },
   ];
@@ -576,23 +574,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'outCount',
       title: '出库数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];

apps/web-antd/src/views/erp/sale/return/data.ts

@@ -232,11 +232,13 @@ export function useSaleReturnItemTableColumns(): VxeTableGridOptions['columns']
     {
       field: 'totalCount',
       title: '原数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '已退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
@@ -449,18 +451,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '应退金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'refundPrice',
       title: '已退金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
@@ -569,23 +572,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '总数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'returnCount',
       title: '已退货数量',
+      formatter: 'formatAmount3',
       minWidth: 120,
     },
     {
       field: 'totalProductPrice',
       title: '金额合计',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
     {
       field: 'totalPrice',
       title: '含税金额',
-      formatter: 'formatNumber',
+      formatter: 'formatAmount2',
       minWidth: 120,
     },
   ];

apps/web-antd/src/views/erp/stock/check/data.ts

@@ -288,11 +288,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '数量',
+      formatter: 'formatAmount3',
       minWidth: 100,
     },
     {
       field: 'totalPrice',
       title: '金额',
+      formatter: 'formatAmount2',
       minWidth: 100,
     },
     {

apps/web-antd/src/views/erp/stock/in/data.ts

@@ -141,6 +141,7 @@ export function useStockInItemTableColumns(
       minWidth: 120,
       slots: { default: 'count' },
       className: createRequiredValidation(isValidating, 'count'),
+      formatter: 'formatAmount3',
     },
     {
       field: 'productPrice',

apps/web-antd/src/views/erp/stock/move/data.ts

@@ -287,11 +287,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '数量',
+      formatter: 'formatAmount3',
       minWidth: 100,
     },
     {
       field: 'totalPrice',
       title: '金额',
+      formatter: 'formatAmount2',
       minWidth: 100,
     },
     {

apps/web-antd/src/views/erp/stock/out/data.ts

@@ -149,6 +149,7 @@ export function useStockInItemTableColumns(
       minWidth: 120,
       slots: { default: 'count' },
       className: createRequiredValidation(isValidating, 'count'),
+      formatter: 'formatAmount3',
     },
     {
       field: 'productPrice',
@@ -304,11 +305,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'totalCount',
       title: '数量',
+      formatter: 'formatAmount3',
       minWidth: 100,
     },
     {
       field: 'totalPrice',
       title: '价格',
+      formatter: 'formatAmount2',
       minWidth: 100,
     },
     {

apps/web-ele/src/adapter/vxe-table.ts

@@ -318,8 +318,8 @@ setupVbenVxeTable({
       },
     });
 
-    // add by 星语：数量格式化，例如说：金额
+    // add by 星语：数量格式化，保留 3 位
-    vxeUI.formats.add('formatNumber', {
+    vxeUI.formats.add('formatAmount3', {
       tableCellFormatMethod({ cellValue }) {
         if (cellValue === null || cellValue === undefined) {
           return '';
@@ -327,7 +327,7 @@ setupVbenVxeTable({
         return erpCountInputFormatter(cellValue);
       },
     });
-
+    // add by 星语：数量格式化，保留 2 位
     vxeUI.formats.add('formatAmount2', {
       tableCellFormatMethod({ cellValue }, digits = 2) {
         return `${erpNumberFormatter(cellValue, digits)}`;