Commit Graph
6745 Commits
Author SHA1 Message Date
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
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
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
zyn 2f437a39f8 style: 重点认证标准/政策合规性项目审查流程-审批意见 2023-11-30 19:01:51 +08:00
zyn bc7e52ed44 style: 政策征求意见流程-审批意见 2023-11-30 19:00:35 +08:00
zyn ae28f03650 style: 政策课题参会流程-审批意见 2023-11-30 18:54:50 +08:00
zyn b34cc6c5a2 style: 政策课题入会流程-审批意见 2023-11-30 18:54:36 +08:00
zyn fd1355d871 style: 政策法规资料入库流程-审批意见 2023-11-30 18:54:23 +08:00
zyn ac4246ecd0 style: 内外部会议入库流程-审批意见 2023-11-30 18:50:29 +08:00
zyn 4fa3d5acfb style: 政策入库流程-审批意见 2023-11-30 18:48:22 +08:00
zyn 40ca0d84c8 fix: 转办时未选择人员给提示语 2023-11-30 18:37:30 +08:00
zyn 0cfce63b66 Merge remote-tracking branch 'origin/dev_20231113_phonePage' into dev_20231113_phonePage
# Conflicts:
#	src/pages/processCenter/pages/phone/bzjd/step2.vue
#	src/pages/processCenter/pages/phone/bzjd/step3.vue
2023-11-30 18:33:04 +08:00
zyn 5a837f5d52 fix: 标准解读流程 2023-11-30 18:32:50 +08:00
zyn b92d330adc fix: 标准解读流程 2023-11-30 18:29:23 +08:00
zyn 611bd37a64 fix: 标题错误 2023-11-30 18:27:59 +08:00
zyn 21c1b6b161 Merge branch 'dev_test' into dev_20230829_change
# Conflicts:
#	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
2023-11-30 18:04:28 +08:00
zyn a5e3fd56a7 Merge remote-tracking branch 'origin/dev_test' into dev_test
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
#	src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
#	src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
2023-11-30 17:56:31 +08:00
zhoulingpo 933c32418c 修改页码bug 2023-11-30 17:51:58 +08:00
zhoulingpo 73260b5ea6 修改页码bug 2023-11-30 17:09:19 +08:00
zhoulingpo 94cc921f1b 修改页码bug 2023-11-30 17:08:52 +08:00
zhoulingpo acf50924a0 修改页码bug 2023-11-30 17:04:09 +08:00
zhoulingpo 1f233eda7a Merge remote-tracking branch 'origin/dev_test' into dev_test 2023-11-30 17:02:05 +08:00
zhoulingpo 19290ce11f 修改页码bug 2023-11-30 17:01:52 +08:00
zyn ea4a95e93f style: 加入标准化协会信息备案流程-审批意见 2023-11-30 16:38:50 +08:00
zyn d51ce75303 style: 外部署名推荐审批流程-审批意见 2023-11-30 16:34:22 +08:00
zyn 5f4cc40f55 style: 外部标准化协会参会流程-审批意见 2023-11-30 16:23:26 +08:00
zyn 3c435345ff style: 外部标准化协会入会流程-审批意见 2023-11-30 16:17:34 +08:00
zyn e0d69dbd91 style: 企标制修订立项计划流程-审批意见 2023-11-30 16:11:02 +08:00
zyn d04a084e65 style: 企标废止流程-审批意见 2023-11-30 16:05:20 +08:00