Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

2024-03-22 16:45:56 +08:00 · 2024-03-22 16:45:56 +08:00 · 95abfcf158
commit 95abfcf158
--- a/src/views/cost/rawMaterialConfig/index.vue
+++ b/src/views/cost/rawMaterialConfig/index.vue
@ -79,10 +79,9 @@ const tableProps = [
 		align: 'right',
 	},
 	{
-		prop: 'enabledTime',
+		prop: 'time',
 		label: '生效时间',
-		filter: parseTime,
-		width: 150,
+		width: 235,
 	},
 	{
 		prop: 'remark',