Commit Graph
6772 Commits
Author SHA1 Message Date
zyn 8d60b79bc5 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20231201_feizhi 2023-12-05 15:07:12 +08:00
zyn e334e1efc0 Merge remote-tracking branch 'origin/dev_test' into dev_20231201_feizhi 2023-12-05 15:01:00 +08:00
zyn 3bfdb1da01 fix(标准入库流程): 批准节点标准来源 国外改为海外 2023-12-05 14:59:35 +08:00
zhoulingpo a71c02333e 上传弹窗 2023-12-05 14:57:58 +08:00
zyn 6f76035a00 fix(手机端): 国内国外企标体系结构参数修改 2023-12-05 14:48:15 +08:00
zyn 5d5da6502c Merge remote-tracking branch 'origin/dev_20231201_feizhi' into dev_20231201_feizhi 2023-12-05 14:48:01 +08:00
zhoulingpo e2e20e6702 Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change 2023-12-05 14:46:49 +08:00
zhoulingpo 6fd3f42163 修改分页错误 2023-12-05 14:46:35 +08:00
zhoulingpo c20ea9ccee 修改分页错误 2023-12-05 14:14:58 +08:00
zhoulingpo 9f825677b5 选择标准号/政策号的发布时间不存在导致显示不全问题 2023-12-05 11:46:00 +08:00
zhoulingpo 15e6cb7024 选择标准号/政策号的loading修改 2023-12-05 11:30:41 +08:00
zhoulingpo a72523106b 当autoSize为true时 不改变其他页面数量 2023-12-05 11:24:21 +08:00
zhoulingpo dea3149524 机构管理分页bug 2023-12-05 11:01:49 +08:00
zhoulingpo 2c4c77b56b 标准复审step7回显意见修改 2023-12-05 10:35:09 +08:00
zhoulingpo 78cf8bcefd 未符合项整改 2023-12-05 10:23:56 +08:00
zhoulingpo bd820559a0 标准调研流程修改第三步回显上一步意见 2023-12-05 09:59:39 +08:00
zhoulingpo d3d1346cf0 参与外部标准制修订保存接口 增加意见输入框 2023-12-05 09:53:00 +08:00
wxyclub 9789adce36 fix: 校验企标顺序号的请求修改请求方式 2023-12-05 09:35:41 +08:00
zyn 1de74763b4 Merge remote-tracking branch 'origin/dev_20231201_feizhi' into dev_20231201_feizhi 2023-12-05 09:26:57 +08:00
wxyclub abc6671786 fix: 手机段修改请求方式 2023-12-04 23:39:32 +08:00
zyn a52796f329 fix(手机端): 修改接口 2023-12-04 23:03:08 +08:00
wxyclub 20a5b522fc Merge remote-tracking branch 'origin/dev_20231201_feizhi' into dev_20231201_feizhi 2023-12-04 20:24:55 +08:00
wxyclub 10c9c008ce fix: 计划管控取消和更名流程企标类别改为字符串 2023-12-04 20:24:47 +08:00
gaosong d46d4756ea Merge remote-tracking branch 'origin/dev_20231201_feizhi' into dev_20231201_feizhi 2023-12-04 19:00:12 +08:00
gaosong 25456f18e4 fix: 技术标准-中文名称禁用 2023-12-04 18:59:43 +08:00
zhoulingpo e79bca92fa 修改回显意见bug 2023-12-04 17:53:00 +08:00
zhoulingpo aa8b442b47 修改回显意见bug 2023-12-04 17:34:38 +08:00
zhoulingpo e077bc79b2 修改页码bug 2023-12-04 16:45:52 +08:00
zhoulingpo 6c9d691189 修改页码bug 2023-12-04 16:38:48 +08:00
zhoulingpo f431f8aff6 修改页码bug 2023-12-04 16:38:20 +08:00
zhoulingpo 9a81d89d5e 修改页码bug 2023-12-04 15:58:36 +08:00
zhoulingpo 8c1b8c953f 修改页码bug 2023-12-04 15:46:35 +08:00
zhoulingpo 726686c847 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-12-04 15:14:58 +08:00
zhoulingpo c71b61ccf1 修改页码bug 2023-12-04 15:13:49 +08:00
zhoulingpo ccd28604cb 修改页码bug 2023-12-04 15:09:51 +08:00
zyn 94137281db Merge branch 'dev_20230829_change' into dev_20231201_feizhi 2023-12-04 09:32:57 +08:00
zyn 989cb9eccd fix(政策入库流程): 政策文号非必填 2023-12-04 09:29:44 +08:00
zyn bec5eab464 Merge branch 'dev_20230829_change' into dev_20231201_feizhi 2023-12-01 18:05:08 +08:00
zyn 1b6b3bf4d8 Merge remote-tracking branch 'origin/dev_20231113_phonePage' into dev_20231201_feizhi
# Conflicts:
#	src/components/hzwlComponents/ReceiptDescription.vue
#	src/pages/processCenter/pages/phone/qbrk-product/step2.vue
2023-12-01 18:02:01 +08:00
zyn 401f113855 Merge remote-tracking branch 'origin/dev_20231101_TXSS' into dev_20231201_feizhi 2023-12-01 17:59:43 +08:00
wxyclub 97b4181034 Merge branch 'dev_test' into dev_20230829_change 2023-12-01 17:52:53 +08:00
wxyclub e4519ead4a Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-12-01 17:36:11 +08:00
wxyclub c7d6a530f4 fix: 更名流程重复发送代办问题 2023-12-01 17:36:06 +08:00
zyn 1a484bce4b Merge branch 'dev_test' into dev_20230829_change 2023-12-01 16:57:04 +08:00
zyn 7575cbbfae perf(手机端): 资料中心结构树添加loading 2023-12-01 16:51:28 +08:00
zyn c44ba54cc7 refactor: 手机端-全库搜索重构 2023-12-01 16:33:19 +08:00
zyn d77dae6292 perf: 优化loading 2023-12-01 16:26:54 +08:00
wxyclub 4f47e12ee6 fix: 废止流程添加修改关联流程的参数 2023-12-01 11:51:03 +08:00
wxyclub 0e6c6d9f45 bug: 文件预览 2023-12-01 11:50:18 +08:00
zhoulingpo 8c8d2e7fc2 Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-12-01 09:47:48 +08:00