Commit Graph

  • f9064ddeb4 Merge pull request 'dj' (#245) from dj into master odjbin 2024-05-30 08:49:38 +00:00
  • 0c1e566578 fix : 修复项目附件页面细节 odjbin 2024-05-30 16:46:51 +08:00
  • 94528cfa06 fix : 修复页面细节 odjbin 2024-05-30 16:05:09 +08:00
  • 2ab4eb1a7e Merge remote-tracking branch 'origin/master' odjbin 2024-05-29 22:10:13 +08:00
  • 04c1175cf8 fix : 修复提交/重新提交按钮显示 odjbin 2024-05-29 21:34:37 +08:00
  • 7a5fbd501e Merge pull request 'fix : 修复费用分摊详情数据' (#244) from dj into master odjbin 2024-05-29 12:53:39 +00:00
  • dd3f793ac2 fix : 修复费用分摊详情数据 odjbin 2024-05-29 20:53:26 +08:00
  • dc153e459e Merge pull request 'dj' (#243) from dj into master odjbin 2024-05-28 15:56:48 +00:00
  • 00ad1c3098 Merge remote-tracking branch 'origin/master' odjbin 2024-05-28 23:55:22 +08:00
  • 6ac425f7de fix : 修复需求上报下拉框数据 odjbin 2024-05-28 23:54:05 +08:00
  • 80ae6bdf7e Merge pull request 'feat : 项目实施的阶段变更界面初始化' (#242) from dj into master odjbin 2024-05-28 15:18:49 +00:00
  • 9198837d65 feat : 项目实施的阶段变更界面初始化 odjbin 2024-05-28 23:17:34 +08:00
  • 4acba8bedc Merge pull request 'fix : 修复费用管理功能细节' (#241) from dj into master odjbin 2024-05-28 15:05:30 +00:00
  • 7f40296f3b fix : 修复费用管理功能细节 odjbin 2024-05-28 23:05:10 +08:00
  • 0ae84ba12e Merge pull request 'fix : 修复项目实施附件接口' (#240) from dj into master odjbin 2024-05-28 10:00:57 +00:00
  • be367ead6e fix : 修复项目实施附件接口 odjbin 2024-05-28 18:00:42 +08:00
  • 335d8c1e72 Merge pull request 'dj' (#239) from dj into master odjbin 2024-05-28 08:42:16 +00:00
  • dd406e4ba6 fix : 修复专项资金页面搜索功能 odjbin 2024-05-28 16:42:05 +08:00
  • beb07edc73 fix : 修复专项资金页面搜索功能 odjbin 2024-05-28 16:39:37 +08:00
  • 0eb036e8a5 Merge pull request 'fix : 修复专项资金页面功能细节' (#238) from dj into master odjbin 2024-05-28 08:36:15 +00:00
  • ba86f54369 fix : 修复专项资金页面功能细节 odjbin 2024-05-28 16:36:03 +08:00
  • 11544acbad Merge pull request 'dj' (#237) from dj into master odjbin 2024-05-28 04:05:49 +00:00
  • 63e94af451 fix : 修复项目实施中功能细节 odjbin 2024-05-28 12:05:31 +08:00
  • 554c7d2be7 fix : 修复首页查看跳转 odjbin 2024-05-27 23:10:34 +08:00
  • e3222e906d Merge remote-tracking branch 'origin/master' odjbin 2024-05-27 22:45:42 +08:00
  • 30a8ceb424 fix : 修复首页查看跳转 odjbin 2024-05-27 22:38:15 +08:00
  • 700c08616f Merge pull request 'fix: up detail, router, display for dont have role' (#236) from master into prod wenhua 2024-05-27 14:34:31 +00:00
  • 304effe93c fix: up detail, router, display for dont have role wenhua 2024-05-27 22:33:24 +08:00
  • 28207004c7 Merge pull request 'master' (#235) from master into prod odjbin 2024-05-27 13:41:13 +00:00
  • 26931f4200 Merge pull request 'fix : 修复路由跳转' (#234) from dj into master odjbin 2024-05-27 13:16:30 +00:00
  • e71c142ea9 fix : 修复路由跳转 odjbin 2024-05-27 21:16:14 +08:00
  • 7ebd897d57 Merge pull request 'fix : 修复步骤条样式' (#233) from dj into master odjbin 2024-05-27 03:38:17 +00:00
  • 0ec14cfd9b fix : 修复步骤条样式 odjbin 2024-05-27 11:37:59 +08:00
  • bef0c2d792 Merge pull request 'fix : 修复路由跳转' (#232) from dj into master odjbin 2024-05-24 08:34:47 +00:00
  • 08f66803a2 fix : 修复路由跳转 odjbin 2024-05-24 16:34:17 +08:00
  • 8b69abfc9b Merge pull request 'fix: 修复问题' (#231) from master into dm dm clay 2024-05-24 08:12:15 +00:00
  • 6af7bf9d2f fix: 修复问题 lilinyuan 2024-05-24 16:10:15 +08:00
  • 604fad9009 Merge pull request 'master' (#230) from master into dm clay 2024-05-24 07:54:17 +00:00
  • 9013d54add fix: 去掉log lilinyuan 2024-05-24 14:26:29 +08:00
  • fd722b5c82 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web lilinyuan 2024-05-24 14:24:39 +08:00
  • a8e56fe985 fix: 修改新增编辑等单页面路由层级 lilinyuan 2024-05-24 14:24:36 +08:00
  • 4953e96415 feat : 需求征集表单权限测试 clay 2024-05-24 10:44:24 +08:00
  • 8c33aaa8a7 Merge pull request 'master' (#229) from master into prod odjbin 2024-05-23 16:19:32 +00:00
  • 5b85abd219 Merge pull request 'fix : 修复详情渲染细节' (#228) from dj into master odjbin 2024-05-23 16:16:00 +00:00
  • 7156e34fde fix : 修复详情渲染细节 odjbin 2024-05-24 00:12:53 +08:00
  • e903dd2994 Merge pull request 'fix : 修复权限按钮细节' (#227) from dj into master odjbin 2024-05-23 15:43:22 +00:00
  • 549e307b3e fix : 修复权限按钮细节 odjbin 2024-05-23 23:42:09 +08:00
  • 390474ea24 Merge pull request 'fix : 修复页面细节' (#226) from dj into master odjbin 2024-05-23 12:48:45 +00:00
  • 43c9cb03d3 fix : 修复页面细节 odjbin 2024-05-23 20:48:09 +08:00
  • 5eb7e34571 fix : 用户nickname查询 clay 2024-05-23 20:29:24 +08:00
  • d12fb8a12b fix : 用户nickname查询 clay 2024-05-23 20:28:46 +08:00
  • 1991d7eada Merge pull request 'fix : 修复页面细节' (#225) from dj into master odjbin 2024-05-23 09:53:04 +00:00
  • 31a12e566a fix : 修复页面细节 odjbin 2024-05-23 17:52:48 +08:00
  • 5c8679d5f9 Merge pull request 'fix : 修复页面细节' (#224) from dj into master odjbin 2024-05-23 09:39:12 +00:00
  • 7e70c9271f fix : 修复页面细节 odjbin 2024-05-23 17:38:58 +08:00
  • 6748685712 Merge pull request 'fix : 修复页面细节' (#223) from dj into master odjbin 2024-05-23 08:44:19 +00:00
  • cd7f94e8f2 fix : 修复页面细节 odjbin 2024-05-23 16:44:04 +08:00
  • db8a96a664 feat : 需求征集index.vue clay 2024-05-23 15:53:33 +08:00
  • 17207b2c87 feat : 按钮全新啊demo clay 2024-05-23 15:48:31 +08:00
  • d6de4d5854 Merge pull request 'fix : 修复页面细节' (#222) from dj into master odjbin 2024-05-23 07:37:20 +00:00
  • bcdafbc7cd fix : 修复页面细节 odjbin 2024-05-23 15:36:57 +08:00
  • e9e5a0c785 feat : 修改菜单状态 clay 2024-05-23 14:49:56 +08:00
  • 21f90e438c fix : 修复细节 clay 2024-05-23 10:00:21 +08:00
  • e1b9f3f220 Merge pull request 'fix : 修复人员选择框' (#221) from dj into master odjbin 2024-05-22 15:53:21 +00:00
  • 96d46e6480 fix : 修复人员选择框 odjbin 2024-05-22 23:52:51 +08:00
  • 9e5d07d7e5 Merge pull request 'master' (#220) from master into prod odjbin 2024-05-20 16:22:59 +00:00
  • 6ab0c206c4 Merge pull request 'fix : 修复细节' (#219) from dj into master odjbin 2024-05-20 16:22:29 +00:00
  • a4255c3157 fix : 修复细节 odjbin 2024-05-21 00:21:24 +08:00
  • 39b1690c0a Merge pull request 'fix : 修复流程图渲染问题' (#218) from dj into master odjbin 2024-05-20 16:15:50 +00:00
  • 9f4fe95e4d fix : 修复流程图渲染问题 odjbin 2024-05-21 00:14:53 +08:00
  • 1635482e09 Merge pull request 'fix : 重新提交全流程初步完成' (#217) from dj into master odjbin 2024-05-20 15:02:07 +00:00
  • 3270aeef06 fix : 重新提交全流程初步完成 odjbin 2024-05-20 23:01:53 +08:00
  • 6c80652416 feat: agree and reject lilinyuan 2024-05-20 22:18:17 +08:00
  • c97091db4f feat: 主流程详情组件基本完成 lilinyuan 2024-05-20 22:03:53 +08:00
  • 1c57cb277b Merge pull request 'fix : 重新提交页面初始化' (#216) from dj into master odjbin 2024-05-20 09:56:49 +00:00
  • e648faba69 fix : 重新提交页面初始化 odjbin 2024-05-20 17:56:38 +08:00
  • a663b84fab Merge pull request 'fix : 修复需求上报/详情下流程渲染' (#215) from dj into master odjbin 2024-05-20 03:47:24 +00:00
  • f83ae8df51 fix : 修复所属公司及详情loading odjbin 2024-05-20 11:45:53 +08:00
  • 1d772e1414 fix : 修复需求上报/详情下流程渲染 odjbin 2024-05-20 11:05:29 +08:00
  • 92e9468cb9 Merge pull request 'fix : 修复页面细节' (#214) from dj into master odjbin 2024-05-19 16:59:19 +00:00
  • 5c93eae4ce fix : 修复页面细节 odjbin 2024-05-20 00:58:48 +08:00
  • 5d7b6bc59f Merge pull request 'dj' (#213) from dj into master odjbin 2024-05-19 16:45:20 +00:00
  • 1825b6c871 fix : 修复页面细节 odjbin 2024-05-20 00:44:37 +08:00
  • dee7fdacf2 Merge pull request 'dj' (#212) from dj into master odjbin 2024-05-19 16:31:02 +00:00
  • dc7d90c349 Merge remote-tracking branch 'origin/master' odjbin 2024-05-20 00:29:46 +08:00
  • 9661cdbb2b fix : 修复页面细节功能及附件上传组件 odjbin 2024-05-20 00:29:31 +08:00
  • 3a4f9927c9 feat: up detail wenhua 2024-05-19 23:07:32 +08:00
  • 1f4389eb5e fix : 修复项目申请/验收/结项功能 odjbin 2024-05-19 20:39:54 +08:00
  • 4a90f4bc1e 合并冲突 wenhua 2024-05-19 20:19:50 +08:00
  • 8155a4d160 feat: 需求上报详情 wenhua 2024-05-19 20:17:55 +08:00
  • 771a844552 Merge pull request 'fix : 修复页面' (#211) from dj into master odjbin 2024-05-19 10:01:01 +00:00
  • 08a609e2a8 fix : 修复页面 odjbin 2024-05-19 18:00:48 +08:00
  • d16045a1b2 Merge pull request 'fix : 修复项目立项页面' (#210) from dj into master odjbin 2024-05-19 08:40:20 +00:00
  • 1fc0ae6ac0 fix : 修复项目立项页面 odjbin 2024-05-19 16:40:05 +08:00
  • 08f20bb171 Merge pull request 'fix : 修改细节' (#209) from dj into master odjbin 2024-05-19 08:20:12 +00:00
  • 5421145583 fix : 修改细节 odjbin 2024-05-19 16:19:53 +08:00
  • b7a0dc2545 Merge pull request 'fix : 修改审批记录样式' (#208) from dj into master odjbin 2024-05-19 07:27:32 +00:00
  • 3bd6df74cc fix : 修改审批记录样式 odjbin 2024-05-19 15:27:22 +08:00
  • 190a1d6477 Merge branches 'master' and 'master' of http://git.feashow.cn/clay/mosr-web wenhua 2024-05-19 14:04:30 +08:00
  • cb7f6e9919 feat: 详情组件, 实例文件 wenhua 2024-05-19 14:04:28 +08:00