From b6d2aa21e917c6c28b79e8d8ef4dbce1c86d70bb Mon Sep 17 00:00:00 2001
From: gcd <wyemail666@163.com>
Date: Fri, 30 May 2025 23:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=20feat:=20=E3=80=90=E5=90=8E=E5=8F=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=98=AF=E5=90=A6=E4=BD=BF=E7=94=A8=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E3=80=81=E6=9D=90=E6=96=99=E5=87=AD=E8=AF=81=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=BB=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/model/Order.php             | 14 ++++++++++++++
 application/services/OrderDispatchService.php  |  3 +++
 public/assets/js/backend/orders/configorder.js | 15 +++------------
 3 files changed, 20 insertions(+), 12 deletions(-)

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": "<span style='color: orange'>未使用</span>",
-                                    "1": "<span style='color: green'>已使用</span>",
-                                }
-                                let res = `
-                                            <span>是否使用材料：${status[row.is_material_used]}</span><br>
-                                        `;
                                 if (row.is_material_used === 1) {
-                                    res += `<span>材料成本：¥${row.material_cost}</span><br>`
+                                    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')},