Commit Graph
6634 Commits
Author SHA1 Message Date
zhoulingpo b8b98bed30 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-23 16:16:17 +08:00
zhoulingpo cda61d2a5d 增加序号 2023-11-23 16:15:53 +08:00
zhoulingpo 9dfc7390c1 增加序号 2023-11-23 15:31:44 +08:00
zyn 8c69fe5cd9 fix: 手机端-资料中心详情-去掉下载按钮 2023-11-23 14:48:26 +08:00
zyn 9df26563cc fix: 流程撤回时数据结构错误 2023-11-23 14:40:11 +08:00
zhoulingpo 1876ebd430 增加序号 2023-11-23 14:27:01 +08:00
zyn 181e954eae fix: 审批历史loading 2023-11-23 13:57:11 +08:00
zyn c8605688d0 fix: 政策法规资料-列表字段修改 2023-11-23 13:42:30 +08:00
zhoulingpo 928261a926 增加序号 2023-11-23 11:51:58 +08:00
wxyclub dc7f982347 bug: 企标制修订立项计划撤回后修改时间提交后未生效修改 2023-11-23 11:46:12 +08:00
zyn 07e8201a43 feat: 树状结构编辑-按钮添加loading 2023-11-23 11:17:08 +08:00
zhoulingpo f2e49054f3 增加序号 2023-11-23 11:07:38 +08:00
zyn b19bac460f feat: 内外部会议、政策课题、政策法规资料详情-添加loading 2023-11-23 09:46:21 +08:00
zyn f8aea4b8c1 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change 2023-11-23 09:33:01 +08:00
zyn d0a1198be2 fix: 导入后重新获取数据 2023-11-23 09:32:49 +08:00
zhoulingpo c2fc8f4514 增加序号 2023-11-23 09:13:11 +08:00
mzaxd a13d37838a feat: 机构管理关联角色 2023-11-23 00:05:16 +08:00
zyn 739b67cf9b fix: 意见输入面板默认展开 2023-11-22 17:59:19 +08:00
zyn 38f82beb8a fix: 编辑页-按钮loading 2023-11-22 17:51:54 +08:00
zyn a16169d8a1 fix: 首页待办任务跳转 2023-11-22 17:43:59 +08:00
zyn 016ff79d3b fix: idm登录不跳转到搜索中心 2023-11-22 16:50:24 +08:00
zhoulingpo 1e9122570d 增加序号 2023-11-22 16:25:32 +08:00
zyn 2a041bd8b4 fix: 内外部会议列表-议题名称字段修改 2023-11-22 15:53:19 +08:00
zhoulingpo f8e7b56e2b 增加序号 2023-11-22 15:22:32 +08:00
zyn c74071e818 style: 国内外政策鼠标悬浮title 2023-11-22 15:02:17 +08:00
zyn 0183eaadb8 refactor: 审批历史页面修改并添加loading 2023-11-22 14:40:43 +08:00
zhoulingpo 5df4c678bf 增加序号 2023-11-22 14:22:42 +08:00
zyn 3f20b0b465 feat: 页面loading 2023-11-22 13:55:11 +08:00
zhoulingpo 59123dd50e 增加序号 2023-11-22 13:50:45 +08:00
zyn 7dbbecb965 style: 政策课题参会流程 2023-11-22 11:33:41 +08:00
zyn b31cae5713 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change
# Conflicts:
#	src/components/hzwlComponents/TableFormItem.vue
2023-11-22 11:24:17 +08:00
zyn 03bed113fe style: 政策课题参会流程 2023-11-22 11:23:49 +08:00
zyn 66694b10eb style: 政策课题参会流程 2023-11-22 11:22:44 +08:00
zhoulingpo 50ca458c1e 增加序号 2023-11-22 11:12:43 +08:00
zhoulingpo e2f8529f21 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change
# Conflicts:
#	src/pages/policyRegulation/meeting/components/TopicsTable.vue
#	src/pages/policyRegulation/meeting/index.vue
#	src/pages/policyRegulation/policyTopics/index.vue
#	src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue
2023-11-22 10:59:25 +08:00
zhoulingpo f3923ce3ef 增加序号 2023-11-22 10:57:35 +08:00
zhoulingpo 784a3612f3 增加序号 2023-11-22 10:57:08 +08:00
zyn 8ac293770e style: 政策入库-带入政策弹窗 2023-11-22 10:25:31 +08:00
zyn caca657510 fix: 政策-表格内容过长隐藏 2023-11-22 09:57:57 +08:00
zyn 40a4037314 fix: 78589 配置管理-标准体系-新增时做校验 2023-11-21 15:25:40 +08:00
zhoulingpo cfd1ffdf0d 撤回配置文件修改 2023-11-21 11:05:17 +08:00
zhoulingpo 0778a0b224 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-21 11:03:23 +08:00
zhoulingpo c84f945f42 自定义指令-上传的el-dialog可拖拽拉宽 2023-11-21 10:48:57 +08:00
zyn e2b7d94b58 企标顺序号错误 2023-11-21 10:02:51 +08:00
zyn b3eb962ae0 国内海外 拆分结果上传接口去掉token 2023-11-21 09:58:02 +08:00
zyn 0017aaffb5 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-20 17:39:44 +08:00
zyn 1965a35fd1 企标制修订-技术标准-制修订类型无法修改 2023-11-20 17:39:25 +08:00
zyn e7e463f7bf Merge branch 'dev_test' into dev_20230829_change 2023-11-20 09:13:59 +08:00
高嵩 ab429566e3 Merge branch 'dev_20231101_TXSS' into 'dev_20230829_change'
Dev 20231101 txss

See merge request laws-foton-slrs/foton-laws-system-front!122
2023-11-20 00:57:28 +00:00
danshihao 4465f597b2 调整流程按钮loading 2023-11-20 08:55:39 +08:00