FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,341 Commits 3 Branches 0 Tags
36861d93d2fad3f05c4b7261176dfdaf1e50383f
Commit Graph
1341 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhutianqi 36861d93d2 Merge remote-tracking branch 'origin/develop' into develop 2021-09-16 15:47:40 +08:00
zhutianqi cb816f0032 commit 2021-09-16 15:47:36 +08:00
super_liu 4064001f80 Merge remote-tracking branch 'origin/develop' into develop 2021-09-16 15:08:04 +08:00
super_liu 053c6d50b4 feat: There is no way the router beforeEach 2021-09-16 15:07:32 +08:00
shenyanpei 76d0dbda65 左侧树形菜单高度调整 2021-09-16 11:15:17 +08:00
zhutianqi e492a780da Merge remote-tracking branch 'origin/develop' into develop 2021-09-16 11:03:00 +08:00
zhutianqi a66b4ef40f commit 2021-09-16 11:02:55 +08:00
Mr.Z 9f65c3803b 标准预警标准编号bug修复 2021-09-16 11:02:07 +08:00
zhutianqi 005f7dbf2d commit 2021-09-16 10:58:14 +08:00
zhutianqi c1e16233c4 Merge remote-tracking branch 'origin/develop' into develop 2021-09-16 10:55:37 +08:00
宋伟佳 df0aec16b4 commit 2021-09-16 10:54:52 +08:00
zhutianqi c6b9f532ce Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/home1/components/solicitopinions/index.vue
 2021-09-16 10:53:33 +08:00
zhutianqi 1b2fbca6fe commit 2021-09-16 10:51:43 +08:00
wangxiahui@91isoft.com bbfb1357b5 Default Changelist 2021-09-16 10:51:18 +08:00
yanyizhou 2e4bd01bde 恢复代码 2021-09-16 10:47:19 +08:00
yanyizhou 36031e8615 恢复代码 2021-09-16 10:44:51 +08:00
宋伟佳 61146836c8 首页展示 2021-09-16 10:07:04 +08:00
yanyizhou c4adff5e91 Merge remote-tracking branch 'origin/develop' into develop 2021-09-16 09:57:55 +08:00
yanyizhou a906e88291 恢复代码 2021-09-16 09:57:48 +08:00
wangxiahui@91isoft.com bd03d966ab 征求意见流程字段居中 2021-09-16 09:47:03 +08:00
zhutianqi 70e24768f9 commit 2021-09-16 09:10:18 +08:00
zhutianqi 8f49668181 Merge remote-tracking branch 'origin/develop' into develop 2021-09-15 18:02:11 +08:00
zhutianqi a96c253a3a Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
#	src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
#	src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
#	src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
#	src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
#	src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
#	src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
 2021-09-15 18:01:57 +08:00
zhaokaiyao@91isoft.com 50d7bc4a61 Merge remote-tracking branch 'origin/develop' into develop 2021-09-15 17:59:34 +08:00
zhaokaiyao@91isoft.com 20e25c7e05 标准详情,已被分解的的文本才有分解单按钮 2021-09-15 17:59:28 +08:00
zhutianqi b2f7e17576 commit 2021-09-15 17:50:42 +08:00
wangxiahui@91isoft.com 195628f861 入库流程字段排序问题 2021-09-15 17:47:25 +08:00
shenyanpei c7f1466c42 标准征求意见页面调整 2021-09-15 17:26:46 +08:00
wangxiahui@91isoft.com a3edd332f6 项目评估流程标准 提交重复 2021-09-15 16:46:27 +08:00
宋伟佳 6ed6d88b8e 项目评估标准维度页面跳转 2021-09-15 16:26:32 +08:00
wangxiahui@91isoft.com 3a7545e3a5 修改最大输入长度 2021-09-15 15:33:38 +08:00
shenyanpei 9b457ba7f4 左边树菜单调整 2021-09-15 13:59:24 +08:00
zhaokaiyao@91isoft.com b44f476c39 Merge remote-tracking branch 'origin/develop' into develop 2021-09-15 10:10:46 +08:00
zhaokaiyao@91isoft.com 349c637e3a 国内外详情->标准分解单->符合性状态->状态为是否 2021-09-15 10:10:33 +08:00
wangxiahui@91isoft.com 3a79b49893 标准比对列表内容过长三个点显示 2021-09-15 10:07:06 +08:00
wangxiahui@91isoft.com 1c3edcb312 Default Changelist 2021-09-15 10:02:35 +08:00
zhaokaiyao@91isoft.com 790e767d4f Merge remote-tracking branch 'origin/develop' into develop 2021-09-15 09:45:03 +08:00
zhaokaiyao@91isoft.com 23b26a5b23 国内外标准库->表格->列宽 2021-09-15 09:44:56 +08:00
宋伟佳 37da8ce2e2 项目清单确认流程增加审批节点 2021-09-14 16:37:45 +08:00
zhutianqi f017ab5501 Merge remote-tracking branch 'origin/develop' into develop 2021-09-14 16:22:39 +08:00
zhutianqi c2ef4878e4 commit 2021-09-14 16:22:16 +08:00
yanyizhou 4591df4a1a commit 2021-09-14 15:59:05 +08:00
yanyizhou d3b6881eef Merge remote-tracking branch 'origin/develop' into develop 2021-09-14 15:22:35 +08:00
yanyizhou f59cee50ee commit 2021-09-14 15:22:28 +08:00
wangxiahui@91isoft.com fa504ff0fa Default Changelist 2021-09-14 15:19:07 +08:00
yanyizhou c65076e554 Merge remote-tracking branch 'origin/develop' into develop 2021-09-14 14:50:51 +08:00
yanyizhou f4e40475c6 企业标准库同步的文本状态为参考是黄色的 2021-09-14 14:50:46 +08:00
super_liu e13557047d Merge remote-tracking branch 'origin/develop' into develop 2021-09-14 14:47:21 +08:00
super_liu be679b9320 feat: There is no way the 2021-09-14 14:47:09 +08:00
宋伟佳 a25118109d 修改流程bug 2021-09-14 13:37:48 +08:00