diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php index 0a5cd83..c5b8cdd 100644 --- a/application/admin/controller/orders/Configorder.php +++ b/application/admin/controller/orders/Configorder.php @@ -4,6 +4,7 @@ namespace app\admin\controller\orders; use app\admin\model\Admin; use app\admin\model\Order; +use app\admin\model\Worker; use app\common\controller\Backend; use think\Db; use think\Exception; @@ -102,6 +103,8 @@ class Configorder extends Backend } if (false === $this->request->isPost()) { $this->view->assign('row', $row); + $workerRate = Worker::where('id',$row->worker_id)->value('rate'); + $this->view->assign('rate', $workerRate); return $this->view->fetch(); } $params = $this->request->post('row/a'); @@ -131,7 +134,10 @@ class Configorder extends Backend 'cost' => $params['cost'], 'offline_amount_type'=> $params['offline_amount_type'], 'amount_images' => $params['amount_images'], - 'material_cost' => $params['material_cost'] + 'material_cost' => $params['material_cost'], + 'cost_rate' => $params['cost_rate'], + 'cost_remark' => $params['cost_remark'], + 'material_images' => $params['material_images'], ]; $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2); diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html index 829ec79..2d823f1 100644 --- a/application/admin/view/orders/configorder/edit.html +++ b/application/admin/view/orders/configorder/edit.html @@ -90,6 +90,14 @@ + +