Commit Graph

Select branches

Hide Pull Requests

dev

dev_m2

feature/bpm

feature/im

feature/iot

im

master

master-vxe

revert-merge-698-feature/bpm

#1

#1

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#219

#219

#22

#22

#220

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#29

#290

#290

#291

#291

#292

#292

#293

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#3

#30

#300

#300

#301

#301

#302

#302

#303

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#310

#310

#311

#311

#312

#312

#313

#313

#314

#314

#315

#315

#316

#316

#317

#317

#318

#318

#319

#319

#32

#32

#320

#320

#321

#321

#322

#322

#323

#323

#324

#324

#325

#325

#326

#326

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#348

#349

#349

#35

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#369

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#374

#375

#375

#376

#376

#377

#377

#378

#378

#379

#379

#38

#38

#380

#380

#381

#381

#382

#382

#383

#383

#384

#384

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#39

#39

#390

#390

#391

#391

#392

#392

#393

#393

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#4

#40

#40

#400

#400

#401

#401

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#407

#407

#408

#408

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#413

#413

#414

#414

#415

#415

#416

#416

#417

#417

#418

#418

#419

#419

#42

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#43

#430

#430

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#439

#439

#44

#44

#440

#440

#441

#441

#442

#442

#443

#443

#444

#444

#445

#445

#446

#446

#447

#447

#448

#448

#449

#449

#45

#45

#450

#450

#451

#451

#452

#452

#453

#453

#454

#454

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#466

#466

#467

#467

#468

#468

#469

#469

#47

#47

#470

#470

#471

#471

#472

#472

#473

#473

#474

#474

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#48

#480

#481

#481

#482

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#487

#488

#488

#489

#489

#49

#49

#490

#490

#491

#491

#492

#492

#493

#493

#494

#494

#495

#495

#496

#496

#497

#497

#498

#498

#499

#499

#5

#5

#50

#50

#500

#500

#501

#501

#502

#502

#503

#503

#504

#504

#505

#505

#506

#506

#507

#507

#508

#508

#509

#509

#51

#51

#510

#510

#511

#511

#512

#512

#513

#513

#514

#514

#515

#515

#516

#516

#517

#517

#518

#518

#519

#519

#52

#52

#520

#520

#521

#521

#522

#522

#523

#523

#524

#524

#525

#525

#526

#526

#527

#527

#528

#528

#529

#529

#53

#53

#530

#530

#531

#531

#532

#532

#533

#533

#534

#534

#535

#535

#536

#536

#537

#537

#538

#539

#539

#54

#54

#540

#540

#541

#541

#542

#542

#543

#543

#544

#544

#545

#545

#546

#546

#547

#547

#548

#548

#549

#549

#55

#55

#550

#550

#551

#552

#552

#553

#553

#554

#554

#555

#555

#556

#556

#557

#557

#558

#558

#559

#559

#56

#56

#560

#560

#561

#561

#562

#562

#563

#563

#564

#564

#565

#565

#566

#566

#567

#567

#568

#568

#569

#569

#57

#570

#570

#571

#571

#572

#572

#573

#573

#574

#574

#575

#575

#576

#576

#577

#577

#578

#578

#579

#579

#58

#58

#580

#581

#582

#583

#583

#584

#584

#585

#585

#586

#586

#587

#587

#588

#588

#589

#589

#59

#59

#590

#590

#591

#591

#592

#592

#593

#593

#594

#594

#595

#595

#596

#597

#597

#598

#598

#599

#599

#6

#6

#60

#60

#600

#600

#601

#601

#602

#603

#603

#604

#604

#605

#605

#606

#606

#607

#607

#608

#608

#609

#609

#61

#610

#610

#611

#611

#612

#612

#613

#613

#614

#614

#615

#615

#616

#616

#617

#617

#618

#618

#619

#619

#62

#62

#620

#620

#621

#621

#622

#622

#623

#623

#624

#624

#625

#625

#626

#626

#627

#627

#628

#628

#629

#629

#63

#63

#630

#630

#631

#631

#632

#632

#633

#633

#634

#634

#635

#635

#636

#636

#637

#637

#638

#638

#639

#639

#64

#64

#640

#640

#641

#641

#642

#642

#643

#643

#644

#644

#645

#645

#646

#646

#647

#647

#648

#648

#649

#649

#65

#65

#650

#651

#651

#652

#652

#653

#654

#654

#655

#655

#656

#656

#657

#657

#658

#658

#659

#659

#66

#66

#660

#660

#661

#661

#662

#662

#663

#663

#664

#664

#665

#665

#666

#666

#667

#667

#668

#668

#669

#669

#67

#67

#670

#670

#671

#671

#672

#672

#673

#673

#674

#674

#675

#675

#676

#676

#677

#677

#678

#678

#679

#679

#68

#68

#680

#680

#681

#681

#682

#682

#683

#683

#684

#684

#685

#685

#686

#686

#687

#687

#688

#688

#689

#689

#69

#69

#690

#690

#691

#691

#692

#692

#693

#693

#694

#694

#695

#695

#696

#696

#697

#697

#698

#698

#699

#699

#7

#7

#70

#70

#700

#700

#701

#701

#702

#702

#703

#703

#704

#704

#705

#705

#706

#706

#707

#707

#708

#708

#709

#709

#71

#71

#710

#710

#711

#711

#712

#712

#713

#713

#714

#715

#715

#716

#716

#717

#717

#718

#718

#719

#719

#72

#72

#720

#720

#721

#721

#722

#722

#723

#723

#724

#724

#725

#725

#726

#726

#727

#727

#728

#728

#729

#729

#73

#73

#730

#730

#731

#731

#732

#732

#733

#733

#734

#734

#735

#735

#736

#736

#737

#737

#738

#738

#739

#739

#74

#74

#740

#740

#741

#741

#742

#742

#743

#743

#744

#744

#745

#745

#746

#746

#747

#747

#748

#748

#749

#749

#75

#75

#750

#750

#751

#751

#752

#752

#753

#753

#754

#754

#755

#755

#756

#756

#757

#757

#758

#758

#759

#759

#76

#76

#760

#760

#761

#761

#762

#762

#763

#763

#764

#764

#765

#765

#766

#766

#767

#767

#768

#768

#769

#769

#77

#77

#770

#770

#771

#771

#772

#772

#773

#773

#774

#774

#775

#775

#776

#776

#777

#777

#778

#778

#779

#779

#78

#78

#780

#780

#781

#782

#782

#783

#783

#784

#784

#785

#785

#786

#786

#787

#787

#788

#788

#789

#789

#79

#79

#790

#790

#791

#791

#792

#792

#793

#793

#794

#794

#795

#795

#796

#796

#797

#797

#798

#798

#799

#799

#8

#8

#80

#80

#800

#800

#801

#801

#802

#802

#803

#803

#804

#804

#805

#805

#806

#806

#807

#807

#808

#808

#809

#809

#81

#81

#810

#810

#811

#811

#812

#812

#813

#813

#814

#814

#815

#815

#816

#816

#817

#817

#818

#818

#819

#819

#82

#82

#820

#820

#821

#821

#822

#822

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

v1.7.1

v1.7.2

v1.7.3

v1.8.0

v1.8.1

v1.8.2

v1.8.3

v1.9.0

v2.0.0

v2.0.1

v2.1.0

v2.2.0

v2.3.0

v2.4.0

v2.4.1

v2.4.2

v2.5.0

v2.6.0

v2.6.1

v2025.08

v2025.09

Mono Color

• a7b1601dc5 优化 苑坤 2025-05-26 23:30:45 +0800
• 97e3647a49 修改问题 zy 2025-05-26 17:26:50 +0800
• 5b3accf2d7 优化联系人页面 苑坤 2025-05-26 11:43:36 +0800
• 0593b1a9a2 去掉了负责人、创建时间 苑坤 2025-05-26 11:35:13 +0800
• f95c651cb1 Merge remote-tracking branch 'origin/master' 苑坤 2025-05-26 10:12:01 +0800
• 62f1ebf40b 1、修改了商机的签约人为必填项 2、自助下单（元） 、客服代订（元）为空的提示问题 苑坤 2025-05-26 10:11:49 +0800
• cc90ed98b1 CRM客户关联单位 wangzhen 2025-05-26 09:52:07 +0800
• bcb3ba5755 Merge remote-tracking branch 'origin/master' 苑坤 2025-05-25 20:15:33 +0800
• e2ddfa8caa 调整服务费收取方式 苑坤 2025-05-25 20:15:17 +0800
• 9d9292898a 商机-客户-变更 zy 2025-05-25 20:14:19 +0800
• 0f2d74276c 调整产品采购成本 苑坤 2025-05-25 20:12:12 +0800
• 343f31b8b5 去掉顾问管理 苑坤 2025-05-25 19:22:26 +0800
• a47b9dac00 去掉顾问管理 苑坤 2025-05-25 19:21:38 +0800
• 6b6b2f4e61 修改服务费收取方式 苑坤 2025-05-25 19:00:18 +0800
• 7ff363e29f Merge remote-tracking branch 'origin/master' 苑坤 2025-05-25 18:52:38 +0800
• 30c1baf3c4 修改资金成本 苑坤 2025-05-25 18:52:24 +0800
• 9ffffc1819 服务费收取方式类型说明字段修改 hzn 2025-05-25 18:46:18 +0800
• 23a14735ef Merge remote-tracking branch 'origin/master' 苑坤 2025-05-25 17:48:02 +0800
• 4a28ebd7d5 项目难度 苑坤 2025-05-25 17:47:45 +0800
• f4fb5f83a6 服务费收取方式类型 hzn 2025-05-25 17:45:18 +0800
• c861750e06 优化技术对接页面 苑坤 2025-05-25 17:42:13 +0800
• b147ba4d08 采购成本 苑坤 2025-05-25 17:29:44 +0800
• e278cea962 修改资金成本页面 苑坤 2025-05-25 17:00:48 +0800
• 86e8620d51 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-25 15:03:56 +0800
• bee919cfb6 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-25 15:02:51 +0800
• da7fc6272d 去掉是否为负责人 苑坤 2025-05-25 14:40:55 +0800
• c0bfe5ef03 修改 苑坤 2025-05-25 14:13:52 +0800
• 25563315ed 去掉商机 苑坤 2025-05-25 13:57:42 +0800
• d69426f756 修改页面 苑坤 2025-05-25 11:53:27 +0800
• 3a1bd12787 报价 zy 2025-05-25 10:00:13 +0800
• 03ee0af863 标签 zy 2025-05-25 09:43:12 +0800
• 39d77b5a3c 修改-反馈 zy 2025-05-24 21:39:01 +0800
• 5591ad0240 增加本地后端地址 wangzhen 2025-05-24 17:13:27 +0800
• 4bb12b8314 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa wangzhen 2025-05-24 15:50:49 +0800
• 4b00cc2e41 增加本地后端地址 wangzhen 2025-05-24 15:46:41 +0800
• 3480d6604c 客户-联系人 zy 2025-05-24 12:48:53 +0800
• 6c1fb7f729 Merge remote-tracking branch 'origin/master' mrz 2025-05-23 18:01:10 +0800
• 23365b8135 升级axios版本 mrz 2025-05-23 18:00:59 +0800
• 36589b2910 获取标签 zy 2025-05-23 17:07:22 +0800
• 8778919237 权限 zy 2025-05-23 17:03:03 +0800
• 0fb88dd794
  Pre Merge pull request !778 from 王祁/master 王祁 2025-05-23 04:58:32 +0000
• 1d5bde26f9
  Pre Merge pull request !776 from 陈家彬/master 陈家彬 2025-05-23 04:58:31 +0000
• 330921f596
  Pre Merge pull request !773 from ydh91/dev ydh91 2025-05-23 04:58:30 +0000
• b14df2e01b (〃'▽'〃) v2.6.0 发布：优化项目结构，希望你会喜欢 v2.6.0 YunaiV 2025-05-23 12:58:21 +0800
• b60a441014 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-23 10:18:39 +0800
• 39e49121e2 组件相关-hrm zy 2025-05-23 10:18:35 +0800
• 65c88a24ef Merge branch 'master' into wkz quu 2025-05-22 21:23:36 +0900
• f4eac55974 hrm quu 2025-05-22 21:10:00 +0900
• 011739879b 修改页面 苑坤 2025-05-21 12:32:08 +0800
• 747f4e9926 修改页面 苑坤 2025-05-21 12:22:00 +0800
• ed09002861 放出字段 zy 2025-05-20 13:32:06 +0800
• d921d0f5c0 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-20 09:49:13 +0800
• 23e802cff3 组件问题 zy 2025-05-20 09:49:09 +0800
• 6ea980d2b2 hrm quu 2025-05-19 22:28:27 +0900
• 990223ec34 问题处理 zy 2025-05-19 19:02:17 +0800
• 4d78cc06f2 师徒 zy 2025-05-19 16:21:23 +0800
• 8a6758ba60 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-19 15:45:10 +0800
• fda9b655fb 客户 zy 2025-05-19 15:45:05 +0800
• e8435e6449 建会申请初始化 wangzhen 2025-05-19 15:22:55 +0800
• 185b306240 客户组件封装 zy 2025-05-19 12:31:14 +0800
• a98497cf47 Merge branch 'master' into wkz quu 2025-05-18 12:03:25 +0900
• db45cc6cbd hrm quu 2025-05-18 12:03:09 +0900
• 0692c4f9dd Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-17 17:40:52 +0800
• a3e714aad9 数据权限 zy 2025-05-17 17:40:48 +0800
• 8c74752b2b Merge branch 'wkz' quu 2025-05-17 17:17:31 +0900
• 32bdf5a292 feat：【PAY 支付】增加 wallet 在管理后台的案例 YunaiV 2025-05-16 23:27:26 +0800
• 0580b9876e hrm quu 2025-05-16 21:26:16 +0900
• 172f9a5dcd Merge branch 'master' into wkz quu 2025-05-16 20:13:49 +0900
• 13d26703e0 fix: 修复在代码生成进行编辑时，对字段信息中的字典类型已经设置后又置空后，提交无法更新的问题。 bozch 2025-05-16 18:15:26 +0800
• 1aea6aca7c 用户管理，选中树形后无法取消选中问题 王靖文 2025-05-16 16:35:18 +0800
• bd50c3fc95 懒加载 zy 2025-05-16 13:53:34 +0800
• f99a823ca9 新建任务 zy 2025-05-15 16:42:12 +0800
• 4804d4e146 项目 zy 2025-05-15 15:32:15 +0800
• 1f508d31d2 feat(infra): 文件配置支持相对路径 王祁 2025-05-15 12:58:34 +0800
• dd2242e2be 文件上传 zy 2025-05-15 10:30:56 +0800
• 0ea5bb7d9b Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-14 22:10:12 +0800
• 060ec1f1b3 月报 zy 2025-05-14 22:10:07 +0800
• 15b84bd98e 修改商机相关内容 苑坤 2025-05-14 17:51:26 +0800
• 551c405c32
  :accept="computedAccept" Timi 2025-05-14 09:45:37 +0000
• 5939ec9131 1.修复因permission.ts、usePageLoading.ts与useTitle.ts在初始化Pinia之前调用导致无法存储应用配置问题(app.ts中的配置令牌)，将permission.ts中调用useAppStoreWithOut()的位置改为路由守卫中调用，同步修改另外两个文件的调用位置。 2.修复水印设置后刷新就没有了的问题;水印设置输入框改为固定宽，以防止label被挤压。 3.修改app.ts中的存储，将useCache存储的个别配置都改为pinia存储（pinia存储问题修复后） chenjiabin 2025-05-14 16:32:27 +0800
• 7049674d1e Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-14 14:36:22 +0800
• 6808e58381 日报-周报 zy 2025-05-14 14:36:18 +0800
• 3570155224 增加服务费收取方式模块 wangzhen 2025-05-14 12:04:00 +0800
• 581ca07cd3 (〃'▽'〃) v2.5.0 发布：又熬过 30 个夜，头发还在 v2.5.0 YunaiV 2025-05-13 20:19:13 +0800
• 3a7a587272 fix：修复工作流的发起时间未返回 YunaiV 2025-05-13 19:59:00 +0800
• d3240df86b update: 代码生成配置时，新添加的字典，添加刷新按钮加载 bozch 2025-05-13 18:42:51 +0800
• ae9723bc54 fix：首页不 keep-alive 的问题 YunaiV 2025-05-13 09:16:49 +0800
• 2459e24213 HRM 员工福利 quu 2025-05-13 10:08:44 +0900
• a8be52c84b 项目难度管理功能 苑坤 2025-05-12 23:56:39 +0800
• e497e9f856 技术对接清单管理功能 苑坤 2025-05-12 23:38:05 +0800
• fc7b9ce6da Merge remote-tracking branch 'origin/master' 苑坤 2025-05-12 23:34:00 +0800
• 4a8788f420 技术对接清单管理功能 苑坤 2025-05-12 23:33:14 +0800
• 5b5ffb8435 feat: update vite.config.ts to add manual chunks for form-create and form-designer YunaiV 2025-05-12 23:08:21 +0800
• d9bcd8238f
  Merge pull request #144 from hqzh/master 芋道源码 2025-05-12 22:54:44 +0800
• 0805d1b9d7 线上申请 zy 2025-05-12 22:34:29 +0800
• 1aa9884af7 Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa zy 2025-05-12 21:57:49 +0800
• a963bdef6f 上线申请 zy 2025-05-12 21:57:45 +0800
• 2b44f1d6dc fix：个人中心修改信息后，左侧没变化 YunaiV 2025-05-12 21:15:26 +0800
• b16be8f7fb 修改线上、线下显示名称 苑坤 2025-05-12 18:03:27 +0800
• 1dda82a081 项目 zy 2025-05-12 15:49:29 +0800