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

• f931c65b57 Merge pull request 'fix : 修复新增需求细节' (#323) from dj into master odjbin 2024-06-11 12:59:11 +00:00
• e64b7fe0ae fix : 修复新增需求细节 odjbin 2024-06-11 20:58:47 +08:00
• 5b78df27f5 Merge pull request 'master' (#322) from master into prod odjbin 2024-06-11 12:56:47 +00:00
• 48e97ed275 Merge pull request 'dj' (#321) from dj into master odjbin 2024-06-11 12:56:37 +00:00
• a2977d0702 fix : 屏蔽导出修复角色权限 odjbin 2024-06-11 20:56:22 +08:00
• 78ab1ddc45 fix : 屏蔽导出 odjbin 2024-06-11 20:32:20 +08:00
• 7f73afa6b5 Merge pull request 'fix : 修复流程图切换功能和屏蔽导出' (#320) from dj into master odjbin 2024-06-11 12:15:02 +00:00
• 208584c34b fix : 修复流程图切换功能和屏蔽导出 odjbin 2024-06-11 20:14:49 +08:00
• f9cf478694 Merge pull request 'master' (#319) from master into prod odjbin 2024-06-11 11:17:20 +00:00
• 40d2bef0ba Merge pull request 'dj' (#318) from dj into master odjbin 2024-06-11 11:16:58 +00:00
• b425e709aa fix : 修复流程图切换功能及修改"研发阶段"文字为项目阶段 odjbin 2024-06-11 19:16:35 +08:00
• 3f7de153da fix : 修复项目立项/验收前置流程展示及系统部分页面分页bug odjbin 2024-06-11 18:47:35 +08:00
• 7b67e71bd6 Merge pull request 'master' (#317) from master into prod odjbin 2024-06-11 07:42:26 +00:00
• 99224392a3 Merge pull request 'dj' (#316) from dj into master odjbin 2024-06-11 07:42:16 +00:00
• ab83724056 fix : 修复详情页切换流程图渲染bug odjbin 2024-06-11 15:42:01 +08:00
• 2c5c694445 Merge pull request 'master' (#315) from master into prod odjbin 2024-06-11 04:19:35 +00:00
• e33a6d5c58 Merge pull request 'fix : 二级页面上加基础信息' (#314) from dj into master odjbin 2024-06-11 04:19:21 +00:00
• 5e2f9df706 Merge remote-tracking branch 'origin/master' odjbin 2024-06-11 12:18:43 +08:00
• 1009cb7345 fix : 二级页面上加基础信息 odjbin 2024-06-10 23:28:34 +08:00
• e5f80ed017 Merge pull request 'dj' (#313) from dj into master odjbin 2024-06-10 15:01:42 +00:00
• 050c5cf57a fix : 列表按钮加权限 odjbin 2024-06-10 23:01:28 +08:00
• 3e6c82dd19 fix : 修复列表页按钮固定右侧 odjbin 2024-06-10 22:38:26 +08:00
• 15a2dda0fa fix : 修复需求征集/汇总权限按钮 odjbin 2024-06-10 22:36:03 +08:00
• 9c812af394 fix : 修复详情提交/重新提交功能 odjbin 2024-06-10 22:34:51 +08:00
• 3379d851c6 Merge remote-tracking branch 'origin/master' odjbin 2024-06-10 22:34:27 +08:00
• 535d3f680b fix : 优化直接上报时项目归档附件tab展示 odjbin 2024-06-10 16:19:09 +08:00
• 2f2dabb82d Merge pull request 'fix : 优化需求汇总详情页面' (#312) from dj into master odjbin 2024-06-10 07:52:38 +00:00
• b05d0ff42f fix : 优化需求汇总详情页面 odjbin 2024-06-10 15:50:26 +08:00
• 4649ad3abd Merge pull request 'master' (#311) from master into prod odjbin 2024-06-10 07:26:33 +00:00
• 4a749fc220 Merge pull request 'fix : 修复详情基本信息显示位置、项目验收、结项操作放在详情页面' (#310) from dj into master odjbin 2024-06-10 07:26:03 +00:00
• 07c089ed29 fix : 修复详情基本信息显示位置、项目验收、结项操作放在详情页面 odjbin 2024-06-10 15:25:28 +08:00
• 3483a32d55 Merge pull request 'fix : 修改阶段变更抄送人样式' (#309) from dj into master odjbin 2024-06-09 16:44:41 +00:00
• cb224ab437 fix : 修改阶段变更抄送人样式 odjbin 2024-06-10 00:44:20 +08:00
• d8b8c65dfb Merge pull request 'fix : 修复提交按钮旁边的返回页面细节' (#308) from dj into master odjbin 2024-06-09 16:25:25 +00:00
• d3fe46f0bc fix : 修复提交按钮旁边的返回页面细节 odjbin 2024-06-10 00:25:00 +08:00
• 1bfb34305f Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-09 23:50:14 +08:00
• bf0cb73946 Merge remote-tracking branch 'origin/master' odjbin 2024-06-09 23:48:50 +08:00
• 992eb2b890 fix : 修复分摊金额显示bug odjbin 2024-06-09 23:48:42 +08:00
• eb8e772e66 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-09 22:37:31 +08:00
• fb52f8b04e Merge pull request 'fix : 修复需求上报接口' (#307) from dj into master odjbin 2024-06-09 14:11:06 +00:00
• 53e461bc4d fix : 修复需求上报接口 odjbin 2024-06-09 22:10:52 +08:00
• f251c08982 Merge pull request 'fix : 修复项目实施上传费用,查看分摊功能细节' (#306) from dj into master odjbin 2024-06-09 14:03:31 +00:00
• 83ba497d73 fix : 修复项目实施上传费用,查看分摊功能细节 odjbin 2024-06-09 22:02:37 +08:00
• c20fbcc356 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-09 21:33:49 +08:00
• bb771b2f6d Merge pull request 'dj' (#305) from dj into master odjbin 2024-06-09 13:29:06 +00:00
• 7fbd067e11 Merge remote-tracking branch 'origin/dj' zhangkaihuai 2024-06-09 20:59:19 +08:00
• 008c474b76 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-09 20:58:09 +08:00
• a88ae09628 fix : 修复项目实施阶段变更功能 odjbin 2024-06-09 20:03:26 +08:00
• b0eabd9c39 fix : 修复项目立项切换bug odjbin 2024-06-09 19:33:03 +08:00
• adbd98f035 fix : 修复项目立项切换bug odjbin 2024-06-09 19:30:45 +08:00
• f61adaf18b Merge remote-tracking branch 'origin/master' odjbin 2024-06-09 19:19:15 +08:00
• d1c6b23aa4 feat : 需求变更详情修改 clay 2024-06-09 19:19:02 +08:00
• c3e006bba8 fix : 修复项目立项重新提交等操作替换到详情页面 odjbin 2024-06-09 19:12:37 +08:00
• 812298acce fix : 修复需求上报是否专项资金流程图显示 odjbin 2024-06-09 19:00:43 +08:00
• fd61fcc485 Merge pull request 'fix : 修复费用分摊详情研究人员显示' (#304) from dj into master odjbin 2024-06-09 10:09:41 +00:00
• 60b7133939 fix : 修复费用分摊详情研究人员显示 odjbin 2024-06-09 18:09:13 +08:00
• 8e46c27af8 Merge pull request 'dj' (#303) from dj into master odjbin 2024-06-09 09:51:15 +00:00
• 4ed64339fa fix : 金额格式化 odjbin 2024-06-09 17:50:49 +08:00
• d6a9ecd944 Merge remote-tracking branch 'origin/dj' zhangkaihuai 2024-06-09 17:09:05 +08:00
• cafb0ef5bf Merge remote-tracking branch 'origin/master' odjbin 2024-06-09 15:06:29 +08:00
• 29b8bad394 fix : 格式化金额显示 odjbin 2024-06-08 23:20:44 +08:00
• 9a862f8cce feat : 修复需求汇总页面细节 odjbin 2024-06-08 11:43:39 +08:00
• 91b2ead3d4 Merge pull request 'dj' (#302) from dj into master odjbin 2024-06-07 16:05:41 +00:00
• 521e40cf3d feat : 项目详情中立项/编辑页面demo odjbin 2024-06-08 00:05:28 +08:00
• 86ff3c2e94 fix : 修复附件校验问题 odjbin 2024-06-08 00:04:33 +08:00
• 617a867965 fix : 修复查看分摊功能 odjbin 2024-06-07 21:34:18 +08:00
• b2e0983cf0 Merge pull request 'fix : 修改提交/重新提交功能文件传参问题' (#301) from dj into master odjbin 2024-06-07 12:37:11 +00:00
• 27bc6ea89f fix : 修改提交/重新提交功能文件传参问题 odjbin 2024-06-07 20:36:54 +08:00
• c2413fe8b2 Merge pull request 'fix : 修改专项资金新增的介绍输入框' (#300) from dj into master odjbin 2024-06-07 11:47:55 +00:00
• ee81e1bb23 fix : 修改专项资金新增的介绍输入框 odjbin 2024-06-07 18:40:54 +08:00
• a6a124d61a Merge pull request 'fix : 修复需求上报bug' (#299) from dj into master odjbin 2024-06-07 10:28:22 +00:00
• 1bc8f26724 fix : 修复需求上报bug odjbin 2024-06-07 18:28:10 +08:00
• 1c56ccae40 Merge pull request 'fix : 修复需求上报文件上传/删除问题' (#298) from dj into master odjbin 2024-06-07 08:46:59 +00:00
• 42fea1853d fix : 修复需求上报文件上传/删除问题 odjbin 2024-06-07 16:46:44 +08:00
• 0eb0bcb0ef Merge pull request 'fix : 修复专项资金显示情况' (#297) from dj into master odjbin 2024-06-07 05:26:04 +00:00
• 9655c41492 fix : 修复专项资金显示情况 odjbin 2024-06-07 13:24:17 +08:00
• ec7cf224d3 Merge pull request 'fix : 修改需求上报页面细节' (#296) from dj into master odjbin 2024-06-06 15:14:04 +00:00
• 35ecec13ad fix : 修改需求上报页面细节 odjbin 2024-06-06 23:13:10 +08:00
• 0adb104c46 Merge pull request 'fix : 修改专项资金' (#295) from dj into master odjbin 2024-06-06 14:59:03 +00:00
• 54e7b81f1e fix : 修改专项资金 odjbin 2024-06-06 22:58:50 +08:00
• ac00d68350 Merge pull request 'master' (#294) from master into prod odjbin 2024-06-06 14:21:42 +00:00
• d9d3a7f02a Merge pull request 'dj' (#293) from dj into master odjbin 2024-06-06 14:21:30 +00:00
• e1a7b46b35 fix : 修改分摊汇总bug odjbin 2024-06-06 22:13:14 +08:00
• 4ddd53cec7 fix : 修改需求征集征集说明输入框 odjbin 2024-06-06 21:52:33 +08:00
• a8921a0683 fix : 修复需求上报数字输入框和人员选择器优化 odjbin 2024-06-06 21:44:43 +08:00
• 6a0c3570f6 fix : 修复需求上报的专项资金显示问题 odjbin 2024-06-06 19:50:46 +08:00
• 40c09c58d4 Merge pull request 'master' (#292) from master into prod odjbin 2024-06-06 05:38:23 +00:00
• 781b4cfb96 Merge pull request 'fix : 修复分摊汇总及编辑功能' (#291) from dj into master odjbin 2024-06-06 05:36:20 +00:00
• 53ecadf315 fix : 修复分摊汇总及编辑功能 odjbin 2024-06-06 13:36:07 +08:00
• a30638d693 Merge pull request 'master' (#290) from master into prod odjbin 2024-06-05 18:02:01 +00:00
• 18806f13e4 Merge pull request 'dj' (#289) from dj into master odjbin 2024-06-05 18:01:52 +00:00
• 031a08e65c fix : 修复分摊汇总及编辑功能 odjbin 2024-06-06 02:01:36 +08:00
• ec4c61d758 fix : 修复费用分摊详情渲染数据问题 odjbin 2024-06-06 01:15:12 +08:00
• 0f83224f28 Merge pull request 'master' (#288) from master into prod odjbin 2024-06-05 14:57:23 +00:00
• aa9d7d9028 Merge pull request 'fix : 修复细节' (#287) from dj into master odjbin 2024-06-05 14:57:14 +00:00
• 1c204b39df fix : 修复细节 odjbin 2024-06-05 22:57:04 +08:00
• 11a1f044f5 Merge pull request 'master' (#286) from master into prod odjbin 2024-06-05 14:10:57 +00:00
• 0685143b3a Merge pull request 'dj' (#285) from dj into master odjbin 2024-06-05 14:10:46 +00:00
• 2e86683f41 fix : 修复新增分摊表格数据校验及矩阵审批加箭头 odjbin 2024-06-05 22:03:49 +08:00
• ca64562059 fix : 修复项目归档中附件上传问题 odjbin 2024-06-05 11:40:31 +08:00