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

• ab33f09538 Merge pull request 'master' (#521) from master into prod odjbin 2024-07-11 13:09:38 +00:00
• 480d419a6c Merge pull request 'fix : 项目立项页面细节优化' (#520) from dd into master odjbin 2024-07-11 13:09:26 +00:00
• 37755d62b1 fix : 项目立项页面细节优化 odjbin 2024-07-11 21:09:10 +08:00
• 152da3c0e4 Merge pull request 'master' (#519) from master into prod odjbin 2024-07-11 08:40:46 +00:00
• 06e175cd8c Merge pull request 'dd' (#518) from dd into master odjbin 2024-07-11 08:40:31 +00:00
• ddcbc02025 fix : 项目立项页面细节优化 odjbin 2024-07-11 16:40:11 +08:00
• 7c63c5e791 Merge remote-tracking branch 'origin/master' odjbin 2024-07-11 14:48:27 +08:00
• bd165769de Merge pull request 'master' (#517) from master into prod clay 2024-07-10 15:20:26 +00:00
• 7bf6336a46 fix : 年度计划删除 clay 2024-07-10 23:19:41 +08:00
• 50a4e21a99 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web wenhua 2024-07-10 22:18:43 +08:00
• e8d3148937 fix: 调整样式 wenhua 2024-07-10 22:18:40 +08:00
• dfdeaec16c Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-07-10 18:09:02 +08:00
• 42fd8d9740 feat:增加项目负责人和成员选择功能 zhangkaihuai 2024-07-10 18:08:51 +08:00
• 17994928bf Merge pull request 'fix : 细节优化' (#516) from dd into master odjbin 2024-07-10 08:57:20 +00:00
• 5efa1b8764 Merge remote-tracking branch 'origin/master' odjbin 2024-07-10 16:57:08 +08:00
• 71b9065f29 fix : 细节优化 odjbin 2024-07-10 16:56:28 +08:00
• b1616b716c Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-07-10 16:53:48 +08:00
• c266e27c51 Merge pull request 'fix: bug修复' (#515) from master into prod wenhua 2024-07-09 15:32:00 +00:00
• 7836450a10 fix: bug修复 wenhua 2024-07-09 23:31:10 +08:00
• 1bfa0095ae Merge pull request 'master' (#514) from master into prod odjbin 2024-07-09 11:35:37 +00:00
• cbc97891b8 Merge pull request 'fix : 修复年度计划详情展示' (#513) from dd into master odjbin 2024-07-09 11:35:25 +00:00
• 7a38c34da9 fix : 修复年度计划详情展示 odjbin 2024-07-09 19:35:04 +08:00
• 33c4e4baa7 Merge pull request 'master' (#512) from master into prod odjbin 2024-07-07 15:36:51 +00:00
• 9f06ecbc62 Merge pull request 'fix : 修复专项资金权限, 费用台账时间搜索' (#511) from dd into master odjbin 2024-07-07 15:36:36 +00:00
• 23975e056a fix : 修复专项资金权限, 费用台账时间搜索 odjbin 2024-07-07 23:36:20 +08:00
• eb5df00b45 Merge pull request 'master' (#510) from master into prod odjbin 2024-07-06 20:13:40 +00:00
• ac409710d8 Merge pull request 'fix : 修复归档-附件搜索传参问题' (#509) from dd into master odjbin 2024-07-06 20:13:29 +00:00
• 2c8de29fcd fix : 修复归档-附件搜索传参问题 odjbin 2024-07-07 04:12:06 +08:00
• 61be47b3d4 Merge pull request 'master' (#508) from master into prod odjbin 2024-07-06 19:31:43 +00:00
• c5a3bc9b58 Merge pull request 'fix : 修复征集公司选择' (#507) from dd into master odjbin 2024-07-06 19:31:33 +00:00
• 09d95babd0 fix : 修复征集公司选择 odjbin 2024-07-07 03:31:18 +08:00
• e5356787be Merge pull request 'master' (#506) from master into prod odjbin 2024-07-06 18:44:08 +00:00
• 584adb63d4 Merge pull request 'dd' (#505) from dd into master odjbin 2024-07-06 18:43:56 +00:00
• 06090fc00b fix : 修复费用台账时间搜索 odjbin 2024-07-07 02:43:40 +08:00
• fce1bfdb6f fix : 修复年度计划编辑功能 odjbin 2024-07-07 02:36:40 +08:00
• f842bf375b Merge pull request 'master' (#504) from master into prod odjbin 2024-07-06 18:23:46 +00:00
• c10f7b2398 Merge pull request 'fix : 修复台账基础信息展示及年度计划通过后跳转' (#503) from dd into master odjbin 2024-07-06 18:22:36 +00:00
• b21719aaa0 fix : 修复台账基础信息展示及年度计划通过后跳转 odjbin 2024-07-07 02:22:17 +08:00
• 9b19de0ff9 feat: 添加需求汇总详情 wenhua 2024-07-07 00:56:20 +08:00
• 9ef88a2d17 Merge pull request 'master' (#502) from master into prod odjbin 2024-07-06 16:47:04 +00:00
• 10e5db2cd6 Merge pull request 'fix : 修复需求上报预期成果形式回显' (#501) from dd into master odjbin 2024-07-06 16:46:43 +00:00
• 2a25942cdf fix : 修复需求上报预期成果形式回显 odjbin 2024-07-07 00:46:19 +08:00
• a5864a32ce feat： 添加详情静态路由 wenhua 2024-07-07 00:45:16 +08:00
• 9688322f69 Merge pull request 'master' (#500) from master into prod odjbin 2024-07-06 16:06:07 +00:00
• 5d661e1276 Merge pull request 'fix : 修复需求上报预期成果形式回显' (#499) from dd into master odjbin 2024-07-06 16:05:57 +00:00
• 8feef06c11 fix : 修复需求上报预期成果形式回显 odjbin 2024-07-07 00:05:47 +08:00
• 19a61159e4 Merge pull request 'master' (#498) from master into prod odjbin 2024-07-06 15:29:56 +00:00
• dd5fb4f44a Merge pull request 'fix : 修复征集公司回显' (#497) from dd into master odjbin 2024-07-06 15:29:45 +00:00
• 57776764f8 fix : 修复征集公司回显 odjbin 2024-07-06 23:29:33 +08:00
• beb727760b Merge pull request 'master' (#496) from master into prod odjbin 2024-07-06 15:11:08 +00:00
• ce5297145b Merge pull request 'fix : 修复文件删除功能' (#495) from dd into master odjbin 2024-07-06 15:10:57 +00:00
• 3c564b600b fix : 修复文件删除功能 odjbin 2024-07-06 23:10:45 +08:00
• e7ee3fbc9d Merge pull request 'fix : 修复文件删除功能' (#494) from dd into master odjbin 2024-07-06 15:09:04 +00:00
• edec70ebbb fix : 修复文件删除功能 odjbin 2024-07-06 23:08:36 +08:00
• aa2631b7de Merge pull request 'master' (#493) from master into prod odjbin 2024-07-06 14:39:17 +00:00
• 13cbd1c7cd Merge pull request 'fix : 年度计划权限按钮' (#492) from dd into master odjbin 2024-07-06 14:38:49 +00:00
• 06524178c7 fix : 年度计划权限按钮 odjbin 2024-07-06 22:38:31 +08:00
• 564084cb02 Merge pull request 'fix : 年度计划权限按钮' (#491) from dd into master odjbin 2024-07-06 14:38:05 +00:00
• e5777b55bc fix : 年度计划权限按钮 odjbin 2024-07-06 22:37:51 +08:00
• cfe89816f4 Merge pull request 'master' (#490) from master into prod odjbin 2024-07-06 13:40:00 +00:00
• 41134a6266 Merge pull request 'fix : 台账表格更新输入框对齐' (#489) from dd into master odjbin 2024-07-06 13:39:51 +00:00
• 7e07010f0d fix : 台账表格更新输入框对齐 odjbin 2024-07-06 21:39:37 +08:00
• ac28c3235e Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-07-06 17:40:24 +08:00
• 80d8d3c687 Merge pull request 'master' (#488) from master into prod odjbin 2024-07-06 09:37:03 +00:00
• 2a5443dc4e Merge pull request 'fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤' (#487) from dd into master odjbin 2024-07-06 09:36:54 +00:00
• 12f6f27b1a fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤 odjbin 2024-07-06 17:36:39 +08:00
• c75bd8a197 Merge pull request 'master' (#486) from master into prod odjbin 2024-07-06 07:46:48 +00:00
• 9eebacc47a Merge pull request 'fix : 修复审批记录主次账号显示, 年度计划详情显示' (#485) from dd into master odjbin 2024-07-06 07:46:35 +00:00
• ddc3b70ddf fix : 修复审批记录主次账号显示, 年度计划详情显示 odjbin 2024-07-06 15:46:22 +08:00
• bd57a54931 fix : 矩阵审批选择自己时可以跳过自己审批 clay 2024-07-06 15:05:19 +08:00
• 12eeeced0e Merge pull request 'master' (#484) from master into prod odjbin 2024-07-05 18:21:54 +00:00
• 8f3d97ec1c Merge pull request 'feat : 年度计划生成功能及分摊汇总导出功能' (#483) from dd into master odjbin 2024-07-05 18:21:44 +00:00
• 8180c248ac feat : 年度计划生成功能及分摊汇总导出功能 odjbin 2024-07-06 02:21:26 +08:00
• a7c1c3a483 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-07-05 09:29:40 +08:00
• de69dc9b47 Merge pull request 'master' (#482) from master into prod wenhua 2024-07-04 09:20:24 +00:00
• fce1708f5c Merge branch 'master' of http://git.feashow.cn/clay/mosr-web lilinyuan 2024-07-04 17:18:41 +08:00
• dd80659044 fix: 样式调整 lilinyuan 2024-07-04 17:18:38 +08:00
• 2edef9fcf0 Merge pull request 'master' (#481) from master into prod odjbin 2024-07-04 06:14:10 +00:00
• d7de238c38 Merge pull request 'fix : 分摊研发人员回显' (#480) from dd into master odjbin 2024-07-04 06:13:40 +00:00
• 08bc318875 fix : 分摊研发人员回显 odjbin 2024-07-04 14:13:26 +08:00
• dfcf635f05 Merge pull request 'master' (#479) from master into prod odjbin 2024-07-04 05:58:55 +00:00
• 888f97125b Merge pull request 'fix : 统一按钮颜色' (#478) from dd into master odjbin 2024-07-04 05:58:46 +00:00
• c065008da0 fix : 统一按钮颜色 odjbin 2024-07-04 13:58:26 +08:00
• 9beb9ed9de Merge pull request 'master' (#477) from master into prod odjbin 2024-07-04 05:08:47 +00:00
• b2fdfc6227 Merge pull request 'fix : 流程图/人员与按钮间距' (#476) from dd into master odjbin 2024-07-04 05:08:33 +00:00
• 05585bb980 fix : 流程图/人员与按钮间距 odjbin 2024-07-04 13:08:00 +08:00
• 89dd56959a Merge pull request 'master' (#475) from master into prod odjbin 2024-07-04 04:31:02 +00:00
• f2863557f9 Merge pull request 'fix : 修复分摊编辑传参' (#474) from dd into master odjbin 2024-07-04 04:30:52 +00:00
• 70ffe5c1eb fix : 修复分摊编辑传参 odjbin 2024-07-04 12:30:38 +08:00
• d2f7f6080a Merge pull request 'master' (#473) from master into prod odjbin 2024-07-04 03:31:16 +00:00
• a17ab96395 Merge pull request 'fix : 修改所属公司->征集公司' (#472) from dd into master odjbin 2024-07-04 03:31:06 +00:00
• 2466e15659 fix : 修改所属公司->征集公司 odjbin 2024-07-04 11:30:03 +08:00
• 0556e5eb79 Merge pull request 'master' (#471) from master into prod wenhua 2024-07-04 02:05:44 +00:00
• 5c889e41c2 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web lilinyuan 2024-07-04 10:04:31 +08:00
• 8ae817ffb3 fix: 分页 lilinyuan 2024-07-04 10:04:28 +08:00
• 6fc5a3f6f3 Merge pull request 'master' (#470) from master into prod odjbin 2024-07-03 14:58:32 +00:00
• df09fbbd38 Merge pull request 'fix : 人员选择框,主次账号回显' (#469) from dd into master odjbin 2024-07-03 14:58:20 +00:00
• 842fa7b782 fix : 人员选择框,主次账号回显 odjbin 2024-07-03 22:58:01 +08:00
• 706bf36aa8 Merge pull request 'master' (#468) from master into prod odjbin 2024-07-03 13:53:07 +00:00
• a8afb48cf7 Merge pull request 'fix : 修复更新表格' (#467) from dd into master odjbin 2024-07-03 13:52:55 +00:00