Commit Graph
130 Commits
Author SHA1 Message Date
caoyanyi 0e32876039 + Add params type and return type for branch setDefault. 2023-09-21 14:37:45 +08:00
tianshujie 4844783e13 * Refactor ajaxGetDropMenu method. 2023-09-21 14:36:46 +08:00
caoyanyi 23ce2122f9 * Adjust batch edit branch logic. 2023-09-21 14:19:56 +08:00
tianshujie 6960a91f09 * Modify the logical operator. 2023-09-21 14:05:14 +08:00
caoyanyi 963079255d * Adjust branch edit method and page. 2023-09-21 13:57:21 +08:00
tianshujie 1f920f785d * Compatible branch creation. 2023-09-21 13:45:38 +08:00
tianshujie c0a4b113a1 * Refactor ajaxGetDropMenu method. 2023-09-21 13:36:57 +08:00
caoyanyi 95689979cd * Adjust branch create model. 2023-09-21 13:34:22 +08:00
tianshujie f87f58a54a * Refactor getByID method and case. 2023-09-21 13:19:04 +08:00
caoyanyi 2a17e60149 + Add getIdListByRelation method for branch. 2023-09-21 11:23:55 +08:00
tianshujie 2bce5349cc * Refactor mergeBranch method. 2023-09-21 09:54:50 +08:00
caoyanyi 58c5b9f55c * Adjust parmas type for branch getList. 2023-09-21 09:30:22 +08:00
caoyanyi f4575bad19 * Adjust branch changeBranchLanguage method unit test case. 2023-09-21 09:30:22 +08:00
tianshujie a54dd76285 * Modify the case where all branches cannot be retrieved when the
incoming product ID is empty.
2023-09-06 17:12:03 +08:00
tianshujie 01e305e651 * Modify the case where all branches cannot be retrieved when the
incoming product ID is empty.
2023-09-06 17:11:29 +08:00
sunguangming 99901462ca * Add branch drop menu. 2023-07-26 09:42:38 +08:00
朱金勇 8ff812b6a6 * Ajax load options for edit module. 2023-07-20 08:53:19 +00:00
朱金勇 d9ad294cf4 + Add type for args. 2023-07-12 04:29:53 +00:00
caoyanyi 980526df66 + Add required field validate. 2023-06-13 16:51:10 +08:00
caoyanyi e2b195c11f * Change date save data. 2023-06-13 14:08:03 +08:00
caoyanyi 010e8ef843 * Adjust batch editing logic for branch. 2023-06-13 13:25:08 +08:00
caoyanyi 92f296e60c * Add clickable check. 2023-06-10 11:05:12 +08:00
wangyidong 876ef0b378 * adjust code for batchEdit method. 2023-05-06 17:35:01 +08:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
孙广明 6df3f17c89 * Exec for dm db. 2022-12-29 14:56:03 +08:00
xieqiyu afb647bedf * Fix bug#30187. 2022-11-24 09:31:24 +08:00
liuhong 13c945cd07 * Adjust code feedback #1422. 2022-11-15 08:26:11 +00:00
liuhong d7f9d55863 * Resolved feedback #1422. 2022-11-15 02:15:12 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
mayue 5f5cc8768e * Fix bug #21904. 2022-04-21 15:04:59 +08:00
liumengyi bdbf43362d * Add unit test of branch. 2022-04-18 17:00:06 +08:00
孙华伟 a5d6663342 * Fix bug #20316. 2022-04-18 10:55:42 +08:00
xieqiyu 8aaaeafcb3 * Modify review code. 2022-04-07 17:22:15 +08:00
xieqiyu 1a59190992 * Fix bug#21550. 2022-04-07 17:09:41 +08:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
xieqiyu 9024dae71e * Modify linked products when edit product. 2022-02-28 10:15:16 +08:00
xieqiyu 9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
hufangzhou 44783c6933 * Fix bug #17999. 2021-12-27 18:08:09 +08:00
xieqiyu 1491db714d * Fix bug: batch update branch. 2021-12-24 13:45:05 +08:00
孙广明 f5da2d8a21 Merge branch 'sprint/178_hufangzhou_mergeBranch' into 'master'
* Finish task #46096.

See merge request easycorp/zentaopms!1095
2021-12-23 03:32:01 +00:00
hufangzhou e1075ca205 * Finish task #46096. 2021-12-23 11:29:51 +08:00
songchenxuan a7258e471b *Finish task #46100. 2021-12-22 14:28:28 +08:00
zhujinyong 42fc345e2a Merge branch 'sprint/176_xieqiyu_mergeBranch' 2021-12-21 16:12:48 +08:00
hufangzhou 2809bc0b94 * Perfect details. 2021-12-21 15:42:26 +08:00
zhujinyong 5a1e31adf2 * Refactor getList of branch. 2021-12-21 14:53:05 +08:00
hufangzhou 872a8b2bbd * Finish task #46096. 2021-12-21 14:30:38 +08:00
xieqiyu b67911b304 * Pass the data of the merged branch. 2021-12-16 17:19:25 +08:00