Commit Graph
5541 Commits
Author SHA1 Message Date
zhn dba8529941 自定义表头 2023-01-09 11:49:46 +08:00
zhn 75df08798e 自定义列表 2023-01-09 11:42:51 +08:00
zhn 9854157768 自定义表头 2023-01-09 11:10:05 +08:00
zhn 7fbbc9c522 自定义表头 2023-01-09 09:58:16 +08:00
zhn 14ab5b1877 自定义表头 2023-01-09 09:38:38 +08:00
zhn 91a3c16956 自定义表头参数接收 2023-01-09 09:18:37 +08:00
zyx.net 43af0f8c23 法规清单 自定义表头数据转换json 2023-01-06 17:28:29 +08:00
zyx.net 5d312c2d95 法规清单 自定义表头 2023-01-06 17:09:34 +08:00
zhn ba7d0e9a08 自定义表头 2023-01-06 16:58:00 +08:00
zhn 557fec17fd 自定义表头 2023-01-06 14:55:59 +08:00
高嵩 45ce6c2a1e 合并分支 'fix_2nd_period' 到 'master'
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!272
2023-01-03 13:57:52 +08:00
高嵩 ba80c8619e 合并分支 'fix_2nd_20230103' 到 'master'
知识分享-联系创建人-获取用户飞书信息接口修改。

查看合并请求 laws-nio/laws-weilai!271
2023-01-03 13:57:29 +08:00
wangzhijiang 1e911f50ff 知识分享-联系创建人-获取用户飞书信息接口修改。 2023-01-03 13:52:28 +08:00
wangzhijiang cdc327755c Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2023-01-03 11:46:34 +08:00
wangzhijiang b438729c55 编辑文档拆分详情-设置自动排序。 2023-01-03 11:46:10 +08:00
zhn f49464d694 法规月报修改 2023-01-03 11:05:01 +08:00
高嵩 7f5633d885 合并分支 'feature_dev_20221129_UI' 到 'master'
UI界面变更-首页

查看合并请求 laws-nio/laws-weilai!270
2022-12-30 20:16:42 +08:00
高嵩 0f09c75dce 合并分支 'fix_2nd_period' 到 'master'
Fix 2nd period

查看合并请求 laws-nio/laws-weilai!269
2022-12-30 20:16:28 +08:00
wangzhijiang e3273a8765 update 2022-12-30 18:32:12 +08:00
wangzhijiang f03ef8f9a8 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 18:19:03 +08:00
wangzhijiang 5437d55fab 64614 参数项收集清单--导出--参考列未正常回显 2022-12-30 18:18:41 +08:00
zhn de33009941 法规月报导出 2022-12-30 18:10:16 +08:00
wangzhijiang cae323e674 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 17:47:26 +08:00
wangzhijiang 0fa7d983d9 64616 认证参数收集--认证工程师、工程接口人--导出 参考列上传的附件未正常回显 2022-12-30 17:47:03 +08:00
刘彦泽 a24f5ebd57 UI界面变更-首页 2022-12-30 17:12:28 +08:00
CD eed32438fd 权限同步接口加log日志 2022-12-30 16:32:25 +08:00
CD 7e1ca22b20 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 16:17:14 +08:00
CD 4870e782a8 加上@transactional注解 2022-12-30 16:16:52 +08:00
高嵩 195417c2d8 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 15:53:54 +08:00
高嵩 b0b8f36e92 Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period
# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
2022-12-30 15:53:39 +08:00
CD f7cae9babc Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 15:42:53 +08:00
CD b167ee2878 把直接返回注掉,防止他查不出viewer 2022-12-30 15:41:41 +08:00
高嵩 07c02abef6 同步上产数据库结构 2022-12-30 15:36:04 +08:00
高嵩 ca074ee4c6 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:54:11 +08:00
高嵩 63ef89834e 文档拆分 上移下移按钮权限 2022-12-30 14:54:00 +08:00
刘彦泽 2154e4edfe UI界面变更-个人中心-流程配置 2022-12-30 14:45:08 +08:00
刘彦泽 b6c8917317 UI界面变更-文档翻译-调取已入库文件 2022-12-30 14:35:02 +08:00
刘彦泽 4545f9fc44 UI界面变更-项目库-项目详情-相关人员名单 2022-12-30 14:32:05 +08:00
CD 0debb90188 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:31:45 +08:00
CD adc4d1ab0c 项目状态看板根据权限筛选 2022-12-30 14:31:18 +08:00
zhn 1728d53f1b Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:10:50 +08:00
zhn b7dd8125cd 未符合项列表--相关项目名称修改 2022-12-30 14:10:26 +08:00
wangzhijiang 5a4c375ed4 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:08:43 +08:00
wangzhijiang b897423f8f 文档拆分-拆分已入库文本功能,设置默认展示顺序。 2022-12-30 14:07:50 +08:00
zyx.net 4bc594317d Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:07:28 +08:00
zyx.net a928fa6b9e 法规符合性看板中,标题链接跳转 2022-12-30 14:07:10 +08:00
CD ebfac5f334 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:03:00 +08:00
zhn ffbff1437a Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 14:02:34 +08:00
zhn bc278eee70 上报库列表--项目名称修改 2022-12-30 14:02:11 +08:00
CD d8f6176cbe 项目列表品牌中英文切换+法规技术评估/法规意见收集viewer去掉按钮 2022-12-30 14:02:10 +08:00