FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,544 Commits 3 Branches 0 Tags
9af1f4320b6794bc9dae4eb4e8adff755f651de1
Commit Graph
1544 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhutianqi 9af1f4320b Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 14:56:47 +08:00
zhutianqi 24afd1f144 commit 2021-10-14 14:56:25 +08:00
super_liu 08bbc9a6ad Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
 2021-10-14 14:46:33 +08:00
super_liu 9394110a24 feat: There is no way the oa 2021-10-14 14:45:03 +08:00
zhutianqi 5e9e82c910 Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 14:22:29 +08:00
zhutianqi a5b6748732 commit 2021-10-14 14:22:22 +08:00
wangxiahui@91isoft.com 68e3980645 项目清单确认流程 注掉多余按钮 2021-10-14 10:33:03 +08:00
宋伟佳 23837b645e commit 2021-10-13 21:47:58 +08:00
zhaokaiyao@91isoft.com 70dd56ec58 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 18:42:33 +08:00
zhaokaiyao@91isoft.com a686c7f0d6 入库流程/标准编辑 树形选择 关闭问题 2021-10-13 18:42:24 +08:00
super_liu e5da6e0b27 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
 2021-10-13 17:58:37 +08:00
super_liu 8d60c72e84 feat: There is no way the oa add endTime 2021-10-13 17:57:48 +08:00
宋伟佳 8cb45eae57 清单确认流程按钮更改 2021-10-13 16:28:14 +08:00
zhutianqi c35c73701b commit 2021-10-13 16:00:56 +08:00
zhaokaiyao@91isoft.com 1931714e05 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 11:20:55 +08:00
zhaokaiyao@91isoft.com df2d5ecc93 标准入库,文件第一次提交 2021-10-13 11:20:45 +08:00
super_liu 15a6f6c9a9 Merge remote-tracking branch 'origin/develop' into develop 2021-10-12 16:32:27 +08:00
super_liu 67073864ca feat: There is no way the to home2 2021-10-12 16:32:08 +08:00
zhutianqi aac560e2d3 commit 2021-10-12 14:26:11 +08:00
zhutianqi 344df35614 commit 2021-10-12 10:06:09 +08:00
super_liu a683c60276 Merge branch 'develop_idm' into 'develop' 
Develop idm

See merge request LAWS/laws-system-front-FOTON!174
 2021-10-11 18:10:25 +08:00
super_liu b0ac11edf4 feat: There is no way the idm and oa 2021-10-11 17:54:22 +08:00
super_liu b3bf5aad01 Merge branch 'develop' into develop_idm 2021-10-11 17:49:49 +08:00
super_liu 19089f562f feat: There is no way the idm and oa 2021-10-11 17:48:17 +08:00
zhaokaiyao@91isoft.com d2a2b6ad74 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-11 16:53:25 +08:00
zhaokaiyao@91isoft.com d4c312d982 标准入库流程1->添加文件名出现undefined 2021-10-11 16:53:15 +08:00
zhutianqi dddb7b613e commit 2021-10-11 16:14:27 +08:00
zhutianqi dd3bad1a91 Merge remote-tracking branch 'origin/develop' into develop 2021-10-11 16:10:33 +08:00
zhutianqi 718a2b923b commit 2021-10-11 16:10:00 +08:00
zhaokaiyao@91isoft.com a105a3e6fc 入库流程->标准体系弹出框->无法取消 同上一个提交 2021-10-11 11:10:44 +08:00
zhaokaiyao@91isoft.com 637b3e1bb4 标准详情->关联模块 弹出框无法取消问题 同上一个问题 2021-10-09 17:33:22 +08:00
zhaokaiyao@91isoft.com 353cbbcfd5 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-10-09 17:23:15 +08:00
zhaokaiyao@91isoft.com ebeed11b5a 入库流程->模块结构选择框问题 2021-10-09 17:23:02 +08:00
yanyizhou d5d514c739 项目清单确认流程只能单选（优化代码） 2021-10-09 16:16:33 +08:00
宋伟佳 d82440e435 项目清单单选 2021-10-09 15:31:09 +08:00
zhutianqi fdef700e1d Merge remote-tracking branch 'origin/develop' into develop 2021-10-09 15:04:03 +08:00
zhutianqi 8bc327553c commit 2021-10-09 15:03:45 +08:00
wangxiahui@91isoft.com a861d826f5 解读流程批量填写的bug 2021-10-09 14:53:49 +08:00
yanyizhou 4e347c37f6 项目清单确认流程只能单选 2021-10-09 14:12:32 +08:00
yanyizhou 430434f34f 一二级菜单区分不明显问题（把左侧树形菜单的选中加上了背景色） 2021-10-09 11:17:54 +08:00
yanyizhou c43f317ddb Merge remote-tracking branch 'origin/develop' into develop 2021-10-09 11:15:21 +08:00
yanyizhou 0a924931d9 车型项目清单详情导致左边树形菜单失去焦点的bug 2021-10-09 11:15:00 +08:00
wangxiahui@91isoft.com 02daf7ee6d 所有流程的字体样式 2021-10-09 09:38:01 +08:00
shenyanpei 1f95dfd2e1 列表宽度 2021-10-09 09:34:29 +08:00
shenyanpei 22bf6c6fd5 调整列表样式 2021-10-09 09:15:34 +08:00
shenyanpei 3a47759103 按钮权限 2021-10-08 16:07:20 +08:00
yanyizhou d335d65520 Merge remote-tracking branch 'origin/develop' into develop 2021-10-08 15:54:04 +08:00
yanyizhou f70f9a0dea 取消项目评估的在产和在研,只保留一个 2021-10-08 15:53:37 +08:00
shenyanpei af8cc1abfb 标准清单库车型清单添加确认流程发布按钮 2021-10-08 15:42:44 +08:00
zhutianqi b8c62e58d0 Merge remote-tracking branch 'origin/develop' into develop 2021-10-08 10:52:07 +08:00