Commit Graph
100 Commits
Author SHA1 Message Date
王夏晖 05a9c584f3 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!334
2022-03-04 15:57:12 +08:00
王夏晖 077e0ddb72 Merge branch 'develop' into 'FOTON'
立项计划导入

See merge request LAWS/laws-system-front-FOTON!333
2022-03-02 09:02:10 +08:00
王夏晖 af9aa58664 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!332
2022-03-01 17:34:15 +08:00
王夏晖 826088c0ab Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!331
2022-03-01 15:25:47 +08:00
王夏晖 ba7f325f95 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!330
2022-03-01 14:05:43 +08:00
王夏晖 5a91403536 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!329
2022-02-28 09:01:38 +08:00
王夏晖 68bf8ffe70 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!328
2022-02-24 08:52:52 +08:00
王夏晖 41ca5359b9 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!327
2022-02-23 16:14:19 +08:00
王夏晖 ee3c00c4a5 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!326
2022-02-22 17:01:35 +08:00
王夏晖 661aa2ca38 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!325
2022-02-22 15:18:57 +08:00
王夏晖 d728a53f87 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!324
2022-02-22 13:26:00 +08:00
王夏晖 247f82b786 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!323
2022-02-21 17:57:07 +08:00
王夏晖 5739cd3974 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!322
2022-02-21 17:10:29 +08:00
王夏晖 b16a7deaf1 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!321
2022-02-21 16:18:23 +08:00
王夏晖 dc41342c12 Merge branch 'develop' into 'FOTON'
项目评估流程开发

See merge request LAWS/laws-system-front-FOTON!320
2022-02-21 09:58:22 +08:00
王夏晖 cd881ab58b Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!319
2022-02-21 09:01:23 +08:00
王夏晖 b13d1b220e Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!318
2022-02-17 09:50:39 +08:00
王夏晖 5ad11cceca Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!317
2022-02-16 10:03:11 +08:00
王夏晖 119744a167 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!316
2022-02-16 09:00:26 +08:00
王夏晖 3e8a9b16cf Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!315
2022-02-14 10:22:38 +08:00
王夏晖 e3a3002080 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!314
2022-02-14 09:30:12 +08:00
王夏晖 424aa2daf6 Merge branch 'develop' into 'FOTON'
标准评估流程修改bug

See merge request LAWS/laws-system-front-FOTON!313
2022-02-10 16:38:18 +08:00
王夏晖 2790c9a8e3 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!312
2022-02-10 14:50:54 +08:00
王夏晖 f4f16e94be Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!311
2022-02-08 15:42:29 +08:00
王夏晖 edb6c49472 Merge branch 'develop' into 'FOTON'
标准评估流程修改bug

See merge request LAWS/laws-system-front-FOTON!310
2022-02-08 10:57:26 +08:00
王夏晖 5831788055 Merge branch 'develop' into 'FOTON'
标准评估流程

See merge request LAWS/laws-system-front-FOTON!309
2022-02-08 10:55:22 +08:00
王夏晖 ad7680d526 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!308
2022-01-28 13:09:02 +08:00
王夏晖 6aa505a1af Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!307
2022-01-27 13:39:51 +08:00
王夏晖 34da378fdb Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!306
2022-01-26 18:32:46 +08:00
王夏晖 c661d533b5 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!305
2022-01-26 14:55:42 +08:00
王夏晖 40cf2ebe41 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!304
2022-01-25 14:13:44 +08:00
王夏晖 be1e4846c3 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!303
2022-01-24 16:58:35 +08:00
王夏晖 f3ee8930ee Merge branch 'develop' into 'FOTON'
机构管理页面分页,入库时间格式问题

See merge request LAWS/laws-system-front-FOTON!302
2022-01-24 15:54:23 +08:00
王夏晖 fe9effa90f Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!301
2022-01-24 15:18:58 +08:00
王夏晖 603e6808dc Merge branch 'develop' into 'FOTON'
标准评估流程

See merge request LAWS/laws-system-front-FOTON!300
2022-01-23 17:59:32 +08:00
王夏晖 d24d66c58d Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!299
2022-01-19 15:26:57 +08:00
王夏晖 967e4b07a1 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!298
2022-01-18 20:57:30 +08:00
王夏晖 aad6148957 Merge branch 'develop' into 'FOTON'
commit

See merge request LAWS/laws-system-front-FOTON!297
2022-01-18 00:22:37 +08:00
王夏晖 bae9704de7 Merge branch 'develop' into 'FOTON'
入库发起

See merge request LAWS/laws-system-front-FOTON!296
2022-01-14 15:14:47 +08:00
王夏晖 e6672e0521 Merge branch 'develop' into 'FOTON'
feat: There is no way the,

See merge request LAWS/laws-system-front-FOTON!295
2022-01-14 14:16:08 +08:00
王夏晖 b776a37f21 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!294
2022-01-13 16:05:06 +08:00
王夏晖 b5f3bff404 Merge branch 'develop' into 'FOTON'
海外入库添加标准体系; 海外库添加标准体系

See merge request LAWS/laws-system-front-FOTON!293
2022-01-12 14:03:39 +08:00
王夏晖 a8549e1289 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!292
2022-01-11 15:40:10 +08:00
王夏晖 ccaa1ae470 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!291
2022-01-11 13:39:45 +08:00
王夏晖 ff2f1b4332 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!290
2022-01-10 15:42:00 +08:00
王夏晖 3cfe57c7b7 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!288
2022-01-07 17:02:04 +08:00
王夏晖 ca4e6ad5cf Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!287
2022-01-07 15:51:58 +08:00
王夏晖 2d35a57539 Merge branch 'develop' into 'FOTON'
去掉产品类型

See merge request LAWS/laws-system-front-FOTON!286
2022-01-07 11:30:06 +08:00
王夏晖 c5497cbb15 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!285
2022-01-07 10:53:47 +08:00
王夏晖 439960ea02 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!284
2022-01-07 09:48:38 +08:00
王夏晖 f8e128c6c5 Merge branch 'develop' into 'FOTON'
去掉消耗时间排序

See merge request LAWS/laws-system-front-FOTON!283
2022-01-07 09:38:30 +08:00
王夏晖 0548db1d0a Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!282
2022-01-06 16:06:30 +08:00
王夏晖 b4a5d9444c Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!281
2022-01-06 15:53:07 +08:00
王夏晖 61a5390585 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!280
2022-01-06 15:33:41 +08:00
王夏晖 e41649f131 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!279
2022-01-06 13:30:18 +08:00
王夏晖 3a00fcf382 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!278
2022-01-04 13:55:54 +08:00
王夏晖 cabdc99af0 Merge branch 'develop' into 'FOTON'
commit

See merge request LAWS/laws-system-front-FOTON!277
2021-12-31 16:13:04 +08:00
王夏晖 8c1ff8cb79 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!276
2021-12-31 15:59:59 +08:00
王夏晖 5f5e128794 Merge branch 'develop' into 'FOTON'
commit

See merge request LAWS/laws-system-front-FOTON!275
2021-12-31 14:35:30 +08:00
王夏晖 e6f94b91f9 Merge branch 'develop' into 'FOTON'
commit

See merge request LAWS/laws-system-front-FOTON!274
2021-12-31 11:12:35 +08:00
王夏晖 f4f0c6151e Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!273
2021-12-31 11:08:14 +08:00
王夏晖 acd4fb92e8 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!272
2021-12-31 10:30:19 +08:00
王夏晖 440d51b389 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!271
2021-12-30 20:24:50 +08:00
王夏晖 2cefaf7c42 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!270
2021-12-30 18:10:51 +08:00
王夏晖 7903146ada Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!269
2021-12-30 17:49:44 +08:00
王夏晖 83bb2d7783 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!268
2021-12-30 16:31:26 +08:00
王夏晖 57cb83e221 Merge branch 'develop' into 'FOTON'
feat: There is no way the,

See merge request LAWS/laws-system-front-FOTON!267
2021-12-30 15:53:39 +08:00
王夏晖 bdc2b350ca Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!266
2021-12-30 14:36:58 +08:00
王夏晖 1e4f0d38b0 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!265
2021-12-29 19:19:06 +08:00
王夏晖 b716c14f34 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!264
2021-12-29 15:35:12 +08:00
王夏晖 244699f4e3 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!263
2021-12-29 14:54:31 +08:00
王夏晖 c7dd27cdfb Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!262
2021-12-28 19:53:20 +08:00
王夏晖 962ed5f19e Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!261
2021-12-28 16:46:07 +08:00
王夏晖 4f574624a9 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!260
2021-12-28 16:30:22 +08:00
王夏晖 cb28bb8199 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!259
2021-12-28 16:06:44 +08:00
王夏晖 e162e069e3 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!258
2021-12-28 14:35:57 +08:00
王夏晖 e179416f2d Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!257
2021-12-27 18:54:18 +08:00
王夏晖 0f6eff3c74 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!256
2021-12-27 17:02:10 +08:00
王夏晖 d258973956 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!255
2021-12-27 16:32:02 +08:00
王夏晖 2dc3fb5970 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!254
2021-12-27 10:23:49 +08:00
王夏晖 2cac11d178 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!253
2021-12-27 09:03:33 +08:00
王夏晖 4582e7e3ed Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!252
2021-12-25 11:37:30 +08:00
王夏晖 6c8d0fce23 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!251
2021-12-25 11:04:44 +08:00
王夏晖 0a1dd26a4b Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!250
2021-12-25 09:31:12 +08:00
王夏晖 ca5fb65779 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!249
2021-12-24 10:55:21 +08:00
王夏晖 8d4cef7b4e Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!248
2021-12-24 10:28:56 +08:00
王夏晖 372cecc98a Merge branch 'develop' into 'FOTON'
按钮调整

See merge request LAWS/laws-system-front-FOTON!247
2021-12-23 14:55:45 +08:00
王夏晖 45511fa8a0 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!246
2021-12-23 14:38:09 +08:00
王夏晖 03cb648805 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!245
2021-12-23 10:20:25 +08:00
王夏晖 3823a1f2b7 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!244
2021-12-23 10:09:48 +08:00
王夏晖 8151b4dc93 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!243
2021-12-22 19:44:04 +08:00
王夏晖 785c918e8f Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!242
2021-12-22 14:11:34 +08:00
王夏晖 54bfe05e76 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!241
2021-12-22 11:00:16 +08:00
wangxiahui@91isoft.com ad001cbf72 流程权限更改 2021-12-22 10:59:49 +08:00
王夏晖 728ccb17e8 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!240
2021-12-21 21:55:42 +08:00
王夏晖 3cf647a714 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!239
2021-12-21 20:08:31 +08:00
wangxiahui@91isoft.com b89c419c43 截止时间 2021-12-21 17:11:17 +08:00
王夏晖 82043e01d4 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!238
2021-12-21 14:00:12 +08:00
王夏晖 12a36e7931 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!237
2021-12-17 14:05:27 +08:00
wangxiahui@91isoft.com 1218e89e57 参会流程第二步修改流程节点名称 2021-12-17 11:26:05 +08:00