Commit Graph
5733 Commits
Author SHA1 Message Date
李雅玮 f6b093be6e 合并分支 'develop' 到 'FOTON'
Develop

查看合并请求 laws-foton-slrs/foton-laws-system-front!2
2022-12-07 16:06:46 +08:00
李雅玮 da7cd3c0ec Merge branch 'FOTON' into 'develop'
# Conflicts:
#   src/sysConfig/index.js
2022-12-07 16:06:35 +08:00
李雅玮 be5923d8f6 合并分支 'develop_new' 到 'develop'
Develop new

查看合并请求 laws-foton-slrs/foton-laws-system-front!1
2022-12-07 15:56:49 +08:00
zyx.net 430d4c7679 Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-12-07 14:18:48 +08:00
zyx.net 3bfeccd224 解开校验 2022-12-07 14:17:38 +08:00
zeng yuneng 1788c3acbc 标准调研流程-人员选择tree渲染bug 2022-12-07 11:37:35 +08:00
zeng yuneng 42a856b617 标准入库流程- 点击新增清空数据 2022-12-06 16:38:41 +08:00
zeng yuneng b82086c7b1 修改bug-284 2022-12-06 15:38:59 +08:00
zeng yuneng 15d519c5e4 修改bug-285 2022-12-06 14:48:13 +08:00
zeng yuneng 32dc25aad3 修改bug-286 2022-12-06 11:46:38 +08:00
zyx.net 231fe6db61 Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-12-06 09:53:53 +08:00
zyx.net fd09e2e086 在线编辑校验暂时注掉 2022-12-06 09:53:12 +08:00
zeng yuneng a9f65e64fb 首页-标准征求意见-添加意见后提交,提示信息颜色修改 2022-12-05 17:28:35 +08:00
zeng yuneng 8b45cf4bb7 标准调研流程-审批节点驳回提示信息 2022-12-05 14:56:04 +08:00
zeng yuneng 11761a31b3 国内标准-导出 2022-12-05 14:40:56 +08:00
zeng yuneng a3d45b3afe 企标制修订技术标准-流程驳回弹框提示信息 2022-12-05 14:23:16 +08:00
zeng yuneng 857d6ae5dd 修改 标准合规评估-任务分发节点 2022-12-05 14:06:55 +08:00
zeng yuneng 2473186cf8 修改企标制修订技术标准-过程稿件提示信息 2022-12-05 10:07:38 +08:00
zeng yuneng f8c4f9ce6c 标准入库流程-批准节点驳回成功提示信息 2022-12-02 17:55:25 +08:00
zeng yuneng 0cdf39251b 企标制修订计划管控-立项-进入页面去除必填项的提示信息 2022-12-02 16:19:48 +08:00
zeng yuneng 56a94f3a41 企标制修订计划管控-分页器 2022-12-02 15:59:09 +08:00
zeng yuneng 46d962dd8a 法规清单-项目清单-列表显示遮挡 2022-12-02 14:56:45 +08:00
zeng yuneng 73ce31a545 企标制修订产品标准-企标编写节点,去除发布稿必填符号 2022-12-02 14:07:45 +08:00
zyx.net 84034116de 首页 标准化动态点击标题跳转到详情页 2022-12-02 11:57:45 +08:00
zyx.net ef9d9d8b55 资料中心类型搜索 2022-12-02 11:53:13 +08:00
zyx.net 393f90fc9e Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-12-02 11:51:12 +08:00
zyx.net 70e4074058 资料中心 类型查询清空修改 2022-12-02 11:49:33 +08:00
zeng yuneng dc8e455d17 企标废止流程-去除按钮上的类别 2022-12-02 09:20:28 +08:00
CD f43900f3a5 Merge branch 'develop_new' into develop 2022-12-01 21:42:56 +08:00
CD ce7c9fb521 恢复成原来的yarn.lock 2022-12-01 21:41:55 +08:00
CD 2c51d70237 Merge remote-tracking branch 'origin/develop' into develop 2022-12-01 21:16:08 +08:00
CD 1a617fe22f Merge branch 'develop_new' into develop 2022-12-01 21:15:32 +08:00
zeng yuneng b85acf1f82 企业标准-列表对其 2022-12-01 17:55:59 +08:00
zeng yuneng 506a580c9a 标准清单发布-选择清单回显 2022-12-01 17:31:44 +08:00
zyx.net dfad5b8af1 Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-12-01 17:21:28 +08:00
zyx.net a4d4be6000 复审流程阻塞复审单id判断 2022-12-01 17:21:01 +08:00
zeng yuneng 6eddacccca 企标制修订-产品标准(发布)-提示信息 2022-12-01 16:46:18 +08:00
zyx.net 87c55421b6 Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-12-01 15:33:36 +08:00
zyx.net 7d0e846abc 修改流程阻塞bug 2022-12-01 15:33:01 +08:00
zeng yuneng e8ebf622f8 企标编写汇总节点-上传发布稿-上传两个文件后,页面只显示一个文件 2022-12-01 15:23:00 +08:00
zyx.net a8e0634eb3 Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-12-01 12:11:18 +08:00
zyx.net 1ec2064832 修改流程阻塞bug 2022-12-01 12:10:42 +08:00
gaojiabao 80e3013c87 当只要截止日期没有填写时,留红色提示信息就行 ,不需要弹框提示 bug 2022-12-01 10:32:42 +08:00
zyx.net ae4d88b9e4 Merge remote-tracking branch 'origin/develop_new' into develop_new 2022-12-01 09:51:07 +08:00
zeng yuneng d34fdc8dd8 修改 2022-12-01 09:47:56 +08:00
zyx.net 73a2a5dde5 企标计划新增弹框修改 2022-11-30 10:36:10 +08:00
zyx.net e8975a106b 企标废止流程-选择标准-弹框中数据显示不全 2022-11-29 14:24:51 +08:00
zyx.net 47d263ef70 适用车型的搜索条件加在添加标准里面 2022-11-29 14:16:03 +08:00
zyx.net 03c00a681f 首页标准化上传时间修改
项目清单确认流程添加 适用车型
2022-11-29 12:00:44 +08:00
zyx.net 019850a020 复审单id修改 2022-11-28 17:18:22 +08:00