Commit Graph

457 Commits

Author SHA1 Message Date
d01758fe88 7.1 党建攻坚修改 2022-07-01 10:43:11 +08:00
1dcf4c84fc Merge branch 'release_20220629' into 'master'
【生产】6.29版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!153
2022-06-30 08:32:12 +08:00
a8476c1908 Merge branch '20220621-PartyMemberTopic' into 'release_20220629'
6.29 bug修改

See merge request eshop/fe_service_ebtp_frontend!152
2022-06-29 22:36:37 +08:00
98159093c0 6.29 bug修改 2022-06-29 22:36:03 +08:00
aaea609833 Merge branch '20220621-PartyMemberTopic' into 'release_20220629'
6.29 党员专题 党建攻坚

See merge request eshop/fe_service_ebtp_frontend!151
2022-06-29 21:31:10 +08:00
23a4551b29 6.29 活动风采详情 2022-06-29 16:22:40 +08:00
ce913ae0f5 6.29 活动联系人样式修改 2022-06-29 11:21:02 +08:00
918c790b06 6.28 党建攻坚第二版 2022-06-28 16:48:36 +08:00
39fc4276ec 6.27 修改 2022-06-27 15:22:15 +08:00
ab70c76464 Merge branch 'release_20220624' into 'master'
【生产】6.24版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!144
2022-06-27 09:14:54 +08:00
f17ebf9c5d 6.27 集成 2022-06-27 09:12:56 +08:00
66fbfb9269 6.26 首页接口联调 2022-06-26 10:42:10 +08:00
66d144fefe 6.24 修改weboffice针对ie11兼容问题 2022-06-24 23:26:55 +08:00
383322546b Merge branch '20220620-富文本编辑器去掉不必要的功能' into 'release_20220624'
6.24 富文本编辑器去掉不必要的功能

See merge request eshop/fe_service_ebtp_frontend!143
2022-06-24 21:28:44 +08:00
3c13a8a88e Merge branch '20220608-提示改成‘组织机构代码’' into 'release_20220624'
6.24 第二个图标记处括号中提示改成【供应商营业执照编号、组织机构代码、税务登记号】

See merge request eshop/fe_service_ebtp_frontend!142
2022-06-24 21:27:48 +08:00
7c535bc526 Merge branch '20220608-评审室应答文件查看,点击查看之后应答文件下载后命名乱码' into 'release_20220624'
6.24 评审室应答文件查看,点击查看之后应答文件下载后命名乱码

See merge request eshop/fe_service_ebtp_frontend!141
2022-06-24 21:26:33 +08:00
2b6da9833c Merge branch '20220608-供应商可以在确认报价前查看到其他人的分项报价' into 'release_20220624'
6.24 供应商可以在确认报价前查看到其他人的分项报价

See merge request eshop/fe_service_ebtp_frontend!140
2022-06-24 21:26:01 +08:00
f3e549c8d7 Merge branch '20220620-详审打分无最低分校验' into 'release_20220624'
6.24 详审打分无最低分校验

See merge request eshop/fe_service_ebtp_frontend!139
2022-06-24 21:25:14 +08:00
bc091f9543 Merge branch '20220609-详审打分可以设置负分但提示有误' into 'release_20220624'
6.24 详审打分可以设置负分但提示有误

See merge request eshop/fe_service_ebtp_frontend!138
2022-06-24 21:24:36 +08:00
bdf4f505be Merge branch '20220413-zjl-Chrome版本100导致WebOffice控件失效问题' into 'release_20220624'
6.24 Chrome版本100导致WebOffice控件失效问题

See merge request eshop/fe_service_ebtp_frontend!137
2022-06-24 21:24:02 +08:00
15499447aa Merge branch '20220505-物资市场闲置物资-内拍新增功能' into 'release_20220624'
6.24 物资市场闲置物资-内拍新增功能

See merge request eshop/fe_service_ebtp_frontend!136
2022-06-24 21:23:10 +08:00
9b4f35eaed Merge branch '20220601-bidSmartReview' into 'release_20220624'
6.24 投标文件智能审查

See merge request eshop/fe_service_ebtp_frontend!135
2022-06-24 21:21:25 +08:00
011adf28bc 四个页面搭建 2022-06-24 13:33:16 +08:00
5fcc7ecd27 6.23 修改 2022-06-23 16:19:08 +08:00
50b1821242 6.23 党员专题首页 2022-06-23 08:42:54 +08:00
1bea5b2fb1 Merge branch 'master' into master_jnryy_customerservice 2022-06-22 11:03:01 +08:00
f34feb7380 6.21 提示改成【供应商营业执照编号、组织机构代码、税务登记号】 2022-06-21 09:48:12 +08:00
069bfc52ca 6.20 去掉wangEditer富文本编辑器的表情,图片,视频,表格,代办功能 2022-06-20 16:22:50 +08:00
c20e33e20d 6.20 详审和比选多阶段初审有限数量制 增加打分最低分校验 2022-06-20 15:44:48 +08:00
9b3fabfbc9 6.20 前端put和delete请求类型修改为post 2022-06-20 14:35:50 +08:00
0f1c83df12 增加moment 2022-06-20 10:36:10 +08:00
39778aeae6 关闭弹窗调用接口 2022-06-20 10:34:39 +08:00
92a63809d0 Merge branch 'release_20220617' into 'master'
【生产】6.17版本同步到master

See merge request eshop/fe_service_ebtp_frontend!123
2022-06-20 09:00:44 +08:00
ca0e348bee Merge branch '20220517-门户-3.0修改-单点中转页与商机列表页修改' into 'release_20220617'
6.17 门户 3.0修改 单点中转页与商机列表页修改

See merge request eshop/fe_service_ebtp_frontend!122
2022-06-17 21:23:09 +08:00
9741ad9df9 Merge branch '20220505-公告公示附件大小和数量' into 'release_20220617'
6.17 公告公示附件大小和数量

See merge request eshop/fe_service_ebtp_frontend!121
2022-06-17 21:19:37 +08:00
eee1cf6d73 Merge branch '20220614-projname-width-optimize' into 'release_20220617'
6.17 项目监督列表、项目委托列表项目名称列宽优化

See merge request eshop/fe_service_ebtp_frontend!120
2022-06-17 21:17:24 +08:00
0a49a50967 Merge branch '20220616-询价修改新的外网平台地址' into 'release_20220617'
6.17 询价修改新的外网平台地址

See merge request eshop/fe_service_ebtp_frontend!119
2022-06-17 21:15:07 +08:00
2cace55608 Merge branch '20220609-生产有公共服务平台的提示' into 'release_20220617'
6.17 生产有公共服务平台的提示

See merge request eshop/fe_service_ebtp_frontend!118
2022-06-17 21:14:06 +08:00
d9606092cf 增加开关 2022-06-17 15:28:43 +08:00
aebd034175 Merge branch '20220601-bidSmartReview' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220601-bidSmartReview 2022-06-17 15:25:21 +08:00
042517e660 Merge branch '20220601-bidSmartReview' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220601-bidSmartReview 2022-06-17 15:24:26 +08:00
14e57a038b Merge branch '20220601-bidSmartReview' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220601-bidSmartReview 2022-06-17 15:23:21 +08:00
6922d4ad64 投标文件智能审查 2022-06-17 15:16:37 +08:00
7d2c7073db Merge branch 'master_jnryy_customerservice' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice 2022-06-17 14:50:38 +08:00
e2ff243cba 去掉警告 2022-06-17 14:50:32 +08:00
93b5f8ab69 Merge branch 'master_jnryy_customerservice' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice 2022-06-17 12:21:14 +08:00
7e0639b1b8 Merge branch '20220616-询价修改新的外网平台地址' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice 2022-06-17 12:21:07 +08:00
dfb22c2a06 6.17 询价修改 2022-06-17 12:12:09 +08:00
c7723de638 6.16 回退 2022-06-16 17:26:51 +08:00
88ba3ccd6a setShow不放到onOpen 2022-06-16 16:01:12 +08:00