Commit Graph

1883 Commits (076b39f7ebad97929fafe4563033733ff5c666b8)

Author SHA1 Message Date
liting 076b39f7eb 修改 2024-06-12 22:50:18 +08:00
liting 382e31d530 修改 2024-06-12 22:30:20 +08:00
liting 19a7a063cf 修改 2024-06-12 20:45:34 +08:00
liting adc8366a60 修改 2024-06-12 20:37:28 +08:00
liting 433759a903 Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3 2024-06-12 20:31:41 +08:00
liting e79cdbad76 修改 2024-06-12 20:31:33 +08:00
admin 25e35900b4 修改立项、执行情况 2024-06-12 20:11:17 +08:00
admin 3e917bb783 Merge remote-tracking branch 'origin/master' 2024-06-12 09:19:34 +08:00
admin 8564c9ed26 添加数据字典 2024-06-12 09:19:18 +08:00
lizilong 82dbe45662 引入各类字典,屏蔽一些前端必填校验 2024-06-12 00:43:22 +08:00
liting 88b86b0f2c 修改 2024-06-11 23:13:29 +08:00
liting b357cd7dd1 Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3 2024-06-11 23:06:24 +08:00
liting 064a3645ec 123 2024-06-11 23:06:18 +08:00
lizilong 85d2ce664b 增加计划类型字典配置 2024-06-11 22:52:49 +08:00
lizilong f72f8e6cb5 Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3 2024-06-11 21:16:58 +08:00
admin 537b7335fd 修改立项 2024-06-11 20:14:38 +08:00
lizilong c3bf745917 Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3 2024-06-10 10:16:31 +08:00
liting eb72621b81 取缔id 2024-06-09 20:41:30 +08:00
lizilong 487cbfccda Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3
# Conflicts:
#	src/views/apply/apply/MainForm.vue
#	src/views/apply/apply/components/InfoForm.vue
2024-06-09 12:43:50 +08:00
admin 90b18acf44 更新全部数据 2024-06-08 22:22:50 +08:00
admin 461785ac3c 更新全部数据 2024-06-08 22:22:27 +08:00
lizilong 3c81c91fec Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3 2024-06-05 22:03:19 +08:00
liting 702fd1bea7 修改样式 2024-04-21 10:15:56 +08:00
liting ee816102a8 修改 2024-04-21 10:13:21 +08:00
admin b5b779cd2f 更新立项审核 2024-04-20 16:25:52 +08:00
admin 90095d2276 更新 2024-04-20 16:23:55 +08:00
liting 8319ffce59 修改 2024-04-16 17:16:22 +08:00
liting 94f4f639fd 修改 2024-04-16 13:24:57 +08:00
lizilong 6b83ca5916 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/apply/apply/MainForm.vue
2024-04-15 23:01:05 +08:00
lizilong 34fa382726 修改立项 2024-04-15 22:59:58 +08:00
liting 382dcb0edc 修改 2024-04-15 22:26:43 +08:00
liting 8fdd5cefcf 修改 2024-04-15 22:24:27 +08:00
liting f5a752776d 修改 2024-04-15 21:56:36 +08:00
liting 54b99742b4 修改 2024-04-15 21:26:22 +08:00
liting d23cd912e9 Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3 2024-04-15 21:07:16 +08:00
liting 409f798cc3 经费 2024-04-15 21:07:02 +08:00
lizilong 4690bdadcb 修改立项 2024-04-15 21:05:41 +08:00
liting a0502af42c 修改 2024-04-15 19:11:42 +08:00
15210398771 798041a328 Merge branch 'master' of https://gitee.com/mtrain/yudao-ui-admin-vue3 2024-04-14 20:11:14 +08:00
15210398771 4435c2e1d1 更新立项字典展示 2024-04-14 20:10:57 +08:00
liting df3519eb9b 修改样式 2024-04-14 19:00:00 +08:00
liting b054a9651d 修改样式 2024-04-14 17:34:36 +08:00
liting 53bdeff4b3 修改样式 2024-04-14 17:16:27 +08:00
liting dec04e7417 修改样式 2024-04-14 17:14:55 +08:00
15210398771 3618a600cd 更新首页字典展示 2024-04-14 17:07:59 +08:00
15210398771 5677292fd2 更新字典表配置 2024-04-14 17:07:39 +08:00
liting 9a7638b2c5 修改 2024-04-14 17:02:27 +08:00
admin bd4c79faf4 更新立项部分页面 2024-04-14 16:45:40 +08:00
admin f742e12dd4 初始化立项、任务书、执行、变更、验收、知识产权、公共实验室模块 2024-04-13 15:07:58 +08:00
芋道源码 ecf9f26547
!398 删除重复的 pagination 事件
Merge pull request !398 from moon69/master
2024-03-09 07:34:06 +00:00