Commit 3c8b35185f88e1d72ad5b62831b52807f0e506e0

Authored by 曾国涛
2 parents 948eea24 e07211fe

Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front

# Conflicts:
#	src/services/request.ts组件进行了条件渲染优化,以确保在有课题组ID的情况下才渲染成员添加相关的UI组件。

另外,对definition.ts文件中的OrderStagesCheckDo和OrderStagesSelDo接口进行了数据类型调整,以适配新的业务需求。

BREAKING CHANGE: 现在添加课题组成员时需要提供课题组ID,相关组件在没有课题组ID的情况下将不会渲染成员添加选项。
Showing 1 changed file with 2 additions and 2 deletions

Too many changes to show.

To preserve performance only 1 of 19 files are displayed.

.umirc.ts
@@ -113,7 +113,7 @@ export default defineConfig({ @@ -113,7 +113,7 @@ export default defineConfig({
113 path: '/instalment', 113 path: '/instalment',
114 component: './Instalment', 114 component: './Instalment',
115 icon: 'BookOutlined', 115 icon: 'BookOutlined',
116 - access: 'canReadLinda', 116 + access: 'canReadProcure',
117 }, 117 },
118 { 118 {
119 name: '区域管理', 119 name: '区域管理',
@@ -136,7 +136,7 @@ export default defineConfig({ @@ -136,7 +136,7 @@ export default defineConfig({
136 layout: false, 136 layout: false,
137 }, 137 },
138 { 138 {
139 - name: '采购退货管理', 139 + name: '寄件管理',
140 path: '/procure', 140 path: '/procure',
141 component: './procure', 141 component: './procure',
142 icon: 'BookOutlined', 142 icon: 'BookOutlined',