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

• 5d9331c23f Merge remote-tracking branch 'origin/master' odjbin 2024-06-29 11:22:14 +08:00
• c247659c6c Merge pull request 'fix : 需求上报-预期成果形式多选及展示' (#416) from dd into master odjbin 2024-06-29 03:22:13 +00:00
• ed08c6a796 fix : 需求上报-预期成果形式多选及展示 odjbin 2024-06-29 11:21:50 +08:00
• 9a306be965 Merge pull request 'master' (#415) from master into prod odjbin 2024-06-28 19:37:22 +00:00
• a769d114bb Merge pull request 'fix : 优化流程图样式及位置,需求上报排版展示' (#414) from dd into master odjbin 2024-06-28 19:30:39 +00:00
• e44b41bf14 fix : 优化流程图样式及位置,需求上报排版展示 odjbin 2024-06-29 03:30:26 +08:00
• 6fe8626acb Merge pull request 'fix : 优化流程图样式及位置' (#413) from dd into master odjbin 2024-06-28 18:12:34 +00:00
• 0a6c37019a fix : 优化流程图样式及位置 odjbin 2024-06-29 02:12:04 +08:00
• d01f37f5b9 Merge pull request 'master' (#412) from master into prod odjbin 2024-06-28 16:10:06 +00:00
• 657b43f739 Merge pull request 'fix : 修复需求汇总' (#411) from dd into master odjbin 2024-06-28 16:09:54 +00:00
• 13c0e3a7f0 fix : 修复需求汇总 odjbin 2024-06-29 00:09:42 +08:00
• 07069af7a0 Merge pull request 'master' (#410) from master into prod odjbin 2024-06-28 16:08:09 +00:00
• 72d5448e90 Merge pull request 'dd' (#409) from dd into master odjbin 2024-06-28 16:07:58 +00:00
• 72171fb573 fix : 需求征集新增/详情样式优化,需求汇总详情优化 odjbin 2024-06-29 00:07:43 +08:00
• 4a598f52d4 Merge pull request 'master' (#408) from master into prod wenhua 2024-06-28 15:55:12 +00:00
• bd2d12551a fix: 修改步骤条样式， 增强tag组件兼容性 wenhua 2024-06-28 23:53:43 +08:00
• 942fc219e2 fix : 修复需求上报排版、费用分摊传参、需求汇总查询字段 odjbin 2024-06-28 22:37:30 +08:00
• 5a6d16afc6 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-28 22:03:09 +08:00
• 16c4e07a86 Merge remote-tracking branch 'origin/master' clay 2024-06-28 21:54:34 +08:00
• 58d5efb655 fix : 费用分摊选择用户会被批量修改 clay 2024-06-28 21:54:16 +08:00
• c199ecb9fb Merge pull request 'fix : 修复项目归档-附件上传后跳转展示页面, 专项资金加"名称"二字' (#407) from dd into master odjbin 2024-06-28 13:50:23 +00:00
• aa9001edd7 fix : 修复项目归档-附件上传后跳转展示页面, 专项资金加"名称"二字 odjbin 2024-06-28 21:50:05 +08:00
• 377509b62a feat : 分摊汇总小计保留两位小数 clay 2024-06-28 21:41:24 +08:00
• c83a3b2ca3 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-28 21:13:44 +08:00
• fc034cc653 feat : 需求征集字段调整 clay 2024-06-28 20:22:23 +08:00
• fe72d0706a Merge pull request 'dd' (#406) from dd into master odjbin 2024-06-28 12:16:35 +00:00
• 84fb6838fb fix : 优化所属公司选择框 odjbin 2024-06-28 20:16:24 +08:00
• efd06e0da7 fix : 修改需求上报展示 odjbin 2024-06-28 20:15:58 +08:00
• 291708e71a fix : 修改新增需求征集"专项资金名称" odjbin 2024-06-28 20:05:23 +08:00
• c67a66c119 Merge pull request 'master' (#405) from master into prod odjbin 2024-06-28 08:39:17 +00:00
• 9db5ad0052 Merge pull request 'dd' (#404) from dd into master odjbin 2024-06-28 08:39:06 +00:00
• b7946d44c8 fix : 修改用户管理展示 odjbin 2024-06-28 16:38:35 +08:00
• daac1812bf fix : 优化审批记录、用户账号切换点击位置、所属公司选择框 odjbin 2024-06-28 16:25:21 +08:00
• c99e553515 Merge pull request 'master' (#403) from master into prod clay 2024-06-28 08:16:11 +00:00
• 114c9116b1 feat: 阶段变更详情 wenhua 2024-06-28 00:08:24 +08:00
• c5d5066ee1 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web wenhua 2024-06-27 23:35:07 +08:00
• a943687afe feat: 新增移动端适配详情 wenhua 2024-06-27 23:35:05 +08:00
• 380c476cf3 Merge pull request 'master' (#402) from master into prod clay 2024-06-27 14:54:16 +00:00
• c61e584dea Merge remote-tracking branch 'origin/master' clay 2024-06-27 22:53:50 +08:00
• 9bdad91b7e feat : 首页任务字段调整 clay 2024-06-27 22:53:43 +08:00
• b433efc81a Merge pull request 'master' (#401) from master into prod odjbin 2024-06-26 15:04:55 +00:00
• 8684132fc7 Merge pull request 'fix : 公司选择框' (#400) from dd into master odjbin 2024-06-26 15:04:46 +00:00
• 7bcd75e6fb fix : 公司选择框 odjbin 2024-06-26 23:04:30 +08:00
• ab4b9c1bf3 Merge pull request 'master' (#399) from master into prod odjbin 2024-06-26 14:53:15 +00:00
• c10f40f668 Merge pull request 'dd' (#398) from dd into master odjbin 2024-06-25 10:47:01 +00:00
• bbb8705cee feat : 用户管理主账号-新增绑定账号功能 odjbin 2024-06-25 18:13:43 +08:00
• 65b8af3e3e fix : 修复新增分摊复制/添加一行功能 odjbin 2024-06-25 16:21:40 +08:00
• afa0a52898 fix : 修复新增分摊复制/添加一行功能 odjbin 2024-06-25 16:21:03 +08:00
• 1032340cc2 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-25 11:59:55 +08:00
• 169423d5f9 Merge pull request 'master' (#397) from master into prod odjbin 2024-06-25 03:56:29 +00:00
• 0e633c40a1 Merge pull request 'fix : 修复分摊编辑传参和台账导出' (#396) from dd into master odjbin 2024-06-25 03:56:00 +00:00
• 9d0490a253 fix : 修复分摊编辑传参和台账导出 odjbin 2024-06-25 11:55:48 +08:00
• 2eaa8337f6 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-24 18:35:22 +08:00
• ce981882c8 Merge pull request 'master' (#395) from master into prod odjbin 2024-06-24 05:39:59 +00:00
• 87768bfdf4 Merge pull request 'fix : 修复分摊/资金详情页面移动端适配' (#394) from dd into master odjbin 2024-06-24 05:39:45 +00:00
• 36c5b04dbc fix : 修复分摊/资金详情页面移动端适配 odjbin 2024-06-24 13:39:30 +08:00
• dd13f8d175 Merge pull request 'master' (#393) from master into prod odjbin 2024-06-24 05:26:03 +00:00
• 9945cc1c86 Merge pull request 'fix : 修复详情页面移动端适配' (#392) from dd into master odjbin 2024-06-24 05:25:50 +00:00
• 6f320a47bb fix : 修复详情页面移动端适配 odjbin 2024-06-24 13:25:34 +08:00
• 47f13d4b1e Merge pull request 'master' (#391) from master into prod odjbin 2024-06-24 03:09:53 +00:00
• 0551379a65 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-24 01:06:15 +08:00
• f66a570f00 feat : 台账导出 clay 2024-06-23 18:55:42 +08:00
• 5edf97338e Merge remote-tracking branch 'origin/master' clay 2024-06-23 18:15:07 +08:00
• 433bb7e1a4 Merge pull request 'master' (#390) from master into prod odjbin 2024-06-23 04:08:40 +00:00
• 0b9712962d Merge pull request 'dd' (#389) from dd into master odjbin 2024-06-23 04:08:23 +00:00
• d03f352169 fix : 注释npm install odjbin 2024-06-23 12:08:02 +08:00
• dc20a6e33d Merge remote-tracking branch 'origin/master' odjbin 2024-06-23 12:06:53 +08:00
• 1efe8c4aaf fix : 修复项目实施-台账基础信息展示及表格更新功能 odjbin 2024-06-23 12:04:22 +08:00
• 27b4f41749 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web wenhua 2024-06-23 01:36:20 +08:00
• 30bd9da52f feat: 新增移动端详情 wenhua 2024-06-23 01:36:17 +08:00
• 74e1938d3c fix : 修改分摊汇总金额展示 odjbin 2024-06-23 01:02:27 +08:00
• 08f86517da Merge pull request 'master' (#388) from master into prod odjbin 2024-06-22 16:59:19 +00:00
• 5757846e7c Merge pull request 'fix : 修复费用分摊详情合计bug' (#387) from dd into master odjbin 2024-06-22 16:59:07 +00:00
• 058421bdd7 fix : 修复费用分摊详情合计bug odjbin 2024-06-23 00:58:56 +08:00
• 794826f0c7 Merge pull request 'master' (#386) from master into prod odjbin 2024-06-22 16:39:27 +00:00
• da9bf2304b Merge pull request 'feat : 项目实施-台账新增表格更新功能' (#385) from dd into master odjbin 2024-06-22 16:39:16 +00:00
• 1a3d2bcf1a feat : 项目实施-台账新增表格更新功能 odjbin 2024-06-23 00:37:07 +08:00
• e0ba874746 Merge pull request 'fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参' (#384) from dd into master odjbin 2024-06-22 15:55:21 +00:00
• 7e524039bd fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参 odjbin 2024-06-22 23:54:54 +08:00
• 096fa6dc51 Merge pull request 'fix : 分摊详情小计与导出' (#383) from master into prod odjbin 2024-06-22 10:49:59 +00:00
• 2d9bba98a7 fix : 分摊详情小计与导出 odjbin 2024-06-22 18:49:14 +08:00
• accf65ef10 Merge pull request 'master' (#381) from master into prod odjbin 2024-06-22 10:46:16 +00:00
• e849c6cde6 Merge remote-tracking branch 'origin/master' odjbin 2024-06-22 18:45:50 +08:00
• 5c60bf91e4 fix : 分摊详情小计与导出 odjbin 2024-06-22 18:45:40 +08:00
• dc189aa726 fix : 修复新增分摊细节 clay 2024-06-22 18:44:49 +08:00
• eaa8b834bf Merge pull request 'master' (#380) from master into prod odjbin 2024-06-21 10:40:13 +00:00
• 82634ddf97 Merge pull request 'fix : 审批记录优化' (#379) from dj into master odjbin 2024-06-21 10:40:00 +00:00
• 3f32683d69 fix : 审批记录优化 odjbin 2024-06-21 18:39:45 +08:00
• b32ced514b Merge pull request 'master' (#378) from master into prod odjbin 2024-06-21 10:36:16 +00:00
• 5fbef17b86 Merge pull request 'dj' (#377) from dj into master odjbin 2024-06-21 10:35:54 +00:00
• 1cdd2cb02b fix : 主次账号消息框展示、审批记录优化、头像框组件优化 odjbin 2024-06-21 18:35:30 +08:00
• 2a80c8df21 fix : 修复项目归档开启/关闭上传文件二次确认 odjbin 2024-06-21 17:17:35 +08:00
• 4bee8bf9e4 fix : 修复项目实施/归档上传附件显示, odjbin 2024-06-21 17:15:01 +08:00
• 78cf7e6857 Merge pull request 'master' (#376) from master into prod odjbin 2024-06-21 07:31:47 +00:00
• efe1be3929 Merge pull request 'dj' (#375) from dj into master odjbin 2024-06-21 07:31:37 +00:00
• bce9b2d8d2 fix : 修复导出表格宽度 odjbin 2024-06-21 15:31:06 +08:00
• b73b9aad4b fix : 分摊汇总表格及小计导出 odjbin 2024-06-21 15:22:22 +08:00
• 8128766e24 Merge pull request 'master' (#374) from master into prod odjbin 2024-06-21 05:03:17 +00:00
• 8a9fffb3d0 Merge pull request 'fix : 移除输出log' (#373) from dj into master odjbin 2024-06-21 05:03:07 +00:00
• 9b758d41d0 fix : 移除输出log odjbin 2024-06-21 13:02:55 +08:00