FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,373 Commits 3 Branches 0 Tags
476422edfdc9f45b31439bc0ed9071626e0228f5
Commit Graph
1970 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com 5463166666 流程vpps查找添加 :type="'truck'" 2021-11-26 14:53:39 +08:00
shenyanpei 5ddab141a3 修改新增编辑样式 2021-11-26 10:23:04 +08:00
Superman_Main 048b94056d Merge branch 'develop' into FOTON 
# Conflicts:
#	package-lock.json
#	src/components/navMenu/index.vue
 2021-11-26 09:02:37 +08:00
zhutianqi 9f4ef0f318 commit 2021-11-25 16:01:53 +08:00
Superman_Main eee8a2e8e5 Merge branch 'develop' into FOTON 2021-11-24 12:06:40 +08:00
shenyanpei edff9d4198 标准入库保存 2021-11-24 10:06:18 +08:00
Superman_Main faf1438540 Merge branch 'develop' into FOTON 2021-11-23 21:16:05 +08:00
zhutianqi 6f89978a4f Merge remote-tracking branch 'origin/develop' into develop 2021-11-23 16:58:42 +08:00
zhutianqi 029e6d71ca commit 2021-11-23 16:58:36 +08:00
shenyanpei ab2ab9c968 标准入库选择海外，标准类别、性质注销 2021-11-23 16:48:36 +08:00
Superman_Main ae4a1d9e3c Merge branch 'develop' into FOTON 2021-11-22 22:27:56 +08:00
yanyizhou a017489a21 折叠动画 2021-11-22 18:20:17 +08:00
yanyizhou 559c891c5a 折叠动画 2021-11-22 18:18:35 +08:00
yanyizhou 422f31280e 折叠动画 2021-11-22 18:15:38 +08:00
yanyizhou 7720d5deaa Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 18:10:16 +08:00
yanyizhou bdf0cb25e6 折叠动画 2021-11-22 18:10:11 +08:00
zhutianqi 7178058e6c Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 18:01:03 +08:00
zhutianqi 12ed48f629 commit 2021-11-22 18:00:52 +08:00
yanyizhou a6ac3c76cf Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 18:00:39 +08:00
yanyizhou 945563477c 折叠动画 2021-11-22 18:00:33 +08:00
Superman_Main 366d1769f8 Merge branch 'develop' into FOTON 
# Conflicts:
#	src/components/navMenu/index.vue
 2021-11-22 16:30:33 +08:00
Superman_Main 2b4b1f75c0 Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 16:26:46 +08:00
yanyizhou 1748fe5d6c 查询清空按钮统一 2021-11-22 15:18:51 +08:00
yanyizhou 97a5f45788 查询清空按钮统一 2021-11-22 15:09:24 +08:00
yanyizhou 1bd8be8d04 查询清空按钮统一 2021-11-22 14:58:02 +08:00
yanyizhou b475ea03dc bzrk Step4 20xxx 2021-11-22 11:03:47 +08:00
Superman_Main ef13fe555b Merge remote-tracking branch 'origin/develop' into develop 2021-11-22 10:43:19 +08:00
Superman_Main 4e0f398ad7 feat:FOTON release 2021-11-22 09:41:51 +08:00
zhutianqi 478a0510d2 commit 2021-11-21 22:19:05 +08:00
zhutianqi 1553761c6d commit 2021-11-21 16:47:00 +08:00
zhutianqi a3c98a1814 commit 2021-11-21 16:20:51 +08:00
yanyizhou b1285e5163 起草单位且增加模糊筛选（输入首字段，跳出相关选项，供选择）； 2021-11-21 14:55:29 +08:00
yanyizhou e36cf79e82 上面有点挤，协调一下 2021-11-21 14:48:07 +08:00
yanyizhou 4c771bd044 Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 14:34:44 +08:00
yanyizhou 86c450ba6c 附件名称部分放大。附件上传成功后，应显示附件及名称 
且能打开预览(预览实现不了，不实现了）
 2021-11-21 14:34:38 +08:00
zhaokaiyao@91isoft.com 1c0d4ff567 Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 14:13:27 +08:00
zhaokaiyao@91isoft.com 204f507097 a. 标准入库--海外标准：英文名称输入左移第一列，与“中文名称在一列” 2021-11-21 14:13:21 +08:00
yanyizhou c77dcedf7a 上传标准附件的窗口，上半部区域缩小 2021-11-21 13:50:56 +08:00
yanyizhou e3782bc039 上传标准附件的窗口，上半部区域缩小 2021-11-21 11:20:23 +08:00
zhaokaiyao@91isoft.com fbcb858145 // 国内英文名称不必填 国外必填 2021-11-21 10:47:23 +08:00
yanyizhou db5262491b Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 10:43:02 +08:00
yanyizhou d1f57a9b4a 海外标准入库：标准类别、性质删掉 2021-11-21 10:42:55 +08:00
宋伟佳 09a1b66801 commit 2021-11-21 10:32:01 +08:00
yanyizhou b2fedcfde8 国内标准入库：删掉责任单位、责任工程师 2021-11-21 10:24:58 +08:00
yanyizhou b8c912a437 Merge remote-tracking branch 'origin/develop' into develop 2021-11-21 10:09:42 +08:00
yanyizhou 24b370ac0d 国内标准入库：右下角新增按钮改为“+新增”，"带入"改为"确认" 2021-11-21 10:09:37 +08:00
zhaokaiyao@91isoft.com 4fc3e5ee4c 标准类别-标准号-标准年份顺序 2021-11-21 10:04:17 +08:00
zhaokaiyao@91isoft.com 69ae1edbeb Merge remote-tracking branch 'origin/develop' into develop 2021-11-19 17:53:00 +08:00
zhaokaiyao@91isoft.com 1f47637212 入库流程保存问题 2021-11-19 17:52:52 +08:00
宋伟佳 502546eaed commit 2021-11-19 16:28:20 +08:00