Commit Graph
100 Commits
Author SHA1 Message Date
super_liu 5d2ce8d44b Merge branch 'develop' into FOTON
# Conflicts:
#	src/sysConfig/index.js
2022-03-27 21:06:19 +08:00
super_liu 9ffe0e2288 feat: There is no way the, BUG #52124 2022-03-27 17:28:47 +08:00
super_liu 6dc3a6a524 feat: There is no way the, BUG #52158 2022-03-27 15:57:11 +08:00
super_liu fabd3f3699 feat: There is no way the, BUG #52169 2022-03-27 15:34:15 +08:00
super_liu 3c54eada74 feat: There is no way the, BUG #52099 2022-03-27 13:11:47 +08:00
super_liu 8eb9652d17 feat: There is no way the, BUG #52130 2022-03-27 12:07:15 +08:00
super_liu 5e44f3385a feat: There is no way the, 2022-03-27 09:47:45 +08:00
super_liu 102ef6362e feat: There is no way the, BUG #52104 2022-03-26 22:04:46 +08:00
super_liu a732d9fe1a feat: There is no way the, BUG #52123 2022-03-26 21:16:37 +08:00
super_liu 7c0d1e5cc7 feat: There is no way the, BUG #52095 2022-03-26 20:56:07 +08:00
super_liu 9b0ed72466 feat: There is no way the, BUG #52136 2022-03-26 19:24:33 +08:00
super_liu 0ca8bb3f52 Merge remote-tracking branch 'origin/develop' into develop 2022-03-26 18:24:36 +08:00
super_liu 613f905faa feat: There is no way the, BUG #52162 企标技术标准 多选参数不渲染问题 2022-03-26 18:24:20 +08:00
super_liu c1a3c9e854 Merge remote-tracking branch 'origin/develop' into develop 2022-03-26 17:37:44 +08:00
super_liu f5f97265db feat: There is no way the, BUG #52162 2022-03-26 17:37:17 +08:00
super_liu 87e2f0dabe feat: There is no way the, 企标编写 上传文件限制一个 2022-03-26 13:41:43 +08:00
super_liu d9d9842474 feat: There is no way the, 企标 技术 产品 手动查找 标准 文本状态字段更新 2022-03-26 11:56:54 +08:00
super_liu 3b54a67b0c feat: There is no way the, 2022-03-26 11:22:45 +08:00
super_liu 3d6614704b feat: There is no way the, BUG #52085 2022-03-26 10:47:53 +08:00
super_liu dc8ebeb631 feat: There is no way the, 2022-03-26 10:27:08 +08:00
super_liu 053db70727 feat: There is no way the, BUG #52084 2022-03-26 10:24:28 +08:00
super_liu 9dcb47eff4 feat: There is no way the, BUG #52083 2022-03-25 20:52:06 +08:00
super_liu f2f620134e feat: There is no way the, BUG #52083 2022-03-25 20:45:25 +08:00
super_liu 6b356b8a80 Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 20:37:15 +08:00
super_liu b79ac60bb7 feat: There is no way the, 跳转选人组件不可再次删除问题 2022-03-25 20:37:00 +08:00
super_liu d1a65a1c2c Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 17:55:17 +08:00
super_liu 46e5faaef6 feat: There is no way the, BUG #52087 2022-03-25 17:55:04 +08:00
super_liu 9f787d0ac9 feat: There is no way the, 选人组件 去掉未选中 确认按钮不可选 2022-03-25 17:27:42 +08:00
super_liu 6bd78eb5a8 feat: There is no way the, BUG #52173 2022-03-25 17:23:27 +08:00
super_liu 7248a58829 Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 16:29:40 +08:00
super_liu 3194cae951 feat: There is no way the, BUG #52093 2022-03-25 16:29:24 +08:00
super_liu 0692521ffd feat: There is no way the, 企标 产品流程详情 标题 改为 最后一节点 发布 2022-03-25 16:04:53 +08:00
super_liu 73a15b6196 Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 15:57:28 +08:00
super_liu 244e050edf feat: There is no way the, 企标制修订-技术标准 模块 选择 分为 卡车和 乘用车俩个 2022-03-25 15:57:06 +08:00
super_liu 46e40ac7a5 Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 14:28:15 +08:00
super_liu 53efc701d4 feat: There is no way the, 模块结构单元分乘用车和卡车 企标库 2022-03-25 14:28:01 +08:00
super_liu 45bcf79c7d feat: There is no way the, BUG #51988 2022-03-25 13:46:04 +08:00
super_liu 5896f0e35b feat: There is no way the, 企标被代替标准 点击跳详情 2022-03-25 13:39:51 +08:00
super_liu 6dd29135df Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 10:56:40 +08:00
super_liu 493abe361a feat: There is no way the, BUG #51951 2022-03-25 10:56:33 +08:00
super_liu 95a9ad61c7 Merge branch 'develop' into FOTON 2022-03-24 23:01:40 +08:00
super_liu 9f1e1f5ef9 Merge remote-tracking branch 'origin/develop' into develop 2022-03-24 22:59:57 +08:00
super_liu 48bf100f37 feat: There is no way the, BUG #51946 #51957 2022-03-24 22:59:48 +08:00
super_liu 1eb826e943 Merge remote-tracking branch 'origin/develop' into develop 2022-03-24 14:52:27 +08:00
super_liu 0e35352af2 feat: There is no way the, bug #51861 2022-03-24 14:52:11 +08:00
super_liu ddcb5bab64 feat: There is no way the, bug #51988 #51984 #51982 2022-03-24 14:23:49 +08:00
super_liu 8cca416f22 feat: There is no way the, 2022-03-24 14:22:16 +08:00
super_liu 96f261e342 Merge remote-tracking branch 'origin/develop' into develop 2022-03-24 13:57:13 +08:00
super_liu 9aed78a2fc feat: There is no way the, 2022-03-24 13:56:52 +08:00
super_liu 9aaab9eb3c feat: There is no way the, 删除高级检索重复字段 2022-03-23 17:37:43 +08:00
super_liu 70e6fee262 Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 17:32:23 +08:00
super_liu d1c07b5727 feat: There is no way the, bug #51959 2022-03-23 17:32:08 +08:00
super_liu 45d09e4310 Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 15:31:49 +08:00
super_liu b348e2d816 feat: There is no way the, bug #51980 2022-03-23 15:31:35 +08:00
super_liu f432c901f2 feat: There is no way the, bug #51948 2022-03-23 13:55:24 +08:00
super_liu fa818a1d83 feat: There is no way the, bug #51989 2022-03-23 13:36:57 +08:00
super_liu 0f85d24b91 feat: There is no way the, ellipsis50 2022-03-23 13:25:31 +08:00
super_liu 20b381865b Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 13:09:30 +08:00
super_liu 5d71ff4747 feat: There is no way the, bug #51961 2022-03-23 12:52:03 +08:00
super_liu c5a888aa6f feat: There is no way the, 样式优化 2022-03-23 12:49:17 +08:00
super_liu 32e77d8282 feat: There is no way the, #51956 2022-03-22 17:28:21 +08:00
super_liu b3a335b56e feat: There is no way the, #51949 2022-03-22 17:11:04 +08:00
super_liu 19ee81d648 feat: There is no way the, #51975 2022-03-22 16:45:34 +08:00
super_liu b021e79c14 Merge remote-tracking branch 'origin/develop' into develop 2022-03-22 16:27:57 +08:00
super_liu 3d038c8289 feat: There is no way the, 技术待办 草稿 批准 跳转 修改 2022-03-22 16:27:44 +08:00
super_liu db2441b65c feat: There is no way the, 技术待办跳转 2022-03-22 16:25:18 +08:00
super_liu 75cddc2fc6 Merge remote-tracking branch 'origin/develop' into develop 2022-03-22 15:25:28 +08:00
super_liu b44cdd5dcb feat: There is no way the, 技术标准 最终节点 评分计算 加 数值默认转换 2022-03-22 15:25:12 +08:00
super_liu 674812e8cd Merge remote-tracking branch 'origin/develop' into develop 2022-03-22 11:00:32 +08:00
super_liu fc658fb3bf feat: There is no way the, 2022-03-22 11:00:19 +08:00
super_liu 8b986683b6 feat: There is no way the, 2022-03-22 10:55:13 +08:00
super_liu d096510113 Merge branch 'develop' into FOTON 2022-03-21 15:16:29 +08:00
super_liu 6323c7fe02 Merge branch 'develop' into FOTON 2022-03-18 19:42:34 +08:00
super_liu 2cebd91ec1 Merge remote-tracking branch 'origin/develop' into develop 2022-03-18 19:39:50 +08:00
super_liu 007d509448 feat: There is no way the, 政策我的收藏不可删除 2022-03-18 19:39:44 +08:00
super_liu 93e94f2f39 Merge branch 'develop' into FOTON
# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
2022-03-17 20:08:03 +08:00
super_liu 139127a22f Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 20:00:07 +08:00
super_liu 3315b54e10 feat: There is no way the, 2022-03-17 19:58:54 +08:00
super_liu dd47344dce Merge remote-tracking branch 'origin/develop' into develop 2022-03-17 16:37:46 +08:00
super_liu a095fb6091 feat: There is no way the, 2022-03-17 16:37:32 +08:00
super_liu 57c5943313 Merge branch 'develop' into FOTON 2022-03-08 20:12:55 +08:00
super_liu a7d19ead3b Merge remote-tracking branch 'origin/develop' into develop 2022-03-08 16:57:10 +08:00
super_liu 97d1941e3f feat: There is no way the, 企标详情 pdf 下载水印 2022-03-08 16:56:51 +08:00
super_liu 7ac4976e53 Merge branch 'develop' into FOTON 2022-03-07 19:58:27 +08:00
super_liu 35b7e06c7b Merge remote-tracking branch 'origin/develop' into develop 2022-03-07 14:51:13 +08:00
super_liu f5b48aa1ac feat: There is no way the, 暂时注释掉催办 2022-03-07 14:50:58 +08:00
super_liu 7899f2c91e Merge remote-tracking branch 'origin/develop' into develop 2022-03-07 11:25:46 +08:00
super_liu 9d306b013e feat: There is no way the, 起草人选择状态,只可以现行有效和废止 2022-03-07 11:25:27 +08:00
super_liu da85c742d1 Merge remote-tracking branch 'origin/develop' into develop 2022-03-07 10:47:54 +08:00
super_liu e70e6cedec feat: There is no way the, 废止 节点更新 2022-03-07 10:47:38 +08:00
super_liu 6754eb1192 Merge branch 'develop' into FOTON 2022-03-06 17:09:56 +08:00
super_liu de9136e899 Merge remote-tracking branch 'origin/develop' into develop 2022-03-04 17:15:06 +08:00
super_liu a0761b85cf feat: There is no way the, 技术 产品 优化 2022-03-04 17:14:55 +08:00
super_liu 1eb700cba9 feat: There is no way the, 当年制定、当年修定才加X (代替企标编号 必填) 2022-03-04 10:54:42 +08:00
super_liu e81322ddcc feat: There is no way the, 高级经理节点 其他问题驳回 修改俩个节点评分回显接口参数 2022-03-04 09:37:06 +08:00
super_liu dc925ae245 feat: There is no way the, 2022-03-04 09:26:59 +08:00
super_liu d8ff28d31a Merge remote-tracking branch 'origin/develop' into develop 2022-03-04 09:00:34 +08:00
super_liu 7104baa445 feat: There is no way the, 2022-03-04 08:59:30 +08:00
super_liu dcb537992b Merge branch 'develop' into FOTON 2022-03-03 16:51:13 +08:00
super_liu 2216a7155d feat: There is no way the, 2022-03-03 16:47:06 +08:00