Commit Graph
6543 Commits
Author SHA1 Message Date
zhoulingpo f484e97887 修改统一体系搜索的按钮大小并且增加序号 2023-11-28 10:32:03 +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
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
mzaxd 38a42e7505 feat: 国标外标增加体系树不能选择根节点限制 2023-11-17 17:39:38 +08:00
zyn 78fefd7414 国内海外库-新增编辑时标准体系字段添加id 2023-11-17 17:00:59 +08:00
zyn f3fc569c6c 自定义指令v-dragDialogWidth添加文件名换行功能 2023-11-17 09:40:21 +08:00
zyn 30f6a2f5f6 体系搜索-处理日期置空的情况 2023-11-17 09:16:11 +08:00
zyn 78937bf691 技术标准-起草-带入标准-作废标红 2023-11-16 17:58:45 +08:00
zyn a89d917806 国内标准库-每页显示数改变后无法获取数据 2023-11-16 17:43:05 +08:00
zyn a2b204c4f9 搜索中心-修改文本状态 2023-11-16 17:32:47 +08:00
zyn 61dd335361 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-16 17:15:20 +08:00
zyn 3b6ffb041e 搜索中心-隐藏国内外政策 2023-11-16 17:15:09 +08:00
danshihao 971f1be9ec Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-16 16:55:42 +08:00
danshihao 8e4e928f56 调整表格序号 2023-11-16 16:55:27 +08:00
zyn 81c887c672 自定义指令-el-dialog可拖拽拉宽 2023-11-16 16:54:31 +08:00
zyn 84438d79c4 78451 体系搜索-标准状态修改 2023-11-16 13:44:39 +08:00
高嵩 f43d4dfd7e Merge branch 'dev_test' into 'dev_20230829_change'
Dev test

See merge request laws-foton-slrs/foton-laws-system-front!121
2023-11-16 03:49:30 +00:00
zyn c6463e33f4 78451 政策法规资料-列表字段修改 2023-11-16 11:46:19 +08:00
zyn 82ee9fc369 体系搜索-展开图形样式修改 2023-11-16 11:25:18 +08:00
zyn bd8d55cca8 体系搜索-添加排序 2023-11-16 11:25:05 +08:00
zyn 5c3f70931e 政策课题-课题组资料-其他-字段修改 2023-11-16 10:58:15 +08:00
zyn dd8eca16d1 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change 2023-11-16 10:25:28 +08:00
zyn f363cdc459 搜索中心-表格添加入库日期、添加排序 2023-11-16 10:25:10 +08:00
wxyclub 8d65b779ce Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-16 10:12:53 +08:00
wxyclub 77cf0841c6 搜索中心去掉数量 2023-11-16 10:12:38 +08:00
wxyclub 91f03db948 搜索中心去掉 选择标准体系 按钮 2023-11-16 10:10:43 +08:00
zyn 5f282442e0 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-16 10:06:03 +08:00
zyn 454738a7d2 企标制修订计划管控流程-标题 2023-11-16 10:05:22 +08:00
zyn 3fd045a63b 体系搜索-列表页对接 2023-11-15 16:02:46 +08:00
zyn 86d0061a5e 公共导出模态框组件修改 2023-11-15 16:02:11 +08:00
zyn c82ff7cdea 体系搜索-列表接口对接 2023-11-15 15:04:00 +08:00
zyn 772b578c1a 体系搜索-树状图接口对接 2023-11-15 14:27:26 +08:00
wxyclub 0338732fec bug: 搜索中心展示字段修改 2023-11-14 17:41:30 +08:00
wangzhijiang feed84827d Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change 2023-11-14 17:09:31 +08:00
wangzhijiang feda1f165a update 2023-11-14 17:09:26 +08:00
zyn ef4f46298f 企标制修订计划管控流程-标题修改 2023-11-14 15:40:20 +08:00
zyn 3179dc7b2c 手机端-首页标识 2023-11-14 15:21:34 +08:00
wxyclub 2d6e64fb87 bug: 搜索中心字段修改 2023-11-14 15:11:07 +08:00
wxyclub 5c6dccb6c2 bug: 搜索中心字段修改 2023-11-14 10:31:30 +08:00
zyn ed55c47131 内外部会议-详情添加课题名称字段 2023-11-14 10:05:28 +08:00
zyn c89a90c837 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change
# Conflicts:
#	src/pages/phone/domesticStand.vue
2023-11-14 10:00:27 +08:00
zyn 4926109900 手机端-国内/海外/企标库-标题字段修改 2023-11-14 10:00:00 +08:00
zyn e182c9c1d5 手机端-国内/海外/企标库-标题字段修改 2023-11-14 09:44:20 +08:00