mosr-web

odjbin/mosr-web

Fork 0

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

d676868cf7 fix : 修复首页点击阶段变更的查看跳转问题 odjbin 2024-06-05 11:05:47 +08:00
80d84c4a85 fix : 修复首页点击费用分摊的查看跳转问题 odjbin 2024-06-05 11:01:41 +08:00
71b2b372b1 Merge pull request 'fix : 修复审核意见位置' (#284) from dj into master odjbin 2024-06-04 16:51:52 +00:00
a7d91a8f32 fix : 修复审核意见位置 odjbin 2024-06-05 00:51:27 +08:00
7df8fbd46a Merge pull request 'master' (#283) from master into prod odjbin 2024-06-04 10:43:33 +00:00
e513af4983 Merge pull request 'fix : 修复阶段变更详情页面细节' (#282) from dj into master odjbin 2024-06-04 10:43:23 +00:00
df6f49caeb fix : 修复阶段变更详情页面细节 odjbin 2024-06-04 18:43:01 +08:00
d57af223cc Merge pull request 'master' (#281) from master into prod odjbin 2024-06-04 10:30:12 +00:00
3e2249431b Merge pull request 'dj' (#280) from dj into master odjbin 2024-06-04 10:23:55 +00:00
b9d33bd6e4 fix : 修复阶段变更/详情/编辑功能 odjbin 2024-06-04 18:23:42 +08:00
8f1cc442ac fix : 修复项目立项上传文件bug odjbin 2024-06-04 17:10:32 +08:00
cc2babcd32 Merge pull request 'dj' (#279) from dj into master odjbin 2024-06-04 08:43:00 +00:00
8b5868fde6 fix : 优化需求征集详情页面 odjbin 2024-06-04 16:42:00 +08:00
1d66c44edb fix : 优化需求征集详情页面 odjbin 2024-06-04 16:41:28 +08:00
6597506435 Merge remote-tracking branch 'origin/master' odjbin 2024-06-04 10:36:31 +08:00
00a2b7a3af fix : 修复项目验收其他文件上传bug odjbin 2024-06-03 21:56:20 +08:00
63a6f9b85e fix : 修复新增台账功能 odjbin 2024-06-03 16:48:00 +08:00
abd060b530 fix : 修复项目实施查看分摊功能 odjbin 2024-06-03 15:53:21 +08:00
d1eb5c3327 Merge pull request 'fix : 修复项目实施附件查询及上传功能、代码文件优化' (#278) from dj into master odjbin 2024-06-03 07:39:38 +00:00
abe80eafdc fix : 修复项目实施附件查询及上传功能、代码文件优化 odjbin 2024-06-03 15:39:22 +08:00
a1925121d7 Merge pull request 'master' (#277) from master into prod odjbin 2024-06-02 15:17:30 +00:00
1ee92f698e Merge pull request 'fix : 项目归档附件查询功能优化' (#276) from dj into master odjbin 2024-06-02 15:17:16 +00:00
747b40f9ba fix : 项目归档附件查询功能优化 odjbin 2024-06-02 23:17:06 +08:00
83fd1b37e2 Merge remote-tracking branch 'origin/master' clay 2024-06-02 22:36:09 +08:00
f6ada88026 feat : 附件处理 clay 2024-06-02 22:36:02 +08:00
2a0e193374 Merge pull request 'fix : 文件权限处理' (#275) from dj into master odjbin 2024-06-02 14:23:39 +00:00
e0b5487951 fix : 文件权限处理 odjbin 2024-06-02 22:23:19 +08:00
f20318843e Merge pull request 'fix : 修复直接上报的详情组件渲染' (#274) from dj into master odjbin 2024-06-02 14:22:15 +00:00
456f2284e9 fix : 修复直接上报的详情组件渲染 odjbin 2024-06-02 22:22:06 +08:00
fb64361c64 Merge pull request 'fix : 修复细节' (#273) from dj into master odjbin 2024-06-02 11:42:44 +00:00
6bb97b4a1d fix : 修复细节 odjbin 2024-06-02 19:42:33 +08:00
9ad29c3a13 feat : 文件组件抽象封装 clay 2024-06-02 19:37:20 +08:00
20fbd0e2d4 feat : 需求上报详情删除 clay 2024-06-02 18:23:32 +08:00
eebb3003c7 Merge remote-tracking branch 'origin/master' clay 2024-06-02 17:39:20 +08:00
3ed5068dee feat : 需求上报fileLie 权限控制 clay 2024-06-02 17:37:53 +08:00
918a02b201 Merge pull request 'fix : 修复获取流程接口的提示框' (#272) from dj into master odjbin 2024-06-02 08:54:58 +00:00
e0ffef25bd fix : 修复获取流程接口的提示框 odjbin 2024-06-02 16:54:46 +08:00
419397fc00 Merge pull request 'fix : 修复文件列表表格高度' (#271) from dj into master odjbin 2024-06-02 08:31:53 +00:00
9b45135a18 fix : 修复文件列表表格高度 odjbin 2024-06-02 16:31:37 +08:00
f0eb28ab84 Merge pull request 'fix : 修复文件下载、专项资金新增、删除功能、流程新增细节优化' (#270) from dj into master odjbin 2024-06-02 08:12:55 +00:00
c416424253 fix : 修复文件下载、专项资金新增、删除功能、流程新增细节优化 odjbin 2024-06-02 16:12:40 +08:00
e9592920e7 Merge pull request 'fix : 修复首页查看跳转问题及简化代码' (#269) from dj into master odjbin 2024-06-02 03:54:31 +00:00
c05322a2bf fix : 修复首页查看跳转问题及简化代码 odjbin 2024-06-02 11:54:19 +08:00
9be3d7096a Merge pull request 'fix : 修复菜单图标、金额单位为元、项目实施台账上传费用功能、' (#268) from dj into master odjbin 2024-06-02 03:05:08 +00:00
cd715fbf98 fix : 修复菜单图标、金额单位为元、项目实施台账上传费用功能、 odjbin 2024-06-02 11:04:54 +08:00
4f4f1842a4 Merge pull request 'master' (#267) from master into prod wenhua 2024-06-01 15:17:36 +00:00
a796e7622f Merge branch 'master' of http://git.feashow.cn/clay/mosr-web lilinyuan 2024-06-01 23:15:39 +08:00
e2d6722ec6 fix: 修复bug lilinyuan 2024-06-01 23:15:37 +08:00
1bc27897d8 Merge pull request 'master' (#266) from master into prod odjbin 2024-06-01 14:54:47 +00:00
13386303e8 Merge pull request 'fix : 修复细节' (#265) from dj into master odjbin 2024-06-01 14:54:37 +00:00
c4db5d6719 fix : 修复细节 odjbin 2024-06-01 22:54:23 +08:00
e5d03a07a3 Merge pull request 'master' (#264) from master into prod odjbin 2024-06-01 14:51:57 +00:00
495e39c802 feat : 表单权限处理 clay 2024-06-01 22:18:57 +08:00
dd5d24768b Merge pull request 'fix : 修复附件上传' (#263) from dj into master odjbin 2024-06-01 14:18:22 +00:00
3746a19063 fix : 修复附件上传 odjbin 2024-06-01 22:17:46 +08:00
9acd05a2cc fix: 修复角色页面跳转bug lilinyuan 2024-06-01 20:49:27 +08:00
d7a4eef7db Merge pull request 'fix : 修复申请文件校验' (#262) from dj into master odjbin 2024-06-01 12:34:25 +00:00
346ad4c4df fix : 修复申请文件校验 odjbin 2024-06-01 20:33:28 +08:00
5d570f3108 Merge pull request 'dj' (#261) from dj into master odjbin 2024-06-01 11:25:22 +00:00
4a0b3db4e4 fix : 修复新增流程数据重置 odjbin 2024-06-01 19:25:04 +08:00
bc27a83848 fix : 修复项目归档五个附件上传功能 odjbin 2024-06-01 19:05:11 +08:00
dd046f645f fix : 修复项目归档五个附件上传功能、提示框、文件多选上传、详情驳回/同意路由跳转问题 odjbin 2024-06-01 18:30:11 +08:00
04a7ba8802 Merge remote-tracking branch 'origin/master' odjbin 2024-06-01 17:33:22 +08:00
b0199c8fd9 fix: 部分权限标识, 修复部门编辑bug lilinyuan 2024-06-01 17:03:43 +08:00
d2f9bfcb33 fix: 项目管理详情查询为空的时候关闭loading lilinyuan 2024-06-01 16:24:40 +08:00
6391ab458b feat: 退出时多标签页全部清空 lilinyuan 2024-06-01 16:07:57 +08:00
e1f6652672 Merge remote-tracking branch 'origin/master' odjbin 2024-06-01 15:57:32 +08:00
4d1ba82696 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web lilinyuan 2024-06-01 15:57:11 +08:00
de2475f39a feat: 部门详情, 编辑 lilinyuan 2024-06-01 15:57:07 +08:00
80ecad0864 fix : 修复需求征集界面样式及提示 odjbin 2024-06-01 14:36:03 +08:00
fa94f9e78d Merge pull request 'fix : 修复项目实施附件查询功能及上传附件页面初始' (#260) from dj into master odjbin 2024-06-01 05:34:32 +00:00
7501c37379 fix : 修复项目实施附件查询功能及上传附件页面初始 odjbin 2024-06-01 13:34:12 +08:00
f776f994ab Merge pull request 'dj' (#259) from dj into master odjbin 2024-05-31 16:46:19 +00:00
daf5ffe2c9 fix : 修复项目实施附件查询及上传功能 odjbin 2024-06-01 00:46:00 +08:00
f4ad871831 fix : 修改详情页数据回显问题及简化代码 odjbin 2024-06-01 00:45:13 +08:00
5be806104f fix: 修复退出登录再次登录菜单不刷新问题 lilinyuan 2024-05-31 21:49:43 +08:00
7ec6cba0f0 Merge pull request 'fix : 修复页面细节' (#258) from dj into master odjbin 2024-05-31 13:05:09 +00:00
14abf64e5d fix : 修复页面细节 odjbin 2024-05-31 21:04:54 +08:00
661bc2e397 Merge pull request 'dj' (#257) from dj into master odjbin 2024-05-31 12:57:30 +00:00
2246fcb621 fix : 修复页面细节 odjbin 2024-05-31 20:57:17 +08:00
5ae8e4be78 fix : 修复页面细节 odjbin 2024-05-31 20:56:58 +08:00
d6909fb449 Merge pull request 'fix : 字典为空死循环bug' (#256) from master into prod clay 2024-05-31 03:24:03 +00:00
5a1e1848cb fix : 字典为空死循环bug clay 2024-05-31 11:23:34 +08:00
73978ca602 Merge pull request 'master' (#255) from master into prod odjbin 2024-05-30 14:53:53 +00:00
3f9b7f9011 Merge pull request 'fix : 修复页面细节' (#254) from dj into master odjbin 2024-05-30 14:53:44 +00:00
f47180dfbe fix : 修复页面细节 odjbin 2024-05-30 22:53:33 +08:00
ac4cdb1189 Merge pull request 'master' (#253) from master into prod odjbin 2024-05-30 14:51:39 +00:00
2e7e55464d Merge pull request 'fix : 修复页面细节' (#252) from dj into master odjbin 2024-05-30 14:51:22 +00:00
7791648837 fix : 修复页面细节 odjbin 2024-05-30 22:51:06 +08:00
b3e85e186e Merge pull request 'master' (#251) from master into prod clay 2024-05-30 14:34:28 +00:00
92e935622a Merge remote-tracking branch 'origin/master' clay 2024-05-30 22:32:41 +08:00
ee890c0e80 feat : 表单权限处理 clay 2024-05-30 22:31:47 +08:00
f0a09b2d0a Merge pull request 'master' (#250) from master into prod odjbin 2024-05-30 12:07:30 +00:00
e39d953385 Merge pull request 'fix : 修复页面细节' (#249) from dj into master odjbin 2024-05-30 12:06:55 +00:00
8c6da666d5 fix : 修复页面细节 odjbin 2024-05-30 20:04:57 +08:00
501790677e Merge pull request 'master' (#248) from master into prod odjbin 2024-05-30 09:49:17 +00:00
29a019b32a Merge pull request 'fix : 修复页面细节' (#247) from dj into master odjbin 2024-05-30 09:48:57 +00:00
8bc9a27ccf fix : 修复页面细节 odjbin 2024-05-30 17:48:36 +08:00
ed988b99b3 Merge pull request 'fix : 修复上传费用校验问题' (#246) from dj into master odjbin 2024-05-30 09:29:20 +00:00
c799c97643 fix : 修复上传费用校验问题 odjbin 2024-05-30 17:29:05 +08:00