From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/purchase/request/data.ts | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index 58f9035..ac87d16 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -4,7 +4,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
+import { getSupplierSimpleList } from '#/api/srm/supplier';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
@@ -48,7 +48,7 @@
placeholder: '閫夋嫨鐢宠鏃堕棿',
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
disabled: formType === 'detail',
},
rules: 'required',
@@ -163,7 +163,7 @@
title: '鍏ュ簱鏁伴噺',
minWidth: 100,
fixed: 'right',
- formatter: 'formatAmount6',
+ formatter: 'formatAmount3',
},
{
field: 'productPrice',
@@ -271,8 +271,8 @@
options: [
{ label: '鏈彁浜�', value: 0 },
{ label: '瀹℃壒涓�', value: 10 },
- { label: '瀹℃牳閫氳繃', value: 20 },
- { label: '瀹℃牳涓嶉�氳繃', value: 30 },
+ { label: '瀹℃壒閫氳繃', value: 20 },
+ { label: '瀹℃壒涓嶉�氳繃', value: 30 },
{ label: '宸插彇娑�', value: 40 },
],
placeholder: '璇烽�夋嫨鐘舵��',
--
Gitblit v1.9.3