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

• 90a08f37f6 Merge pull request 'master' (#372) from master into prod odjbin 2024-06-21 04:42:08 +00:00
• 9a3bfc784e Merge pull request 'fix : 审批记录优化' (#371) from dj into master odjbin 2024-06-21 04:41:58 +00:00
• ddc305297f fix : 审批记录优化 odjbin 2024-06-21 12:41:43 +08:00
• ad03a1ed2b Merge pull request 'master' (#370) from master into prod odjbin 2024-06-21 04:33:41 +00:00
• 853be5f9de Merge pull request 'dj' (#369) from dj into master odjbin 2024-06-21 04:33:31 +00:00
• 5977f13b91 fix : 修复人员选择框 odjbin 2024-06-21 12:33:18 +08:00
• 3f26324747 fix : 修复研发人员选择框 odjbin 2024-06-21 12:32:46 +08:00
• 141e965f95 fix : 修复研发人员选择框 odjbin 2024-06-21 12:31:27 +08:00
• e12dd9e5d7 Merge pull request 'dj' (#367) from dj into master odjbin 2024-06-21 04:30:50 +00:00
• d97ea2f19e Merge remote-tracking branch 'origin/master' odjbin 2024-06-21 12:30:31 +08:00
• e3664314d0 fix : 修复所属公司选择框细节 odjbin 2024-06-21 12:30:19 +08:00
• 41b1bed81d Merge pull request 'master' (#366) from master into prod odjbin 2024-06-21 04:24:08 +00:00
• bfc38d035f Merge pull request 'dj' (#365) from dj into master odjbin 2024-06-21 04:23:54 +00:00
• cef8530a5b fix : 固定所属公司选择条数为14则隐藏 odjbin 2024-06-21 12:23:25 +08:00
• a6476c359d fix : 审批记录样式优化, 上传费用,新增分摊输入框宽度固定 odjbin 2024-06-20 16:55:15 +08:00
• 57f27c2b84 fix : 修复专项资金/费用分摊,编辑,审批记录展示 odjbin 2024-06-20 15:08:12 +08:00
• 4c8959e3c4 fix : 修复专项资金/费用分摊,编辑,审批记录展示 odjbin 2024-06-20 14:39:24 +08:00
• bc882f375f Merge pull request 'master' (#364) from master into prod clay 2024-06-19 19:25:34 +00:00
• a1064f6111 Merge pull request 'fix : 修复分摊明细/汇总导出' (#363) from dj into master clay 2024-06-19 19:25:23 +00:00
• 255dbe67e0 fix : 修复分摊明细/汇总导出 odjbin 2024-06-20 03:24:58 +08:00
• 5d23a903fc Merge pull request 'master' (#362) from master into prod odjbin 2024-06-19 18:28:50 +00:00
• 994e474532 feat: 分摊明细异构表格数据对接 + 分摊明细异构表格excel导出 odjbin 2024-06-20 02:27:42 +08:00
• 7fb30322b3 Merge pull request 'master' (#361) from master into prod odjbin 2024-06-19 07:12:19 +00:00
• f3e8e12a5a fix : 右上角用户展示样式优化 odjbin 2024-06-19 11:53:50 +08:00
• 4289ab2709 fix : 右上角用户展示样式优化 odjbin 2024-06-19 11:52:07 +08:00
• a9dfa26b0d fix : 修改首页待办数量 odjbin 2024-06-19 11:44:30 +08:00
• c0bfbbfe65 fix: user 暂存 lilinyuan 2024-06-19 11:26:01 +08:00
• f812b4af4d feat: 新增table获取数据总量方法 lilinyuan 2024-06-19 11:25:50 +08:00
• 94bb4ce943 Merge pull request 'dj' (#360) from dj into master odjbin 2024-06-18 19:07:21 +00:00
• 7ad99048f4 fix : 修改右上角用户样式 odjbin 2024-06-19 03:07:06 +08:00
• 0eba2c45f5 fix : 修改右上角用户样式 odjbin 2024-06-19 03:03:29 +08:00
• 6f33aa1114 fix : 修改用户切换样式 odjbin 2024-06-19 02:56:00 +08:00
• 4f8a27e518 Merge remote-tracking branch 'origin/master' clay 2024-06-19 01:26:31 +08:00
• 59014f6367 feat : 用户账号切换 clay 2024-06-19 01:26:24 +08:00
• 20825fee23 Merge pull request 'fix : 修改人员选择框细节' (#359) from dj into master odjbin 2024-06-18 16:08:18 +00:00
• bd1393d41c fix : 修改人员选择框细节 odjbin 2024-06-19 00:08:09 +08:00
• a3ac29b28b Merge pull request 'fix : 前置流程回显' (#358) from dj into master odjbin 2024-06-18 16:03:27 +00:00
• da49b51b3d fix : 前置流程回显 odjbin 2024-06-19 00:02:38 +08:00
• fbd6c3695d Merge pull request 'dj' (#357) from dj into master odjbin 2024-06-18 15:55:54 +00:00
• aa15e9b8d0 fix : 前置流程多选 odjbin 2024-06-18 23:55:40 +08:00
• 91f21409f6 fix : 前置流程多选 odjbin 2024-06-18 23:46:24 +08:00
• 820349877c fix : 修复需求征集编辑时所属公司回显,项目阶段改成研发阶段,人员选择器主子账号颜色区分 odjbin 2024-06-18 23:11:27 +08:00
• 5410b6d248 feat : 菜单与公司选择组件修改 clay 2024-06-18 22:24:50 +08:00
• 369647f64f Merge pull request 'fix : 修复需求征集/汇总/费用台账页面搜索细节' (#356) from dj into master odjbin 2024-06-18 14:19:02 +00:00
• 3745c9cb28 fix : 修复需求征集/汇总/费用台账页面搜索细节 odjbin 2024-06-18 22:18:35 +08:00
• 45a6b6733f Merge pull request 'fix : 修复列表左侧选择框,及正确json格式' (#355) from dj into master odjbin 2024-06-18 13:27:22 +00:00
• 6ab1dc806e fix : 修复列表左侧选择框,及正确json格式 odjbin 2024-06-18 21:27:03 +08:00
• a795fa5786 Merge pull request 'master' (#354) from master into prod odjbin 2024-06-18 12:43:42 +00:00
• a678420f4f Merge pull request 'fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填' (#353) from dj into master odjbin 2024-06-18 12:43:17 +00:00
• 5100281c1f fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填 odjbin 2024-06-18 20:43:02 +08:00
• 3a79c85033 Merge pull request 'fix : 修复所属公司选择框右侧的删除功能' (#352) from dj into master odjbin 2024-06-18 08:45:40 +00:00
• df513a91fe fix : 修复所属公司选择框右侧的删除功能 odjbin 2024-06-18 16:45:19 +08:00
• 6fcb68d929 Merge pull request 'fix: 多标签页bug' (#351) from master into prod wenhua 2024-06-18 08:10:35 +00:00
• 506c794c5d fix: 多标签页bug lilinyuan 2024-06-18 16:09:21 +08:00
• 9cf7396fb8 Merge pull request 'master' (#350) from master into prod odjbin 2024-06-17 03:48:08 +00:00
• 1c908017bb Merge pull request 'fix : 修复上传费用输入框垂直居中、台账时间搜索' (#349) from dj into master odjbin 2024-06-17 03:40:03 +00:00
• 9cbe89007d fix : 修复上传费用输入框垂直居中、台账时间搜索 odjbin 2024-06-17 11:39:34 +08:00
• 891cebec90 Merge pull request 'master' (#348) from master into prod odjbin 2024-06-17 03:22:45 +00:00
• 132ab60d0f Merge pull request 'fix : 修复新增费用分摊输入框垂直居中' (#347) from dj into master odjbin 2024-06-16 13:41:33 +00:00
• 0c36801e83 fix : 修复新增费用分摊输入框垂直居中 odjbin 2024-06-16 21:41:20 +08:00
• f187e7c5b1 Merge pull request 'fix : 修复费用分摊时间搜索' (#346) from dj into master odjbin 2024-06-16 13:08:13 +00:00
• b162bb8977 fix : 修复费用分摊时间搜索 odjbin 2024-06-16 21:08:04 +08:00
• 2206e2aa21 Merge pull request 'master' (#345) from master into prod odjbin 2024-06-16 12:35:37 +00:00
• 75664822e4 Merge pull request 'fix : 修复项目费用显示bug' (#344) from dj into master odjbin 2024-06-16 12:35:12 +00:00
• 009d73ce86 fix : 修复项目费用显示bug odjbin 2024-06-16 20:34:46 +08:00
• ba4e927ff5 Merge pull request 'master' (#343) from master into prod odjbin 2024-06-16 11:50:40 +00:00
• 33a90e59f6 Merge pull request 'fix : 修改所属公司选择框bug' (#342) from dj into master odjbin 2024-06-16 11:50:30 +00:00
• 63107ece02 fix : 修改所属公司选择框bug odjbin 2024-06-16 19:50:17 +08:00
• a75c2dd0fa Merge pull request 'fix : 流程图位置更换' (#341) from dj into master odjbin 2024-06-16 11:36:30 +00:00
• d1a8077eea fix : 流程图位置更换 odjbin 2024-06-16 19:34:08 +08:00
• a72a09008f Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-16 18:07:39 +08:00
• fa366d18e5 Merge pull request 'master' (#340) from master into prod odjbin 2024-06-16 10:07:34 +00:00
• 46e67f30a0 Merge pull request 'dj' (#339) from dj into master odjbin 2024-06-16 10:07:18 +00:00
• 7ffb689927 fix : 修复所属公司选择框 odjbin 2024-06-16 18:06:53 +08:00
• 13e0b6401c Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-16 17:31:15 +08:00
• 79171758f5 fix : 修复需求汇总重新提交专项资金参数回传 odjbin 2024-06-16 15:41:38 +08:00
• 61a999758e fix : 修复默认矩阵审批 odjbin 2024-06-15 18:02:32 +08:00
• 31ff2a4502 Merge pull request 'master' (#338) from master into prod odjbin 2024-06-14 16:47:38 +00:00
• f624b4d290 Merge pull request 'fix : 修复公司选择框全选功能' (#337) from dj into master odjbin 2024-06-14 16:47:29 +00:00
• 9153c20902 fix : 修复公司选择框全选功能 odjbin 2024-06-15 00:47:17 +08:00
• 4d312a8892 Merge pull request 'master' (#336) from master into prod odjbin 2024-06-14 15:27:00 +00:00
• 5fdcf42336 Merge pull request 'fix : 修复阶段变更中抄送人员回显' (#335) from dj into master odjbin 2024-06-14 15:26:51 +00:00
• 73313a1532 fix : 修复阶段变更中抄送人员回显 odjbin 2024-06-14 23:26:38 +08:00
• fc09c1db05 Merge pull request 'master' (#334) from master into prod odjbin 2024-06-14 15:18:20 +00:00
• 21cfe73a13 Merge pull request 'fix : 修复新增需求征集所属公司选择弹框' (#333) from dj into master odjbin 2024-06-14 15:18:10 +00:00
• 532ef440ce fix : 修复新增需求征集所属公司选择弹框 odjbin 2024-06-14 23:17:32 +08:00
• 62983eea10 Merge pull request 'master' (#332) from master into prod odjbin 2024-06-14 06:02:16 +00:00
• 2ff0dbd2a4 Merge pull request 'fix : 修复项目实施台账字典问题' (#331) from dj into master odjbin 2024-06-14 06:01:59 +00:00
• 58cbceb747 fix : 修复项目实施台账字典问题 odjbin 2024-06-14 14:01:41 +08:00
• a7f95e98aa Merge pull request 'master' (#330) from master into prod odjbin 2024-06-14 05:05:07 +00:00
• 49b64c177f Merge pull request 'fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件' (#329) from dj into master odjbin 2024-06-14 05:04:56 +00:00
• f240016e44 fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件 odjbin 2024-06-14 13:04:37 +08:00
• d3133a8860 Merge remote-tracking branch 'origin/master' zhangkaihuai 2024-06-11 21:19:00 +08:00
• df4312e61d Merge pull request 'master' (#328) from master into prod odjbin 2024-06-11 13:14:34 +00:00
• 6d56c4702b Merge pull request 'fix : 修复细节' (#327) from dj into master odjbin 2024-06-11 13:14:24 +00:00
• 3db0f3bd5b fix : 修复细节 odjbin 2024-06-11 21:14:09 +08:00
• 65af3e7bfb Merge pull request 'master' (#326) from master into prod odjbin 2024-06-11 13:05:54 +00:00
• 363e2b983e Merge pull request 'fix : 修复新增需求细节' (#325) from dj into master odjbin 2024-06-11 13:05:46 +00:00
• 90a26f2e1e fix : 修复新增需求细节 odjbin 2024-06-11 21:05:31 +08:00
• fe5c28dbf0 Merge pull request 'master' (#324) from master into prod odjbin 2024-06-11 12:59:21 +00:00