Commit Graph

Select branches

Hide Pull Requests

clay

dj

dm

gary

hzlt

master

prod

role

uesr

xqhz

zhangkaihuai-patch-1

#1

#10

#100

#1000

#1001

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#101

#1010

#1011

#1012

#1013

#1014

#1015

#1016

#1017

#1018

#1019

#102

#1020

#1021

#1022

#1023

#1024

#1025

#1026

#1027

#1028

#1029

#103

#1030

#1031

#1032

#1033

#1034

#1035

#1036

#1037

#1038

#1039

#104

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1048

#1049

#105

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#106

#1060

#1061

#1062

#1063

#1064

#1065

#1066

#1067

#1068

#1069

#107

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#108

#1080

#1081

#1082

#1083

#1084

#1085

#1086

#1087

#1088

#1089

#109

#1090

#1091

#1092

#1093

#1094

#1095

#1096

#1097

#1098

#1099

#11

#110

#1100

#1101

#1102

#1103

#1104

#1105

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#56

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#57

#570

#571

#572

#573

#574

#575

#576

#577

#578

#579

#58

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#59

#590

#591

#592

#593

#594

#595

#596

#597

#598

#599

#6

#60

#600

#601

#602

#603

#604

#605

#606

#607

#608

#609

#61

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#62

#620

#621

#622

#623

#624

#625

#626

#627

#628

#629

#63

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#64

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#65

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#66

#660

#661

#662

#663

#664

#665

#666

#667

#668

#669

#67

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#68

#680

#681

#682

#683

#684

#685

#686

#687

#688

#689

#69

#690

#691

#692

#693

#694

#695

#696

#697

#698

#699

#7

#70

#700

#701

#702

#703

#704

#705

#706

#707

#708

#709

#71

#710

#711

#712

#713

#714

#715

#716

#717

#718

#719

#72

#720

#721

#722

#723

#724

#725

#726

#727

#728

#729

#73

#730

#731

#732

#733

#734

#735

#736

#737

#738

#739

#74

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#75

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#76

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#77

#770

#771

#772

#773

#774

#775

#776

#777

#778

#779

#78

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#79

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#8

#80

#800

#801

#802

#803

#804

#805

#806

#807

#808

#809

#81

#810

#811

#812

#813

#814

#815

#816

#817

#818

#819

#82

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#83

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#84

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#85

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#86

#860

#861

#862

#863

#864

#865

#866

#867

#868

#869

#87

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#88

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#89

#890

#891

#892

#893

#894

#895

#896

#897

#898

#899

#9

#90

#900

#901

#902

#903

#904

#905

#906

#907

#908

#909

#91

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#930

#931

#932

#933

#934

#935

#936

#937

#938

#939

#94

#940

#941

#942

#943

#944

#945

#946

#947

#948

#949

#95

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#96

#960

#961

#962

#963

#964

#965

#966

#967

#968

#969

#97

#970

#971

#972

#973

#974

#975

#976

#977

#978

#979

#98

#980

#981

#982

#983

#984

#985

#986

#987

#988

#989

#99

#990

#991

#992

#993

#994

#995

#996

#997

#998

#999

Mono Color

• e44380c000 Merge pull request 'refactor(expense-management): 优化数字输入和附件处理' (#1020) from master into prod odjbin 2025-06-07 01:30:52 +00:00
• 70d94f3c1d refactor(expense-management): 优化数字输入和附件处理 dj 2025-06-06 22:58:48 +08:00
• 14c6ed1168 Merge pull request 'fix : 修复归档附件bug' (#1019) from master into prod odjbin 2025-05-28 15:53:32 +00:00
• 05275aed15 fix : 修复归档附件bug dj 2025-05-28 23:53:10 +08:00
• 47d5863361 Merge pull request 'fix : 修复归档附件bug' (#1018) from master into prod odjbin 2025-05-28 15:51:11 +00:00
• 9758981d3f fix : 修复归档附件bug dj 2025-05-28 23:50:59 +08:00
• a946247849 Merge pull request 'master' (#1017) from master into prod odjbin 2025-05-28 15:03:54 +00:00
• 7c2d713035 fix(components): 优化多个组件的显示逻辑 dj 2025-05-28 23:01:16 +08:00
• f4330b60d5 refactor(ProjectApply): 优化归档附件上传逻辑 dj 2025-05-28 16:50:55 +08:00
• 1a38381ab8 Merge pull request 'refactor(components): 调整文件上传大小限制并优化附件展示逻辑' (#1016) from master into prod odjbin 2025-05-23 01:08:02 +00:00
• f61d50dbfc refactor(components): 调整文件上传大小限制并优化附件展示逻辑 dj 2025-05-23 09:07:02 +08:00
• f5b9339b36 Merge pull request 'fix(ProjectAttachment): 重新获取附件列表' (#1015) from master into prod odjbin 2025-05-22 15:09:20 +00:00
• 66dc6df0d9 fix(ProjectAttachment): 重新获取附件列表 dj 2025-05-22 23:08:27 +08:00
• a3c7439a7f Merge pull request 'fix(ProjectAttachment): 修复删除附件后未及时更新文件列表的问题- 在删除文件后添加了更新文件列表的逻辑' (#1014) from master into prod odjbin 2025-05-22 14:57:02 +00:00
• c7329f2f6d fix(ProjectAttachment): 修复删除附件后未及时更新文件列表的问题- 在删除文件后添加了更新文件列表的逻辑 - 优化了获取本地文件列表的方法 - 调整了文件列表的初始化位置 dj 2025-05-22 22:56:06 +08:00
• 59699b6118 Merge pull request 'feat(ProjectAttachment): 优化文件上传和管理功能' (#1013) from master into prod odjbin 2025-05-22 08:46:46 +00:00
• 673e4fa20a feat(ProjectAttachment): 优化文件上传和管理功能 dj 2025-05-22 16:45:58 +08:00
• eb2a5581ca Merge pull request 'refactor(project-demand): 优化方案总结提交逻辑' (#1012) from master into prod odjbin 2025-05-22 02:09:05 +00:00
• ee5fc2cba3 refactor(project-demand): 优化方案总结提交逻辑 dj 2025-05-22 10:06:44 +08:00
• 952884a7fe Merge pull request 'fix(project-demand): 修复专项经费选择框逻辑' (#1011) from master into prod odjbin 2025-05-21 15:17:49 +00:00
• b7ca97696a fix(project-demand): 修复专项经费选择框逻辑 dj 2025-05-21 23:14:00 +08:00
• 6ba9fa4bee Merge pull request 'master' (#1010) from master into prod odjbin 2025-05-21 14:39:55 +00:00
• baea68c52a Merge remote-tracking branch 'origin/master' dj 2025-05-21 22:39:08 +08:00
• a2ed04e144 refactor(project-demand): 优化加载状态管理 dj 2025-05-21 22:38:53 +08:00
• 8a218ad270 Merge pull request 'feat(project-demand): 编辑概览页面数据持久化' (#1009) from master into prod odjbin 2025-05-21 06:31:54 +00:00
• 287d6a3ad0 feat(project-demand): 编辑概览页面数据持久化 dj 2025-05-21 14:31:38 +08:00
• 9813f8c585 Merge pull request 'fix(project-demand): 修复专项基金选择问题' (#1008) from master into prod odjbin 2025-05-21 04:55:59 +00:00
• 673a26368a fix(project-demand): 修复专项基金选择问题 dj 2025-05-21 12:55:23 +08:00
• 9b90dbc649 Merge pull request 'feat(ProjectApply): 科技处用户申请项目时增加部门分管领导必选项' (#1007) from master into prod odjbin 2025-05-19 14:13:55 +00:00
• 9adea1060c feat(ProjectApply): 科技处用户申请项目时增加部门分管领导必选项 dj 2025-05-19 22:13:03 +08:00
• 4f471494cc Merge pull request 'refactor(permission): 优化面包屑控制逻辑' (#1006) from master into prod odjbin 2025-05-16 10:15:13 +00:00
• 4e5a4bb4b9 refactor(permission): 优化面包屑控制逻辑 dj 2025-05-16 18:14:31 +08:00
• b4d6d97e27 Merge pull request 'fix : 修复需求上报缓存问题' (#1005) from master into prod odjbin 2025-05-15 08:06:29 +00:00
• a5ebab16a6 fix : 修复需求上报缓存问题 dj 2025-05-15 16:06:04 +08:00
• 6ad76d1571 Merge pull request 'master' (#1004) from master into prod odjbin 2025-05-05 12:15:31 +00:00
• 0cc1b63ae7 feat(project-management): 优化前置流程选择功能 dj 2025-05-05 20:15:13 +08:00
• d76ef8ff9c feat(project-demand): 更新项目需求汇总功能 dj 2025-05-05 17:53:55 +08:00
• f105485714 feat(project-demand): 添加项目名称远程搜索功能并优化前置流程显示逻辑 dj 2025-05-05 14:48:07 +08:00
• df99acd638 Merge pull request 'fix : 修复公告问题' (#1003) from master into prod odjbin 2025-04-29 03:29:31 +00:00
• af275ea6c4 fix : 修复公告问题 dj 2025-04-29 11:29:06 +08:00
• 68830daab3 Merge pull request 'master' (#1002) from master into prod odjbin 2025-04-27 06:29:31 +00:00
• c27162f918 feat : 项目归档-实施附件 dj 2025-04-27 14:28:59 +08:00
• f1b81d86a2 fix : 备份附件 dj 2025-04-27 11:00:38 +08:00
• 0c24d2cf51 Merge pull request 'fix : 修复单位元' (#1001) from master into prod odjbin 2025-04-24 13:48:41 +00:00
• 710ccbdf65 fix : 修复单位元 dj 2025-04-24 21:48:23 +08:00
• 7001261f01 Merge pull request 'refactor(project-management): 统一经费预算单位' (#1000) from master into prod odjbin 2025-04-24 07:30:38 +00:00
• 7fcfc992fb refactor(project-management): 统一经费预算单位 dj 2025-04-24 15:30:14 +08:00
• b7be0a34ae Merge pull request 'feat(components): 增加审核意见必填校验' (#999) from master into prod odjbin 2025-04-23 14:47:41 +00:00
• a792df80e6 feat(components): 增加审核意见必填校验 dj 2025-04-23 22:46:58 +08:00
• b56e5b3544 Merge pull request 'fix : 标签不可编辑' (#998) from master into prod odjbin 2025-04-20 12:32:35 +00:00
• 5dccaa1ee7 fix : 标签不可编辑 dj 2025-04-20 20:32:16 +08:00
• 6aa074bfa3 Merge pull request 'feat : 项目验收新增字段' (#997) from master into prod odjbin 2025-04-20 11:50:58 +00:00
• 8aefca0c82 feat : 项目验收新增字段 dj 2025-04-20 19:49:57 +08:00
• e518791ddd Merge pull request 'master' (#996) from master into prod odjbin 2025-04-20 06:44:18 +00:00
• afda146103 feat : 项目归档-附件新增项目阶段字段 dj 2025-04-20 14:43:57 +08:00
• 11f7fa37aa feat : 年度计划新字段 dj 2025-04-20 13:01:43 +08:00
• 35c2e1d9b4 feat : 需求上报新增字段 dj 2025-04-20 12:46:14 +08:00
• fe3a15fcbd fix: 调整详情页面知识产权输出项 dj 2025-04-19 21:03:54 +08:00
• 9fd97f6ea2 feat :需求上报新增字段 dj 2025-04-19 20:13:11 +08:00
• cccd14ec79 fix: 移除预期成果形式相关代码 dj 2025-04-19 19:03:10 +08:00
• 2ed2cae599 Merge pull request 'fix : 注释立项提交的前置流程' (#995) from master into prod odjbin 2025-04-19 05:43:49 +00:00
• 958399a32a fix : 注释立项提交的前置流程 dj 2025-04-19 13:43:36 +08:00
• 745971087c Merge pull request 'fix : 完善需求上报字段页面' (#994) from master into prod odjbin 2025-04-19 02:58:46 +00:00
• 8ea916c206 fix : 完善需求上报字段页面 dj 2025-04-19 10:58:28 +08:00
• e0aefecf50 Merge pull request 'fix: 修复审批白名单中取消事件' (#993) from master into prod odjbin 2025-04-18 14:52:27 +00:00
• 10e9c9de19 fix: 修复审批白名单中取消事件 dj 2025-04-18 22:51:49 +08:00
• 950b32270b Merge pull request 'master' (#992) from master into prod odjbin 2025-04-18 14:40:16 +00:00
• b032903ed4 fix(project): 调整知识产权相关表述和附件表格样式 - 将"知识产权状况"修改为"知识产权归属" - 优化附件上传和展示组件的样式- 统一知识产权归属相关的标签和提示信息 - 调整部分组件的显示逻辑和样式 dj 2025-04-18 22:37:22 +08:00
• 696921243e fix : 首页字体颜色统一 dj 2025-04-18 18:13:03 +08:00
• 7200592f05 fix : 首页字体颜色统一 dj 2025-04-18 14:04:44 +08:00
• 963b7b93e3 Merge remote-tracking branch 'origin/master' dj 2025-04-18 11:22:24 +08:00
• 86751acbd6 fix : 首页字体颜色统一 dj 2025-04-18 11:22:00 +08:00
• c17149235f Merge pull request 'fix: 编辑上报时主项目选项过滤当前项目' (#991) from master into prod odjbin 2025-04-15 16:00:21 +00:00
• fda0f4fcde fix: 编辑上报时主项目选项过滤当前项目 dj 2025-04-15 23:56:05 +08:00
• 560485f255 Merge pull request 'style(article-management): 优化附件列表样式' (#990) from master into prod odjbin 2025-04-15 15:31:31 +00:00
• 2847c88c61 style(article-management): 优化附件列表样式 dj 2025-04-15 23:29:30 +08:00
• 5611fd9f02 Merge pull request 'feat: 费用导入功能' (#989) from master into prod odjbin 2025-04-15 15:14:57 +00:00
• 2827c5ace6 feat: 费用导入功能 dj 2025-04-15 23:14:46 +08:00
• 750a4c8178 Merge pull request 'fix: 注释公告附件列表相关代码' (#988) from master into prod odjbin 2025-04-15 14:34:01 +00:00
• 9941fc14f6 fix: 注释公告附件列表相关代码 dj 2025-04-15 22:33:38 +08:00
• 8b94f044db Merge pull request 'feat: 抄送成功后刷新功能' (#987) from master into prod odjbin 2025-04-15 03:15:54 +00:00
• c71208c3e4 feat: 抄送成功后刷新功能 dj 2025-04-15 11:15:15 +08:00
• b2fb3fbb67 Merge pull request 'feat: 项目详情审批流程加立即抄送按钮' (#986) from master into prod odjbin 2025-04-15 02:41:27 +00:00
• 7e6b48b62a feat: 项目详情审批流程加立即抄送按钮 dj 2025-04-15 10:40:52 +08:00
• 4aa0b093bb Merge pull request 'fix: 修复附件上传和展示问题' (#985) from master into prod odjbin 2025-04-14 13:20:20 +00:00
• e77820e145 fix: 修复附件上传和展示问题 dj 2025-04-14 21:19:55 +08:00
• 66d2c3c7cf Merge pull request 'master' (#984) from master into prod odjbin 2025-04-14 13:19:48 +00:00
• a1422067d0 feat: 审批流程加立即抄送按钮 dj 2025-04-14 16:44:42 +08:00
• 7579b77b2d feat: 添加导入研发费用明细表和模板下载功能 dj 2025-04-14 15:43:48 +08:00
• c6390a8117 feat: 文章管理增加附件上传/删除/下载功能 dj 2025-04-14 15:07:58 +08:00
• e20f8cad7f fix: 修复附件上传和展示问题 dj 2025-04-13 21:22:22 +08:00
• 5cf2e4d208 feat(article-management): 增加文章附件上传功能 dj 2025-04-11 18:21:43 +08:00
• 4f3a8550eb Merge pull request 'master' (#983) from master into prod odjbin 2025-04-11 06:09:41 +00:00
• ad6d7af1a3 Merge remote-tracking branch 'origin/master' dj 2025-04-11 14:08:25 +08:00
• 65a4c72fd0 style(mobile): 优化附件文件列表的展示效果 dj 2025-04-11 14:08:02 +08:00
• 5ea25ae8ae Merge pull request 'fix: 修复附件上传和展示问题' (#982) from master into prod odjbin 2025-04-09 15:11:29 +00:00
• 810757e828 fix: 修复附件上传和展示问题 dj 2025-04-09 23:11:06 +08:00
• e82c6e2316 Merge pull request 'master' (#981) from master into prod odjbin 2025-04-09 04:59:16 +00:00
• af593b08da Merge remote-tracking branch 'origin/master' dj 2025-04-09 12:58:56 +08:00
• 2b14bd19a4 fix : 修复项目归档附件项目基本信息展示 dj 2025-04-09 12:58:34 +08:00