Commit Graph
6634 Commits
Author SHA1 Message Date
zyn c1664954ce fix: 体系搜索-搜索条件-标准状态暂时去掉 2023-11-28 17:18:17 +08:00
wxyclub 25ac88cf0c 解决代码合并冲突 2023-11-28 15:46:53 +08:00
wxyclub f49c92a941 Merge branch 'dev_test' into dev_20230829_change
# Conflicts:
#	src/components/hzwlComponents/ReceiptDescription.vue
#	src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
2023-11-28 15:34:45 +08:00
zyn 5d3b76140b fix: 技术标准批准-页面阻塞 2023-11-28 14:25:16 +08:00
zyn 303da8163c feat: 意见组件高度自适应 2023-11-28 14:06:42 +08:00
zyn a6c638526f feat: 手机端-标准化动态添加字段 2023-11-28 11:14:18 +08:00
zhoulingpo 423b5198ea 标准体系模块,标准状态改成文本状态 2023-11-28 10:57:17 +08:00
zhoulingpo 785dae86b2 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change
# Conflicts:
#	src/pages/regulatoryRepository/systemSearch/components/DialogTable.vue
2023-11-28 10:33:42 +08:00
zhoulingpo f484e97887 修改统一体系搜索的按钮大小并且增加序号 2023-11-28 10:32:03 +08:00
zhoulingpo 431de4dc05 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-28 10:20:19 +08:00
zhoulingpo e74a3f0c87 工作台(除了新增流程)增加查看或处理时打开新页面 2023-11-28 10:18:34 +08:00
zyn 70268b9d1b feat: 体系搜索列表可查看详情 2023-11-28 10:04:24 +08:00
zyn 4614e5adc5 feat: 手机端标准化动态-页面缓存 2023-11-27 17:41:53 +08:00
zhoulingpo 6df26680c8 删除所属岗位 新增角色列 2023-11-27 17:38:01 +08:00
zyn 7e6ec986fc feat: 手机端国内/海外/企标-标准状态默认全部 2023-11-27 17:23:04 +08:00
zyn 6c6814a4b9 feat: 手机端国内/海外/企标-页面缓存 2023-11-27 17:12:58 +08:00
zhoulingpo caa32237a3 增加漏掉的导入宽度 2023-11-27 17:10:55 +08:00
zyn 87346b9b6c fix: 手机端海外法规库-译文附件未展示全 2023-11-27 15:29:18 +08:00
zhoulingpo ab74b75070 杨卫力改为刘金英 修改机构中无角色字段 2023-11-27 15:01:07 +08:00
zhoulingpo c84c27774e Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-27 14:50:36 +08:00
wxyclub eb9c65ed32 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-27 14:46:08 +08:00
zyn dc5fb966be refactor: 手机端-国内/海外/企标重构-增加下拉加载功能 2023-11-27 14:44:55 +08:00
zyn 5a99533819 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-27 11:27:37 +08:00
zyn 4341b0603a refactor: 手机端-标准化动态重构-增加下拉加载功能 2023-11-27 11:26:53 +08:00
zyn 88706b6127 feat: 手机端-下拉加载公共组件 2023-11-27 11:26:20 +08:00
zhoulingpo 21b7b30cf5 标准征求意见增加表格边框 2023-11-27 10:32:45 +08:00
wxyclub cf7af05cd6 Revert "删除所属岗位 新增角色列"
This reverts commit 92f5515620.
2023-11-27 09:23:05 +08:00
wxyclub eefac010ff bug: 征求意见修改意见,表格添加边框 2023-11-26 12:49:11 +08:00
zhoulingpo 674bf052c2 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-24 16:14:06 +08:00
zhoulingpo aa161cb7cd 首页标准问答增加标准编号列 2023-11-24 16:13:48 +08:00
zyn 1265d16eae style: 政策课题参会流程-会议资料独占整行 2023-11-24 15:22:35 +08:00
zyn 5299f3647b Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-24 15:15:28 +08:00
zyn b0a53b6d1c fix: 企标制修订计划管控-审批意见 2023-11-24 15:14:58 +08:00
zhoulingpo 92f5515620 删除所属岗位 新增角色列 2023-11-24 14:34:39 +08:00
zhoulingpo a9e465f2ff 修改新旧位置 2023-11-24 14:34:13 +08:00
zhoulingpo 2335a6b046 增加序号 2023-11-24 14:11:16 +08:00
zhoulingpo 289e71c9ea 增加序号 2023-11-24 13:51:39 +08:00
zhoulingpo 2ee18cced1 增加序号 2023-11-24 13:40:18 +08:00
zhoulingpo eb506face8 增加序号 2023-11-24 11:09:45 +08:00
zhoulingpo e2e1a52fb9 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-24 11:01:19 +08:00
zhoulingpo 0afd5ef087 增加序号 2023-11-24 10:58:52 +08:00
zyn e3df7fb844 refactor: 手机端体系搜索弹窗中去掉取消按钮 2023-11-24 10:48:30 +08:00
zyn 2db709c192 feat: 体系搜索-搜索条件添加体系结构 2023-11-24 10:26:14 +08:00
zhoulingpo 5151b68514 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-24 09:55:39 +08:00
zhoulingpo 8a2e733746 增加序号 2023-11-24 09:55:05 +08:00
wxyclub bea71ccbb1 bug: 政策法规资料导入添加token 2023-11-23 22:24:26 +08:00
zhoulingpo 9763cd1b96 增加序号 2023-11-23 17:53:52 +08:00
zyn 14a50aa4b4 style: 手机端首页-logo修改 2023-11-23 17:45:21 +08:00
zyn 460f60bb95 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-23 17:38:50 +08:00
zyn f72900eed7 fix: 手机端首页-logo尺寸修改 2023-11-23 17:37:49 +08:00