mt-ck-wms-ui

mt-ck-00a/mt-ck-wms-ui

Fork 0

Commit Graph

Select branches

Hide Pull Requests

cicd

develop

dy

fzq

gtz

master

test

zwq

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

f0562eade5 Merge pull request '修改EAP' (#97) from zwq into develop develop 朱文强 2022-08-09 10:07:48 +08:00
396e09f696 修改EAP zwq zwq 2022-08-09 10:07:17 +08:00
0402b24568 Merge pull request '更新ERP' (#96) from zwq into develop 朱文强 2022-07-29 16:33:15 +08:00
dcbece43f8 更新ERP zwq 2022-07-29 16:32:28 +08:00
4cd26e2f47 Merge pull request '打包' (#95) from zwq into develop 朱文强 2022-07-25 10:22:32 +08:00
35c3b18b0c 打包 zwq 2022-07-25 10:21:32 +08:00
b31e9539fd Merge pull request '更新ERP' (#94) from zwq into develop 朱文强 2022-07-25 10:18:48 +08:00
72af437415 更新ERP zwq 2022-07-25 10:17:59 +08:00
3e6712ddc5 Merge pull request '修改样式' (#93) from zwq into develop 朱文强 2022-06-29 13:32:36 +08:00
8d0c0feb72 修改样式 zwq 2022-06-29 13:31:49 +08:00
47895cfcf5 Merge pull request '改名字' (#92) from zwq into develop 朱文强 2022-06-21 14:04:14 +08:00
b907cb88f2 改名字 zwq 2022-06-21 14:03:26 +08:00
0fc8003621 Merge pull request '改名字' (#91) from zwq into develop 朱文强 2022-06-21 11:35:38 +08:00
ecc16ce276 改名字 zwq 2022-06-21 11:35:09 +08:00
65a30bae9c Merge pull request 'build: 🏗️ 构建完成后添加钉钉通知' (#90) from ci into develop 施海荣 2022-06-08 14:57:47 +08:00
1753aa87a9 build: 🏗️ 构建完成后添加钉钉通知 thomas 2022-06-08 14:56:36 +08:00
76ce6184e7 Merge pull request '更新' (#89) from zwq into develop 朱文强 2022-06-07 15:14:16 +08:00
7ff955ead5 Merge branch 'develop' into zwq 朱文强 2022-06-07 15:14:12 +08:00
b3ec8dfd4e 更新 zwq 2022-06-07 15:13:51 +08:00
74e4aefb86 Merge pull request '名字改回来' (#88) from zwq into develop 朱文强 2022-06-07 15:13:18 +08:00
42d7714210 名字改回来 zwq 2022-06-07 15:11:51 +08:00
f1c60da6b6 Merge pull request '打包' (#87) from zwq into develop 朱文强 2022-06-07 10:44:23 +08:00
39a1fe7482 打包 zwq 2022-06-07 10:43:58 +08:00
5b17f49619 Merge pull request 'build: 🏗️ 调整构建方式，从本地构建后上传dist目录' (#86) from ci into develop 施海荣 2022-06-07 10:37:06 +08:00
4929c41361 build: 🏗️ 调整构建方式，从本地构建后上传dist目录 thomas 2022-06-07 10:29:21 +08:00
dbb67e6064 Merge pull request '暂时改名字' (#85) from zwq into develop 朱文强 2022-06-06 16:01:57 +08:00
05fa4c5e21 暂时改名字 zwq 2022-06-06 16:01:01 +08:00
8a18d705a4 Merge pull request '暂时改名字' (#84) from zwq into develop 朱文强 2022-06-06 13:57:53 +08:00
a64de34ef1 暂时改名字 zwq 2022-06-06 13:57:21 +08:00
0bcc5baf7a Merge pull request 'fzq' (#83) from fzq into develop 朱文强 2022-05-30 13:45:03 +08:00
c595794b1a Merge branch 'develop' into fzq fzq Fanzink 2022-05-30 13:42:36 +08:00
72ac5b9998 '修改导出后空白bug' Fanzink 2022-05-30 13:41:50 +08:00
ddc3f5d49d Merge pull request '修改首页详情' (#82) from zwq into develop 朱文强 2022-04-02 16:04:35 +08:00
db0a906323 修改首页详情 zwq 2022-04-02 16:04:07 +08:00
93a412d243 Merge pull request '修改bug' (#81) from zwq into develop 朱文强 2022-03-28 13:56:31 +08:00
aa85593884 修改bug zwq 2022-03-28 13:56:03 +08:00
a77918c059 Merge pull request 'fzq' (#80) from fzq into develop 朱文强 2022-03-28 13:54:27 +08:00
d8336aced0 '修改存储箱字段' Fanzink 2022-03-28 11:13:51 +08:00
43983bc929 '修改存储箱字段' Fanzink 2022-03-28 11:12:03 +08:00
6d3309ed2b Merge pull request '修改bug' (#79) from zwq into develop 朱文强 2022-03-22 11:27:14 +08:00
cae8938e22 修改bug zwq 2022-03-22 11:26:34 +08:00
03b13c77aa Merge pull request 'fzq' (#78) from fzq into develop 朱文强 2022-03-21 09:12:51 +08:00
985ec95bc6 Merge branch 'develop' into fzq Fanzink 2022-03-20 09:50:51 +08:00
453f66b7b3 '更新字段' Fanzink 2022-03-20 09:50:14 +08:00
47793c38da Merge pull request '修改bug' (#77) from zwq into develop 朱文强 2022-03-19 13:52:17 +08:00
dcb7801d24 修改bug zwq 2022-03-19 13:49:04 +08:00
f59fc1a594 Merge pull request 'gtz' (#76) from gtz into develop 高天泽 2022-03-18 16:37:14 +08:00
b2c50e8c56 merge gtz gtz217 2022-03-18 16:36:37 +08:00
dd8e54f743 首页去除缓存 gtz217 2022-03-18 16:29:54 +08:00
8142f16662 dashboard attribute number to string gtz217 2022-03-18 16:05:01 +08:00
5ec45b87ca Merge pull request 'fzq' (#75) from fzq into develop 朱文强 2022-03-18 15:03:46 +08:00
445ad7f280 Merge branch 'develop' into fzq Fanzink 2022-03-18 15:01:06 +08:00
15f9fb0f5b '改bug更新' Fanzink 2022-03-18 15:00:32 +08:00
114bfeccf3 Merge pull request '修改bug' (#74) from zwq into develop 朱文强 2022-03-18 09:50:40 +08:00
018695fe70 修改bug zwq 2022-03-18 09:49:30 +08:00
9aaffbb8b4 Merge pull request '修改bug' (#73) from zwq into develop 朱文强 2022-03-17 16:22:39 +08:00
2a2bd1d726 修改bug zwq 2022-03-17 16:21:35 +08:00
dd029f2055 Merge pull request 'eqtyep default' (#72) from gtz into develop 高天泽 2022-03-17 14:01:10 +08:00
fe54918801 eqtyep default gtz217 2022-03-17 14:00:36 +08:00
ced191b4df Merge pull request '修改仓库样式' (#71) from zwq into develop 朱文强 2022-03-17 10:59:56 +08:00
995db83484 修改仓库样式 zwq 2022-03-17 10:59:00 +08:00
40f426f7f5 Merge pull request 'base eq add' (#70) from gtz into develop 高天泽 2022-03-17 10:57:00 +08:00
61270a542d base eq gtz217 2022-03-17 10:56:24 +08:00
3ecaa99a8c Merge branch 'develop' into gtz gtz217 2022-03-17 10:52:41 +08:00
79238fca27 1 gtz217 2022-03-17 10:52:22 +08:00
73d8951bbb Merge pull request '首页对接以及库位详情' (#69) from gtz into develop 高天泽 2022-03-16 20:12:20 +08:00
2f19b50e20 merge and update dashboard detail gtz217 2022-03-16 20:11:30 +08:00
6d4594b338 update gtz217 2022-03-16 19:14:00 +08:00
d4168e6157 Merge pull request '修改bug' (#68) from zwq into develop 朱文强 2022-03-16 16:19:42 +08:00
dfb1f3d97b 修改bug zwq 2022-03-16 16:18:59 +08:00
26772a324a Merge pull request 'fzq' (#67) from fzq into develop 朱文强 2022-03-16 16:17:35 +08:00
aae6117db7 Merge branch 'develop' into fzq Fanzink 2022-03-16 16:15:16 +08:00
99f92f6891 '报表更新' Fanzink 2022-03-16 16:14:50 +08:00
d8424e1752 Merge pull request '修改bug' (#66) from zwq into develop 朱文强 2022-03-16 14:19:58 +08:00
598f49e378 修改bug zwq 2022-03-16 14:19:28 +08:00
982c25fa0b Merge pull request '修改bug' (#65) from zwq into develop 朱文强 2022-03-16 10:13:21 +08:00
2756e75aaf 修改bug zwq 2022-03-16 10:12:36 +08:00
74883db1c0 Merge pull request 'fzq' (#64) from fzq into develop 朱文强 2022-03-16 09:55:55 +08:00
643277e1c7 更新 'src/lang/i18n/zh/module/basicData.js' 范志钦 2022-03-16 09:53:24 +08:00
4a834c3dc1 更新 'src/lang/i18n/en/module/basicData.js' 范志钦 2022-03-16 09:53:04 +08:00
6b20524a5f 更新 'src/lang/i18n/zh/module/basicData.js' 范志钦 2022-03-16 09:52:02 +08:00
f219b55d0c '更新' Fanzink 2022-03-16 09:43:13 +08:00
79b7fe0eec '更新' Fanzink 2022-03-16 09:41:00 +08:00
2329a20c4f Merge pull request 'zwq' (#63) from zwq into develop 朱文强 2022-03-16 09:00:59 +08:00
7aba931c94 提交 zwq 2022-03-16 08:58:59 +08:00
176fd99cd1 Merge branch 'test' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into zwq zwq 2022-03-16 08:42:53 +08:00
77fbbb630b Merge pull request '仓库翻译' (#62) from zwq into develop 朱文强 2022-03-15 17:04:29 +08:00
18b932afa1 仓库翻译 zwq 2022-03-15 17:04:06 +08:00
251d507db7 Merge pull request 'gtz' (#61) from gtz into test test 高天泽 2022-03-15 16:59:59 +08:00
8502f5d7d1 Merge branch 'develop' into gtz gtz217 2022-03-15 16:59:11 +08:00
9eea286c08 i18n dashboard gtz217 2022-03-15 16:58:48 +08:00
d4e0384e10 Merge pull request '修改bug' (#60) from zwq into develop 朱文强 2022-03-15 14:38:09 +08:00
983be7801c 修改bug zwq 2022-03-15 14:37:40 +08:00
d725cb7a0c Merge pull request '修改bug' (#59) from zwq into develop 朱文强 2022-03-15 11:21:10 +08:00
ef8a7ef497 修改bug zwq 2022-03-15 11:20:36 +08:00
6ac3fcb572 Merge pull request 'fzq' (#58) from fzq into develop 朱文强 2022-03-15 10:09:07 +08:00
3e6389f0eb '更新' Fanzink 2022-03-15 09:55:49 +08:00
afde4d5225 '更新' Fanzink 2022-03-15 09:12:22 +08:00
8da50584fc Merge pull request 'gtz' (#57) from gtz into develop 高天泽 2022-03-14 17:00:11 +08:00
2351e96c9e Merge branch 'develop' into gtz gtz217 2022-03-14 16:59:06 +08:00