engineering

mkm/engineering

Fork 0

Commit Graph

Select branches

Hide Pull Requests

dev

main

master

yaooo

zhangwei

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#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

#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

#98

#99

a5178a76b0 Merge pull request 'update' (#105) from zhangwei into dev weiz 2024-01-03 11:33:12 +08:00
f508a48c3c update weiz 2024-01-03 11:32:23 +08:00
3f0b18f7ae Merge pull request 'update' (#104) from zhangwei into dev weiz 2024-01-02 17:27:45 +08:00
d94f53e35f update weiz 2024-01-02 17:27:21 +08:00
f8c8b3d618 Merge pull request 'update' (#103) from zhangwei into dev weiz 2024-01-02 17:24:36 +08:00
91ee52f77e update weiz 2024-01-02 17:24:06 +08:00
0c8f3c37b6 Merge pull request 'update' (#102) from zhangwei into dev weiz 2024-01-02 16:38:04 +08:00
f64d31d6e4 update weiz 2024-01-02 16:37:38 +08:00
f4570d0e40 Merge pull request 'update' (#101) from zhangwei into dev weiz 2024-01-02 16:26:24 +08:00
75ae871c69 update weiz 2024-01-02 16:25:51 +08:00
9d3c837a70 Merge pull request 'update' (#100) from zhangwei into dev weiz 2024-01-02 16:24:44 +08:00
46620b3dca update weiz 2024-01-02 16:23:53 +08:00
2d2caaa57f Merge pull request 'update custom modules' (#99) from zhangwei into dev weiz 2024-01-02 16:06:26 +08:00
8ef091c323 update custom modules weiz 2024-01-02 16:05:25 +08:00
6835d3773e 更新pc页面 shengchanzhe 2023-12-30 11:59:48 +08:00
0621505c7c Merge pull request 'fixed' (#97) from zhangwei into dev weiz 2023-12-29 16:04:00 +08:00
2d9c019591 fixed weiz 2023-12-29 16:03:34 +08:00
f403c1b61e Merge pull request 'fixed' (#96) from zhangwei into dev weiz 2023-12-29 15:53:43 +08:00
65fa27fedd fixed weiz 2023-12-29 15:53:20 +08:00
3ae1f71483 Merge pull request 'fixed' (#95) from zhangwei into dev weiz 2023-12-29 14:36:20 +08:00
554f1f7a47 fixed weiz 2023-12-29 14:35:58 +08:00
f357e5a7a8 Merge pull request 'fixed' (#94) from zhangwei into dev weiz 2023-12-29 14:32:20 +08:00
4d9023f15d fixed weiz 2023-12-29 14:31:55 +08:00
8c06e8a4c9 Merge pull request 'ProjectSubcontractSettlement' (#93) from zhangwei into dev weiz 2023-12-29 14:28:05 +08:00
0c45b05141 ProjectSubcontractSettlement weiz 2023-12-29 14:27:38 +08:00
e7fead7860 Merge pull request 'fixed' (#92) from zhangwei into dev weiz 2023-12-29 11:56:28 +08:00
2fdfedc8a8 fixed weiz 2023-12-29 11:55:56 +08:00
1cf628c213 Merge pull request 'ProjectSettlement' (#91) from zhangwei into dev weiz 2023-12-29 11:24:49 +08:00
7b0eed2115 ProjectSettlement weiz 2023-12-29 11:24:24 +08:00
884394494e Merge pull request 'fixed-2023-12-29-1' (#90) from zhangwei into dev weiz 2023-12-29 10:17:52 +08:00
217b710231 fixed-2023-12-29-1 weiz 2023-12-29 10:17:18 +08:00
ce3a1385d1 更新pc端 shengchanzhe 2023-12-28 22:39:33 +08:00
f9c695eb7f 更新模块 shengchanzhe 2023-12-28 22:26:45 +08:00
d2c1ac4acc pc后台页面更新 shengchanzhe 2023-12-28 21:29:43 +08:00
39d147ed7f 修复错误 shengchanzhe 2023-12-28 21:24:34 +08:00
a65f837ad4 Merge pull request 'zhangwei' (#89) from zhangwei into dev weiz 2023-12-28 16:59:39 +08:00
a2f26c4b37 fixed 12-28-4 weiz 2023-12-28 16:59:15 +08:00
b7665dc6a4 fixed 12-28-3 weiz 2023-12-28 16:44:59 +08:00
607eb2375d Merge pull request 'fixed 12-28-2' (#88) from zhangwei into dev weiz 2023-12-28 16:25:08 +08:00
1209d79fa1 fixed 12-28-2 weiz 2023-12-28 16:24:45 +08:00
c9a5b1de11 Merge pull request 'fixed 12-28' (#87) from zhangwei into dev weiz 2023-12-28 15:58:25 +08:00
3ee35c147d fixed 12-28 weiz 2023-12-28 15:57:58 +08:00
d79bd8e6cc 更新 main mkm 2023-12-28 10:20:32 +08:00
64d608fd9f Merge pull request 'ProjectSalaryDetail&&ProjectSalaryPayment' (#86) from zhangwei into dev weiz 2023-12-27 17:51:22 +08:00
c5be08cf58 ProjectSalaryDetail&&ProjectSalaryPayment weiz 2023-12-27 17:50:48 +08:00
2ab6fbc69c Merge branch 'dev' mkm 2023-12-27 17:25:57 +08:00
d27bf442a2 Merge pull request 'update' (#85) from zhangwei into dev weiz 2023-12-27 15:13:39 +08:00
1fef64dc40 update weiz 2023-12-27 15:13:01 +08:00
fef05be50a Merge pull request 'update' (#84) from zhangwei into dev weiz 2023-12-27 15:10:06 +08:00
ff8fc093da update weiz 2023-12-27 15:09:18 +08:00
b7971872f2 更新供应商 yaooo 2023-12-27 14:19:50 +08:00
67a0965715 Merge pull request 'update build modul' (#83) from zhangwei into dev weiz 2023-12-27 11:53:23 +08:00
c912f17a4a update build modul weiz 2023-12-27 11:52:40 +08:00
f7618bfaf6 Merge pull request 'update' (#82) from zhangwei into dev weiz 2023-12-26 16:24:27 +08:00
fcc1224266 update weiz 2023-12-26 16:23:50 +08:00
bc13b67944 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/engineering into dev yaooo 2023-12-26 16:15:27 +08:00
7c388b1990 更新供应商联系人模块 yaooo 2023-12-26 16:15:12 +08:00
bf00b0c1df Merge pull request 'fixed' (#81) from zhangwei into dev weiz 2023-12-26 16:02:30 +08:00
fc9c8bebc6 fixed weiz 2023-12-26 15:57:34 +08:00
ba63057a4c Merge pull request 'fixed' (#80) from zhangwei into dev weiz 2023-12-26 15:55:49 +08:00
7ec9cb6ecc fixed weiz 2023-12-26 15:54:22 +08:00
5a42ee46dc Merge pull request 'ProjectAttendanceDetail&&ProjectAttendanceRecord' (#79) from zhangwei into dev weiz 2023-12-26 15:36:04 +08:00
1c9f579796 ProjectAttendanceDetail&&ProjectAttendanceRecord weiz 2023-12-26 15:34:56 +08:00
b4a749479d 更新供应商联系人模块 yaooo 2023-12-26 14:13:55 +08:00
6a5d5d9057 新增供应商联系人模块 yaooo 2023-12-26 14:07:14 +08:00
2e5ffedd0a 更新供应商模块 yaooo 2023-12-26 11:32:12 +08:00
e57077ebe8 更新供应商模块 yaooo 2023-12-26 11:16:47 +08:00
c5ce1eb731 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/engineering into dev yaooo 2023-12-26 10:57:02 +08:00
ddef9efa72 新增供应商模块 yaooo 2023-12-26 10:56:52 +08:00
7729dcbb2e Merge pull request 'ProjectInsuranceManagement' (#78) from zhangwei into dev weiz 2023-12-25 16:23:22 +08:00
5099e1378e ProjectInsuranceManagement weiz 2023-12-25 16:22:47 +08:00
84d9443ba1 Merge pull request 'ProjectLaborContract' (#77) from zhangwei into dev weiz 2023-12-25 15:41:55 +08:00
1795d8ddfa ProjectLaborContract weiz 2023-12-25 15:40:30 +08:00
c3ad0a39ff 更新细节 yaooo 2023-12-25 15:25:44 +08:00
c03caa6bc7 Merge pull request 'ProjectJobType' (#76) from zhangwei into dev weiz 2023-12-25 14:15:24 +08:00
884a5d3573 ProjectJobType weiz 2023-12-25 14:14:33 +08:00
7ee8f3abe0 更新细节 yaooo 2023-12-25 14:13:14 +08:00
3cb8dea883 更新细节 yaooo 2023-12-25 13:58:26 +08:00
5c088d427f 更新细节 yaooo 2023-12-25 13:55:22 +08:00
1e2b4f1d15 更新细节 yaooo 2023-12-25 11:00:46 +08:00
98ec0f40df 更新细节 yaooo 2023-12-25 10:57:01 +08:00
3c09f05bef 更新细节 yaooo 2023-12-25 10:47:50 +08:00
fd84b91a6a 更新细节 yaooo 2023-12-25 10:42:20 +08:00
8554de48db 更新细节 yaooo 2023-12-25 09:48:26 +08:00
1d1589b400 更新细节 yaooo 2023-12-25 09:34:00 +08:00
6cdf274a48 更新细节 yaooo 2023-12-23 17:42:16 +08:00
cffa0a3ef5 更新细节 yaooo 2023-12-23 17:34:59 +08:00
c31ef25f86 更新细节 yaooo 2023-12-23 16:28:37 +08:00
55368eb92e 更新细节 yaooo 2023-12-23 15:11:31 +08:00
67d6897ea4 更新细节 yaooo 2023-12-23 14:58:40 +08:00
4d825b1d64 更新细节 yaooo 2023-12-23 14:52:47 +08:00
490bde6bb4 更新细节 yaooo 2023-12-23 14:36:53 +08:00
0fe251ad2a Merge branch 'dev' of https://gitea.lihaink.cn/mkm/engineering into dev yaooo 2023-12-23 11:57:00 +08:00
dd9bb2e1c8 更新细节 yaooo 2023-12-23 11:56:47 +08:00
004b3d64db Merge pull request '新增施工汇报模块' (#75) from zhangwei into dev weiz 2023-12-22 18:04:26 +08:00
394274483c 新增施工汇报模块 weiz 2023-12-22 18:03:09 +08:00
648bb531bf 更新细节 yaooo 2023-12-22 17:14:30 +08:00
831a06387c 更新细节 yaooo 2023-12-22 16:58:44 +08:00
c5bbf1d010 更新细节 yaooo 2023-12-22 16:22:10 +08:00
fd4c6d3ebb 更新细节 yaooo 2023-12-22 15:57:45 +08:00