vue-element-admin

blackteay/vue-element-admin

Fork 0

mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-31 03:49:46 +08:00

Commit Graph

Select branches

Hide Pull Requests

CodeSandbox

aisen60

check-engine

chore/update

deploy

gh-pages

i18n

master

perf/getInfo

perf/keep-alive

pwa

refactor/copy

refactor/tinymce4.7.6

tag/3.11.0

tinymce-action

webpack3

#1011

#1011

#1017

#1017

#1018

#102

#1024

#1025

#1032

#1033

#1045

#1046

#1047

#1055

#1055

#1058

#1059

#1065

#1067

#1081

#109

#1090

#1096

#111

#1110

#1110

#1111

#1134

#1136

#1144

#1148

#1149

#1152

#1154

#1156

#1167

#117

#1176

#1180

#1194

#1195

#1196

#1213

#1223

#1228

#1230

#1232

#1236

#1249

#1251

#1251

#1256

#1267

#128

#1290

#1291

#13

#1304

#132

#1333

#1338

#1346

#1349

#1355

#136

#136

#1374

#1382

#1387

#139

#140

#142

#1428

#1441

#1441

#145

#146

#1460

#1469

#1474

#1494

#15

#1505

#1517

#1521

#1525

#1525

#1527

#1528

#1538

#1545

#1546

#155

#1550

#1552

#1566

#1568

#1569

#1573

#1573

#1577

#1587

#1591

#1595

#1595

#1597

#1600

#1600

#1603

#1605

#1611

#1619

#1633

#1650

#1653

#1657

#1660

#1666

#1667

#1672

#1673

#1690

#1692

#1700

#1701

#1701

#1702

#1705

#1707

#1712

#1718

#1732

#1733

#1736

#1743

#1748

#176

#1760

#1762

#1767

#1775

#1776

#1779

#1782

#179

#1798

#1815

#1822

#1824

#1828

#1833

#1835

#1836

#1841

#1844

#1845

#1848

#1850

#1853

#1865

#1866

#1870

#188

#1883

#1884

#1908

#1910

#1911

#1924

#1928

#1933

#1939

#1943

#195

#1951

#1953

#1974

#1983

#199

#1996

#1999

#2001

#201

#2012

#2012

#2013

#2020

#2027

#2038

#2047

#2052

#2060

#2065

#2066

#2070

#2072

#2080

#2086

#2090

#2093

#2097

#2100

#2101

#2102

#2113

#2113

#2114

#2119

#2142

#2143

#2146

#2147

#2148

#2149

#2150

#2151

#2152

#2154

#2159

#2160

#2166

#2166

#2167

#2169

#217

#217

#2170

#2188

#2191

#2197

#2197

#2202

#2242

#2243

#2248

#226

#227

#2275

#2275

#228

#2283

#229

#2307

#2309

#2314

#2327

#233

#2347

#2357

#2364

#2364

#2365

#237

#237

#2374

#2382

#2388

#239

#240

#2401

#2403

#2403

#2454

#2463

#2465

#2529

#2530

#2531

#2532

#2538

#256

#2565

#258

#258

#2590

#2592

#2597

#2599

#2609

#261

#261

#2616

#2616

#2617

#2622

#2625

#2626

#2632

#2634

#2635

#2642

#2642

#2643

#2645

#2649

#2650

#2652

#2656

#2677

#27

#27

#2715

#2720

#2725

#2732

#2733

#2739

#2741

#2743

#2744

#2752

#2753

#2753

#2791

#2803

#2805

#2825

#2832

#2832

#2835

#285

#2854

#2857

#289

#289

#2896

#2903

#291

#291

#2910

#2922

#2929

#2930

#2933

#2939

#2948

#2949

#2951

#2956

#2957

#2966

#2969

#2969

#2970

#2976

#298

#2984

#2984

#2990

#2990

#2993

#3

#300

#302

#302

#3021

#3028

#303

#303

#3031

#3031

#3036

#3038

#3040

#3044

#3044

#3048

#3052

#3056

#306

#3065

#3066

#3074

#3084

#3085

#3091

#3096

#3097

#3100

#3102

#3110

#3111

#3116

#3118

#312

#312

#3131

#3131

#314

#314

#3141

#3144

#315

#315

#3152

#3164

#3183

#3186

#3188

#3191

#3191

#32

#3217

#3218

#3218

#3227

#3227

#3234

#3242

#3244

#3244

#3246

#3249

#3251

#3254

#3272

#3272

#3279

#3280

#3284

#3284

#3292

#3292

#3295

#3298

#3298

#33

#3301

#3303

#3303

#3304

#3304

#3313

#3313

#3314

#3314

#3321

#3323

#3327

#3327

#3329

#3353

#3360

#3360

#337

#34

#3400

#3400

#3401

#3401

#3402

#3402

#3403

#3403

#3409

#3409

#341

#341

#3412

#3412

#343

#3430

#344

#3449

#3449

#3467

#3467

#3472

#3472

#3487

#3487

#3494

#3494

#3497

#3497

#3514

#3514

#3515

#3515

#3532

#3532

#3533

#3542

#3546

#3546

#3547

#3548

#355

#3562

#3582

#3582

#3607

#3607

#3608

#3608

#3609

#3609

#3635

#3652

#3658

#3658

#3664

#3664

#3665

#3665

#3673

#3673

#3678

#3678

#368

#3681

#3681

#3683

#3683

#3693

#3693

#3702

#3702

#3728

#3728

#373

#3738

#3738

#3750

#3750

#3759

#3778

#3793

#381

#3813

#3813

#3822

#3822

#3829

#3829

#3848

#3854

#3854

#3872

#3884

#3884

#389

#389

#3905

#3905

#3908

#3908

#3914

#3914

#3923

#3923

#3929

#3929

#3940

#3940

#3941

#3941

#3944

#3944

#3949

#3949

#3953

#3953

#3969

#3969

#3995

#3995

#3996

#3996

#4003

#4006

#4020

#4021

#4021

#403

#4043

#4044

#4044

#4064

#4064

#4076

#4076

#4077

#4077

#4099

#4099

#41

#41

#4116

#4116

#4122

#4122

#4125

#4126

#4126

#4127

#4127

#4130

#4135

#4137

#4137

#4143

#4143

#415

#4150

#4150

#4153

#4153

#4154

#4154

#4162

#4162

#4165

#4165

#4180

#4185

#4185

#419

#419

#4194

#42

#4200

#4200

#4202

#4204

#4204

#4209

#4209

#4217

#4217

#422

#4226

#4226

#4227

#4227

#4228

#4228

#4235

#4235

#4237

#4237

#4248

#4248

#4268

#4268

#4271

#4271

#4272

#4272

#4273

#4273

#4292

#4292

#43

#4303

#431

#4310

#4311

#4311

#4316

#4320

#437

#437

#451

#451

#464

#464

#47

#476

#479

#507

#51

#518

#52

#522

#523

#523

#524

#524

#536

#546

#546

#554

#56

#57

#571

#578

#585

#589

#589

#59

#591

#591

#596

#597

#604

#604

#618

#618

#622

#625

#634

#634

#636

#646

#653

#677

#677

#707

#708

#710

#710

#713

#723

#727

#732

#747

#749

#749

#75

#765

#768

#784

#789

#798

#799

#81

#81

#811

#818

#841

#843

#845

#856

#858

#878

#88

#889

#894

#895

#913

#914

#914

#92

#921

#921

#926

#927

#931

#931

#949

#95

#96

#965

#969

#969

#97

#97

#973

#973

#975

#976

#979

#979

#98

#98

#983

#983

#991

#993

#993

#994

#995

3.5.0

4.0.1

4.1.0

4.2.0

4.2.1

4.2.2

4.3.0

4.3.1

4.4.0

v1.0.0

v1.0.1

v1.0.2

v1.0.3

v1.1.0

v1.1.1

v1.2.0

v2.0.0

v2.1.0

v2.1.1

v2.2.0

v2.2.1

v3.0.0

v3.1.0

v3.1.1

v3.10.0

v3.11.0

v3.2.0

v3.3.0

v3.4.0

v3.4.1

v3.5.1

v3.6.1

v3.6.2

v3.6.3

v3.6.4

v3.6.5

v3.6.6

v3.7.0

v3.7.1

v3.7.2

v3.7.3

v3.8.0

v3.8.1

v3.9.0

v3.9.1

v3.9.2

v3.9.3

v4.0.0

v4.0.0-beta

98096c81dd removedhaha Z 2019-09-13 11:20:26 -05:00
69948997c3 button fixed Z 2019-09-12 13:53:25 -05:00
310c9f4784 made seller specific account stuff only for de a Chad Derya 2019-09-12 18:45:39 +01:00
41eb5552dc added user type to germany users list Chad Derya 2019-09-12 18:22:53 +01:00
b95bd2a23d minoe fixes, removed status from terminal as it doesnt exist Chad Derya 2019-09-12 18:06:17 +01:00
48c2c14e94 hide full name of a terminal from DE Chad Derya 2019-09-12 11:34:52 +01:00
08143186f5 update package.json weijianli 2019-09-11 20:47:45 -05:00
a6af009e43 analyzing page update weijianli 2019-09-11 20:35:09 -05:00
a23b0611b0 clear out terminal create after save ,show id in UK, show fullname inDE Chad Derya 2019-09-11 23:33:16 +01:00
8f29a42338 made some terminal display fields only for DE Chad Derya 2019-09-11 23:09:15 +01:00
557a556476 updated label for consistency Chad Derya 2019-09-11 22:03:39 +01:00
e0b367c1da Added rest of the germany fuel columns Chad Derya 2019-09-11 21:58:05 +01:00
cef39fe5c0 prroduct type edit works Chad Derya 2019-09-11 21:43:24 +01:00
1d063b9850 Hide unnecessary fields from UK product edit/create Chad Derya 2019-09-11 20:49:56 +01:00
0a4f337f00 Removed testing thingy Chad Derya 2019-09-11 20:42:16 +01:00
c99fdb28b3 Silly eslint Chad Derya 2019-09-11 20:40:36 +01:00
e3cf5346f2 analyze button Z 2019-09-11 14:37:17 -05:00
f3ee6a38b2 Merge branch 'OLFBP-885' into OLFBP-885 Chad Derya 2019-09-11 20:09:52 +01:00
c1b858c3e8 First commit Chad Derya 2019-09-11 19:42:06 +01:00
131e790e26 Added user name and user status fields to user view Chad Derya 2019-09-11 19:17:39 +01:00
cb86b920be Updated user edit acording to feed back Chad Derya 2019-09-11 18:54:25 +01:00
ab754e7f1b Getting the correct list of accounts on edit users Chad Derya 2019-09-11 18:02:17 +01:00
a464270171 Show region name in the DE terminals table Chad Derya 2019-09-11 13:56:33 +01:00
1dad28d2ae Terminals list refreshes once a teminal is deleted Chad Derya 2019-09-11 12:05:35 +01:00
02d9a1765d Added terminal Identifier to UK admin Chad Derya 2019-09-11 12:02:03 +01:00
abdc79688a bug with created terminal data not going to edit page Chad Derya 2019-09-11 11:46:42 +01:00
dd467e8ef8 re labeled all instances of account to terminal, clear create terminal Chad Derya 2019-09-11 09:52:04 +01:00
a242a18e52 Fix foraccounts not defaulting the conf email Dean Bartok-Thomas 2019-09-11 08:46:24 +01:00
2f4f82ee11 remove the order conf field Dean Bartok-Thomas 2019-09-10 22:00:16 +01:00
013b12988f Added new orderCompleteEmail alert fields Dean Bartok-Thomas 2019-09-10 21:50:54 +01:00
a9d8cce29e showing only the required cols Chad Derya 2019-09-10 20:37:16 +01:00
dbff113a46 fix Z 2019-09-10 14:37:00 -05:00
30c3299d90 fix Z 2019-09-10 14:32:52 -05:00
7f3a8eedf0 Adding rest of the columns WIP Chad Derya 2019-09-10 20:24:04 +01:00
04a3e15f9c fix Z 2019-09-10 14:16:09 -05:00
8605cb1b87 filter by name works, removed some more code Chad Derya 2019-09-10 19:26:08 +01:00
3823ba30ad removed pagination from terminals for now (wasnt working anyway) Chad Derya 2019-09-10 19:24:26 +01:00
bb15b8f258 renamed terminal file, temporary fix for an error Chad Derya 2019-09-10 18:58:28 +01:00
84a41f2276 Made fuel type radio for uk, page refresh after closing popup Chad Derya 2019-09-10 16:49:16 +01:00
fd265ae8bb Add ability to manage account lifting periods and payment terms in admin Dean Bartok-Thomas 2019-09-10 15:31:16 +01:00
f7c2b15c46 re fetch products after succesfull delete Chad Derya 2019-09-10 14:29:29 +01:00
776efdd2ad deleting individual fuels and terminals work Chad Derya 2019-09-10 13:45:55 +01:00
b3ac795200 Improve loading message Chad Derya 2019-09-10 11:42:55 +01:00
6ae0a40529 delete confirmation screen dynamic and pretty for success and error Chad Derya 2019-09-10 09:56:57 +01:00
11dca03aa8 Added delete to terminals Chad Derya 2019-09-09 22:09:35 +01:00
ea34bf3e80 renamed and relocated delete popup Chad Derya 2019-09-09 21:55:20 +01:00
619ae1b940 Delete only the selected fuel, but lets not play with fire at this time of the night, and accidentally delete all fuels Chad Derya 2019-09-09 20:11:18 +01:00
08349b68e8 Confirm delete button becomes enabled if item name matches the input text Chad Derya 2019-09-09 19:28:40 +01:00
51aeb7629f made delete component reusable, added error and success place holder Chad Derya 2019-09-09 19:03:32 +01:00
0ee3fc3722 made the delete component look all pretty, some place holders, removed Chad Derya 2019-09-09 17:13:59 +01:00
22b113e76c Have a pop up for deleting Chad Derya 2019-09-09 16:27:28 +01:00
353fc9b39c Properly clearing the create product fuel, after creating Chad Derya 2019-09-09 15:21:37 +01:00
c7d3ce9a99 fixed a bug where admin create a fuel then, edit page not showing correct details of fuel Chad Derya 2019-09-09 15:04:48 +01:00
7fa961b5b8 Added the missing fields in to fuels Chad Derya 2019-09-09 14:36:31 +01:00
f027bf260f accounts search by name works - but filters front end only Chad Derya 2019-09-09 12:28:51 +01:00
71cfd9a108 Fixed a bug with accounts not filtering by buyer and seller Chad Derya 2019-09-09 11:45:30 +01:00
fbcf66a247 OLFBP-751user search by account name works Chad Derya 2019-09-09 09:46:48 +01:00
1260989d87 Added payment terms Dean Bartok-Thomas 2019-09-08 22:00:23 +01:00
101408b1da Added lifting periods Dean Bartok-Thomas 2019-09-08 21:48:22 +01:00
10ff36d9a1 支持国际化中文菜单拼音模糊搜索马云海 2019-09-07 09:09:15 +08:00
c3c5704195 Merge remote-tracking branch 'origin/OLFBP-857' into OLFBP-857 Mike 2019-09-06 16:08:25 +01:00
4d2ea2a1c7 MOST UP TO DATE ADMIN Mike 2019-09-06 16:06:06 +01:00
930ebe1e40 Merge branch 'OLFBP-858' into OLFBP-857 Mike 2019-09-06 16:06:06 +01:00
a66dbaf0de fixed products Mike 2019-09-06 16:02:16 +01:00
a1e0f96e46 changed prop name and now DE terminals now save when edited Mike 2019-09-06 14:33:28 +01:00
3c13a7dc54 terminal regions fixed Mike 2019-09-06 13:50:51 +01:00
f629755bf4 terminals displays right name when switching platform Mike 2019-09-06 09:50:18 +01:00
2a210efea1 Added crude relationship matrix view Dean Bartok-Thomas 2019-09-05 21:12:39 +01:00
cf031cf4fd Account now displays the name instead of account id Mike 2019-09-05 16:25:15 +01:00
5a2d91c515 Fixed query params Mike 2019-09-05 11:37:52 +01:00
a0ad82ffba When creating a user the account search now displays countries accordingly Mike 2019-09-05 10:16:01 +01:00
54dc4ad551

Merge pull request #1 from PanJiaChen/master bhrong 2019-09-05 09:15:53 +08:00
8188801829 Display and create fuels for de and uk Chad Derya 2019-09-04 12:48:17 +01:00
01a37eec58 Users now fetch and can create works for UK/DE Mike 2019-09-04 12:42:13 +01:00
68ffe55abb Accounts fetch and create works for UK/DE Mike 2019-09-04 11:35:39 +01:00
af2464cbf6 showing OLFUK or OLFDE near API api calls Chad Derya 2019-09-03 17:07:18 +01:00
eb8633c630 Chnging platform changes theme Chad Derya 2019-09-03 15:03:10 +01:00
1e9b248f24 plat form saved to store, console.logging on change Chad Derya 2019-09-03 10:16:08 +01:00
9a6514fe17 fixed warnings Chad Derya 2019-09-03 09:55:11 +01:00
e9f0d91ad7 console.log ing the radio input Chad Derya 2019-09-03 09:29:59 +01:00
0873f5b8e4 got a radio button changes on click Chad Derya 2019-09-03 08:57:57 +01:00
d22924b507 Fix the title of the page, showing the name instead of the id Dean Bartok-Thomas 2019-09-02 16:05:34 +01:00
cfd42544f9 Added fuel and terminal restrictions to the account admin Dean Bartok-Thomas 2019-09-02 15:21:31 +01:00
d9ce373481 Added the full name to the list/edit Dean Bartok-Thomas 2019-09-02 12:54:38 +01:00
3f2a40fbde Added password reset to the user list Dean Bartok-Thomas 2019-09-02 11:26:00 +01:00
b6163b1fe1 Added orders list and filtering, displaying of order too Dean Bartok-Thomas 2019-09-01 23:09:20 +01:00
e6544d6dd8 Added FAQs to the admin Dean Bartok-Thomas 2019-09-01 16:06:55 +01:00
eeeccde926 Terminal management complete Dean Bartok-Thomas 2019-08-31 22:17:13 +01:00
65149d5049 Few Terminal based name corrects Dean Bartok-Thomas 2019-08-31 22:02:57 +01:00
0902be2aff Making a platform selector, dropdown/radio button WIP Chad Derya 2019-08-30 17:55:46 +01:00
90e790cee4 Changed for managing products Dean Bartok-Thomas 2019-08-29 14:12:16 +01:00
ee287d8314 fix: typos (#2532) Baskerville* 2019-08-29 10:23:45 +08:00
106e15fb73 Update the name Dean Bartok-Thomas 2019-08-28 16:16:07 +01:00
e73cd68482

Update role.vue Baskerville* 2019-08-28 19:14:48 +08:00
ee1900984a

Merge branch 'i18n' into master 前端码农er 2019-08-28 14:06:07 +08:00
0308447178

Merge pull request #1 from PanJiaChen/master 前端码农er 2019-08-28 11:49:41 +08:00
12c8d85873 fix: fixed missing icons 花裤衩 2019-08-27 20:57:51 +08:00
ab31b69434 Store the URL in the config Dean Bartok-Thomas 2019-08-20 15:33:09 +01:00
479cd51c51 Set the correct locale Dean Bartok-Thomas 2019-08-20 15:05:42 +01:00
7ff91a1fcf Remove default login details box Dean Bartok-Thomas 2019-08-20 15:05:13 +01:00