781 Commits

Author SHA1 Message Date
weiz
ade97f7eeb Merge pull request 'add project_cost_budget' (#182) from zhangwei into dev
Reviewed-on: #182
2024-01-16 15:58:01 +08:00
weiz
8fdb154242 add project_cost_budget 2024-01-16 15:57:32 +08:00
weiz
b0d8f590f4 Merge pull request 'add project_equipment_budget' (#181) from zhangwei into dev
Reviewed-on: #181
2024-01-16 14:16:49 +08:00
weiz
5315bc7aee add project_equipment_budget 2024-01-16 14:15:55 +08:00
weiz
a17732842e Merge pull request 'add project_labor_budget' (#180) from zhangwei into dev
Reviewed-on: #180
2024-01-16 11:28:27 +08:00
weiz
696ef7c544 add project_labor_budget 2024-01-16 11:26:24 +08:00
mkm
a1727ed68a 更新 2024-01-15 18:56:42 +08:00
weiz
3ece35ade3 Merge pull request 'update' (#179) from zhangwei into dev
Reviewed-on: #179
2024-01-15 15:48:46 +08:00
weiz
2cd09e8e5b update 2024-01-15 15:48:15 +08:00
weiz
a539abdaab Merge pull request 'update' (#178) from zhangwei into dev
Reviewed-on: #178
2024-01-15 15:41:07 +08:00
weiz
8fc7710f63 update 2024-01-15 15:40:40 +08:00
weiz
7844d6a3d8 Merge pull request 'update' (#177) from zhangwei into dev
Reviewed-on: #177
2024-01-15 15:07:17 +08:00
weiz
9475b5c7c9 update 2024-01-15 15:06:39 +08:00
weiz
d3e6072bdf Merge pull request 'update' (#176) from zhangwei into dev
Reviewed-on: #176
2024-01-15 15:00:35 +08:00
weiz
cb0a010517 update 2024-01-15 14:59:41 +08:00
weiz
ced3b0b122 Merge pull request 'update' (#175) from zhangwei into dev
Reviewed-on: #175
2024-01-15 14:09:32 +08:00
weiz
b139c7f638 update 2024-01-15 14:08:56 +08:00
weiz
75953e42ef Merge pull request 'update' (#174) from zhangwei into dev
Reviewed-on: #174
2024-01-15 13:59:09 +08:00
weiz
f3c2c82c62 update 2024-01-15 13:58:41 +08:00
weiz
4433439c64 Merge pull request 'update' (#173) from zhangwei into dev
Reviewed-on: #173
2024-01-15 13:55:55 +08:00
weiz
eb484d10ac update 2024-01-15 13:55:16 +08:00
weiz
9302aa19f1 Merge pull request 'zhangwei' (#172) from zhangwei into dev
Reviewed-on: #172
2024-01-15 11:33:28 +08:00
weiz
abdcaf74b2 Merge branch 'dev' into zhangwei 2024-01-15 11:32:39 +08:00
weiz
0a3e9995f2 update 2024-01-15 11:31:34 +08:00
mkm
8a195679f3 申请明细-更新custom_name 2024-01-15 10:52:02 +08:00
mkm
ff58c36407 更新annex json_encode转换 2024-01-15 10:28:35 +08:00
weiz
6f2b599da5 Merge pull request 'update' (#171) from zhangwei into dev
Reviewed-on: #171
2024-01-15 10:21:45 +08:00
mkm
0bf7ccb8fb 更新供应链名称 2024-01-15 10:21:43 +08:00
weiz
0aa531cd98 update 2024-01-15 10:21:12 +08:00
weiz
de6058aaa5 Merge pull request 'update' (#170) from zhangwei into dev
Reviewed-on: #170
2024-01-15 09:31:22 +08:00
mkm
c5ef626337 更新 2024-01-15 09:30:56 +08:00
weiz
4711c88013 update 2024-01-15 09:30:15 +08:00
shengchanzhe
627445edda 更新 2024-01-14 19:47:49 +08:00
shengchanzhe
86dacbac4c 更新 2024-01-14 16:01:42 +08:00
shengchanzhe
b7ad755ca7 更新quotation_detail 2024-01-14 12:26:00 +08:00
mkm
fcec7088c4 更新 2024-01-13 18:18:45 +08:00
mkm
9fda964fc5 更新 2024-01-13 17:51:24 +08:00
mkm
72cd3e5054 更新 2024-01-13 17:32:44 +08:00
weiz
6848217f4d Merge pull request 'update' (#169) from zhangwei into dev
Reviewed-on: #169
2024-01-13 17:31:29 +08:00
weiz
86f36bd781 update 2024-01-13 17:31:01 +08:00
mkm
547267d941 更新 2024-01-13 17:22:09 +08:00
weiz
7f3f7db619 Merge pull request 'update' (#168) from zhangwei into dev
Reviewed-on: #168
2024-01-13 17:19:19 +08:00
weiz
b00e624d64 update 2024-01-13 17:18:54 +08:00
weiz
a65a0c2d0a Merge pull request 'update' (#167) from zhangwei into dev
Reviewed-on: #167
2024-01-13 17:14:21 +08:00
weiz
dd2e9da0f1 update 2024-01-13 17:13:29 +08:00
mkm
b663064eaf 修复错误 2024-01-13 17:01:17 +08:00
mkm
c17c775040 更新筛选 2024-01-13 16:58:50 +08:00
weiz
bff6a65ae7 Merge pull request 'zhangwei' (#166) from zhangwei into dev
Reviewed-on: #166
2024-01-13 16:46:59 +08:00
weiz
ac9362ee80 Merge branch 'dev' into zhangwei 2024-01-13 16:45:46 +08:00
mkm
ca92182486 更新字段 2024-01-13 16:25:10 +08:00