develop #1

Merged

wally merged 55 commits from develop into master 4 years ago

xuesinan commented 4 years ago

Collaborator

There is no content yet.

xuesinan added 55 commits 4 years ago

ada472b626 feat: "页面"

42b67f6524 feat: "登录、项目列表"

ffa87084f1 fix: "v-model不支持"

6dad31d920 feat: "项目详情"

2939c62083 feat: "创建项目、删除项目、刷新页面数据清空问题"

3bb8da58c0 feat: "刷新页面任务数据清空问题"

8187dd00ef feat: "任务"

4e40c2f42d feat: "项目进展"

058af8c327 feat: "查看課題進展"

cc590313d6 fix: "解決任務詳情為空是報錯"

beb9af8ded fix: "新建课题"

866bef6dd1 fix: "展示页面"

2e176f7137 feat: "科研会议管理"

69d5dd3f93 feat: "计划任务书页面"

29fcea4d7f feat: "任务计划书添加"

b4dc52f61f feat: "页面"

ab4253285c feat: "成员管理 - 增删改查"

1de6f3d85c feat: "任务计划书增删改"

981ca45008 feat: "分配子课题、项目详情分组件"

062ea6ef45 feat: "课题中期检查报告、结题报告、验收证书、子课题论文、专利、软著、中期报告、结题报告、验收证书、实验报告、过程、数据、代码、结果"

6cc4ff8a57 feat: "合同管理"

fc94c2cc9d feat: "子课题成员管理"

abf5137ce3 feat: 微信复制

c1af8af7ae feat: "课题进展"

7d2bdcca3e feat: "科研会议"

5c6fe0603c feat: "代码整理"

72c0895b5c fix: "删除项目"

e2282ee38b fix: "点击项目、子课题、实验没反应问题，增加接口错误提示"

e844be7d36 fix: "项目点击展开收缩问题"

d2386ef839 fix: "合同管理按钮"

0dbca8b64a fix: "手机号验证"

283d93fda7 fix: "样式更改"

400a4c1039 fix: 数据格式更改

d1b127fea2 fix: 科研成果管理

9c762f3c92 feat: 时间范围判断

f0a6e3402a feat: 切换项目详情页不及时更新

de57f95522 feat: 登录页面

41254a26a8 feat: 实验状态

8a148b8259 fix: 编辑取消数据需刷新

6c92d0f778 fix: 分配课题选择子指标父指标也要选中

5cdb9353f1 fix: 分配课题选择子指标父指标也要选中

b4b219b833 fix: 指标数量填写对应指标选中

ff0c1f01b9 fix: 增加实验不能实时更新

a50e577f5c feat: 新建项目展示新项目信息

2be1e92117 fix: 文件上传

276c99201b refactor: 删除打印数据

df6b6794c0 feat: 实验数据文件上传一个

03df109bc3 fix: 科研成果换行

d53b60dd2f refactor: 科研成果

9ded143464 feat: 操作提示

f23174cb19 fix: 时间判断

7d057585e9 fix: 时间判断隐藏

7919703077 fix: 任务详情列表隐藏显示

ab5eb99b51 fix: 科研成果驳回重新提交

ce287a9e77 refactor: 样式

wally merged commit c22a26e416 into master 4 years ago

wally referenced this issue from a commit 4 years ago

Merge pull request 'develop' (#1) from develop into master

The pull request has been merged as c22a26e416.

No reviewers

No Label

No Milestone

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.