diff --git a/application/common/model/Order.php b/application/common/model/Order.php index 24737de..8604719 100644 --- a/application/common/model/Order.php +++ b/application/common/model/Order.php @@ -61,4 +61,18 @@ class Order extends Model return $images; } + + public function getMaterialImagesAttr($val) + { + if (empty($val)) { + return []; + } + + $images = explode(',', $val); + foreach ($images as $k => $v) { + $images[$k] = cdnurl($v, true); + } + + return $images; + } } diff --git a/application/services/OrderDispatchService.php b/application/services/OrderDispatchService.php index 7a8179c..20b6911 100644 --- a/application/services/OrderDispatchService.php +++ b/application/services/OrderDispatchService.php @@ -228,6 +228,9 @@ class OrderDispatchService extends BaseService 'images', 'status', 'coupon_id', + 'is_material_used', + 'material_cost', + 'material_images', ]; $orderDispatchFields = [ 'id', diff --git a/public/assets/js/backend/orders/configorder.js b/public/assets/js/backend/orders/configorder.js index 7868a0c..715a0ba 100644 --- a/public/assets/js/backend/orders/configorder.js +++ b/public/assets/js/backend/orders/configorder.js @@ -62,25 +62,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'real_amount', title: __('Real_amount'), operate:false}, {field: 'cost', title: __('Cost'), operate:false}, { - field: 'material_cost_text', title: '材料', + field: 'material_cost_text', title: '材料成本', operate: false, cellStyle: {css: {"text-align": "left !important"}}, formatter: function (val, row) { - let status = { - "0": "未使用", - "1": "已使用", - } - let res = ` - 是否使用材料:${status[row.is_material_used]}
- `; if (row.is_material_used === 1) { - res += `材料成本:¥${row.material_cost}
` + return `¥${row.material_cost}` } - return res + return '无' }}, {field: 'material_images', title: __('材料凭证'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, - - {field: 'performance', title: __('Performance'), operate:false}, // {field: 'dispatch_type', title: __('Dispatch_type')},