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

• bbc883a116 fix : 修复更新表格 odjbin 2024-07-03 21:52:33 +08:00
• 634931a624 Merge pull request 'master' (#466) from master into prod odjbin 2024-07-03 13:46:14 +00:00
• 216b0d273e Merge pull request 'fix : 修复台账表格最小高度' (#465) from dd into master odjbin 2024-07-03 13:40:13 +00:00
• 361510242c fix : 修复台账表格最小高度 odjbin 2024-07-03 21:38:51 +08:00
• 94913d558d Merge pull request 'dd' (#464) from dd into master odjbin 2024-07-03 13:31:21 +00:00
• 9a789db8a7 fix : 修复分摊编辑传参问题 odjbin 2024-07-03 21:31:05 +08:00
• 0f0fa0f4e0 fix : 修复研究人员每行的回显 odjbin 2024-07-03 20:47:47 +08:00
• afc079b670 Merge pull request 'master' (#463) from master into prod odjbin 2024-07-03 11:40:24 +00:00
• 212cbbcb78 Merge pull request 'fix : 修复征集公司回显,所属公司改为征集公司' (#462) from dd into master odjbin 2024-07-03 11:40:08 +00:00
• 9edf5d484f fix : 修复征集公司回显,所属公司改为征集公司 odjbin 2024-07-03 19:39:53 +08:00
• c1a1b30c99 Merge pull request 'master' (#461) from master into prod odjbin 2024-07-03 06:10:35 +00:00
• 3bae1d1cc0 Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' (#460) from dd into master odjbin 2024-07-03 06:10:26 +00:00
• f26a29338a feat : 优化指定用户时该用户的矩阵状态检查 odjbin 2024-07-03 14:10:10 +08:00
• d17bca9994 Merge pull request 'master' (#459) from master into prod odjbin 2024-07-03 05:30:30 +00:00
• 509b216e4c Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' (#458) from dd into master odjbin 2024-07-03 05:30:20 +00:00
• bffa726cbf feat : 优化指定用户时该用户的矩阵状态检查 odjbin 2024-07-03 13:30:01 +08:00
• 0fbaa25cd6 Merge pull request 'master' (#457) from master into prod odjbin 2024-07-02 17:46:35 +00:00
• a7fb633b89 feat : 优化指定用户时该用户的矩阵状态检查 odjbin 2024-07-03 01:46:13 +08:00
• b1ac328d9d Revert "feat : 优化指定用户时该用户的矩阵状态检查" odjbin 2024-07-03 01:45:10 +08:00
• faaeb7be2b Merge remote-tracking branch 'origin/master' odjbin 2024-07-03 01:44:38 +08:00
• d2ddf378bf feat : 优化指定用户时该用户的矩阵状态检查 odjbin 2024-07-03 01:44:28 +08:00
• 9a1b04966d Merge pull request 'master' (#456) from master into prod odjbin 2024-07-02 16:38:48 +00:00
• c97798696a Merge pull request 'fix : 修复提交校验' (#455) from dd into master odjbin 2024-07-02 16:38:36 +00:00
• 0d7c303397 fix : 修复提交校验 odjbin 2024-07-03 00:38:21 +08:00
• 3d9db30ba3 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-07-02 23:58:49 +08:00
• 759f93078b Merge pull request 'master' (#454) from master into prod odjbin 2024-07-01 12:53:23 +00:00
• 66be60d011 Merge pull request 'fix : 调整头部icon,删除没用的代码' (#453) from dd into master odjbin 2024-07-01 12:53:12 +00:00
• 928f41112c fix : 调整头部icon,删除没用的代码 odjbin 2024-07-01 20:53:03 +08:00
• 1e97239d18 Merge pull request 'master' (#452) from master into prod odjbin 2024-07-01 11:05:15 +00:00
• 9d55358d73 Merge pull request 'fix : 调整头部icon,删除没用的代码' (#451) from dd into master odjbin 2024-07-01 10:56:40 +00:00
• 2fd2d1d25b fix : 调整头部icon,删除没用的代码 odjbin 2024-07-01 18:56:16 +08:00
• 49a3bbd701 Merge pull request 'master' (#450) from master into prod odjbin 2024-06-30 14:50:10 +00:00
• daa76ada6e Merge pull request 'fix : 调整部门管理演示,优化移动端详情' (#449) from dd into master odjbin 2024-06-30 14:49:59 +00:00
• 09e2bfc605 fix : 调整部门管理演示,优化移动端详情 odjbin 2024-06-30 22:49:37 +08:00
• 68dc2ff018 Merge pull request 'master' (#448) from master into prod odjbin 2024-06-30 13:29:31 +00:00
• cae3746a7b Merge pull request 'fix : 新增分摊/上传费用输入框显示问题' (#447) from dd into master odjbin 2024-06-30 13:28:56 +00:00
• 47a5cd3338 fix : 新增分摊/上传费用输入框显示问题 odjbin 2024-06-30 21:28:46 +08:00
• 6f843f54a6 Merge pull request 'master' (#446) from master into prod odjbin 2024-06-30 13:09:47 +00:00
• 51d2e8357b Merge pull request 'fix : "科研管理平台" 标题放开' (#445) from dd into master odjbin 2024-06-30 13:09:24 +00:00
• d87027423e fix : "科研管理平台" 标题放开 odjbin 2024-06-30 21:08:56 +08:00
• 19791498d4 Merge pull request 'master' (#444) from master into prod odjbin 2024-06-30 12:50:56 +00:00
• 592bba132e Merge pull request 'fix : 调整费用分摊,表格更新人员回显' (#443) from dd into master odjbin 2024-06-30 12:50:39 +00:00
• a7b898fe48 fix : 调整费用分摊,表格更新人员回显 odjbin 2024-06-30 20:43:08 +08:00
• 4242b22c1a Merge pull request 'master' (#442) from master into prod odjbin 2024-06-30 12:10:14 +00:00
• 3c494d038e Merge pull request 'fix : 调整台账显示信息' (#441) from dd into master odjbin 2024-06-30 12:10:05 +00:00
• c226715097 fix : 调整台账显示信息 odjbin 2024-06-30 20:09:53 +08:00
• 6e3b1e8b54 Merge pull request 'master' (#440) from master into prod odjbin 2024-06-30 12:04:14 +00:00
• 3ba97bca2d Merge pull request 'fix : 调整台账显示信息' (#439) from dd into master odjbin 2024-06-30 12:04:04 +00:00
• 7daa4b676d fix : 调整台账显示信息 odjbin 2024-06-30 20:03:31 +08:00
• 88198a62b2 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-30 19:33:03 +08:00
• a07bc1cc1c Merge remote-tracking branch 'origin/master' odjbin 2024-06-30 19:18:04 +08:00
• fd3231db4d fix : 添加征集详情 odjbin 2024-06-30 19:17:56 +08:00
• 43703f3366 Merge pull request 'master' (#438) from master into prod odjbin 2024-06-30 09:21:22 +00:00
• d011dc4008 Merge pull request 'fix : 优化分摊汇总项目阶段显示' (#437) from dd into master odjbin 2024-06-30 09:21:10 +00:00
• e43213d9a7 fix : 优化分摊汇总项目阶段显示 odjbin 2024-06-30 17:21:00 +08:00
• 9fbfa918e9 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-30 17:16:34 +08:00
• bb052b85ac Merge pull request 'master' (#436) from master into prod odjbin 2024-06-30 08:43:52 +00:00
• 04fa4bc334 Merge pull request 'fix : 优化阶段变更详情/项目编辑界面' (#435) from dd into master odjbin 2024-06-30 08:43:36 +00:00
• c89f4db529 fix : 优化阶段变更详情/项目编辑界面 odjbin 2024-06-30 16:43:21 +08:00
• 7a49a23128 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-30 15:54:18 +08:00
• 4049becfb8 Merge pull request 'master' (#434) from master into prod odjbin 2024-06-29 17:23:10 +00:00
• 7b18a92a26 Merge pull request 'fix : 优化移动端详情界面' (#433) from dd into master odjbin 2024-06-29 17:22:58 +00:00
• 6434605c7a fix : 优化移动端详情界面 odjbin 2024-06-30 01:22:29 +08:00
• 2a8dabd648 Merge pull request 'master' (#432) from master into prod odjbin 2024-06-29 16:11:11 +00:00
• c8eea20196 Merge pull request 'dd' (#431) from dd into master odjbin 2024-06-29 16:10:56 +00:00
• 87613e8113 fix : 优化移动端详情界面 odjbin 2024-06-30 00:10:42 +08:00
• 80aef38e7a fix : 优化移动端详情界面 odjbin 2024-06-30 00:00:16 +08:00
• 14ce31262d Merge pull request 'fix : 优化页面细节' (#430) from dd into master odjbin 2024-06-29 15:18:01 +00:00
• 2e9adb3248 fix : 优化页面细节 odjbin 2024-06-29 23:17:47 +08:00
• a6bd56c29c Merge pull request 'master' (#429) from master into prod odjbin 2024-06-29 14:47:08 +00:00
• 68b954a21e Merge pull request 'fix : 修复项目详情单个文件回显' (#428) from dd into master odjbin 2024-06-29 14:46:50 +00:00
• 1e4397b5ea fix : 修复项目详情单个文件回显 odjbin 2024-06-29 22:46:37 +08:00
• eac76ca3bf Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-29 22:32:21 +08:00
• 215b17f066 Merge pull request 'fix : 修复需求汇总文件回显' (#427) from dd into master odjbin 2024-06-29 14:31:46 +00:00
• 719012f075 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-29 22:30:31 +08:00
• 40d3d423c7 fix : 修复需求汇总文件回显 odjbin 2024-06-29 22:30:21 +08:00
• 02ac44f389 Merge pull request 'fix : 修复需求上报成果展示,需求新增专项资金校验' (#426) from dd into master odjbin 2024-06-29 14:27:35 +00:00
• 3b884c0b78 fix : 修复需求上报成果展示,需求新增专项资金校验 odjbin 2024-06-29 22:27:22 +08:00
• 870ee5a6d0 Merge pull request 'fix : 修复项目详情前置流程更改回显' (#425) from dd into master odjbin 2024-06-29 13:44:08 +00:00
• a446dfcaa6 fix : 修复项目详情前置流程更改回显 odjbin 2024-06-29 21:43:57 +08:00
• 167bff642e Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-29 19:57:55 +08:00
• 630e35b078 Merge pull request 'fix : 修复需求上报成果多选' (#424) from dd into master odjbin 2024-06-29 10:57:13 +00:00
• bd6fef9f7e fix : 修复需求上报成果多选 odjbin 2024-06-29 18:56:05 +08:00
• da885d4965 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-29 18:27:19 +08:00
• 662e11c154 Merge pull request 'master' (#423) from master into prod odjbin 2024-06-29 09:14:09 +00:00
• 5394e45ab8 Merge pull request 'dd' (#422) from dd into master odjbin 2024-06-29 09:13:54 +00:00
• d25c285ad6 fix : 完善信息提示框 odjbin 2024-06-29 17:13:42 +08:00
• 0273e19156 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-29 16:47:45 +08:00
• e075eeb0d5 fix : 时间选择框为月份 odjbin 2024-06-29 16:39:30 +08:00
• 54e50de6b1 fix : 修复阶段变更编辑回显 odjbin 2024-06-29 15:51:03 +08:00
• fab991400e Merge pull request 'master' (#421) from master into prod odjbin 2024-06-29 07:40:19 +00:00
• 58d6a8f567 Merge pull request 'fix : 修复表格更新数据回显,新增征集提示框' (#420) from dd into master odjbin 2024-06-29 07:40:05 +00:00
• 38e9c1d1e5 fix : 修复表格更新数据回显,新增征集提示框 odjbin 2024-06-29 15:39:42 +08:00
• b1b389ce8f Merge pull request 'master' (#419) from master into prod odjbin 2024-06-29 05:44:49 +00:00
• 080b588723 Merge pull request 'dd' (#418) from dd into master odjbin 2024-06-29 05:43:24 +00:00
• 3efcc1d039 fix : 还原vite.config.js odjbin 2024-06-29 13:42:40 +08:00
• 0ad12c361d fix : 优化需求征集新增 odjbin 2024-06-29 13:40:05 +08:00
• 0bfa18eac8 fix : 修复所属公司选择框细节 odjbin 2024-06-29 13:02:12 +08:00
• 12db4164d0 fix : 单文件和多文件上传样式调整 odjbin 2024-06-29 12:05:10 +08:00
• c977249713 Merge pull request 'master' (#417) from master into prod odjbin 2024-06-29 03:22:35 +00:00