FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,662 Commits 3 Branches 0 Tags
05377b5b70813533f2aed10dc2eb20cd95d6102b
Commit Graph
64 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zyd 56de43533e Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 
# Conflicts:
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
 2022-10-26 22:46:47 +08:00
zhangyanduan bb7bc9e484 fix: 修复BUG 2022-10-26 16:53:40 +08:00
zhangyanduan 48a6a89193 fix: 修复BUG 2022-10-26 11:13:46 +08:00
zyd ab95a315e0 add：清单导入增加loading 2022-10-25 01:27:07 +08:00
zyd 2c1a0f5085 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2022-10-24 22:30:44 +08:00
zyd 2392d08ea6 fix: 修复BUG 2022-10-24 22:30:39 +08:00
zyd a37070a052 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2022-10-24 16:10:10 +08:00
zyd 8a290cbc24 fix: 修复BUG 2022-10-24 16:09:53 +08:00
zhangyanduan 922183fc74 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2022-10-18 16:17:29 +08:00
zhangyanduan 1da200847d fix: 修复角色状态设置时无效的BUG 2022-10-18 16:16:49 +08:00
zyd 849cf3797f fix:修复流程中的页面BUG 2022-10-11 22:51:15 +08:00
zhangyanduan c31e4e0b63 fix: 1、修复企标编辑时，如果企标类别中带有空格，则拼接最后的Code时不再拼接空格，产品标准同样如此处理，但是其他类别的需要再拼上空格 2022-10-11 15:49:55 +08:00
zhangyanduan d95a426c1a fix:修复点击编辑以后之前挂载得目录丢失得问题 2022-10-10 16:33:44 +08:00
zyd 5e83c1869c fix:增加项目评估的跳转校验 2022-10-08 23:39:25 +08:00
zhangyanduan 4ae82a122b fix: 修复立项计划流程中的导入功能不支持解密的BUG 2022-10-08 13:54:50 +08:00
zhangyanduan 15c3afdc17 fix: 将文本状态是被代替的修改颜色显示 2022-09-27 15:31:34 +08:00
zhangyanduan ae9584e12e Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2022-09-27 13:46:02 +08:00
zhangyanduan 64702e2e57 fix:详情页面分解单中的适用车型改为必填 2022-09-27 11:32:39 +08:00
zyd 3b549ab1d4 Merge branch 'develop' into FOTON 
# Conflicts:
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
 2022-09-26 20:10:02 +08:00
zhangyanduan 7b192ed73f Merge branch 'develop' into FOTON 
# Conflicts:
#	src/sysConfig/index.js
 2022-09-26 09:27:02 +08:00
zhangyanduan c18cfdfe93 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2022-09-23 17:36:39 +08:00
zhangyanduan 1ccd4f9cfd fix:修复页面BUG 2022-09-23 17:36:14 +08:00
zyd cdc311df1f fix: 修复带水印下载功能，此处将无需带水印下载的功能进行移除 2022-09-22 23:11:39 +08:00
zyd 1f068a9ff6 fix: 项目清单确认流程增加企标在线预览 2022-09-22 22:43:59 +08:00
zyd f5861b2f5d fix: 标准调研流程第三步去掉接收待办功能 2022-09-22 22:41:07 +08:00
zyd 63098c8fcf fix: 征求意见填写意见页面加载文件机制更新 2022-09-22 22:20:07 +08:00
zyd 2f8294b0d2 Merge branch 'develop' into FOTON 2022-09-22 00:45:36 +08:00
zhangyanduan 3d8b35a115 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2022-09-21 18:11:13 +08:00
zhangyanduan e51c92d0d9 back: 回退PDF.JS版本，支持低版本浏览器 2022-09-21 18:06:14 +08:00
zyd 481721e16c Merge branch 'develop' into FOTON 2022-09-21 00:41:56 +08:00
zyd f8e77e9e9d fix: 移除pdf.js中打开文件、打印、下载按钮 2022-09-21 00:40:35 +08:00
zyd b015299253 fix:去掉移动端的相关按钮 2022-09-20 23:20:53 +08:00
zhangyanduan a6550acc6c Merge branch 'develop' into FOTON 
# Conflicts:
#	src/sysConfig/index.js
 2022-09-20 13:39:36 +08:00
zyd 5be854bb95 add: 更新PDF.JS组件版本，从1.9.426升级到2.16.105版本 2022-09-20 01:29:12 +08:00
zyd 22dbcea3a8 Merge branch 'develop' into FOTON 2022-09-19 07:39:50 +08:00
zyd 24cf574fb9 fix: 标准识别模块上传文件去掉标准号、名称字段的必填校验 标准项目评估流程项目分发节点查询项目列表时放开所有项目，不再管控是否维护 2022-09-16 10:44:11 +08:00
zyd e29bfa8cc9 fix: 修改权限管控逻辑 2022-09-16 00:19:38 +08:00
zhangyanduan 4f2ad8eb15 fix: 修复权限问题 2022-09-15 20:22:55 +08:00
zhangyanduan ee6baeb393 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2022-09-15 11:35:38 +08:00
zhangyanduan 081c12d115 fix： 修改权限管控 2022-09-15 11:35:28 +08:00
zhangyanduan 5688301da7 fix: 修复入库归档位置选不了的BUG 2022-09-14 09:52:17 +08:00
zhangyanduan f12f5ca8db fix：解决解读中对比增加新旧标准标识内容 2022-09-09 18:01:54 +08:00
DESKTOP-JNBCTEI\Edison 7bc9dc687d fix:修复标准项目评估流程中发起时选择的标准编号回显的BUG 2022-09-09 00:55:45 +08:00
DESKTOP-JNBCTEI\Edison 6a6aa50df7 Merge branch 'develop' into FOTON 2022-09-08 22:07:08 +08:00
zhangyanduan 3921070b9b fix: 项目评估流程中标准表单数据列表中标准号、标准名称收起显示 2022-09-08 18:18:59 +08:00
zhangyanduan 04b9cb4c1e fix: 配置岗位功能BUG修复 2022-09-08 17:43:50 +08:00
zhangyanduan 6cb001352b fix: 解读流程中标准号、标准名称增加点击阅览功能、解读增加新旧标记 2022-09-06 09:06:26 +08:00
zhangyanduan 782b442585 fix: 修复标准详情页面正文显示的问题以及项目清单更新流程中企标状态没有显示的BUG 2022-09-01 14:13:29 +08:00
zhangyanduan 5636801b9c fix: 认证清单中标准号显示错误的BUG修复 2022-09-01 10:41:24 +08:00
zhangyanduan da8cb7236a fix: 修复标准详情里面英文名称没有显示的BUG 2022-08-31 18:04:40 +08:00
zhangyanduan e31fdacb4c fix: 征求意见列表中来源、意见处理等字段根据状态反馈显示还是不显示 2022-08-29 11:07:19 +08:00
zhangyanduan 68041a564b fix: 标准详情页面中发布稿译文字段默认显示 2022-08-29 10:34:31 +08:00
zhangyanduan f297daaab5 Merge branch 'develop' into FOTON 
# Conflicts:
#	src/sysConfig/index.js
 2022-08-25 19:04:48 +08:00
zhangyanduan 525e0ea12a 资料中心页面预览使用KKVIEW组件支持 2022-08-18 13:30:36 +08:00
zhangyanduan 97de11f627 fix:企业标准库编辑后标准编号中自动增加了空格的问题 2022-07-28 17:58:36 +08:00
zhangyanduan 0d7a2978e3 fix: 手机端首页图标LOGO问题 2022-07-26 16:05:24 +08:00
zhangyanduan 4979458391 fix: 发布稿名称修改以及移动流程中的位置 2022-07-26 16:01:08 +08:00
zhangyanduan 23b52d1292 fix: 前端页面中将所有国外标准替换为海外标准 2022-07-21 16:50:52 +08:00
zhangyanduan d4d1075225 add:提交问题按钮新增loading 2022-07-18 11:30:11 +08:00
zhangyanduan f2f3b01aea fix: 修改文字描述，将海外标准修改为国外标准 2022-07-18 09:40:49 +08:00
zhangyanduan 495c723abd fix: 修复海外标准中如果没有标准年份显示横线的问题 2022-06-30 17:20:02 +08:00
zhangyanduan 0f43773caf fix: 修复海外标准中如果没有标准年份显示横线的问题 2022-06-30 17:10:45 +08:00
zhangyanduan 08d632e729 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 
# Conflicts:
#	package.json
 2022-06-17 09:06:31 +08:00
zhangyanduan 36457d6ba8 fix: NPM命令增加修改内存的操作 2022-06-17 09:04:29 +08:00