Commit Graph

  • b183862a6b update weiz 2024-01-17 16:08:23 +08:00
  • 50e1ade7f7 Merge pull request '新增项目成本调整模块' (#186) from zhangwei into dev weiz 2024-01-17 14:09:23 +08:00
  • 29e4f22ce9 新增项目成本调整模块 weiz 2024-01-17 14:08:46 +08:00
  • 18c110a9f0 Merge pull request 'update' (#185) from zhangwei into dev weiz 2024-01-17 13:39:45 +08:00
  • cc92ff7d13 update weiz 2024-01-17 13:39:10 +08:00
  • 3488a2f3dc Merge pull request '新增借款申请模块' (#184) from zhangwei into dev weiz 2024-01-17 11:53:45 +08:00
  • b38341c1ae 新增借款申请模块 weiz 2024-01-17 11:53:11 +08:00
  • 7d79a836d8 Merge pull request '新增出差申请模块' (#183) from zhangwei into dev weiz 2024-01-17 10:43:18 +08:00
  • 6bec557ab6 新增出差申请模块 weiz 2024-01-17 10:42:23 +08:00
  • ade97f7eeb Merge pull request 'add project_cost_budget' (#182) from zhangwei into dev weiz 2024-01-16 15:58:01 +08:00
  • 8fdb154242 add project_cost_budget weiz 2024-01-16 15:57:32 +08:00
  • b0d8f590f4 Merge pull request 'add project_equipment_budget' (#181) from zhangwei into dev weiz 2024-01-16 14:16:49 +08:00
  • 5315bc7aee add project_equipment_budget weiz 2024-01-16 14:15:55 +08:00
  • a17732842e Merge pull request 'add project_labor_budget' (#180) from zhangwei into dev weiz 2024-01-16 11:28:27 +08:00
  • 696ef7c544 add project_labor_budget weiz 2024-01-16 11:26:24 +08:00
  • a1727ed68a 更新 mkm 2024-01-15 18:56:42 +08:00
  • 3ece35ade3 Merge pull request 'update' (#179) from zhangwei into dev weiz 2024-01-15 15:48:46 +08:00
  • 2cd09e8e5b update weiz 2024-01-15 15:48:15 +08:00
  • a539abdaab Merge pull request 'update' (#178) from zhangwei into dev weiz 2024-01-15 15:41:07 +08:00
  • 8fc7710f63 update weiz 2024-01-15 15:40:40 +08:00
  • 7844d6a3d8 Merge pull request 'update' (#177) from zhangwei into dev weiz 2024-01-15 15:07:17 +08:00
  • 9475b5c7c9 update weiz 2024-01-15 15:06:39 +08:00
  • d3e6072bdf Merge pull request 'update' (#176) from zhangwei into dev weiz 2024-01-15 15:00:35 +08:00
  • cb0a010517 update weiz 2024-01-15 14:59:41 +08:00
  • ced3b0b122 Merge pull request 'update' (#175) from zhangwei into dev weiz 2024-01-15 14:09:32 +08:00
  • b139c7f638 update weiz 2024-01-15 14:08:56 +08:00
  • 75953e42ef Merge pull request 'update' (#174) from zhangwei into dev weiz 2024-01-15 13:59:09 +08:00
  • f3c2c82c62 update weiz 2024-01-15 13:58:41 +08:00
  • 4433439c64 Merge pull request 'update' (#173) from zhangwei into dev weiz 2024-01-15 13:55:55 +08:00
  • eb484d10ac update weiz 2024-01-15 13:55:16 +08:00
  • 9302aa19f1 Merge pull request 'zhangwei' (#172) from zhangwei into dev weiz 2024-01-15 11:33:28 +08:00
  • abdcaf74b2 Merge branch 'dev' into zhangwei weiz 2024-01-15 11:32:39 +08:00
  • 0a3e9995f2 update weiz 2024-01-15 11:31:34 +08:00
  • 8a195679f3 申请明细-更新custom_name mkm 2024-01-15 10:52:02 +08:00
  • ff58c36407 更新annex json_encode转换 mkm 2024-01-15 10:28:35 +08:00
  • 6f2b599da5 Merge pull request 'update' (#171) from zhangwei into dev weiz 2024-01-15 10:21:45 +08:00
  • 0bf7ccb8fb 更新供应链名称 mkm 2024-01-15 10:21:43 +08:00
  • 0aa531cd98 update weiz 2024-01-15 10:21:12 +08:00
  • de6058aaa5 Merge pull request 'update' (#170) from zhangwei into dev weiz 2024-01-15 09:31:22 +08:00
  • c5ef626337 更新 mkm 2024-01-15 09:30:56 +08:00
  • 4711c88013 update weiz 2024-01-15 09:30:15 +08:00
  • 627445edda 更新 shengchanzhe 2024-01-14 19:47:49 +08:00
  • 86dacbac4c 更新 shengchanzhe 2024-01-14 16:01:42 +08:00
  • b7ad755ca7 更新quotation_detail shengchanzhe 2024-01-14 12:26:00 +08:00
  • fcec7088c4 更新 mkm 2024-01-13 18:18:45 +08:00
  • 9fda964fc5 更新 mkm 2024-01-13 17:51:24 +08:00
  • 72cd3e5054 更新 mkm 2024-01-13 17:32:35 +08:00
  • 6848217f4d Merge pull request 'update' (#169) from zhangwei into dev weiz 2024-01-13 17:31:29 +08:00
  • 86f36bd781 update weiz 2024-01-13 17:31:01 +08:00
  • 547267d941 更新 mkm 2024-01-13 17:21:04 +08:00
  • 7f3f7db619 Merge pull request 'update' (#168) from zhangwei into dev weiz 2024-01-13 17:19:19 +08:00
  • b00e624d64 update weiz 2024-01-13 17:18:54 +08:00
  • a65a0c2d0a Merge pull request 'update' (#167) from zhangwei into dev weiz 2024-01-13 17:14:21 +08:00
  • dd2e9da0f1 update weiz 2024-01-13 17:13:29 +08:00
  • b663064eaf 修复错误 mkm 2024-01-13 17:01:17 +08:00
  • c17c775040 更新筛选 mkm 2024-01-13 16:58:50 +08:00
  • bff6a65ae7 Merge pull request 'zhangwei' (#166) from zhangwei into dev weiz 2024-01-13 16:46:59 +08:00
  • ac9362ee80 Merge branch 'dev' into zhangwei weiz 2024-01-13 16:45:46 +08:00
  • ca92182486 更新字段 mkm 2024-01-13 16:25:10 +08:00
  • cba6ceb109 update weiz 2024-01-13 15:26:48 +08:00
  • 84f77dddcb 更新pc页面 mkm 2024-01-13 15:04:51 +08:00
  • e9acba9b76 Merge pull request 'update' (#165) from zhangwei into dev weiz 2024-01-13 14:55:38 +08:00
  • 1c0ccbdf48 update weiz 2024-01-13 14:55:02 +08:00
  • d77f54e2d8 更新报错 mkm 2024-01-13 10:06:41 +08:00
  • 8f52d0c42e Merge pull request 'update' (#164) from zhangwei into dev weiz 2024-01-12 17:51:01 +08:00
  • 64ee036e85 update weiz 2024-01-12 17:50:29 +08:00
  • 69adca47bd Merge pull request 'update' (#163) from zhangwei into dev weiz 2024-01-12 17:22:20 +08:00
  • 30b01be381 update weiz 2024-01-12 17:21:51 +08:00
  • 4855720263 更新pc mkm 2024-01-12 16:37:09 +08:00
  • 61992c2843 更新pc mkm 2024-01-12 16:36:55 +08:00
  • 9644fb9f8b Merge pull request 'update' (#162) from zhangwei into dev weiz 2024-01-12 15:42:02 +08:00
  • 5f63f4ec3f update weiz 2024-01-12 15:41:27 +08:00
  • 8a54d6b581 Merge pull request 'update' (#161) from zhangwei into dev weiz 2024-01-12 14:55:28 +08:00
  • 785da1961d update weiz 2024-01-12 14:55:02 +08:00
  • bc25dd564d Merge pull request 'update' (#160) from zhangwei into dev weiz 2024-01-12 11:42:24 +08:00
  • dc94d7ed58 update weiz 2024-01-12 11:41:53 +08:00
  • 76089aa36c Merge pull request 'update' (#159) from zhangwei into dev weiz 2024-01-12 10:43:24 +08:00
  • a0453d3251 update weiz 2024-01-12 10:43:01 +08:00
  • 53a9b4e1f3 Merge pull request 'update' (#158) from zhangwei into dev weiz 2024-01-12 10:40:01 +08:00
  • b8faf0954e update weiz 2024-01-12 10:39:36 +08:00
  • a334b89c56 Merge pull request 'zhangwei' (#157) from zhangwei into dev weiz 2024-01-12 10:19:09 +08:00
  • a9cf9b768f update weiz 2024-01-12 10:18:43 +08:00
  • 118424517d update weiz 2024-01-11 18:18:45 +08:00
  • 5fad9b162d Merge pull request 'update' (#156) from zhangwei into dev weiz 2024-01-11 18:10:07 +08:00
  • 1f2bc07986 update weiz 2024-01-11 18:09:43 +08:00
  • 7a2572f1c9 Merge pull request 'update' (#155) from zhangwei into dev weiz 2024-01-11 17:34:43 +08:00
  • ee7447f31b update weiz 2024-01-11 17:34:17 +08:00
  • 792f133958 Merge pull request 'update' (#154) from zhangwei into dev weiz 2024-01-11 17:20:42 +08:00
  • f9d16f2f2b update weiz 2024-01-11 17:20:10 +08:00
  • 542e8982d2 Merge pull request 'update' (#153) from zhangwei into dev weiz 2024-01-11 15:43:48 +08:00
  • ad6d5def3a update weiz 2024-01-11 15:43:11 +08:00
  • c96b830700 Merge pull request 'update' (#152) from zhangwei into dev weiz 2024-01-11 13:59:47 +08:00
  • 9393725242 update weiz 2024-01-11 13:59:14 +08:00
  • 1244b55744 Merge pull request 'update' (#151) from zhangwei into dev weiz 2024-01-11 11:43:56 +08:00
  • 0db484f9fe update weiz 2024-01-11 11:43:25 +08:00
  • d770c8c99c Merge pull request 'update' (#150) from zhangwei into dev weiz 2024-01-11 09:44:46 +08:00
  • 6fb4376c40 update weiz 2024-01-11 09:44:14 +08:00
  • 6606ad9493 Merge pull request 'update' (#149) from zhangwei into dev weiz 2024-01-11 09:32:42 +08:00
  • 27a1b74c31 update weiz 2024-01-11 09:32:06 +08:00
  • 3c7112a10e Merge pull request 'zhangwei' (#148) from zhangwei into dev weiz 2024-01-10 18:24:34 +08:00