From 9a74ea6d5dd1f2ce54fe169cb78dbfdb436d2d0e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 15 Jun 2022 10:05:52 +0800 Subject: [PATCH] * Fix bug of task #57089. --- module/execution/css/create.css | 4 ++++ module/execution/css/edit.css | 3 +++ module/execution/model.php | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/module/execution/css/create.css b/module/execution/css/create.css index f8689e174c..1d8a16b1f2 100644 --- a/module/execution/css/create.css +++ b/module/execution/css/create.css @@ -18,3 +18,7 @@ #lifeTimeTips {display: none;} #teams_chosen .chosen-drop ul li .label {margin-top: 3px; background: #fff; color: #838a9d; border: 1px solid #d8d8d8;} + +#productsBox .row .col-sm-4 {padding-right: 13px;} +#plansBox .row {display: inline-table; width: 102%;} +#plansBox .row .col-sm-4 {display: inline-block; float: none; padding-right: 13px;} diff --git a/module/execution/css/edit.css b/module/execution/css/edit.css index 2425ae4674..13a5a35dc3 100644 --- a/module/execution/css/edit.css +++ b/module/execution/css/edit.css @@ -1 +1,4 @@ .chosen-container-single .chosen-single > span {max-width: 100%;} + +#plansBox .row {display: inline-table; width: 102%;} +#plansBox .row .col-sm-4 {display: inline-block; float: none;} diff --git a/module/execution/model.php b/module/execution/model.php index fbd5818e4e..6c423c8929 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -2016,7 +2016,7 @@ class executionModel extends model if(isset($oldProducts[$productID][$branch])) { $oldProduct = $oldProducts[$productID][$branch]; - $oldPlan = $oldProduct->plan; + if($this->app->rawMethod != 'edit') $oldPlan = $oldProduct->plan; } $data = new stdclass();