diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppleOrderController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppleOrderController.java
index 5e32772..8536fbd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppleOrderController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppleOrderController.java
@@ -2779,7 +2779,7 @@ public class AppleOrderController extends BaseController {
                     JSONObject user = new JSONObject();
                     user.put("id", u.getId());
                     user.put("name", u.getName());
-                    user.put("avatar", u.getAvatar());
+                    user.put("avatar", AppletControllerUtil.buildImageUrl(u.getAvatar()));
                     comment.put("user", user);
                 }
                 result.put("comment", comment);
@@ -4126,6 +4126,38 @@ public class AppleOrderController extends BaseController {
         }
     }
 
+
+    /**
+     * 小程序通过code换取手机号
+     * POST /api/user/phone
+     * 参数示例：{"code":"xxxxxx"}
+     */
+    @PostMapping(value = "/api/user/phone")
+    public AjaxResult getUserPhoneByCode(@RequestBody Map<String, Object> params) {
+        try {
+            if (params == null || params.get("code") == null) {
+                return AppletControllerUtil.appletError("code不能为空");
+            }
+            String code = String.valueOf(params.get("code")).trim();
+            if (code.isEmpty()) {
+                return AppletControllerUtil.appletError("code不能为空");
+            }
+
+            Map<String, Object> result = WechatApiUtil.getPhoneNumberByCode(code);
+            if (Boolean.TRUE.equals(result.get("success"))) {
+                // 返回微信接口中的 phone_info 节点
+                Object phoneInfo = result.get("phone_info");
+                return AppletControllerUtil.appletSuccess(phoneInfo != null ? phoneInfo : result);
+            } else {
+                String msg = result != null && result.get("errorMsg") != null ? String.valueOf(result.get("errorMsg")) : "获取手机号失败";
+                return AppletControllerUtil.appletError(msg);
+            }
+        } catch (Exception e) {
+            return AppletControllerUtil.appletError("获取手机号失败：" + e.getMessage());
+        }
+    }
+
+
     @PostMapping("/api/workerdata/index")
     public AjaxResult workerdataIndex(@RequestBody Map<String, Object> params, HttpServletRequest request) {
         try {
@@ -6101,6 +6133,62 @@ public class AppleOrderController extends BaseController {
         return null;
     }
 
+
+
+
+    @PostMapping(value = "/api/user/address/del")
+    public AjaxResult apiuseraddressdel(@RequestBody Map<String, Object> params, HttpServletRequest request) {
+        Long id = Long.parseLong(params.get("id").toString());
+        int result = userAddressService.deleteUserAddressById(id);
+        return AppletControllerUtil.appletSuccess("操作成功");
+    }
+
+
+    @PostMapping(value = "/api/coupon/add")
+    public AjaxResult apicouponadd(@RequestBody Map<String, Object> params, HttpServletRequest request) {
+        Long id = Long.parseLong(params.get("coupon_id").toString());
+        // 获取token
+        String token = request.getHeader("token");
+        if (StringUtils.isEmpty(token)) {
+            return AjaxResult.error("token不能为空");
+        }
+
+        // 验证用户token
+        Map<String, Object> userInfo = AppletLoginUtil.validateUserToken(token, usersService);
+        if (userInfo == null) {
+            return AjaxResult.error("token验证失败");
+        }
+
+        Users user = (Users) userInfo.get("user");
+
+        Coupons coupon = couponsService.selectCouponsById( id);
+//        CouponUser couponUser = couponUserService.selectCouponUserById(id);
+        if (coupon == null) {
+            AppletControllerUtil.appletWarning("优惠券不存在");
+        }
+        CouponUser couponUser = new CouponUser();
+
+        couponUser.setUid(user.getId());
+        couponUser.setCouponId(coupon.getId());
+        couponUser.setCouponTitle(coupon.getTitle());
+        couponUser.setCouponPrice(coupon.getPrice().intValue());
+        couponUser.setMinPrice(coupon.getMinPrice().longValue());
+        couponUser.setAddTime(new Date().getTime()/1000);
+        couponUser.setLoseTime(String.valueOf(coupon.getEndTime()));
+        couponUser.setCateId(coupon.getCateId());
+        couponUser.setProductId(coupon.getProductId());
+        couponUser.setReceiveType(String.valueOf(coupon.getReceiveType()));
+        couponUser.setStatus(1L);
+        couponUserService.insertCouponUser(couponUser);
+
+        return AppletControllerUtil.appletSuccess("操作成功");
+    }
+
+
+
+
+
+
     /**
      * 服务/商品搜索接口
      *
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ApplePayController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ApplePayController.java
index ed09d9f..8d3f879 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ApplePayController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ApplePayController.java
@@ -1289,7 +1289,8 @@ public class ApplePayController extends BaseController {
                     //先微信支付，微信支付成功之后再回调中把剩余的进行余额支付
                     payResult = wechatPayUtil.createBatchOrderAndPay(
                         user.getOpenid(),
-                        payBefor.getPaycode(),
+                            payBefor.getOrderid(),
+//                        payBefor.getPaycode(),
                             new BigDecimal("0.01"),
                         1,
                         WechatPayUtil.PAY_FH + "api/order/amount/paydata/zuhenotify"
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java
index e4b3b2a..0967783 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java
@@ -2016,8 +2016,9 @@ public class AppletController extends BaseController {
                 return AppletControllerUtil.appletSuccess(AppletControllerUtil.buildCouponUserList(couponUserDataList,serviceCateService,serviceGoodsService,productId,totalPrice));
             }
         }
+        JSONArray jsonArray = new JSONArray();
         // 按is_use排序
-        return AjaxResult.success();
+        return AppletControllerUtil.appletSuccess(jsonArray);
     }
     /**
      * 积分订单收货确认接口
@@ -2490,7 +2491,7 @@ public class AppletController extends BaseController {
                 if (!allAddressList.isEmpty()) {
                     targetAddress = allAddressList.get(0);
                 } else {
-                    return AppletControllerUtil.appletWarning("用户暂无收货地址");
+                    return AppletControllerUtil.appletSuccess("用户暂无收货地址");
                 }
             }
 
@@ -4110,6 +4111,9 @@ public class AppletController extends BaseController {
             return AppletControllerUtil.appletWarning("取消失败：" + e.getMessage());
         }
     }
+
+
+    //接单
     @GetMapping("/api/worker/accept/order/{id}")
     public AjaxResult workerAcceptOrder(@PathVariable("id") Long id, HttpServletRequest request) {
         try {
@@ -4649,7 +4653,7 @@ public class AppletController extends BaseController {
 
             return AjaxResult.success(data);
         } catch (Exception e) {
-            return AppletControllerUtil.appletError("查询师傅订单详情失败：" + e.getMessage());
+            return AppletControllerUtil.appletError("查询订单详情失败：" + e.getMessage());
         }
     }
 
@@ -5487,7 +5491,7 @@ public class AppletController extends BaseController {
             workerApply.setUid(user.getId());
             List<WorkerApply> workerApplyList = workerApplyService.selectWorkerApplyList(workerApply);
             if (workerApplyList == null || workerApplyList.isEmpty()) {
-                return AppletControllerUtil.appletError("用户没有申请成为师傅");
+                return AppletControllerUtil.appletSuccess(null);
             }
             return AjaxResult.success(workerApplyList.getFirst());
         } catch (Exception e) {
@@ -6996,25 +7000,14 @@ public class AppletController extends BaseController {
             orderLog.setOrderId(orderInfo.getOrderId());
             orderLog.setType(new BigDecimal(5));
             List<OrderLog> orderLogList = orderLogService.selectOrderLogList(orderLog);
-            System.out.println("=== 开始退款处理，orderLogList.getFirst().getId()2222222222订单号: " + orderLogList+ " ===");
             if (!orderLogList.isEmpty()) {
-                System.out.println("=== 开始退款处理，orderLogList.getFirst().getId()2222222222订单号: " + orderLogList.getFirst().getId()+ " ===");
                 orderLogService.updateOrderLogEnd(orderLogList.getFirst().getId());
-             //   OrderLog orderLogInfo = orderLogList.getFirst();
-              //  orderLogInfo
             }
 
             if (StringUtils.isNotBlank(shangmenprice)){
                 log.setPaid(1L);
                 log.setPrice(new  BigDecimal(shangmenprice));
                 jsonObject.put("name","师傅提前结束订单,上门费"+shangmenprice+"元");
-//                BigDecimal totalAmount=log.getPrice();
-//
-//                Users userinfo = usersService.selectUsersById(orderInfo.getUid());
-//                PayBeforeUtil payBeforeUtil = new PayBeforeUtil();
-//                payBeforeUtil.createPayBefore(userinfo, totalAmount, logOrderId, log.getId(),
-//                        null, 7L, null, null,
-//                        null, null, null,1L,null,order.getOrderId());
             }else{
                 jsonObject.put("name","师傅提前结束订单,无其他费用");
             }
@@ -7041,59 +7034,11 @@ public class AppletController extends BaseController {
                 //微信推送师傅设置上门费
                 WXsendMsgUtil.sendMsgForUserDoorMoney(userinfo.getOpenid(), orderInfo, serviceGoods);
             }
-//            // 3.3 查询是否有上门费(type=2, paid=2)
-//            OrderLog doorPriceLogself = new OrderLog();
-//            doorPriceLogself.setOid(orderInfo.getId());
-//            doorPriceLogself.setType(BigDecimal.valueOf(2));
-//            doorPriceLogself.setPaid(2L);
-//            doorPriceLogself.setWorkerId(workerInfo.getId());
-//            OrderLog doorPriceLog = orderLogService.selectOneByOidTypeWorkerIdPaid(doorPriceLogself);
-//            if (doorPriceLog != null && doorPriceLog.getPrice() != null) {
-//                // 师傅等级信息
-//                //Users workerInfo = usersService.selectUsersById(workerId);
-//                WorkerLevel levelInfo = workerLevelService.selectWorkerLevelByLevel(Long.valueOf(workerInfo.getLevel()));
-//                // 更新师傅佣金
-//                BigDecimal price = doorPriceLog.getPrice();
-//                Users updateUser = new Users();
-//                updateUser.setId(workerInfo.getId());
-//                updateUser.setCommission(workerInfo.getCommission().add(price));
-//                updateUser.setTotalComm(workerInfo.getTotalComm().add(price));
-//                usersService.updateUsers(updateUser);
-//                // 插入师傅金额记录
-//                WorkerMoneyLog moneyLog = new WorkerMoneyLog();
-//                moneyLog.setWorkerId(workerInfo.getId());
-//                moneyLog.setOid(orderInfo.getId());
-//                moneyLog.setOrderId(orderInfo.getOrderId());
-//                moneyLog.setPrice(price);
-//                moneyLog.setType(1);
-//                moneyLog.setServicePrice(BigDecimal.ZERO);
-//                moneyLog.setReductionPrice(BigDecimal.ZERO);
-//                moneyLog.setCr(Math.toIntExact(levelInfo != null ? levelInfo.getCr() : null));
-//                moneyLog.setMergin(BigDecimal.ZERO);
-//                moneyLog.setDoorPrice(price);
-//
-//                moneyLog.setStatus(1);//锁单
-//                moneyLog.setStatusType(0);//后台锁定
-//                moneyLog.setBeginlook(new Date());
-//                //7天锁单
-//                LocalDateTime ldt = LocalDateTime.now().plusDays(7);
-//                Date end = Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant());
-//                moneyLog.setEndlook(end);
-//                moneyLog.setLookday(7);
-//                moneyLog.setLookMoney(price);
-//                workerMoneyLogService.insertWorkerMoneyLog(moneyLog);
-//
-//            }
+
             // 3.4 解绑虚拟号
             if (orderInfo.getMiddlePhone() != null) {
                 VoiceResponseResult unbind = YunXinPhoneUtilAPI.httpsPrivacyUnbind(orderInfo.getWorkerPhone(), orderInfo.getUserPhone(), orderInfo.getMiddlePhone());
                 if (unbind.getResult().equals("000000")) {
-//                    Order phoneUpdate = new Order();
-//                    phoneUpdate.setId(orderInfo.getId());
-//                    phoneUpdate.setMiddlePhone(null);
-//                    phoneUpdate.setUserPhone(null);
-//                    phoneUpdate.setWorkerPhone(null);
-//                    orderService.updateOrder(phoneUpdate);
                       orderService.updateOrderPhone(orderInfo.getId());
                 }
             }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/CoursorUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/CoursorUtil.java
index 5c70a99..9e96040 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/CoursorUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/CoursorUtil.java
@@ -17,6 +17,7 @@ import com.ruoyi.system.service.IServiceGoodsService;
 import com.ruoyi.system.service.IGoodsOrderCursorService;
 import com.ruoyi.system.service.IOrderService;
 import com.ruoyi.system.service.ISiteConfigService;
+import com.ruoyi.system.ControllerUtil.WechatApiUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -206,6 +207,8 @@ public class CoursorUtil extends BaseController {
             return AppletControllerUtil.appletError("创建游标失败：" + e.getMessage());
         }
     }
+
+
     
     /**
      * 构建服务商品响应数据
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
index f7a9093..bf8703a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
@@ -1,15 +1,15 @@
 package com.ruoyi.system.controller;
 
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.ControllerUtil.DispatchUtil;
-import com.ruoyi.system.ControllerUtil.OrderUtil;
-import com.ruoyi.system.ControllerUtil.VerificationResult;
-import com.ruoyi.system.ControllerUtil.WXsendMsgUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.ControllerUtil.*;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.*;
+import com.winnerlook.model.VoiceResponseResult;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +44,11 @@ public class OrderController extends BaseController {
     private IOrderService orderService;
     @Autowired
     private IServiceGoodsService serviceGoodsService;
+
+    @Autowired
+    private IUsersPayBeforService usersPayBeforService;
+
+
     @Autowired
     IUsersService usersService;
     @Autowired
@@ -54,6 +59,9 @@ public class OrderController extends BaseController {
     IOrderSoundLogService orderSoundLogService;
     @Autowired
     IOrderSoundService orderSoundService;
+    @Autowired
+    IUserAddressService userAddressService;
+
 
     @Autowired
     IOrderLogService orderLogService;
@@ -140,34 +148,77 @@ public class OrderController extends BaseController {
     @Log(title = "服务订单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Order order) {
-        OrderUtil orderUtil = new OrderUtil();
-        //1,根据用户手机号和地址判断用户的数据数据和地址数据
-        //如果用户数据不存在，则添加用户数据
-        //如果用户地址不存在，则添加用户地址数据
-        if (order.getType() == 1) {
-            Map<String, Object> map = orderUtil.isUser(order.getPhone(), order.getAddress());
-            if (map.get("code").equals("1")) {
-                Users usersdata = (Users) map.get("users");
-                UserAddress userAddressdata = (UserAddress) map.get("UserAddress");
-                if (userAddressdata != null) {
-                    order.setAddressId(userAddressdata.getId());
-                }
-                if (usersdata != null) {
-                    order.setUid(usersdata.getId());
-                }
+        Order orderdata=new Order();
 
-            }
-            order.setUserPhone(order.getPhone());
+        Users users = usersService.selectUsersById(order.getUid());
+        if (users == null){
+            return error("用户不能为空");
         }
+       UserAddress userAddress = userAddressService.selectUserAddressById(order.getAddressId());
+        if (userAddress == null){
+            return error("地址不能为空");
+        }
+        ServiceGoods serviceGoods = serviceGoodsService.selectServiceGoodsById(order.getProductId());
+        if (serviceGoods == null){
+            return error("服务不能为空");
+        }
+
+        orderdata.setType(1);
+        orderdata.setMainOrderId(GenerateCustomCode.generCreateOrder("HT"));
+        orderdata.setOrderId(GenerateCustomCode.generCreateOrder("SE"));
+        orderdata.setCreateType(1);
+        orderdata.setCreatePhone(users.getPhone());
+        orderdata.setUid(users.getId());
+        orderdata.setProductId(serviceGoods.getId());
+        orderdata.setName(userAddress.getName());
+        orderdata.setPhone(userAddress.getPhone());
+        orderdata.setAddress(userAddress.getAddressName());
+        orderdata.setMakeTime(order.getMakeTime());
+        orderdata.setMakeHour(order.getMakeHour());
+        orderdata.setNum(order.getNum());
+        orderdata.setTotalPrice(new BigDecimal(0));
+        orderdata.setGoodPrice(new BigDecimal(0));
+        orderdata.setPayPrice(new BigDecimal(0));
+        orderdata.setDeduction(new BigDecimal(0));
+        orderdata.setStatus(1L);
+        orderdata.setIsPause(1);
+        orderdata.setMark(order.getMark());
+        orderdata.setAddressId(userAddress.getId());
+        orderdata.setSku(order.getSku());
+        //orderdata.setReceiveTime();
+        orderdata.setIsComment(0);
+        orderdata.setReceiveType(3L);
+        orderdata.setIsAccept(0);
+        orderdata.setUidAdmin(String.valueOf(users.getId()));
+        orderdata.setAddressAdmin(String.valueOf(userAddress.getId()));
+        orderdata.setLogStatus(9);
+        JSONObject logJson=new JSONObject();
+        logJson.put("type",9);
+        orderdata.setLogJson(logJson.toJSONString());
+        orderdata.setJsonStatus(0);
+        orderdata.setFileData(order.getFileData());
+        orderdata.setOdertype(0);
+        orderdata.setReamk(order.getReamk());
+        orderdata.setBigtype(1);
+        orderdata.setAddressEn(userAddress.getAddressName());
         //添加订单日志记录
-        int flg= orderService.insertOrder(order);
+        int flg= orderService.insertOrder(orderdata);
         if (flg>0){
-            return toAjax(orderUtil.SaveOrderLog(order));
-        }else{
-            return error();
+
+            // 添加订单日志
+            OrderLog orderLog = new OrderLog();
+            orderLog.setOid(orderdata.getId());
+            orderLog.setOrderId(orderdata.getOrderId());
+            orderLog.setTitle("订单生成");
+            orderLog.setType(BigDecimal.valueOf(1.0));
+            com.alibaba.fastjson2.JSONObject jsonObject = new com.alibaba.fastjson2.JSONObject();
+            jsonObject.put("name", "后台订单创建成功");
+            orderLog.setContent(jsonObject.toJSONString());
+            orderLogService.insertOrderLog(orderLog);
+
         }
 
-
+        return success("操作成功");
     }
 
 
@@ -462,6 +513,100 @@ public class OrderController extends BaseController {
         }
     }
 
+    /**
+     * 接单接口
+     */
+    @PreAuthorize("@ss.hasPermi('system:Order:edit')")
+    @Log(title = "订单接单", businessType = BusinessType.UPDATE)
+    @PostMapping("/accept-order")
+    public AjaxResult acceptOrder(@RequestBody Map<String, Object> params) {
+        try {
+            String orderId = params.get("orderId").toString();
+//            Long workerId = null;
+//            if (params.get("workerId") != null) {
+//                workerId = Long.valueOf(params.get("workerId").toString());
+//            }
+            
+            // 2. 查询订单
+            Order order = orderService.selectOrderByOrderId(orderId);
+            if (order == null) {
+                return error("订单不存在");
+            }
+            Long workerId =order.getWorkerId();
+            // 如果没有传递workerId，使用订单中的workerId
+//            if (workerId == null) {
+//                workerId = order.getWorkerId();
+//            }
+            
+            if (workerId == null) {
+                return error("订单未分配师傅，无法接单");
+            }
+            
+            Users worker = usersService.selectUsersById(workerId);
+            if (worker == null) {
+                return error("工人不存在");
+            }
+
+            // 3. 验证订单状态（允许状态1和2的订单接单）
+            if (order.getStatus() == null || (order.getStatus() != 1L && order.getStatus() != 2L)) {
+                return error("当前订单状态不可接单，只有待支付或待服务状态的订单才能接单");
+            }
+            
+            // 4. 设置接单相关字段
+            order.setWorkerId(worker.getId());
+            order.setWorkerPhone(worker.getPhone());
+            order.setIsPause(1); // 1:未暂停
+            order.setReceiveType(3L); // 3:平台派单
+            order.setReceiveTime(new Date());
+            order.setIsAccept(1); // 1:已接单
+            order.setJsonStatus(2); // 服务进度：2=接单
+            order.setStatus(2L); // 设置为待服务状态
+            order.setLogStatus(9);
+            
+            com.alibaba.fastjson2.JSONObject json = new com.alibaba.fastjson2.JSONObject();
+            json.put("type", 1);
+            order.setLogJson(json.toJSONString());
+            
+            // 更新订单
+            int updateResult = orderService.updateOrder(order);
+            if (updateResult <= 0) {
+                return error("更新订单失败");
+            }
+
+            // 5. 写入日志
+            OrderLog orderLog = new OrderLog();
+            orderLog.setOid(order.getId());
+            orderLog.setOrderId(order.getOrderId());
+            orderLog.setTitle("师傅接单");
+            orderLog.setType(new BigDecimal(2.0));
+            orderLog.setCreatedAt(new Date());
+            
+            com.alibaba.fastjson2.JSONObject logContent = new com.alibaba.fastjson2.JSONObject();
+            logContent.put("name", "同意系统配单");
+            orderLog.setContent(logContent.toJSONString());
+            orderLog.setWorkerId(order.getWorkerId());
+            orderLog.setWorkerLogId(order.getWorkerId());
+            
+            int logResult = orderLogService.insertOrderLog(orderLog);
+            if (logResult <= 0) {
+                return error("记录接单日志失败");
+            }
+            
+            // 6. 绑定号码（如果有相关工具类）
+            try {
+                Map<String, Object> bindmap = OrderBindWorkerUtil.getOrderBindWorker(order.getId());
+                // 这里可以处理绑定结果
+            } catch (Exception e) {
+                // 绑定失败不影响接单流程
+                System.out.println("绑定号码失败：" + e.getMessage());
+            }
+            
+            return success("接单成功");
+        } catch (Exception e) {
+            return error("接单失败：" + e.getMessage());
+        }
+    }
+
     /**
      * 出发上门接口
      */
@@ -470,11 +615,68 @@ public class OrderController extends BaseController {
     @PostMapping("/departure")
     public AjaxResult departure(@RequestBody Map<String, Object> params) {
         try {
-            String orderId = params.get("orderId").toString();
+            // 参数验证
+            if (params == null || params.isEmpty()) {
+                return error("请求参数不能为空");
+            }
             
-            // 这里调用具体的业务逻辑，您来实现
-            // 例如：更新订单状态为出发上门，记录出发时间等
+            String orderId = params.get("orderId") != null ? params.get("orderId").toString() : null;
+            if (orderId == null || orderId.trim().isEmpty()) {
+                return error("订单号不能为空");
+            }
             
+            // 查询订单信息
+            Order order = orderService.selectOrderByOrderId(orderId);
+            if (order == null) {
+                return error("订单不存在");
+            }
+            
+            // 验证订单状态（只有已接单状态的订单才能出发上门）
+            if (order.getStatus() == null || order.getStatus() != 2L) {
+                return error("当前订单状态不可出发上门，只有已接单状态的订单才能出发上门");
+            }
+            
+            // 验证是否已分配师傅
+            if (order.getWorkerId() == null) {
+                return error("订单未分配师傅，无法出发上门");
+            }
+            
+            // 验证师傅是否已接单
+            if (order.getIsAccept() == null || order.getIsAccept() != 1) {
+                return error("师傅未接单，无法出发上门");
+            }
+
+
+//        if (order.getStatus() == null || order.getStatus() != 2L) {
+//            return AppletControllerUtil.appletWarning("订单状态不正确");
+//        }
+//        if (order.getJsonStatus() == null || order.getJsonStatus() != 3) {
+//            return AppletControllerUtil.appletWarning("订单进度不正确");
+//        }
+
+            order.setJsonStatus(4); // 出发上门
+            com.alibaba.fastjson2.JSONObject typeJson = new com.alibaba.fastjson2.JSONObject();
+            typeJson.put("type", 3);
+            order.setLogJson(typeJson.toJSONString());
+            // 5. 保存
+            orderService.updateOrder(order);
+            // 4. 写订单日志
+            OrderLog orderLog = new OrderLog();
+            orderLog.setOid(order.getId());
+            orderLog.setOrderId(order.getOrderId());
+            orderLog.setWorkerId(order.getWorkerId());
+            orderLog.setWorkerLogId(order.getWorkerId());
+            orderLog.setTitle("出发上门");
+            com.alibaba.fastjson2.JSONObject typeJson1 = new com.alibaba.fastjson2.JSONObject();
+            typeJson1.put("name", "师傅收到派单信息准备出发");
+            orderLog.setType(new BigDecimal("3.0"));
+            orderLog.setContent(typeJson1.toJSONString());
+            orderLogService.insertOrderLog(orderLog);
+            ServiceGoods serviceGoods = serviceGoodsService.selectServiceGoodsById(order.getProductId());
+            Users user=usersService.selectUsersById(order.getUid());
+            //小程序推送给用户师傅已经出发
+            WXsendMsgUtil.sendStartDoorMoney(user.getOpenid(), order, serviceGoods);
+
             return success("出发上门成功");
         } catch (Exception e) {
             return error("出发上门失败：" + e.getMessage());
@@ -489,10 +691,101 @@ public class OrderController extends BaseController {
     @PostMapping("/confirm-arrival")
     public AjaxResult confirmArrival(@RequestBody Map<String, Object> params) {
         try {
-            String orderId = params.get("orderId").toString();
+            // 参数验证
+            if (params == null || params.isEmpty()) {
+                return error("请求参数不能为空");
+            }
             
-            // 这里调用具体的业务逻辑，您来实现
-            // 例如：更新订单状态为已到达，记录到达时间等
+            String orderId = params.get("orderId") != null ? params.get("orderId").toString() : null;
+            if (orderId == null || orderId.trim().isEmpty()) {
+                return error("订单号不能为空");
+            }
+            
+            // 查询订单信息
+            Order order = orderService.selectOrderByOrderId(orderId);
+            if (order == null) {
+                return error("订单不存在");
+            }
+            
+            // 验证订单状态（只有已出发上门状态的订单才能确认到达）
+            if (order.getStatus() == null || order.getStatus() != 2L) {
+                return error("当前订单状态不可确认到达，只有已出发上门状态的订单才能确认到达");
+            }
+            
+            // 验证是否已分配师傅
+            if (order.getWorkerId() == null) {
+                return error("订单未分配师傅，无法确认到达");
+            }
+            
+            // 验证师傅是否已接单
+            if (order.getIsAccept() == null || order.getIsAccept() != 1) {
+                return error("师傅未接单，无法确认到达");
+            }
+            
+            // 验证订单进度状态（应该是出发上门状态）
+            if (order.getJsonStatus() == null || order.getJsonStatus() != 4) {
+                return error("订单进度状态不正确，只有出发上门状态的订单才能确认到达");
+            }
+
+
+            order.setJsonStatus(5); // 确认到达
+            com.alibaba.fastjson2.JSONObject typeJson = new com.alibaba.fastjson2.JSONObject();
+            typeJson.put("type", 4);
+            order.setLogJson(typeJson.toJSONString());
+            // 6. 保存
+            orderService.updateOrder(order);
+            // 5. 写订单日志
+            //一口价直接开始服务，没有报价的环节
+//            if (order.getOdertype()!= 0){
+//                OrderLog orderLog = new OrderLog();
+//                orderLog.setOid(order.getId());
+//                orderLog.setOrderId(order.getOrderId());
+//                orderLog.setWorkerId(workerId);
+//                orderLog.setLatitude(latitude);
+//                orderLog.setLongitude(longitude);
+//                orderLog.setAddressName(addressName);
+//                orderLog.setWorkerLogId(workerId);
+//                orderLog.setTitle("师傅到达");
+//                orderLog.setType(new BigDecimal("5.0"));
+//                com.alibaba.fastjson2.JSONObject content = new com.alibaba.fastjson2.JSONObject();
+//                content.put("name", "师傅到达服务地点,开始服务工作");
+//                orderLog.setContent(content.toJSONString());
+//                // 6. 保存
+//                orderLogService.insertOrderLog(orderLog);
+//                ServiceGoods serviceGoods = serviceGoodsService.selectServiceGoodsById(order.getProductId());
+//                // WXsendMsgUtil.sendMsgForWorkerInfo(user.getOpenid(), order, serviceGoods);
+//                return AppletControllerUtil.appletSuccess("师傅已经上门");
+//            }
+            OrderLog orderLog = new OrderLog();
+            orderLog.setOid(order.getId());
+            orderLog.setOrderId(order.getOrderId());
+            orderLog.setWorkerId(order.getWorkerId());
+            orderLog.setWorkerLogId(order.getWorkerId());
+            orderLog.setTitle("师傅到达");
+            orderLog.setType(new BigDecimal("4.0"));
+            com.alibaba.fastjson2.JSONObject content = new com.alibaba.fastjson2.JSONObject();
+            content.put("name", "师傅到达服务地点");
+            orderLog.setContent(content.toJSONString());
+            // 6. 保存
+            orderLogService.insertOrderLog(orderLog);
+            //解绑订单虚拟号
+            //需要解绑原订单上原师傅和客户的虚拟号
+            VoiceResponseResult resultObj = YunXinPhoneUtilAPI.httpsPrivacyUnbind(order.getWorkerPhone(), order.getUserPhone(), order.getMiddlePhone());
+            if (resultObj.getResult().equals("000000")) {
+//            order.setWorkerPhone(null);
+//            order.setUserPhone(null);
+//            order.setMiddlePhone(null);
+//            orderService.updateOrder(order);
+                orderService.updateOrderPhone(order.getId());
+            }        // 4. 更新订单状
+            //解绑号码
+            YunXinPhoneUtilAPI.httpsPrivacyUnbind(order.getWorkerPhone(), order.getUserPhone(), order.getMiddlePhone());
+            // 小程序推送给用户师傅已经到达
+
+            ServiceGoods serviceGoods = serviceGoodsService.selectServiceGoodsById(order.getProductId());
+            //师傅到达的时候给客户的微信推送
+            Users user = usersService.selectUsersById(order.getUid());
+            WXsendMsgUtil.sendWorkerIsComing(user.getOpenid(), order, serviceGoods);
             
             return success("确认到达成功");
         } catch (Exception e) {
@@ -508,11 +801,103 @@ public class OrderController extends BaseController {
     @PostMapping("/end-order")
     public AjaxResult endOrder(@RequestBody Map<String, Object> params) {
         try {
-            String orderId = params.get("orderId").toString();
-            
-            // 这里调用具体的业务逻辑，您来实现
-            // 例如：更新订单状态为已结束，记录结束时间等
-            
+            // 参数校验
+            if (params == null || params.isEmpty()) {
+                return error("请求参数不能为空");
+            }
+            String orderId = params.get("orderId") != null ? params.get("orderId").toString() : null;
+            if (orderId == null || orderId.trim().isEmpty()) {
+                return error("订单号不能为空");
+            }
+            String doorFee=params.get("doorFee") != null ? params.get("doorFee").toString() : null;
+            // 查询订单
+            Order order = orderService.selectOrderByOrderId(orderId);
+            if (order == null) {
+                return error("订单不存在");
+            }
+            RefundUtil refundUtil = new RefundUtil();
+            // 3.1 更新订单状态为7（已结束）
+            Order updateOrder = new Order();
+            updateOrder.setId(order.getId());
+            updateOrder.setStatus(7L);
+            updateOrder.setServicePrice(new BigDecimal(0));
+            updateOrder.setGoodPrice(new BigDecimal(0));
+            updateOrder.setTotalPrice(new BigDecimal(0));
+            orderService.updateOrder(updateOrder);
+            String logOrderId = GenerateCustomCode.generCreateOrder("DSB");
+            // 3.2 插入订单日志
+            OrderLog log = new OrderLog();
+            com.alibaba.fastjson2.JSONObject jsonObject = new com.alibaba.fastjson2.JSONObject();
+            //1.1结束订单就要删除客户未支付的付款数据
+            UsersPayBefor payBefor = new UsersPayBefor();
+            payBefor.setLastorderid(order.getOrderId());
+            payBefor.setStatus(1L);
+            List<UsersPayBefor> payBeforList = usersPayBeforService.selectUsersPayBeforList(payBefor);
+            for (UsersPayBefor payBeforInfo : payBeforList) {
+                usersPayBeforService.deleteUsersPayBeforById(payBeforInfo.getId());
+            }
+
+            //1.2如果这个订单有支付数据，还要给客户退回去
+            UsersPayBefor userpayBefor = usersPayBeforService.selectUsersPayBeforByOrderId(order.getOrderId());
+            if (userpayBefor != null) {
+                Users user = usersService.selectUsersById(order.getUid());
+                //退回其他对应支付时产生的金额和积分
+                BenefitPointsUtil.refundServiceAndConsumption(order.getId(), user, userpayBefor.getServicemoney(),userpayBefor.getShopmoney());
+                System.out.println("=== 开始退款处理，2222222222订单号: " + userpayBefor.getStatus() + " ===");
+                // if (usersPayBefor.getStatus() == 2){
+                System.out.println("=== 开始退款处理，2222222222订单号: " + order.getOrderId() + " ===");
+                refundUtil.refundOrder(order.getOrderId());
+                //  }
+            }
+            //1.3找到订单日志的报价数据将报价的支付数据给抹除
+            OrderLog orderLog = new OrderLog();
+            orderLog.setOrderId(order.getOrderId());
+            orderLog.setType(new BigDecimal(5));
+            List<OrderLog> orderLogList = orderLogService.selectOrderLogList(orderLog);
+            if (!orderLogList.isEmpty()) {
+                orderLogService.updateOrderLogEnd(orderLogList.getFirst().getId());
+            }
+
+            if (StringUtils.isNotBlank(doorFee)&&!doorFee.equals("0")){
+                log.setPaid(1L);
+                log.setPrice(new  BigDecimal(doorFee));
+                jsonObject.put("name","师傅提前结束订单,上门费"+doorFee+"元");
+            }else{
+                jsonObject.put("name","师傅提前结束订单,无其他费用");
+            }
+
+            log.setLogOrderId(logOrderId);
+            log.setOid(order.getId());
+            log.setOrderId(order.getOrderId());
+            log.setTitle("结束订单");
+            log.setType(BigDecimal.valueOf(10));
+            log.setContent(jsonObject.toJSONString());
+            //Long workerId = getCurrentWorkerId(request); // 需实现
+            log.setWorkerId(order.getWorkerId());
+            log.setCreatedAt(new Date());
+            log.setUpdatedAt(new Date());
+            orderLogService.insertOrderLog(log);
+            if (StringUtils.isNotBlank(doorFee)){
+                BigDecimal totalAmount=log.getPrice();
+                Users userinfo = usersService.selectUsersById(order.getUid());
+                PayBeforeUtil payBeforeUtil = new PayBeforeUtil();
+                payBeforeUtil.createPayBefore(userinfo, totalAmount, logOrderId, log.getId(),
+                        null, 7L, null, null,
+                        null, null, null,1L,null,order.getOrderId(), null);
+                ServiceGoods serviceGoods = serviceGoodsService.selectServiceGoodsById(order.getProductId());
+                //微信推送师傅设置上门费
+                WXsendMsgUtil.sendMsgForUserDoorMoney(userinfo.getOpenid(), order, serviceGoods);
+            }
+
+            // 3.4 解绑虚拟号
+            if (order.getMiddlePhone() != null) {
+                VoiceResponseResult unbind = YunXinPhoneUtilAPI.httpsPrivacyUnbind(order.getWorkerPhone(), order.getUserPhone(), order.getMiddlePhone());
+                if (unbind.getResult().equals("000000")) {
+                    orderService.updateOrderPhone(order.getId());
+                }
+            }
+           // return AjaxResult.success("订单结束成功");
+
             return success("订单已结束");
         } catch (Exception e) {
             return error("结束订单失败：" + e.getMessage());
@@ -528,7 +913,117 @@ public class OrderController extends BaseController {
     public AjaxResult startService(@RequestBody Map<String, Object> params) {
         try {
             String orderId = params.get("orderId").toString();
-            
+            String image = params.get("image").toString();
+            if (StringUtils.isBlank(image)) {
+                return error("需上传图片");
+             }
+            Order order = orderService.selectOrderByOrderId(orderId);
+            if (order == null) {
+                return error("订单不存在");
+            }
+
+            OrderLog newlogdata =new OrderLog();
+            newlogdata.setType(new BigDecimal("6.0"));
+            newlogdata.setOid(order.getId());
+            //如果没有进行服务的记录就是开启服务
+            List<OrderLog> logList = orderLogService.selectOrderLogList(newlogdata);
+            if (logList.isEmpty()){
+                // 2. 组装日志内容为数组格式
+                Map<String, Object> logItem = new LinkedHashMap<>();
+                logItem.put("name", "师傅开始服务");
+                logItem.put("image", params.get("image"));
+                logItem.put("type", 1);
+                List<Object> logArr = new ArrayList<>();
+                logArr.add(logItem);
+                String contentStr = com.alibaba.fastjson2.JSONObject.toJSONString(logArr);
+                // 3. 写入订单日志
+                OrderLog log = new OrderLog();
+                log.setOid(order.getId());
+                log.setOrderId(order.getOrderId());
+                log.setTitle("开始服务");
+                log.setType(new BigDecimal(6.0));
+                log.setContent(contentStr);
+                log.setWorkerId(order.getWorkerId());
+                log.setWorkerLogId(order.getWorkerId());
+                log.setIsPause(1);
+                log.setCreatedAt(new Date());
+                orderLogService.insertOrderLog(log);
+                //开始服务
+                // 1. 修改订单状态
+                order.setStatus(3L); // 服务中
+                order.setJsonStatus(7); // 服务中
+                order.setLogJson("{\"type\":6}");
+                order.setIsPause(1); // 服务中
+                order.setUpdatedAt(new Date());
+                int update = orderService.updateOrder(order);
+                return AppletControllerUtil.appletSuccess("服务已开始");
+            }else{
+
+                if (order.getJsonStatus() == 7) {
+                    com.alibaba.fastjson2.JSONObject logItem = new com.alibaba.fastjson2.JSONObject();
+                    logItem.put("name", "暂停服务");
+                    logItem.put("image", params.get("image"));
+                    logItem.put("reson", params.get("reson"));
+                    logItem.put("next_time", params.get("next_time"));
+                    logItem.put("time", new Date());
+                    logItem.put("type", 2);
+
+
+                    OrderLog newlogdata1 =new OrderLog();
+                    newlogdata1.setOid(order.getId());
+                    newlogdata1.setOrderId(order.getOrderId());
+                    newlogdata1.setTitle("暂停服务");
+                    newlogdata1.setIsPause(2);
+                    newlogdata1.setContent(logItem.toJSONString());
+                    newlogdata1.setType(new BigDecimal(6.0));
+                    newlogdata1.setWorkerId(order.getWorkerId());
+                    newlogdata1.setWorkerLogId(order.getWorkerId());
+
+
+                    orderLogService.insertOrderLog(newlogdata1);
+                    if (order != null) {
+                        // 1. 修改订单状态
+                        order.setStatus(3L); // 服务中
+                        order.setJsonStatus(8); // 服务中
+                        order.setLogJson("{\"type\":6}");
+                        order.setIsPause(2); // 服务中
+                        order.setUpdatedAt(new Date());
+                        orderService.updateOrder(order);
+                    }
+                    return AppletControllerUtil.appletSuccess("操作成功");
+                }
+                if (order.getJsonStatus() == 8) {
+                    com.alibaba.fastjson2.JSONObject logItem = new com.alibaba.fastjson2.JSONObject();
+                    logItem.put("name", "继续服务");
+                    logItem.put("image", params.get("image"));
+                    logItem.put("time", new Date());
+                    logItem.put("type", 1);
+
+                    OrderLog newlogdata2 =new OrderLog();
+                    newlogdata2.setOid(order.getId());
+                    newlogdata2.setOrderId(order.getOrderId());
+                    newlogdata2.setTitle("继续服务");
+                    newlogdata2.setIsPause(1);
+                    newlogdata2.setType(new BigDecimal(6.0));
+                    newlogdata2.setWorkerId(order.getWorkerId());
+                    newlogdata2.setWorkerLogId(order.getWorkerId());
+                    newlogdata2.setContent(logItem.toJSONString());
+                    orderLogService.insertOrderLog(newlogdata2);
+                    if (order != null) {
+                        //继续服务
+                        order.setStatus(3L); // 服务中
+                        order.setJsonStatus(7); // 服务中
+                        order.setLogJson("{\"type\":6}");
+                        order.setIsPause(1); // 服务中
+                        order.setUpdatedAt(new Date());
+                        orderService.updateOrder(order);
+                    }
+                    return AppletControllerUtil.appletSuccess("操作成功");
+                }
+            }
+
+
+
             // 这里调用具体的业务逻辑，您来实现
             // 例如：更新订单状态为服务中，记录开始时间等
             
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersPayBeforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersPayBeforMapper.java
index 5426423..f1d4cf5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersPayBeforMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsersPayBeforMapper.java
@@ -78,4 +78,11 @@ public interface UsersPayBeforMapper
      * @return 支付明细列表
      */
     public List<UsersPayBefor> selectPayDetailsByOrderId(String orderId);
+
+    /**
+     * 统计开票用的微信支付总额（仅统计status=2，且orderid或lastorderid匹配传入orderId）
+     * @param orderId 订单ID
+     * @return 微信支付总额（BigDecimal）
+     */
+    public java.math.BigDecimal sumWxMoneyForInvoicingByOrderId(String orderId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersPayBeforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersPayBeforService.java
index 2fcfa9c..a590c8c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersPayBeforService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersPayBeforService.java
@@ -78,4 +78,11 @@ public interface IUsersPayBeforService
      * @return 支付明细列表
      */
     public List<UsersPayBefor> selectPayDetailsByOrderId(String orderId);
+
+    /**
+     * 统计开票用的微信支付总额（仅统计status=2，且orderid或lastorderid匹配传入orderId）
+     * @param orderId 订单ID
+     * @return 微信支付总额
+     */
+    public java.math.BigDecimal sumWxMoneyForInvoicingByOrderId(String orderId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersPayBeforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersPayBeforServiceImpl.java
index 4440ae6..e0a8ac0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersPayBeforServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsersPayBeforServiceImpl.java
@@ -112,4 +112,14 @@ public class UsersPayBeforServiceImpl implements IUsersPayBeforService
     {
         return usersPayBeforMapper.selectPayDetailsByOrderId(orderId);
     }
+
+    /**
+     * 统计开票用的微信支付总额（仅统计status=2，且orderid或lastorderid匹配传入orderId）
+     * @param orderId 订单ID
+     * @return 微信支付总额
+     */
+    @Override
+    public java.math.BigDecimal sumWxMoneyForInvoicingByOrderId(String orderId) {
+        return usersPayBeforMapper.sumWxMoneyForInvoicingByOrderId(orderId);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/UsersPayBeforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsersPayBeforMapper.xml
index 906c38f..cfb85bc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UsersPayBeforMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UsersPayBeforMapper.xml
@@ -96,6 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by paytime desc, id desc
     </select>
 
+    <!-- 统计开票用的微信支付总额（status=2，且orderid=或lastorderid=给定orderId） -->
+    <select id="sumWxMoneyForInvoicingByOrderId" parameterType="String" resultType="java.math.BigDecimal">
+        select COALESCE(SUM(wxmoney), 0)
+        from users_pay_befor
+        where status = 2
+          and (orderid = #{orderId} or lastorderid = #{orderId})
+    </select>
+
     <insert id="insertUsersPayBefor" parameterType="UsersPayBefor" useGeneratedKeys="true" keyProperty="id">
         insert into users_pay_befor
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/ruoyi-ui/dist.zip b/ruoyi-ui/dist.zip
index 77bc638..bf622ce 100644
Binary files a/ruoyi-ui/dist.zip and b/ruoyi-ui/dist.zip differ
diff --git a/ruoyi-ui/src/api/system/DiyCity.js b/ruoyi-ui/src/api/system/DiyCity.js
index 4d6ad22..f28c178 100644
--- a/ruoyi-ui/src/api/system/DiyCity.js
+++ b/ruoyi-ui/src/api/system/DiyCity.js
@@ -9,6 +9,15 @@ export function listDiyCity(query) {
   })
 }
 
+// 通用城市数据列表（支持按 parentId 取下级）
+export function datalist(query) {
+  return request({
+    url: '/system/DiyCity/datalist',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询城市详细
 export function getDiyCity(id) {
   return request({
@@ -62,3 +71,11 @@ export function getFirstLevelCities() {
     }
   })
 }
+
+// 手动恢复过期的师傅暂停状态
+export function manualResumeWorkerStatus() {
+  return request({
+    url: '/system/DiyCity/manualResumeWorkerStatus',
+    method: 'post'
+  })
+}
diff --git a/ruoyi-ui/src/views/system/Order/components/OrderDetailDialog.vue b/ruoyi-ui/src/views/system/Order/components/OrderDetailDialog.vue
index 0aa88f0..b3509d9 100644
--- a/ruoyi-ui/src/views/system/Order/components/OrderDetailDialog.vue
+++ b/ruoyi-ui/src/views/system/Order/components/OrderDetailDialog.vue
@@ -1,147 +1,296 @@
 <template>
-  <el-dialog
-    :title="`订单明细 - ${orderInfo.orderId}`"
-    :visible.sync="visible"
-    width="90%"
-    :close-on-click-modal="true"
-    :close-on-press-escape="true"
-    class="order-detail-dialog"
-    top="5vh"
-  >
+  <div>
+    <el-dialog
+      :title="`订单明细 - ${orderInfo.orderId}`"
+      :visible.sync="dialogVisible"
+      width="90%"
+      append-to-body
+      :close-on-click-modal="true"
+      :close-on-press-escape="true"
+      class="order-detail-dialog"
+      top="5vh"
+      @close="handleClose"
+    >
     <div class="order-detail-container">
-      <el-row :gutter="24">
-        <!-- 左侧：订单基本信息 -->
-        <el-col :span="12">
-          <el-card class="box-card" shadow="hover">
-            <div slot="header" class="clearfix">
-              <span>订单基本信息</span>
-            </div>
-            
-            <el-descriptions :column="1" border>
-              <el-descriptions-item label="订单号">
-                {{ orderInfo.orderId || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="用户姓名">
-                {{ orderInfo.userName || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="联系电话">
-                {{ orderInfo.userPhone || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="服务名称">
-                {{ orderInfo.productName || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="预约数量">
-                {{ orderInfo.num || '0' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="预约时间">
-                {{ orderInfo.appointmentTime || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="预约地点">
-                {{ orderInfo.appointmentAddress || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="订单总价">
-                ¥{{ (orderInfo.totalPrice || 0).toFixed(2) }}
-              </el-descriptions-item>
-              <el-descriptions-item label="支付金额">
-                ¥{{ (orderInfo.payPrice || 0).toFixed(2) }}
-              </el-descriptions-item>
-              <el-descriptions-item label="抵扣金额">
-                ¥{{ (orderInfo.deduction || 0).toFixed(2) }}
-              </el-descriptions-item>
-              <el-descriptions-item label="创建时间">
-                {{ orderInfo.createdAt || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="支付时间">
-                {{ orderInfo.payTime || '未设置' }}
-              </el-descriptions-item>
-              <el-descriptions-item label="订单状态">
-                <el-tag :type="getStatusTagType(orderInfo.status)">
-                  {{ getStatusLabel(orderInfo.status) }}
-                </el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item label="备注说明" v-if="orderInfo.mark">
-                {{ orderInfo.mark }}
-              </el-descriptions-item>
-            </el-descriptions>
+             <el-row :gutter="20">
+         <!-- 左侧：订单基本信息 -->
+         <el-col :span="8">
+           <el-card class="box-card" shadow="hover">
+             <div slot="header" class="clearfix">
+               <span>订单基本信息</span>
+             </div>
 
-            <!-- 附件信息 -->
-            <div v-if="orderInfo.fileData" class="attachment-section">
-              <h4>订单附件</h4>
-              <div class="file-list">
-                <div v-for="(file, index) in getFileList()" :key="index" class="file-item">
-                  <el-image
-                    v-if="isImage(file)"
-                    :src="file"
-                    :preview-src-list="getFileList()"
-                    fit="cover"
-                    class="file-image"
-                  >
-                    <div slot="error" class="image-slot">
-                      <i class="el-icon-picture-outline"></i>
-                    </div>
-                  </el-image>
-                  <div v-else class="file-icon">
-                    <i class="el-icon-document"></i>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </el-card>
-        </el-col>
+             <el-descriptions :column="1" border size="small">
+               <el-descriptions-item label="订单号">
+                 {{ orderInfo.orderId || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="用户姓名">
+                 {{ orderInfo.userName || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="联系电话">
+                 {{ orderInfo.userPhone || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="服务名称">
+                 {{ orderInfo.productName || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="订单总价">
+                 ¥{{ (orderInfo.totalPrice || 0).toFixed(2) }}
+               </el-descriptions-item>
+               <el-descriptions-item label="支付金额">
+                 ¥{{ (orderInfo.payPrice || 0).toFixed(2) }}
+               </el-descriptions-item>
+               <el-descriptions-item label="抵扣金额">
+                 ¥{{ (orderInfo.deduction || 0).toFixed(2) }}
+               </el-descriptions-item>
+               <el-descriptions-item label="创建时间">
+                 {{ orderInfo.createdAt || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="支付时间">
+                 {{ orderInfo.payTime || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="订单状态">
+                 <el-tag :type="getStatusTagType(orderInfo.status)" size="small">
+                   {{ getStatusLabel(orderInfo.status) }}
+                 </el-tag>
+               </el-descriptions-item>
+               <el-descriptions-item label="备注说明" v-if="orderInfo.mark">
+                 {{ orderInfo.mark }}
+               </el-descriptions-item>
+             </el-descriptions>
 
-        <!-- 右侧：订单日志流水 -->
-        <el-col :span="12">
-          <el-card class="box-card" shadow="hover">
-            <div slot="header" class="clearfix">
-              <span>订单日志流水</span>
-              <div class="header-actions">
-                <el-button
-                  type="text"
-                  icon="el-icon-refresh"
-                  @click="handleRefreshLogs"
-                  class="action-btn"
-                >
-                  刷新
-                </el-button>
-                <el-button
-                  type="text"
-                  icon="el-icon-download"
-                  @click="handleExportLogs"
-                  class="action-btn"
-                >
-                  导出
-                </el-button>
-              </div>
-            </div>
+             <!-- 附件信息 -->
+             <div v-if="orderInfo.fileData" class="attachment-section">
+               <h4>订单附件</h4>
+               <div class="file-list">
+                 <div v-for="(file, index) in getFileList()" :key="index" class="file-item">
+                   <el-image
+                     v-if="isImage(file)"
+                     :src="file"
+                     :preview-src-list="getFileList()"
+                     fit="cover"
+                     class="file-image"
+                   >
+                     <div slot="error" class="image-slot">
+                       <i class="el-icon-picture-outline"></i>
+                     </div>
+                   </el-image>
+                   <div v-else class="file-icon">
+                     <i class="el-icon-document"></i>
+                   </div>
+                 </div>
+               </div>
+             </div>
+           </el-card>
+         </el-col>
 
-            <div v-if="orderInfo.logs && orderInfo.logs.length > 0" class="order-timeline">
+         <!-- 中间：师傅基本信息 -->
+         <el-col :span="8">
+           <el-card class="box-card" shadow="hover">
+             <div slot="header" class="clearfix">
+               <span>师傅基本信息</span>
+             </div>
+
+             <el-descriptions :column="1" border size="small">
+               <el-descriptions-item label="师傅姓名">
+                 <div v-if="loadingWorkerInfo" class="loading-info">
+                   <i class="el-icon-loading"></i> 加载中...
+                 </div>
+                 <span v-else-if="workerInfo">{{ workerInfo.name || '未设置' }}</span>
+                 <span v-else>{{ orderInfo.workerName || '未分配' }}</span>
+               </el-descriptions-item>
+               <el-descriptions-item label="师傅电话">
+                 <div v-if="loadingWorkerInfo" class="loading-info">
+                   <i class="el-icon-loading"></i> 加载中...
+                 </div>
+                 <span v-else-if="workerInfo">{{ workerInfo.phone || '未设置' }}</span>
+                 <span v-else>{{ workerInfo.phone || '未设置' }}</span>
+               </el-descriptions-item>
+               <el-descriptions-item label="师傅等级">
+                 <div v-if="loadingWorkerInfo" class="loading-info">
+                   <i class="el-icon-loading"></i> 加载中...
+                 </div>
+                 <span v-else-if="workerInfo">{{ getWorkerLevelLabel(workerInfo.level) }}</span>
+                 <span v-else>{{ orderInfo.workerLevel || '未设置' }}</span>
+               </el-descriptions-item>
+<!--               <el-descriptions-item label="服务区域">-->
+<!--                 <div v-if="loadingWorkerInfo" class="loading-info">-->
+<!--                   <i class="el-icon-loading"></i> 加载中...-->
+<!--                 </div>-->
+<!--                 <span v-else-if="workerInfo">{{ getWorkerAreaLabel(workerInfo.serviceCityIds) }}</span>-->
+<!--                 <span v-else>{{ orderInfo.workerArea || '未设置' }}</span>-->
+<!--               </el-descriptions-item>-->
+<!--               <el-descriptions-item label="技能标签">-->
+<!--                 <div v-if="loadingWorkerInfo" class="loading-info">-->
+<!--                   <i class="el-icon-loading"></i> 加载中...-->
+<!--                 </div>-->
+<!--                 <div v-else-if="workerInfo && workerInfo.skillIds" class="skills-tags">-->
+<!--                   <el-tag -->
+<!--                     v-for="skill in getWorkerSkillLabels(workerInfo.skillIds)" -->
+<!--                     :key="skill" -->
+<!--                     size="mini" -->
+<!--                     type="info"-->
+<!--                     style="margin: 2px;"-->
+<!--                   >-->
+<!--                     {{ skill }}-->
+<!--                   </el-tag>-->
+<!--                 </div>-->
+<!--                 <div v-else-if="orderInfo.workerSkills && orderInfo.workerSkills.length > 0" class="skills-tags">-->
+<!--                   <el-tag -->
+<!--                     v-for="skill in orderInfo.workerSkills" -->
+<!--                     :key="skill" -->
+<!--                     size="mini" -->
+<!--                     type="info"-->
+<!--                     style="margin: 2px;"-->
+<!--                   >-->
+<!--                     {{ skill }}-->
+<!--                   </el-tag>-->
+<!--                 </div>-->
+<!--                 <span v-else>未设置</span>-->
+<!--               </el-descriptions-item>-->
+               <el-descriptions-item label="接单时间">
+                 {{ orderInfo.receiveTime || '未接单' }}
+               </el-descriptions-item>
+<!--               <el-descriptions-item label="派单时间">-->
+<!--                 {{ orderInfo.dispatchTime || '未派单' }}-->
+<!--               </el-descriptions-item>-->
+             </el-descriptions>
+
+             <!-- 师傅头像 -->
+             <div v-if="workerInfo && workerInfo.avatar" class="worker-avatar-section">
+               <h4>师傅头像</h4>
+               <div class="worker-avatar">
+                 <el-image
+                   :src="workerInfo.avatar"
+                   fit="cover"
+                   class="avatar-image"
+                 >
+                   <div slot="error" class="avatar-slot">
+                     <i class="el-icon-user"></i>
+                   </div>
+                 </el-image>
+               </div>
+             </div>
+             <!-- 占位区域，确保卡片高度一致 -->
+             <div v-else class="placeholder-section">
+               <div class="placeholder-content">
+                 <i v-if="loadingWorkerInfo" class="el-icon-loading"></i>
+                 <i v-else class="el-icon-user-solid"></i>
+                 <p v-if="loadingWorkerInfo">加载中...</p>
+                 <p v-else>暂无师傅信息</p>
+               </div>
+             </div>
+           </el-card>
+         </el-col>
+
+         <!-- 中间：预约信息 -->
+         <el-col :span="8">
+           <el-card class="box-card" shadow="hover">
+             <div slot="header" class="clearfix">
+               <span>预约信息</span>
+             </div>
+
+             <el-descriptions :column="1" border size="small">
+               <el-descriptions-item label="预约数量">
+                 {{ orderInfo.num || '0' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="预约时间">
+                 {{ orderInfo.appointmentTime || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="预约地点">
+                 {{ orderInfo.appointmentAddress || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="服务类型">
+                 {{ orderInfo.serviceType || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="服务要求">
+                 {{ orderInfo.serviceRequirement || '无特殊要求' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="紧急程度">
+                 <el-tag
+                   :type="getUrgencyTagType(orderInfo.urgency)"
+                   size="small"
+                 >
+                   {{ getUrgencyLabel(orderInfo.urgency) }}
+                 </el-tag>
+               </el-descriptions-item>
+               <el-descriptions-item label="预计时长">
+                 {{ orderInfo.estimatedDuration || '未设置' }}
+               </el-descriptions-item>
+               <el-descriptions-item label="特殊说明">
+                 {{ orderInfo.specialNote || '无' }}
+               </el-descriptions-item>
+             </el-descriptions>
+
+
+           </el-card>
+         </el-col>
+       </el-row>
+
+       <!-- 下方：订单进度 -->
+       <el-row :gutter="20" style="margin-top: 20px;">
+         <el-col :span="24">
+           <el-card class="box-card" shadow="hover">
+             <div slot="header" class="clearfix">
+               <span>订单进度</span>
+               <div class="header-actions">
+                 <el-button
+                   type="text"
+                   icon="el-icon-refresh"
+                   @click="handleRefreshLogs"
+                   class="action-btn"
+                 >
+                   刷新
+                 </el-button>
+                 <el-button
+                   type="text"
+                   icon="el-icon-download"
+                   @click="handleExportLogs"
+                   class="action-btn"
+                 >
+                   导出
+                 </el-button>
+               </div>
+             </div>
+
+            <div v-if="orderInfo.receiveRecords && orderInfo.receiveRecords.length > 0" class="order-timeline">
               <div class="timeline-container">
                 <div
-                  v-for="(log, index) in orderInfo.logs"
-                  :key="log.id || index"
+                  v-for="(record, index) in orderInfo.receiveRecords"
+                  :key="record.id || index"
                   class="timeline-item"
                 >
                   <!-- 时间轴节点 -->
-                  <div class="timeline-node" :class="getTimelineNodeClass(log.type)">
-                    <i :class="getTimelineIcon(log.type)"></i>
+                  <div class="timeline-node" :class="getTimelineNodeClass(record.title)">
+                    <i :class="getTimelineIcon(record.title)"></i>
                   </div>
 
                   <!-- 时间轴内容 -->
                   <div class="timeline-content">
                     <div class="timeline-header">
-                      <span class="timeline-title">{{ log.title || '未知操作' }}</span>
-                      <span class="timeline-time">{{ formatTime(log.createdAt) }}</span>
+                      <span class="timeline-title">{{ record.title || '未知操作' }}</span>
+                      <span class="timeline-time">{{ formatTimelineTime(record.createdAt) }}</span>
                     </div>
                     <div class="timeline-body">
-                      <div class="timeline-description">{{ log.content || '无描述信息' }}</div>
-                      
+                      <div class="timeline-description">{{ getContentDescription(record.content) }}</div>
+
+                      <!-- 显示报价数据 -->
+                      <div v-if="record.quote && isJsonString(record.quote)" class="timeline-quote">
+                        <div class="quote-header">
+                          <i class="el-icon-money"></i>
+                          <span>报价详情</span>
+                        </div>
+                        <div class="quote-content">
+                          <pre>{{ formatJson(record.quote) }}</pre>
+                        </div>
+                      </div>
+
                       <!-- 显示图片 -->
-                      <div v-if="log.images && log.images.length > 0" class="timeline-images">
+                      <div v-if="record.contentImage && record.contentImage.length > 0" class="timeline-images">
                         <el-image
-                          v-for="(img, imgIndex) in log.images"
+                          v-for="(img, imgIndex) in record.contentImage"
                           :key="imgIndex"
                           :src="img"
-                          :preview-src-list="log.images"
+                          :preview-src-list="record.contentImage"
                           fit="cover"
                           class="timeline-image"
                         >
@@ -151,40 +300,98 @@
                         </el-image>
                       </div>
 
-                      <!-- 操作按钮 -->
-                      <div class="timeline-actions" v-if="index === orderInfo.logs.length - 1">
+                      <!-- 订单流程操作按钮 - 只在最后一条日志显示 -->
+                      <div class="timeline-actions" v-if="index === orderInfo.receiveRecords.length - 1">
+                        <!-- 根据最后一条日志的type显示不同操作 -->
                         <el-button
-                          v-if="log.type === 'create'"
+                          v-if="record.type === 1"
                           type="primary"
                           size="small"
-                          @click="handleDispatch"
+                          @click="handleDispatchFromTimeline(record)"
                         >
                           <i class="el-icon-s-promotion"></i>
                           派单
                         </el-button>
+
+                        <!-- type为1.1时显示更换师傅和接单按钮 -->
                         <el-button
-                          v-if="log.type === 'dispatch'"
+                          v-if="record.type === 1.1"
+                          type="warning"
+                          size="small"
+                          @click="handleChangeWorker(record)"
+                          style="margin-right: 8px;"
+                        >
+                          <i class="el-icon-refresh"></i>
+                          更换师傅
+                        </el-button>
+
+                        <el-button
+                          v-if="record.type === 1.1"
                           type="success"
                           size="small"
-                          @click="handleAccept"
+                          @click="handleAcceptOrder(record)"
                         >
                           <i class="el-icon-check"></i>
                           接单
                         </el-button>
+
                         <el-button
-                          v-if="log.type === 'accept'"
-                          type="warning"
-                          size="small"
-                          @click="handleStartService"
-                        >
-                          <i class="el-icon-video-play"></i>
-                          开始服务
-                        </el-button>
-                        <el-button
-                          v-if="log.type === 'service'"
+                          v-if="record.type === 2"
                           type="success"
                           size="small"
-                          @click="handleComplete"
+                          @click="handleDeparture(record)"
+                        >
+                          <i class="el-icon-location"></i>
+                          出发上门
+                        </el-button>
+
+                        <el-button
+                          v-if="record.type === 3"
+                          type="warning"
+                          size="small"
+                          @click="handleConfirmArrival(record)"
+                        >
+                          <i class="el-icon-location-information"></i>
+                          确认到达
+                        </el-button>
+
+                        <!-- type为4时显示三个按钮：结束订单、开始服务、项目报价 -->
+                        <div v-if="record.type === 4" class="timeline-actions-multiple">
+                          <el-button
+                            type="danger"
+                            size="small"
+                            @click="handleEndOrder(record)"
+                            style="margin-right: 8px;"
+                          >
+                            <i class="el-icon-close"></i>
+                            结束订单
+                          </el-button>
+
+                          <el-button
+                            type="success"
+                            size="small"
+                            @click="handleStartService(record)"
+                            style="margin-right: 8px;"
+                          >
+                            <i class="el-icon-video-play"></i>
+                            开始服务
+                          </el-button>
+
+                          <el-button
+                            type="primary"
+                            size="small"
+                            @click="handleProjectQuote(record)"
+                          >
+                            <i class="el-icon-money"></i>
+                            项目报价
+                          </el-button>
+                        </div>
+
+                        <el-button
+                          v-if="record.type === 5"
+                          type="success"
+                          size="small"
+                          @click="handleCompleteService(record)"
                         >
                           <i class="el-icon-circle-check"></i>
                           完成服务
@@ -194,13 +401,13 @@
                   </div>
 
                   <!-- 连接线（除了最后一个项目） -->
-                  <div v-if="index < orderInfo.logs.length - 1" class="timeline-connector"></div>
+                  <div v-if="index < orderInfo.receiveRecords.length - 1" class="timeline-connector"></div>
                 </div>
               </div>
             </div>
 
             <div v-else class="no-logs">
-              <el-empty description="暂无日志记录" :image-size="100">
+              <el-empty description="暂无接单记录" :image-size="100">
                 <el-button type="primary" @click="handleRefreshLogs">刷新数据</el-button>
               </el-empty>
             </div>
@@ -210,14 +417,262 @@
     </div>
 
     <div slot="footer" class="dialog-footer">
-      <el-button @click="visible = false" type="primary" size="medium">关 闭</el-button>
+      <el-button @click="handleClose" type="primary" size="medium">关 闭</el-button>
     </div>
   </el-dialog>
+
+  <!-- 结束订单 - 上门费输入弹窗 -->
+  <el-dialog
+    title="结束订单"
+    :visible.sync="endOrderDialogVisible"
+    width="420px"
+    append-to-body
+    @close="resetEndOrderForm"
+  >
+    <el-form ref="endOrderFormRef" :model="endOrderForm" :rules="endOrderRules" label-width="90px">
+      <el-form-item label="上门费" prop="fee">
+        <el-input-number
+          v-model.number="endOrderForm.fee"
+          :min="0"
+          :step="1"
+          placeholder="请输入上门费"
+          style="width: 100%;"
+        />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="endOrderDialogVisible = false">取 消</el-button>
+      <el-button type="primary" :loading="endOrderSubmitting" @click="submitEndOrder">确 认</el-button>
+    </div>
+  </el-dialog>
+
+  <!-- 更换师傅弹窗 -->
+  <el-dialog
+    title="更换师傅"
+    :visible.sync="changeWorkerDialogVisible"
+    width="800px"
+    append-to-body
+    @close="selectedWorker = null"
+  >
+    <!-- 当前师傅信息 -->
+    <div v-if="orderInfo.workerName" class="current-worker-banner">
+      <el-alert
+        :title="`当前师傅: ${orderInfo.workerName}`"
+        type="info"
+        :closable="false"
+        show-icon
+      />
+    </div>
+
+    <!-- 已选择新师傅提示 -->
+    <div v-if="selectedWorker" class="selected-worker-banner">
+      <el-alert
+        :title="`已选择新师傅: ${selectedWorker.name}`"
+        type="success"
+        :closable="false"
+        show-icon
+      />
+    </div>
+
+    <div class="change-worker-content">
+      <!-- 订单信息 -->
+      <div class="order-info-section">
+        <h4>订单信息</h4>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <div class="info-item">
+              <label>订单号：</label>
+              <span>{{ orderInfo.orderId }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-item">
+              <label>客户姓名：</label>
+              <span>{{ orderInfo.userName }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-item">
+              <label>联系电话：</label>
+              <span>{{ orderInfo.userPhone }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-item">
+              <label>服务地址：</label>
+              <span>{{ orderInfo.appointmentAddress || '未设置' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-item">
+              <label>服务项目：</label>
+              <span>{{ orderInfo.productName }}</span>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-item">
+              <label>订单金额：</label>
+              <span class="amount-highlight">￥{{ (orderInfo.payPrice || 0).toFixed(2) }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+
+      <!-- 选择新师傅 -->
+      <div class="worker-selection-section">
+        <h4>选择新师傅</h4>
+
+        <!-- 搜索条件 -->
+        <el-form :model="workerQueryParams" :inline="true" style="margin-bottom: 15px;">
+          <el-form-item label="昵称">
+            <el-input
+              v-model="workerQueryParams.name"
+              placeholder="请输入师傅昵称"
+              clearable
+              style="width: 150px"
+            />
+          </el-form-item>
+          <el-form-item label="电话">
+            <el-input
+              v-model="workerQueryParams.phone"
+              placeholder="请输入联系电话"
+              clearable
+              style="width: 150px"
+            />
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-select
+              v-model="workerQueryParams.status"
+              placeholder="请选择状态"
+              clearable
+              style="width: 150px"
+            >
+              <el-option label="全部" value="" />
+              <el-option label="可用" value="1" />
+              <el-option label="不可用" value="0" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="searchWorkers" :loading="loadingWorkers">
+              <i class="el-icon-search"></i> 搜索
+            </el-button>
+            <el-button @click="resetWorkerSearch">
+              <i class="el-icon-refresh"></i> 重置
+            </el-button>
+          </el-form-item>
+        </el-form>
+
+        <!-- 师傅列表 -->
+        <div class="worker-list">
+          <el-table
+            :data="availableWorkers"
+            v-loading="loadingWorkers"
+            style="width: 100%"
+            @row-click="selectWorker"
+            :row-class-name="getWorkerRowClass"
+          >
+            <el-table-column prop="name" label="师傅姓名" width="120">
+              <template slot-scope="scope">
+                <div class="worker-info">
+                  <el-avatar
+                    :size="32"
+                    :src="scope.row.avatar"
+                    :alt="scope.row.name"
+                  >
+                    <i class="el-icon-user"></i>
+                  </el-avatar>
+                  <span style="margin-left: 8px;">{{ scope.row.name }}</span>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="phonenumber" label="联系电话" width="120" />
+            <el-table-column prop="level" label="等级" width="80">
+              <template slot-scope="scope">
+                <el-tag :type="getLevelTagType(scope.row.level)" size="mini">
+                  {{ getWorkerLevelLabel(scope.row.level) }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="serviceCityIds" label="服务区域" width="150">
+              <template slot-scope="scope">
+                <span>{{ getWorkerAreaLabel(scope.row.serviceCityIds) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="skillIds" label="技能标签" min-width="200">
+              <template slot-scope="scope">
+                <div class="skills-tags">
+                  <el-tag
+                    v-for="skill in getWorkerSkillLabels(scope.row.skillIds)"
+                    :key="skill"
+                    size="mini"
+                    type="info"
+                    style="margin: 2px;"
+                  >
+                    {{ skill }}
+                  </el-tag>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click.stop="selectWorker(scope.row)"
+                  :disabled="scope.row.id === orderInfo.workerId"
+                >
+                  {{ scope.row.id === orderInfo.workerId ? '当前师傅' : '选择' }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="changeWorkerDialogVisible = false">取 消</el-button>
+      <el-button
+        type="primary"
+        @click="confirmChangeWorker"
+        :disabled="!selectedWorker"
+      >
+        确认更换
+      </el-button>
+    </div>
+  </el-dialog>
+
+  <!-- 开始服务 - 上传图片弹窗 -->
+  <el-dialog
+    title="开始服务"
+    :visible.sync="startServiceDialogVisible"
+    width="680px"
+    append-to-body
+  >
+    <el-form label-width="90px">
+      <el-form-item label="服务图片" required>
+        <ImageUpload v-model="startServiceImages" :limit="9" :file-size="10" />
+        <div class="el-upload__tip" style="margin-top: 6px; color: #909399;">
+          至少上传1张服务开始图片，支持 jpg/png/jpeg，单张 ≤ 10MB
+        </div>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="startServiceDialogVisible = false">取 消</el-button>
+      <el-button type="primary" :loading="startServiceSubmitting" @click="submitStartService">完 成</el-button>
+    </div>
+  </el-dialog>
+  </div>
 </template>
 
 <script>
+import { getUsers, listUsers } from '@/api/system/users'
+import request from '@/utils/request'
+import ImageUpload from '@/components/ImageUpload'
+
 export default {
   name: 'OrderDetailDialog',
+  components: { ImageUpload },
   props: {
     visible: {
       type: Boolean,
@@ -228,7 +683,92 @@ export default {
       default: () => ({})
     }
   },
+  data() {
+    return {
+      dialogVisible: false,
+      workerInfo: null, // 存储师傅信息
+      loadingWorkerInfo: false, // 加载师傅信息的状态
+      
+      // 结束订单弹窗
+      endOrderDialogVisible: false,
+      endOrderSubmitting: false,
+      endOrderForm: { fee: 0 },
+      endOrderRules: {
+        fee: [
+          { required: true, message: '请输入上门费', trigger: 'blur' }
+        ]
+      },
+
+      // 更换师傅相关数据
+      changeWorkerDialogVisible: false,
+      availableWorkers: [],
+      selectedWorker: null,
+      loadingWorkers: false,
+      workerQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: '',
+        phone: '',
+        status: ''
+      },
+
+      // 开始服务弹窗
+      startServiceDialogVisible: false,
+      startServiceImages: [],
+      startServiceSubmitting: false
+    }
+  },
+  watch: {
+    visible: {
+      immediate: true,
+      handler(newVal) {
+        this.dialogVisible = newVal
+        if (newVal && this.orderInfo.workerId) {
+          this.loadWorkerInfo()
+        }
+      }
+    },
+    'orderInfo.workerId': {
+      immediate: true,
+      handler(newWorkerId) {
+        if (newWorkerId && this.dialogVisible) {
+          this.loadWorkerInfo()
+        }
+      }
+    }
+  },
   methods: {
+    /** 关闭对话框 */
+    handleClose() {
+      this.dialogVisible = false
+      this.$emit('update:visible', false)
+    },
+
+    /** 加载师傅信息 */
+    async loadWorkerInfo() {
+      if (!this.orderInfo.workerId) {
+        this.workerInfo = null
+        return
+      }
+
+      try {
+        this.loadingWorkerInfo = true
+        const response = await getUsers(this.orderInfo.workerId)
+        if (response.code === 200) {
+          this.workerInfo = response.data
+        } else {
+          this.$message.error('获取师傅信息失败：' + response.msg)
+          this.workerInfo = null
+        }
+      } catch (error) {
+        console.error('获取师傅信息失败:', error)
+        this.$message.error('获取师傅信息失败')
+        this.workerInfo = null
+      } finally {
+        this.loadingWorkerInfo = false
+      }
+    },
+
     /** 获取状态标签类型 */
     getStatusTagType(status) {
       if (!status) return 'info'
@@ -259,41 +799,96 @@ export default {
       return statusMap[status] || `状态${status}`
     },
 
-    /** 获取时间轴节点样式类 */
-    getTimelineNodeClass(type) {
-      if (!type) return 'timeline-node-default'
-      const typeMap = {
-        'create': 'timeline-node-primary',
-        'pay': 'timeline-node-success',
-        'dispatch': 'timeline-node-info',
-        'accept': 'timeline-node-warning',
-        'service': 'timeline-node-info',
-        'complete': 'timeline-node-danger'
+    /** 获取紧急程度标签类型 */
+    getUrgencyTagType(urgency) {
+      if (!urgency) return 'info'
+      const urgencyMap = {
+        1: 'info',      // 普通
+        2: 'warning',   // 紧急
+        3: 'danger'     // 特急
       }
-      return typeMap[type] || 'timeline-node-default'
+      return urgencyMap[urgency] || 'info'
+    },
+
+    /** 获取紧急程度标签 */
+    getUrgencyLabel(urgency) {
+      if (!urgency) return '普通'
+      const urgencyMap = {
+        1: '普通',
+        2: '紧急',
+        3: '特急'
+      }
+      return urgencyMap[urgency] || '普通'
+    },
+
+    /** 获取时间轴节点样式类 */
+    getTimelineNodeClass(title) {
+      if (!title) return 'timeline-node-default'
+      if (title.includes('订单生成') || title.includes('创建')) return 'timeline-node-primary'
+      if (title.includes('支付成功') || title.includes('接单') || title.includes('派单')) return 'timeline-node-success'
+      if (title.includes('出发') || title.includes('到达')) return 'timeline-node-warning'
+      if (title.includes('开始服务')) return 'timeline-node-info'
+      if (title.includes('服务完成') || title.includes('完成')) return 'timeline-node-danger'
+      return 'timeline-node-default'
     },
 
     /** 获取时间轴图标 */
-    getTimelineIcon(type) {
-      if (!type) return 'el-icon-info'
-      const typeMap = {
-        'create': 'el-icon-plus',
-        'pay': 'el-icon-check',
-        'dispatch': 'el-icon-s-promotion',
-        'accept': 'el-icon-check',
-        'service': 'el-icon-video-play',
-        'complete': 'el-icon-circle-check'
-      }
-      return typeMap[type] || 'el-icon-info'
+    getTimelineIcon(title) {
+      if (!title) return 'el-icon-info'
+      if (title.includes('订单生成') || title.includes('创建')) return 'el-icon-plus'
+      if (title.includes('支付成功') || title.includes('接单') || title.includes('派单')) return 'el-icon-check'
+      if (title.includes('出发') || title.includes('到达')) return 'el-icon-location'
+      if (title.includes('开始服务')) return 'el-icon-video-play'
+      if (title.includes('服务完成') || title.includes('完成')) return 'el-icon-circle-check'
+      return 'el-icon-info'
     },
 
-    /** 格式化时间 */
-    formatTime(time) {
+    /** 格式化时间轴时间 */
+    formatTimelineTime(time) {
       if (!time) return '未知时间'
       const date = new Date(time)
       return date.toLocaleString()
     },
 
+    /** 获取内容描述 */
+    getContentDescription(content) {
+      if (!content) return '无描述信息'
+
+      try {
+        const contentData = JSON.parse(content)
+        if (Array.isArray(contentData)) {
+          return contentData[0]?.name || content
+        } else if (typeof contentData === 'object') {
+          return contentData.name || content
+        }
+      } catch (e) {
+        // 如果解析失败，直接返回原始内容
+      }
+
+      return content
+    },
+
+    /** 判断是否为JSON字符串 */
+    isJsonString(str) {
+      if (typeof str !== 'string') return false
+      try {
+        JSON.parse(str)
+        return true
+      } catch (e) {
+        return false
+      }
+    },
+
+    /** 格式化JSON显示 */
+    formatJson(jsonStr) {
+      try {
+        const obj = JSON.parse(jsonStr)
+        return JSON.stringify(obj, null, 2)
+      } catch (e) {
+        return jsonStr
+      }
+    },
+
     /** 获取文件列表 */
     getFileList() {
       if (!this.orderInfo.fileData) {
@@ -340,23 +935,349 @@ export default {
     },
 
     /** 派单操作 */
-    handleDispatch() {
-      this.$emit('dispatch-order')
+    handleDispatchFromTimeline(record) {
+      this.$emit('dispatch-order', record)
+    },
+
+    /** 更换师傅操作 */
+    handleChangeWorker(record) {
+      console.log('更换师傅按钮被点击，记录:', record)
+      // 打开更换师傅弹窗
+      this.changeWorkerDialogVisible = true
+      // 加载可用的师傅列表
+      this.loadAvailableWorkers()
     },
 
     /** 接单操作 */
-    handleAccept() {
-      this.$emit('accept-order')
+    async handleAcceptOrder(record) {
+      try {
+        console.log('接单按钮被点击，记录:', record)
+
+        // 构建接单参数
+        const params = {
+          orderId: this.orderInfo.orderId,
+          workerId: this.orderInfo.workerId || null
+        }
+
+        console.log('接单参数:', params)
+
+        // 调用接单API
+        const response = await request({
+          url: '/system/Order/accept-order',
+          method: 'post',
+          data: params
+        })
+
+        if (response.code === 200) {
+          this.$message.success('接单成功！')
+
+          // 刷新订单信息
+          this.$emit('refresh-order')
+
+          // 关闭订单明细弹窗
+          this.handleClose()
+        } else {
+          this.$message.error('接单失败：' + response.msg)
+        }
+      } catch (error) {
+        console.error('接单失败:', error)
+        this.$message.error('接单失败：' + (error.message || '未知错误'))
+      }
+    },
+
+    /** 出发上门操作 */
+    handleDeparture(record) {
+      this.$emit('departure', record)
+    },
+
+    /** 确认到达操作 */
+    async handleConfirmArrival(record) {
+      try {
+        this.$modal.confirm('确认要执行确认到达操作吗？').then(async () => {
+          // 调用确认到达API
+          const response = await request.post('/system/Order/confirm-arrival', {
+            orderId: this.orderInfo.orderId
+          })
+
+          if (response.code === 200) {
+            this.$message.success('确认到达成功！')
+            // 刷新订单信息
+            this.$emit('refresh-order')
+            // 关闭订单明细弹窗
+            this.handleClose()
+          } else {
+            this.$message.error('确认到达失败：' + response.msg)
+          }
+        }).catch(() => {
+          // 用户取消操作
+        })
+      } catch (error) {
+        console.error('确认到达失败:', error)
+        this.$message.error('确认到达失败：' + (error.message || '未知错误'))
+      }
+    },
+
+    /** 结束订单操作 */
+    handleEndOrder(record) {
+      this.endOrderDialogVisible = true
     },
 
     /** 开始服务操作 */
-    handleStartService() {
-      this.$emit('start-service')
+    handleStartService(record) {
+      this.startServiceImages = []
+      this.startServiceDialogVisible = true
+    },
+
+    /** 提交开始服务 */
+    async submitStartService() {
+      if (!this.startServiceImages || this.startServiceImages.length === 0) {
+        this.$message.warning('请至少上传一张服务图片')
+        return
+      }
+      try {
+        this.startServiceSubmitting = true
+        const response = await request({
+          url: '/system/Order/start-service',
+          method: 'post',
+          data: {
+            orderId: this.orderInfo.orderId,
+            image: this.startServiceImages
+          }
+        })
+        if (response.code === 200) {
+          this.$message.success('开始服务成功！')
+          this.startServiceDialogVisible = false
+          this.startServiceImages = []
+          this.$emit('refresh-order')
+        } else {
+          this.$message.error('开始服务失败：' + (response.msg || '未知错误'))
+        }
+      } catch (error) {
+        this.$message.error('开始服务失败：' + (error.message || '网络错误'))
+      } finally {
+        this.startServiceSubmitting = false
+      }
+    },
+
+    /** 项目报价操作 */
+    handleProjectQuote(record) {
+      this.$emit('project-quote', record)
     },
 
     /** 完成服务操作 */
-    handleComplete() {
-      this.$emit('complete-service')
+    handleCompleteService(record) {
+      this.$emit('complete-service', record)
+    },
+
+    /** 获取师傅等级标签 */
+    getWorkerLevelLabel(level) {
+      if (!level) return '未设置'
+      const levelMap = {
+        1: '初级',
+        2: '中级',
+        3: '高级',
+        4: '专家'
+      }
+      return levelMap[level] || `等级${level}`
+    },
+
+    /** 获取师傅服务区域标签 */
+    getWorkerAreaLabel(city) {
+      if (!city) return '未设置'
+      try {
+        const cityData = JSON.parse(city)
+        if (Array.isArray(cityData)) {
+          return cityData.map(item => item.name || item).join(', ')
+        } else if (typeof cityData === 'object') {
+          return cityData.name || city
+        }
+      } catch (e) {
+        // 如果解析失败，直接返回原始内容
+      }
+      return city
+    },
+
+    /** 重置结束订单表单 */
+    resetEndOrderForm() {
+      this.endOrderForm = { fee: 0 }
+      this.endOrderSubmitting = false
+    },
+
+    /** 提交结束订单 */
+    submitEndOrder() {
+      this.$refs.endOrderFormRef && this.$refs.endOrderFormRef.validate(async valid => {
+        if (!valid) return
+        try {
+          this.endOrderSubmitting = true
+          const response = await request({
+            url: '/system/Order/end-order',
+            method: 'post',
+            data: {
+              orderId: this.orderInfo.orderId,
+              doorFee: this.endOrderForm.fee
+            }
+          })
+          if (response.code === 200) {
+            this.$message.success('订单已结束')
+            this.$emit('refresh-order')
+            this.endOrderDialogVisible = false
+            this.resetEndOrderForm()
+            this.handleClose()
+          } else {
+            this.$message.error('结束订单失败：' + (response.msg || '未知错误'))
+          }
+        } catch (e) {
+          this.$message.error('结束订单失败：' + (e.message || '网络错误'))
+        } finally {
+          this.endOrderSubmitting = false
+        }
+      })
+    },
+
+    /** 获取师傅技能标签 */
+    getWorkerSkillLabels(skillIds) {
+      if (!skillIds) return []
+      try {
+        const skills = JSON.parse(skillIds)
+        if (Array.isArray(skills)) {
+          return skills.map(skill => skill.name || skill).filter(Boolean)
+        }
+      } catch (e) {
+        // 如果解析失败，直接返回原始内容
+      }
+      return []
+    },
+
+    /** 加载可用的师傅列表 */
+    async loadAvailableWorkers() {
+      try {
+        this.loadingWorkers = true
+
+        // 构建查询参数
+        const params = {
+          pageNum: this.workerQueryParams.pageNum,
+          pageSize: this.workerQueryParams.pageSize
+        }
+
+        // 只有当有值时才添加搜索条件
+        if (this.workerQueryParams.name) {
+          params.name = this.workerQueryParams.name
+        }
+        if (this.workerQueryParams.phone) {
+          params.phone = this.workerQueryParams.phone
+        }
+        if (this.workerQueryParams.status) {
+          params.status = this.workerQueryParams.status
+        }
+
+        console.log('调用getUsers API，参数:', params)
+
+        // 调用获取可用师傅列表的API
+        const response = await listUsers(params)
+
+        if (response.code === 200) {
+          this.availableWorkers = response.rows || []
+          console.log('获取师傅列表成功，数量:', this.availableWorkers.length)
+        } else {
+          this.$message.error('获取师傅列表失败：' + response.msg)
+          this.availableWorkers = []
+        }
+      } catch (error) {
+        console.error('获取师傅列表失败:', error)
+        this.$message.error('获取师傅列表失败：' + (error.message || '未知错误'))
+        this.availableWorkers = []
+      } finally {
+        this.loadingWorkers = false
+      }
+    },
+
+    /** 搜索师傅 */
+    searchWorkers() {
+      this.workerQueryParams.pageNum = 1
+      this.loadAvailableWorkers()
+    },
+
+    /** 重置师傅搜索 */
+    resetWorkerSearch() {
+      this.workerQueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        name: '',
+        phone: '',
+        status: ''
+      }
+      this.loadAvailableWorkers()
+    },
+
+    /** 选择师傅 */
+    selectWorker(worker) {
+      this.selectedWorker = worker
+      this.$message.success(`已选择师傅：${worker.name}`)
+    },
+
+    /** 确认更换师傅 */
+    confirmChangeWorker() {
+      if (!this.selectedWorker) {
+        this.$message.warning('请先选择要更换的师傅')
+        return
+      }
+
+      if (this.selectedWorker.id === this.orderInfo.workerId) {
+        this.$message.warning('不能选择当前已分配的师傅')
+        return
+      }
+
+      this.$modal.confirm(`确认将订单更换给师傅 ${this.selectedWorker.name} 吗？`).then(() => {
+        // 这里调用更换师傅的API
+        this.processChangeWorker()
+      }).catch(() => {
+        // 用户取消
+      })
+    },
+
+    /** 处理更换师傅 */
+    async processChangeWorker() {
+      try {
+        // 这里需要调用更换师傅的API
+        // 您需要根据实际情况实现这个API调用
+        this.$message.success('更换师傅成功！')
+        this.changeWorkerDialogVisible = false
+        this.selectedWorker = null
+
+        // 刷新师傅信息
+        if (this.orderInfo.workerId) {
+          this.loadWorkerInfo()
+        }
+
+        // 通知父组件刷新数据
+        this.$emit('refresh-order')
+      } catch (error) {
+        console.error('更换师傅失败:', error)
+        this.$message.error('更换师傅失败：' + (error.message || '未知错误'))
+      }
+    },
+
+    /** 获取等级标签类型 */
+    getLevelTagType(level) {
+      if (!level) return 'info'
+      const levelMap = {
+        1: 'info',      // 初级
+        2: 'success',   // 中级
+        3: 'warning',   // 高级
+        4: 'danger'     // 专家
+      }
+      return levelMap[level] || 'info'
+    },
+
+    /** 获取师傅行样式类 */
+    getWorkerRowClass({ row }) {
+      if (row.id === this.orderInfo.workerId) {
+        return 'current-worker-row'
+      }
+      if (row.id === this.selectedWorker?.id) {
+        return 'selected-worker-row'
+      }
+      return ''
     }
   }
 }
@@ -378,39 +1299,75 @@ export default {
 }
 
 .order-detail-container {
-  .el-card {
-    margin-bottom: 20px;
+  // 确保三个卡片在同一行时高度一致
+  .el-row:first-child {
+    display: flex;
+    align-items: stretch;
 
-    .el-card__header {
-      background-color: #f5f7fa;
-      border-bottom: 1px solid #e4e7ed;
+    .el-col {
+      display: flex;
 
-      .clearfix {
+      .el-card {
+        flex: 1;
         display: flex;
-        align-items: center;
-        justify-content: space-between;
+        flex-direction: column;
+        margin-bottom: 20px;
+        min-height: 0; // 重要：允许flex子项收缩
 
-        span {
-          font-weight: 600;
-          color: #303133;
-          font-size: 16px;
-        }
+        .el-card__header {
+          background-color: #f5f7fa;
+          border-bottom: 1px solid #e4e7ed;
+          flex-shrink: 0; // 防止header收缩
 
-        .header-actions {
-          .action-btn {
-            margin-left: 10px;
-            color: #409EFF;
-            
-            &:hover {
-              color: #1890ff;
+          .clearfix {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            span {
+              font-weight: 600;
+              color: #303133;
+              font-size: 16px;
+            }
+
+            .header-actions {
+              .action-btn {
+                margin-left: 10px;
+                color: #409EFF;
+
+                &:hover {
+                  color: #1890ff;
+                }
+              }
             }
           }
         }
+
+        .el-card__body {
+          padding: 20px;
+          flex: 1; // 占据剩余空间
+          display: flex;
+          flex-direction: column;
+          min-height: 0; // 允许收缩
+        }
       }
     }
+  }
 
-    .el-card__body {
-      padding: 20px;
+  // 其他卡片样式
+  .el-row:not(:first-child) {
+    .el-card {
+      margin-bottom: 20px;
+    }
+  }
+
+  // 强制三个卡片高度一致
+  .el-row:first-child {
+    .el-col {
+      .el-card {
+        height: auto !important;
+        min-height: 400px; // 设置最小高度确保一致性
+      }
     }
   }
 }
@@ -419,6 +1376,11 @@ export default {
   margin-top: 20px;
   padding-top: 20px;
   border-top: 1px solid #e4e7ed;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  min-height: 120px; // 确保最小高度
 
   h4 {
     margin: 0 0 15px 0;
@@ -608,6 +1570,149 @@ export default {
   border-top: 1px solid #f0f0f0;
 }
 
+.timeline-actions-multiple {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+/* 报价详情样式 */
+.timeline-quote {
+  margin-top: 12px;
+  padding: 12px;
+  background: #f8f9fa;
+  border-radius: 6px;
+  border: 1px solid #e9ecef;
+}
+
+.quote-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+  font-weight: 600;
+  color: #495057;
+}
+
+.quote-header i {
+  margin-right: 6px;
+  color: #28a745;
+}
+
+.quote-content {
+  background: white;
+  padding: 8px;
+  border-radius: 4px;
+  border: 1px solid #dee2e6;
+}
+
+.quote-content pre {
+  margin: 0;
+  font-size: 12px;
+  color: #6c757d;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+/* 技能标签样式 */
+.skills-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+}
+
+/* 师傅头像样式 */
+.worker-avatar-section {
+  margin-top: 20px;
+  padding-top: 20px;
+  border-top: 1px solid #e4e7ed;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-height: 120px; // 确保最小高度
+
+  h4 {
+    margin: 0 0 15px 0;
+    color: #303133;
+    font-size: 14px;
+    font-weight: 600;
+  }
+
+  .worker-avatar {
+    display: flex;
+    justify-content: center;
+
+    .avatar-image {
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+      border: 3px solid #e4e7ed;
+      cursor: pointer;
+      transition: border-color 0.2s ease;
+
+      &:hover {
+        border-color: #409eff;
+      }
+    }
+
+    .avatar-slot {
+      width: 80px;
+      height: 80px;
+      border-radius: 50%;
+      background: #f5f7fa;
+      border: 3px solid #e4e7ed;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 32px;
+      color: #909399;
+    }
+  }
+}
+
+/* 占位区域样式 */
+.placeholder-section {
+  margin-top: 20px;
+  padding-top: 20px;
+  border-top: 1px solid #e4e7ed;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 120px; // 确保最小高度
+
+  .placeholder-content {
+    text-align: center;
+    color: #909399;
+
+    i {
+      font-size: 48px;
+      margin-bottom: 10px;
+      display: block;
+    }
+
+    p {
+      margin: 0;
+      font-size: 14px;
+    }
+  }
+}
+
+/* 加载状态样式 */
+.loading-info {
+  display: flex;
+  align-items: center;
+  color: #909399;
+  font-size: 14px;
+
+  i {
+    margin-right: 6px;
+    font-size: 16px;
+  }
+}
+
+
+
 /* 响应式设计 */
 @media (max-width: 768px) {
   .order-detail-container {
@@ -643,4 +1748,90 @@ export default {
     transform: translateX(-50%);
   }
 }
+
+/* 更换师傅弹窗样式 */
+.current-worker-banner,
+.selected-worker-banner {
+  margin-bottom: 20px;
+}
+
+.change-worker-content {
+  .order-info-section {
+    margin-bottom: 30px;
+    padding: 20px;
+    background: #f8f9fa;
+    border-radius: 8px;
+    border: 1px solid #e9ecef;
+
+    h4 {
+      margin: 0 0 15px 0;
+      color: #303133;
+      font-size: 16px;
+      font-weight: 600;
+    }
+
+    .info-item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 12px;
+
+      label {
+        font-weight: 600;
+        color: #606266;
+        width: 80px;
+        flex-shrink: 0;
+      }
+
+      span {
+        color: #303133;
+        flex: 1;
+      }
+
+      .amount-highlight {
+        color: #f56c6c;
+        font-weight: 600;
+        font-size: 16px;
+      }
+    }
+  }
+
+  .worker-selection-section {
+    h4 {
+      margin: 0 0 15px 0;
+      color: #303133;
+      font-size: 16px;
+      font-weight: 600;
+    }
+
+    .worker-list {
+      .worker-info {
+        display: flex;
+        align-items: center;
+      }
+
+      .skills-tags {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 4px;
+      }
+    }
+  }
+}
+
+/* 师傅行样式 */
+.current-worker-row {
+  background-color: #f0f9ff !important;
+
+  .el-button {
+    background-color: #909399;
+    border-color: #909399;
+    color: white;
+    cursor: not-allowed;
+  }
+}
+
+.selected-worker-row {
+  background-color: #f0f9ff !important;
+  border: 2px solid #409eff;
+}
 </style>
diff --git a/ruoyi-ui/src/views/system/Order/components/ProjectQuoteDialog.vue b/ruoyi-ui/src/views/system/Order/components/ProjectQuoteDialog.vue
new file mode 100644
index 0000000..d3c67c7
--- /dev/null
+++ b/ruoyi-ui/src/views/system/Order/components/ProjectQuoteDialog.vue
@@ -0,0 +1,344 @@
+<template>
+  <el-dialog
+    title="项目报价"
+    :visible.sync="visibleInner"
+    width="420px"
+    top="6vh"
+    append-to-body
+    @close="handleClose"
+  >
+    <div class="quote-wrapper" v-loading="loadingInspections">
+      <!-- 基检现象 -->
+      <section class="group">
+        <div class="group-title">基检现象</div>
+        <div class="group-sub">请和用户确认基础现象</div>
+        <div class="chip-list">
+          <el-button
+            v-for="opt in inspectionOptions"
+            :key="opt.id"
+            :type="selectedInspectionIds.includes(opt.id) ? 'primary' : 'default'"
+            size="mini"
+            class="chip"
+            @click="toggleInspection(opt.id)"
+          >
+            {{ opt.name }}
+          </el-button>
+        </div>
+      </section>
+
+      <!-- 服务项目 -->
+      <section class="group">
+        <div class="group-title">服务项目</div>
+        <div class="group-sub">请和用户确认基础项目</div>
+        <el-card class="slot-card" shadow="never">
+          <div class="slot-row">
+            <el-button type="text" @click="projectPickerVisible = true">
+              去添加服务项目
+            </el-button>
+          </div>
+          <div v-if="projectItems.length > 0" class="list">
+            <div v-for="(item, idx) in projectItems" :key="idx" class="list-item">
+              <span class="name">{{ item.name }}</span>
+              <span class="price">￥{{ toMoney(item.price) }}</span>
+              <el-button type="text" @click="removeProject(idx)">移除</el-button>
+            </div>
+          </div>
+        </el-card>
+      </section>
+
+      <!-- 所需物料 -->
+      <section class="group">
+        <div class="group-title">所需物料</div>
+        <div class="group-sub">如需物料，请添加并向用户一并报价</div>
+        <el-card class="slot-card" shadow="never">
+          <div class="slot-row">
+            <el-button type="text" @click="materialPickerVisible = true">
+              去添加所需物料
+            </el-button>
+          </div>
+          <div v-if="materialItems.length > 0" class="list">
+            <div v-for="(item, idx) in materialItems" :key="idx" class="list-item">
+              <span class="name">{{ item.name }}</span>
+              <span class="qty">x{{ item.quantity }}</span>
+              <span class="price">￥{{ toMoney(item.price * item.quantity) }}</span>
+              <el-button type="text" @click="removeMaterial(idx)">移除</el-button>
+            </div>
+          </div>
+        </el-card>
+      </section>
+
+      <!-- 付款方式 -->
+      <section class="group">
+        <div class="group-title">付款方式</div>
+        <div class="group-sub">如需物料，请添加并向用户一并报价</div>
+        <el-card class="slot-card" shadow="never">
+          <div class="pay-row">
+            <el-radio v-model="payType" label="stage">定金 + 尾款</el-radio>
+            <el-radio v-model="payType" label="once">一次性付清</el-radio>
+          </div>
+        </el-card>
+      </section>
+
+      <!-- 优惠 -->
+      <section class="group">
+        <el-button type="text" @click="discountVisible = !discountVisible">添加优惠</el-button>
+        <transition name="el-fade-in">
+          <div v-show="discountVisible" class="discount-box">
+            <el-form :model="discount" label-width="80px" size="small">
+              <el-form-item label="优惠类型">
+                <el-select v-model="discount.type" placeholder="请选择">
+                  <el-option label="立减" value="minus" />
+                  <el-option label="折扣(%)" value="rate" />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="discount.type === 'minus'" label="立减金额">
+                <el-input-number v-model="discount.amount" :min="0" :step="1" />
+              </el-form-item>
+              <el-form-item v-else label="折扣比例">
+                <el-input-number v-model="discount.rate" :min="0" :max="100" :step="1" />
+              </el-form-item>
+            </el-form>
+          </div>
+        </transition>
+      </section>
+
+      <!-- 底部报价 -->
+      <div class="footer">
+        <el-button type="primary" class="btn-generate" @click="handleGenerate">
+          生成报价（报价：￥{{ toMoney(grandTotal) }}）
+        </el-button>
+      </div>
+
+      <!-- 服务项目选择弹窗（临时简化版，后续替换为接口数据） -->
+      <el-dialog
+        title="添加服务项目"
+        :visible.sync="projectPickerVisible"
+        width="520px"
+        append-to-body
+      >
+        <el-form :model="tempProject" label-width="90px" size="small">
+          <el-form-item label="项目名称">
+            <el-input v-model="tempProject.name" placeholder="请输入项目名称" />
+          </el-form-item>
+          <el-form-item label="项目单价">
+            <el-input-number v-model="tempProject.price" :min="0" :step="1" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="projectPickerVisible = false">取消</el-button>
+          <el-button type="primary" @click="addProject">添加</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 物料选择弹窗（临时简化版，后续替换为接口数据） -->
+      <el-dialog
+        title="添加物料"
+        :visible.sync="materialPickerVisible"
+        width="520px"
+        append-to-body
+      >
+        <el-form :model="tempMaterial" label-width="90px" size="small">
+          <el-form-item label="物料名称">
+            <el-input v-model="tempMaterial.name" placeholder="请输入物料名称" />
+          </el-form-item>
+          <el-form-item label="物料单价">
+            <el-input-number v-model="tempMaterial.price" :min="0" :step="1" />
+          </el-form-item>
+          <el-form-item label="数量">
+            <el-input-number v-model="tempMaterial.quantity" :min="1" :step="1" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="materialPickerVisible = false">取消</el-button>
+          <el-button type="primary" @click="addMaterial">添加</el-button>
+        </div>
+      </el-dialog>
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">取 消</el-button>
+      <el-button type="primary" @click="handleGenerate">生成报价</el-button>
+    </div>
+  </el-dialog>
+  </template>
+
+<script>
+import request from '@/utils/request'
+export default {
+  name: 'ProjectQuoteDialog',
+  props: {
+    visible: { type: Boolean, default: false },
+    orderId: { type: String, default: '' },
+    workerId: { type: [String, Number], default: '' },
+    goodId: { type: [String, Number], default: '' }
+  },
+  data() {
+    return {
+      visibleInner: false,
+      // 基检现象（接口获取）
+      inspectionOptions: [],
+      loadingInspections: false,
+      selectedInspectionIds: [],
+
+      // 服务项目与物料
+      projectItems: [],
+      materialItems: [],
+
+      // 付款方式
+      payType: 'stage', // stage: 定金+尾款, once: 一次性
+
+      // 优惠
+      discountVisible: false,
+      discount: {
+        type: 'minus', // minus | rate
+        amount: 0,
+        rate: 0
+      },
+
+      // 选择弹窗临时模型
+      projectPickerVisible: false,
+      materialPickerVisible: false,
+      tempProject: { name: '', price: 0 },
+      tempMaterial: { name: '', price: 0, quantity: 1 }
+    }
+  },
+  watch: {
+    visible: {
+      immediate: true,
+      handler(val) {
+        this.visibleInner = val
+        if (val) {
+          this.loadInspectionOptions()
+        }
+      }
+    },
+    workerId() { if (this.visibleInner) this.loadInspectionOptions() },
+    goodId() { if (this.visibleInner) this.loadInspectionOptions() }
+  },
+  computed: {
+    projectTotal() {
+      return this.projectItems.reduce((sum, it) => sum + (Number(it.price) || 0), 0)
+    },
+    materialTotal() {
+      return this.materialItems.reduce((sum, it) => sum + (Number(it.price) || 0) * (Number(it.quantity) || 0), 0)
+    },
+    subtotal() {
+      return this.projectTotal + this.materialTotal
+    },
+    discountAmount() {
+      if (this.discount.type === 'minus') {
+        return Number(this.discount.amount) || 0
+      }
+      const rate = Number(this.discount.rate) || 0
+      return (this.subtotal * rate) / 100
+    },
+    grandTotal() {
+      const val = this.subtotal - this.discountAmount
+      return val > 0 ? val : 0
+    }
+  },
+  methods: {
+    async loadInspectionOptions() {
+      if (!this.workerId || !this.goodId) {
+        // 缺少必要参数时不请求
+        return
+      }
+      try {
+        this.loadingInspections = true
+        const url = `api/worker/basic/project?id=${this.workerId}&goodid=${this.goodId}`
+        const res = await request.get(url)
+        if (res && res.code === 200 && res.data && Array.isArray(res.data.basic)) {
+          this.inspectionOptions = res.data.basic.map((name, idx) => ({ id: idx + 1, name }))
+          this.selectedInspectionIds = []
+        } else {
+          this.inspectionOptions = []
+        }
+      } catch (e) {
+        console.error('获取基检现象失败:', e)
+        this.$message.error('获取基检现象失败')
+        this.inspectionOptions = []
+      } finally {
+        this.loadingInspections = false
+      }
+    },
+    toMoney(v) {
+      const num = Number(v) || 0
+      return num.toFixed(2)
+    },
+    toggleInspection(id) {
+      const idx = this.selectedInspectionIds.indexOf(id)
+      if (idx >= 0) this.selectedInspectionIds.splice(idx, 1)
+      else this.selectedInspectionIds.push(id)
+    },
+    addProject() {
+      if (!this.tempProject.name) return this.$message.warning('请输入项目名称')
+      this.projectItems.push({ ...this.tempProject })
+      this.tempProject = { name: '', price: 0 }
+      this.projectPickerVisible = false
+    },
+    removeProject(index) {
+      this.projectItems.splice(index, 1)
+    },
+    addMaterial() {
+      if (!this.tempMaterial.name) return this.$message.warning('请输入物料名称')
+      this.materialItems.push({ ...this.tempMaterial })
+      this.tempMaterial = { name: '', price: 0, quantity: 1 }
+      this.materialPickerVisible = false
+    },
+    removeMaterial(index) {
+      this.materialItems.splice(index, 1)
+    },
+    handleGenerate() {
+      const payload = {
+        orderId: this.orderId,
+        inspections: this.selectedInspectionIds,
+        projects: this.projectItems,
+        materials: this.materialItems,
+        payType: this.payType,
+        discount: { ...this.discount },
+        amount: this.grandTotal
+      }
+      this.$emit('submit', payload)
+      this.visibleInner = false
+      this.$emit('update:visible', false)
+    },
+    handleClose() {
+      this.visibleInner = false
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.quote-wrapper {
+  .group { margin-bottom: 16px; }
+  .group-title { font-weight: 600; color: #2c3e50; margin-bottom: 4px; }
+  .group-sub { font-size: 12px; color: #909399; margin-bottom: 8px; }
+
+  .chip-list {
+    display: flex; flex-wrap: wrap; gap: 8px;
+    .chip { min-width: 84px; }
+  }
+
+  .slot-card {
+    background: #f7fbff;
+    .slot-row { padding: 6px 0; }
+    .list { margin-top: 8px; }
+    .list-item {
+      display: flex; align-items: center; justify-content: space-between;
+      padding: 6px 0; border-bottom: 1px dashed #ebeef5;
+      .name { color: #303133; }
+      .qty { color: #606266; margin: 0 6px; }
+      .price { color: #409EFF; font-weight: 600; }
+    }
+  }
+
+  .pay-row { display: flex; align-items: center; gap: 12px; }
+  .discount-box { background: #f8f9fb; border: 1px solid #ebeef5; padding: 10px; border-radius: 6px; }
+  .footer { display: flex; justify-content: center; margin-top: 12px; }
+  .btn-generate { width: 100%; }
+}
+</style>
+
+
diff --git a/ruoyi-ui/src/views/system/Order/index.vue b/ruoyi-ui/src/views/system/Order/index.vue
index 4fe588a..e17931b 100644
--- a/ruoyi-ui/src/views/system/Order/index.vue
+++ b/ruoyi-ui/src/views/system/Order/index.vue
@@ -224,7 +224,7 @@
           <template slot-scope="scope">
             <span
               class="pay-price-clickable"
-              @click="showPaymentDetails(scope.row)"
+              @click.stop="showPaymentDetails(scope.row)"
               title="点击查看支付明细"
             >
               ￥{{ (scope.row.payPrice != null ? scope.row.payPrice : 0).toFixed(2) }}
@@ -273,8 +273,8 @@
 
       <el-table-column label="通话记录" align="center" width="100">
         <template slot-scope="scope">
-          <div class="record-box" @click="showRecordDetails(scope.row, 'call')">
-            <el-button type="text" class="expand-button">
+          <div class="record-box" @click.stop="showRecordDetails(scope.row, 'call')">
+            <el-button type="text" class="expand-button" @click.stop>
               <span class="record-count">{{ scope.row.thjl || 0 }}</span>
               <i class="el-icon-arrow-right"></i>
             </el-button>
@@ -283,8 +283,8 @@
       </el-table-column>
       <el-table-column label="录音文件" align="center" width="100">
         <template slot-scope="scope">
-          <div class="record-box" @click="showRecordDetails(scope.row, 'audio')">
-            <el-button type="text" class="expand-button">
+          <div class="record-box" @click.stop="showRecordDetails(scope.row, 'audio')">
+            <el-button type="text" class="expand-button" @click.stop>
               <span class="record-count">{{ scope.row.lywj || 0 }}</span>
               <i class="el-icon-arrow-right"></i>
             </el-button>
@@ -293,8 +293,8 @@
       </el-table-column>
       <el-table-column label="接单记录" align="center" width="100">
         <template slot-scope="scope">
-          <div class="record-box" @click="showRecordDetails(scope.row, 'receive')">
-            <el-button type="text" class="expand-button">
+          <div class="record-box" @click.stop="showRecordDetails(scope.row, 'receive')">
+            <el-button type="text" class="expand-button" @click.stop>
               <span class="record-count">{{ scope.row.jdjl || 0 }}</span>
               <i class="el-icon-arrow-right"></i>
             </el-button>
@@ -303,8 +303,8 @@
       </el-table-column>
       <el-table-column label="通知记录" align="center" width="100">
         <template slot-scope="scope">
-          <div class="record-box" @click="showRecordDetails(scope.row, 'notify')">
-            <el-button type="text" class="expand-button">
+          <div class="record-box" @click.stop="showRecordDetails(scope.row, 'notify')">
+            <el-button type="text" class="expand-button" @click.stop>
               <span class="record-count">{{ scope.row.tzjl || 0 }}</span>
               <i class="el-icon-arrow-right"></i>
             </el-button>
@@ -315,8 +315,8 @@
       <!-- 修改评价列，点击时弹出对话框而非展开行 -->
       <el-table-column label="评价" align="center" width="100">
         <template slot-scope="scope">
-          <div class="comment-box" @click="showCommentDetails(scope.row)">
-            <el-button type="text" class="expand-button">
+          <div class="comment-box" @click.stop="showCommentDetails(scope.row)">
+            <el-button type="text" class="expand-button" @click.stop>
               <span class="comment-count">{{ scope.row.fwpj || 0 }}</span>
               <i class="el-icon-arrow-right"></i>
             </el-button>
@@ -325,7 +325,7 @@
       </el-table-column>
 
       <!-- 修复操作栏样式，确保按钮是标准圆形 -->
-      <el-table-column label="操作" align="center" width="280"    fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="300"    fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <div class="button-group" v-if="scope.row.id">
             <!-- 派单按钮 - 只有待接单状态才显示 -->
@@ -335,39 +335,57 @@
                   type="success"
                   icon="el-icon-s-promotion"
                   circle
-                  @click="handleDispatch(scope.row)"
+              @click.stop="handleDispatch(scope.row)"
                   v-hasPermi="['system:Order:edit']"
                   title="派单"
                 ></el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              circle
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:Order:edit']"
-            ></el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleViewOrderDetail(scope.row)"
-              v-hasPermi="['system:Order:edit']"
-            >查看详情</el-button>
+
+            <!-- 更换师傅按钮 - 只有已分配师傅的订单才显示 -->
+<!--            <el-button-->
+<!--              v-if="scope.row.workerId && scope.row.workerId !== null && scope.row.workerId !== ''"-->
+<!--              size="mini"-->
+<!--              type="warning"-->
+<!--              icon="el-icon-refresh"-->
+<!--              circle-->
+<!--              @click.stop="handleChangeWorker(scope.row)"-->
+<!--              v-hasPermi="['system:Order:edit']"-->
+<!--              title="更换师傅"-->
+<!--            ></el-button>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="primary"-->
+<!--              icon="el-icon-edit"-->
+<!--              circle-->
+<!--              @click.stop="handleUpdate(scope.row)"-->
+<!--              v-hasPermi="['system:Order:edit']"-->
+<!--              title="编辑"-->
+<!--            ></el-button>-->
+
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="primary"-->
+<!--              icon="el-icon-view"-->
+<!--              @click.stop="handleViewOrderDetail(scope.row)"-->
+<!--              v-hasPermi="['system:Order:edit']"-->
+<!--              title="查看详情"-->
+<!--            >查看详情</el-button>-->
             <el-button
               size="mini"
               type="info"
               icon="el-icon-document"
-              @click="handleOrderDetail(scope.row)"
+              @click.stop="handleOrderDetail(scope.row)"
               v-hasPermi="['system:Order:edit']"
+              title="订单明细"
             >订单明细</el-button>
+
             <el-button
               size="mini"
               type="danger"
               icon="el-icon-delete"
               circle
-              @click="handleDelete(scope.row)"
+              @click.stop="handleDelete(scope.row)"
               v-hasPermi="['system:Order:remove']"
+              title="删除"
             ></el-button>
             <el-dropdown trigger="click" @command="(command) => handleCommand(command, scope.row)">
               <el-button
@@ -390,8 +408,9 @@
         <template slot-scope="scope">
           <el-button
             type="text"
-            @click="handleViewFiles(scope.row)"
+            @click.stop="handleViewFiles(scope.row)"
             v-if="scope.row.fileData"
+            title="查看附件"
           >查看附件</el-button>
           <span v-else>无</span>
         </template>
@@ -410,24 +429,24 @@
     <el-drawer :title="title" :visible.sync="open" size="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="订单号" prop="orderId">
-              <el-input v-model="form.orderId" placeholder="请输入订单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="微信支付单号" prop="transactionId">
-              <el-input v-model="form.transactionId" placeholder="请输入微信支付单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="下单类型" prop="createType">
-              <el-radio-group v-model="form.createType">
-                <el-radio :label="1">自主下单</el-radio>
-                <el-radio :label="2">后台下单</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="订单号" prop="orderId">-->
+<!--              <el-input v-model="form.orderId" placeholder="请输入订单号" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="微信支付单号" prop="transactionId">-->
+<!--              <el-input v-model="form.transactionId" placeholder="请输入微信支付单号" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="下单类型" prop="createType">-->
+<!--              <el-radio-group v-model="form.createType">-->
+<!--                <el-radio :label="1">自主下单</el-radio>-->
+<!--                <el-radio :label="2">后台下单</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <!-- 自主下单表单项 -->
           <template v-if="form.createType === 1">
@@ -491,7 +510,7 @@
 
           <!-- 共同表单项 -->
           <el-col :span="24">
-            <el-form-item label="商品" prop="productId">
+            <el-form-item label="服务" prop="productId">
               <el-select v-model="form.productId" placeholder="请选择商品" clearable filterable style="width: 100%">
                 <el-option
                   v-for="item in goodsDataList"
@@ -507,103 +526,103 @@
               <el-input-number v-model="form.num" :min="1" style="width: 120px;" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="总价" prop="totalPrice">
-              <el-input v-model="form.totalPrice" placeholder="请输入总价" prefix-icon="el-icon-money" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="支付金额" prop="payPrice">
-              <el-input v-model="form.payPrice" placeholder="请输入支付金额" prefix-icon="el-icon-money" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="抵扣金额" prop="deduction">
-              <el-input v-model="form.deduction" placeholder="请输入抵扣金额" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="支付时间" prop="payTime">
-              <el-date-picker clearable v-model="form.payTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择支付时间" style="width:100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="订单状态" prop="status">
-              <el-radio-group v-model="form.status" @change="handleStatusChange">
-                <el-radio :label="1">待接单</el-radio>
-                <el-radio :label="2">待服务</el-radio>
-                <el-radio :label="3">服务中</el-radio>
-                <el-radio :label="4">已结束</el-radio>
-                <el-radio :label="5">已取消</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="总价" prop="totalPrice">-->
+<!--              <el-input v-model="form.totalPrice" placeholder="请输入总价" prefix-icon="el-icon-money" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="支付金额" prop="payPrice">-->
+<!--              <el-input v-model="form.payPrice" placeholder="请输入支付金额" prefix-icon="el-icon-money" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="抵扣金额" prop="deduction">-->
+<!--              <el-input v-model="form.deduction" placeholder="请输入抵扣金额" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="支付时间" prop="payTime">-->
+<!--              <el-date-picker clearable v-model="form.payTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择支付时间" style="width:100%" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="订单状态" prop="status">-->
+<!--              <el-radio-group v-model="form.status" @change="handleStatusChange">-->
+<!--                <el-radio :label="1">待接单</el-radio>-->
+<!--                <el-radio :label="2">待服务</el-radio>-->
+<!--                <el-radio :label="3">服务中</el-radio>-->
+<!--                <el-radio :label="4">已结束</el-radio>-->
+<!--                <el-radio :label="5">已取消</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <!-- 服务进度选项 - 待服务状态 -->
-          <el-col :span="24" v-if="form.status === 2">
-            <el-form-item label="服务进度" prop="jsonStatus">
-              <el-radio-group v-model="form.jsonStatus" @change="handlejsonStatusChange">
-                <el-radio :label="1">派单</el-radio>
-                <el-radio :label="2">接单</el-radio>
-                <el-radio :label="3">设置上门</el-radio>
-                <el-radio :label="4">出发上门</el-radio>
-                <el-radio :label="5">确认到达</el-radio>
-                <el-radio :label="6">项目报价</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+<!--          &lt;!&ndash; 服务进度选项 - 待服务状态 &ndash;&gt;-->
+<!--          <el-col :span="24" v-if="form.status === 2">-->
+<!--            <el-form-item label="服务进度" prop="jsonStatus">-->
+<!--              <el-radio-group v-model="form.jsonStatus" @change="handlejsonStatusChange">-->
+<!--                <el-radio :label="1">派单</el-radio>-->
+<!--                <el-radio :label="2">接单</el-radio>-->
+<!--                <el-radio :label="3">设置上门</el-radio>-->
+<!--                <el-radio :label="4">出发上门</el-radio>-->
+<!--                <el-radio :label="5">确认到达</el-radio>-->
+<!--                <el-radio :label="6">项目报价</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <!-- 服务进度选项 - 服务中状态 -->
-          <el-col :span="24" v-if="form.status === 3">
-            <el-form-item label="服务进度" prop="jsonStatus">
-              <el-radio-group v-model="form.jsonStatus" @change="handlejsonStatusChange">
-                <el-radio :label="7">开始服务</el-radio>
-                <el-radio :label="8">暂停</el-radio>
-                <el-radio :label="9">完成服务</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="24" v-if="form.status === 3">-->
+<!--            <el-form-item label="服务进度" prop="jsonStatus">-->
+<!--              <el-radio-group v-model="form.jsonStatus" @change="handlejsonStatusChange">-->
+<!--                <el-radio :label="7">开始服务</el-radio>-->
+<!--                <el-radio :label="8">暂停</el-radio>-->
+<!--                <el-radio :label="9">完成服务</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <!-- 服务进度选项 - 已取消状态 -->
-          <el-col :span="24" v-if="form.status === 5">
-            <el-form-item label="取消原因" prop="jsonStatus">
-              <el-radio-group v-model="form.jsonStatus" @change="handlejsonStatusChange">
-                <el-radio :label="10">用户取消</el-radio>
-                <el-radio :label="11">师傅取消</el-radio>
-                <el-radio :label="12">系统取消</el-radio>
-                <el-radio :label="13">超时取消</el-radio>
-                <el-radio :label="14">其他原因</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+<!--          &lt;!&ndash; 服务进度选项 - 已取消状态 &ndash;&gt;-->
+<!--          <el-col :span="24" v-if="form.status === 5">-->
+<!--            <el-form-item label="取消原因" prop="jsonStatus">-->
+<!--              <el-radio-group v-model="form.jsonStatus" @change="handlejsonStatusChange">-->
+<!--                <el-radio :label="10">用户取消</el-radio>-->
+<!--                <el-radio :label="11">师傅取消</el-radio>-->
+<!--                <el-radio :label="12">系统取消</el-radio>-->
+<!--                <el-radio :label="13">超时取消</el-radio>-->
+<!--                <el-radio :label="14">其他原因</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <!-- 设置上门费内容 -->
-          <template v-if="form.jsonStatus === 3">
-            <el-col :span="24">
-              <el-form-item label="上门费" prop="orderLog.price">
-                <el-input v-model="form.orderLog.price" type="number" placeholder="请输入上门费" prefix-icon="el-icon-money">
-                  <template slot="prepend">￥</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
+<!--          <template v-if="form.jsonStatus === 3">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="上门费" prop="orderLog.price">-->
+<!--                <el-input v-model="form.orderLog.price" type="number" placeholder="请输入上门费" prefix-icon="el-icon-money">-->
+<!--                  <template slot="prepend">￥</template>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
 
-          </template>
+<!--          </template>-->
 
           <!-- 派单内容 -->
-          <template v-if="form.jsonStatus === 1">
-          <el-col :span="24">
-              <el-form-item label="师傅" prop="orderLog.workerId">
-                <user-select
-                  v-model="form.orderLog.workerId"
-                  placeholder="请选择师傅"
-                  user-type="2"
-                  dialog-title="选择师傅"
-                />
-              </el-form-item>
-            </el-col>
+<!--          <template v-if="form.jsonStatus === 1">-->
+<!--          <el-col :span="24">-->
+<!--              <el-form-item label="师傅" prop="orderLog.workerId">-->
+<!--                <user-select-->
+<!--                  v-model="form.orderLog.workerId"-->
+<!--                  placeholder="请选择师傅"-->
+<!--                  user-type="2"-->
+<!--                  dialog-title="选择师傅"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
-          </template>
+<!--          </template>-->
 
           <!-- 接单内容
           <template v-if="form.jsonStatus === 2">
@@ -626,401 +645,393 @@
             <!-- 出发上门内容 -->
 
 
-          <!-- 项目报价内容 -->
-          <template v-if="form.jsonStatus === 6">
-            <el-col :span="24">
-              <el-form-item label="项目费用" prop="price">
-                <el-input
-                  v-model="form.price"
-                  type="number"
-                  placeholder="请输入项目费用"
-                  @change="handlePriceChange"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="基础项目" prop="baseProject">
-                <el-select
-                  v-model="form.baseProject"
-                  multiple
-                  collapse-tags
-                  placeholder="请选择基础项目"
-                  style="width: 100%"
-                  @change="handleBaseProjectChange"
-                >
-                  <el-option
-                    v-for="item in baseProjectList"
-                    :key="item"
-                    :label="item"
-                    :value="item"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="服务项目" prop="serviceItems">
-                <div class="service-items">
-                  <div v-for="(item, index) in form.serviceItems" :key="index" class="service-item">
-                    <el-select
-                      v-model="item.id"
-                      placeholder="选择项目"
-                      style="width: 40%; margin-right: 10px;"
-                      @change="(val) => handleServiceItemChange(val, index)"
-                    >
-                      <el-option
-                        v-for="option in quoteCraftList"
-                        :key="option.id"
-                        :label="option.title+'--('+option.price+'元/'+option.unit+')'"
-                        :value="option.id"
-                      />
-                    </el-select>
-                    <el-input-number
-                      v-model="item.quantity"
-                      :min="1"
-                      placeholder="数量"
-                      style="width: 25%; margin-right: 10px;"
-                      @change="handleQuantityChange"
-                    />
-                    <el-button type="danger" icon="el-icon-delete" circle @click="removeServiceItem(index)" />
-                  </div>
-                  <el-button type="primary" icon="el-icon-plus" @click="addServiceItem">新增服务项目</el-button>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="服务项目合计" prop="servicePrice">
-                <el-input
-                  v-model="form.servicePrice"
-                  type="number"
-                  placeholder="服务项目合计金额"
-                  :disabled="true"
-                  prefix-icon="el-icon-money"
-                >
-                  <template slot="prepend">￥</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="物料" prop="materials">
-                <div class="materials">
-                  <div v-for="(item, index) in form.materials" :key="index" class="material-item">
-                    <el-select
-                      v-model="item.id"
-                      placeholder="选择物料"
-                      style="width: 40%; margin-right: 10px;"
-                      @change="(val) => handleMaterialChange(val, index)"
-                    >
-                      <el-option
-                        v-for="option in quoteMaterialList"
-                        :key="option.id"
-                        :label="option.title+'--('+option.price+'元/'+option.unit+')'"
-                        :value="option.id"
-                      />
-                    </el-select>
-                    <el-input-number
-                      v-model="item.quantity"
-                      :min="1"
-                      placeholder="数量"
-                      style="width: 25%; margin-right: 10px;"
-                      @change="handleQuantityChange"
-                    />
-                    <el-button type="danger" icon="el-icon-delete" circle @click="removeMaterial(index)" />
-                  </div>
-                  <el-button type="primary" icon="el-icon-plus" @click="addMaterial">新增物料</el-button>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="物料合计" prop="goodPrice">
-                <el-input
-                  v-model="form.goodPrice"
-                  type="number"
-                  placeholder="物料合计金额"
-                  :disabled="true"
-                  prefix-icon="el-icon-money"
-                >
-                  <template slot="prepend">￥</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="付款方式" prop="paymentMethod">
-                <el-radio-group v-model="form.paymentMethod" @change="handlePaymentMethodChange">
-                  <el-radio :label="1">定金+尾款</el-radio>
-                  <el-radio :label="2">一次性付清</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <!-- 只在选择定金+尾款时显示定金输入框 -->
-            <el-col :span="24" v-if="form.paymentMethod === 1">
-              <el-form-item label="定金" prop="orderLog.deposit">
-                <el-input
-                  v-model="form.orderLog.deposit"
-                  type="number"
-                  placeholder="请输入定金金额"
-                  @change="handleDepositChange"
-                >
-                  <template slot="prepend">￥</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </template>
+<!--          &lt;!&ndash; 项目报价内容 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 6">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="项目费用" prop="price">-->
+<!--                <el-input-->
+<!--                  v-model="form.price"-->
+<!--                  type="number"-->
+<!--                  placeholder="请输入项目费用"-->
+<!--                  @change="handlePriceChange"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="基础项目" prop="baseProject">-->
+<!--                <el-select-->
+<!--                  v-model="form.baseProject"-->
+<!--                  multiple-->
+<!--                  collapse-tags-->
+<!--                  placeholder="请选择基础项目"-->
+<!--                  style="width: 100%"-->
+<!--                  @change="handleBaseProjectChange"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in baseProjectList"-->
+<!--                    :key="item"-->
+<!--                    :label="item"-->
+<!--                    :value="item"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="服务项目" prop="serviceItems">-->
+<!--                <div class="service-items">-->
+<!--                  <div v-for="(item, index) in form.serviceItems" :key="index" class="service-item">-->
+<!--                    <el-select-->
+<!--                      v-model="item.id"-->
+<!--                      placeholder="选择项目"-->
+<!--                      style="width: 40%; margin-right: 10px;"-->
+<!--                      @change="(val) => handleServiceItemChange(val, index)"-->
+<!--                    >-->
+<!--                      <el-option-->
+<!--                        v-for="option in quoteCraftList"-->
+<!--                        :key="option.id"-->
+<!--                        :label="option.title+'&#45;&#45;('+option.price+'元/'+option.unit+')'"-->
+<!--                        :value="option.id"-->
+<!--                      />-->
+<!--                    </el-select>-->
+<!--                    <el-input-number-->
+<!--                      v-model="item.quantity"-->
+<!--                      :min="1"-->
+<!--                      placeholder="数量"-->
+<!--                      style="width: 25%; margin-right: 10px;"-->
+<!--                      @change="handleQuantityChange"-->
+<!--                    />-->
+<!--                    <el-button type="danger" icon="el-icon-delete" circle @click="removeServiceItem(index)" />-->
+<!--                  </div>-->
+<!--                  <el-button type="primary" icon="el-icon-plus" @click="addServiceItem">新增服务项目</el-button>-->
+<!--                </div>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="服务项目合计" prop="servicePrice">-->
+<!--                <el-input-->
+<!--                  v-model="form.servicePrice"-->
+<!--                  type="number"-->
+<!--                  placeholder="服务项目合计金额"-->
+<!--                  :disabled="true"-->
+<!--                  prefix-icon="el-icon-money"-->
+<!--                >-->
+<!--                  <template slot="prepend">￥</template>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="物料" prop="materials">-->
+<!--                <div class="materials">-->
+<!--                  <div v-for="(item, index) in form.materials" :key="index" class="material-item">-->
+<!--                    <el-select-->
+<!--                      v-model="item.id"-->
+<!--                      placeholder="选择物料"-->
+<!--                      style="width: 40%; margin-right: 10px;"-->
+<!--                      @change="(val) => handleMaterialChange(val, index)"-->
+<!--                    >-->
+<!--                      <el-option-->
+<!--                        v-for="option in quoteMaterialList"-->
+<!--                        :key="option.id"-->
+<!--                        :label="option.title+'&#45;&#45;('+option.price+'元/'+option.unit+')'"-->
+<!--                        :value="option.id"-->
+<!--                      />-->
+<!--                    </el-select>-->
+<!--                    <el-input-number-->
+<!--                      v-model="item.quantity"-->
+<!--                      :min="1"-->
+<!--                      placeholder="数量"-->
+<!--                      style="width: 25%; margin-right: 10px;"-->
+<!--                      @change="handleQuantityChange"-->
+<!--                    />-->
+<!--                    <el-button type="danger" icon="el-icon-delete" circle @click="removeMaterial(index)" />-->
+<!--                  </div>-->
+<!--                  <el-button type="primary" icon="el-icon-plus" @click="addMaterial">新增物料</el-button>-->
+<!--                </div>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="物料合计" prop="goodPrice">-->
+<!--                <el-input-->
+<!--                  v-model="form.goodPrice"-->
+<!--                  type="number"-->
+<!--                  placeholder="物料合计金额"-->
+<!--                  :disabled="true"-->
+<!--                  prefix-icon="el-icon-money"-->
+<!--                >-->
+<!--                  <template slot="prepend">￥</template>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="付款方式" prop="paymentMethod">-->
+<!--                <el-radio-group v-model="form.paymentMethod" @change="handlePaymentMethodChange">-->
+<!--                  <el-radio :label="1">定金+尾款</el-radio>-->
+<!--                  <el-radio :label="2">一次性付清</el-radio>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            &lt;!&ndash; 只在选择定金+尾款时显示定金输入框 &ndash;&gt;-->
+<!--            <el-col :span="24" v-if="form.paymentMethod === 1">-->
+<!--              <el-form-item label="定金" prop="orderLog.deposit">-->
+<!--                <el-input-->
+<!--                  v-model="form.orderLog.deposit"-->
+<!--                  type="number"-->
+<!--                  placeholder="请输入定金金额"-->
+<!--                  @change="handleDepositChange"-->
+<!--                >-->
+<!--                  <template slot="prepend">￥</template>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </template>-->
 
-          <!-- 开始服务内容 -->
-          <template v-if="form.jsonStatus === 7">
-            <el-col :span="24">
-              <el-form-item label="服务照片" prop="servicePhotos">
-                <el-upload
-                  class="upload-demo"
-                  action="#"
-                  :auto-upload="false"
-                  :on-change="handlePhotoChange"
-                  :file-list="form.servicePhotos"
-                  list-type="picture-card"
-                  multiple
-                >
-                  <i class="el-icon-plus"></i>
-                  <div slot="tip" class="el-upload__tip">可将文件拖到这里</div>
-                </el-upload>
-              </el-form-item>
-            </el-col>
+<!--          &lt;!&ndash; 开始服务内容 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 7">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="服务照片" prop="servicePhotos">-->
+<!--                <el-upload-->
+<!--                  class="upload-demo"-->
+<!--                  action="#"-->
+<!--                  :auto-upload="false"-->
+<!--                  :on-change="handlePhotoChange"-->
+<!--                  :file-list="form.servicePhotos"-->
+<!--                  list-type="picture-card"-->
+<!--                  multiple-->
+<!--                >-->
+<!--                  <i class="el-icon-plus"></i>-->
+<!--                  <div slot="tip" class="el-upload__tip">可将文件拖到这里</div>-->
+<!--                </el-upload>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
-          </template>
+<!--          </template>-->
 
-          <!-- 暂停内容 -->
-          <template v-if="form.jsonStatus === 8">
-            <el-col :span="24">
-              <el-form-item label="服务照片" prop="servicePhotos">
-                <el-upload
-                  class="upload-demo"
-                  action="#"
-                  :auto-upload="false"
-                  :on-change="handlePhotoChange"
-                  :file-list="form.servicePhotos"
-                  list-type="picture-card"
-                  multiple
-                >
-                  <i class="el-icon-plus"></i>
-                  <div slot="tip" class="el-upload__tip">可将文件拖到这里</div>
-                </el-upload>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="暂停原因" prop="pauseReason">
-                <el-input
-                  v-model="form.pauseReason"
-                  type="textarea"
-                  placeholder="请输入暂停原因"
-                  @change="handlePauseServiceData"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="下次服务时间" prop="nextServiceTime">
-                <el-date-picker
-                  v-model="form.nextServiceTime"
-                  type="datetime"
-                  placeholder="选择下次服务时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  style="width: 100%"
-                  @change="handlePauseServiceData"
-                />
-              </el-form-item>
-            </el-col>
+<!--          &lt;!&ndash; 暂停内容 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 8">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="服务照片" prop="servicePhotos">-->
+<!--                <el-upload-->
+<!--                  class="upload-demo"-->
+<!--                  action="#"-->
+<!--                  :auto-upload="false"-->
+<!--                  :on-change="handlePhotoChange"-->
+<!--                  :file-list="form.servicePhotos"-->
+<!--                  list-type="picture-card"-->
+<!--                  multiple-->
+<!--                >-->
+<!--                  <i class="el-icon-plus"></i>-->
+<!--                  <div slot="tip" class="el-upload__tip">可将文件拖到这里</div>-->
+<!--                </el-upload>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="暂停原因" prop="pauseReason">-->
+<!--                <el-input-->
+<!--                  v-model="form.pauseReason"-->
+<!--                  type="textarea"-->
+<!--                  placeholder="请输入暂停原因"-->
+<!--                  @change="handlePauseServiceData"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="下次服务时间" prop="nextServiceTime">-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.nextServiceTime"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="选择下次服务时间"-->
+<!--                  value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  style="width: 100%"-->
+<!--                  @change="handlePauseServiceData"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
-          </template>
+<!--          </template>-->
 
-          <!-- 完成服务内容 -->
-          <template v-if="form.jsonStatus === 9">
-            <el-col :span="24">
-              <el-form-item label="服务照片" prop="servicePhotos">
-                <el-upload
-                  class="upload-demo"
-                  action="#"
-                  :auto-upload="false"
-                  :on-change="handlePhotoChange"
-                  :file-list="form.servicePhotos"
-                  list-type="picture-card"
-                  multiple
-                >
-                  <i class="el-icon-plus"></i>
-                  <div slot="tip" class="el-upload__tip">可将文件拖到这里</div>
-                </el-upload>
-              </el-form-item>
-            </el-col>
+<!--          &lt;!&ndash; 完成服务内容 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 9">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="服务照片" prop="servicePhotos">-->
+<!--                <el-upload-->
+<!--                  class="upload-demo"-->
+<!--                  action="#"-->
+<!--                  :auto-upload="false"-->
+<!--                  :on-change="handlePhotoChange"-->
+<!--                  :file-list="form.servicePhotos"-->
+<!--                  list-type="picture-card"-->
+<!--                  multiple-->
+<!--                >-->
+<!--                  <i class="el-icon-plus"></i>-->
+<!--                  <div slot="tip" class="el-upload__tip">可将文件拖到这里</div>-->
+<!--                </el-upload>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
-          </template>
+<!--          </template>-->
 
-          <!-- 取消订单内容 - 用户取消 -->
-          <template v-if="form.jsonStatus === 10">
-            <el-col :span="24">
-              <el-form-item label="取消时间" prop="cancelTime">
-                <el-date-picker
-                  v-model="form.cancelTime"
-                  type="datetime"
-                  placeholder="选择取消时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  style="width: 100%"
-                  @change="handleCancelData"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="取消原因" prop="cancelReason">
-                <el-select v-model="form.cancelReason" placeholder="请选择取消原因" @change="handleCancelData">
-                  <el-option label="不需要服务了" value="不需要服务了" />
-                  <el-option label="服务时间不合适" value="服务时间不合适" />
-                  <el-option label="价格问题" value="价格问题" />
-                  <el-option label="找到其他师傅" value="找到其他师傅" />
-                  <el-option label="其他原因" value="其他原因" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </template>
+<!--          &lt;!&ndash; 取消订单内容 - 用户取消 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 10">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="取消时间" prop="cancelTime">-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.cancelTime"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="选择取消时间"-->
+<!--                  value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  style="width: 100%"-->
+<!--                  @change="handleCancelData"-->
+<!--                  clearable-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="取消原因" prop="cancelReason">-->
+<!--                <el-select v-model="form.cancelReason" placeholder="请选择取消原因" @change="handleCancelData">-->
+<!--                  <el-option label="不需要服务了" value="不需要服务了" />-->
+<!--                  <el-option label="服务时间不合适" value="服务时间不合适" />-->
+<!--                  <el-option label="价格问题" value="价格问题" />-->
+<!--                  <el-option label="找到其他师傅" value="找到其他师傅" />-->
+<!--                  <el-option label="其他原因" value="其他原因" />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </template>-->
 
-          <!-- 取消订单内容 - 师傅取消 -->
-          <template v-if="form.jsonStatus === 11">
-            <el-col :span="24">
-              <el-form-item label="取消时间" prop="cancelTime">
-                <el-date-picker
-                  v-model="form.cancelTime"
-                  type="datetime"
-                  placeholder="选择取消时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  style="width: 100%"
-                  @change="handleCancelData"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="师傅" prop="orderLog.workerId">
-                <user-select
-                  v-model="form.orderLog.workerId"
-                  placeholder="请选择师傅"
-                  user-type="2"
-                  dialog-title="选择师傅"
-                  @change="handleCancelDataWithWorker"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="取消原因" prop="cancelReason">
-                <el-select v-model="form.cancelReason" placeholder="请选择取消原因" @change="handleCancelData">
-                  <el-option label="时间冲突" value="时间冲突" />
-                  <el-option label="服务范围外" value="服务范围外" />
-                  <el-option label="技术问题无法解决" value="技术问题无法解决" />
-                  <el-option label="客户要求过高" value="客户要求过高" />
-                  <el-option label="其他原因" value="其他原因" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </template>
+<!--          &lt;!&ndash; 取消订单内容 - 师傅取消 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 11">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="取消时间" prop="cancelTime">-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.cancelTime"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="选择取消时间"-->
+<!--                  value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  style="width: 100%"-->
+<!--                  @change="handleCancelData"-->
+<!--                  clearable-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="师傅" prop="orderLog.workerId">-->
+<!--                <user-select-->
+<!--                  v-model="form.orderLog.workerId"-->
+<!--                  placeholder="请选择师傅"-->
+<!--                  user-type="2"-->
+<!--                  dialog-title="选择师傅"-->
+<!--                  @change="handleCancelDataWithWorker"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="取消原因" prop="cancelReason">-->
+<!--                <el-select v-model="form.cancelReason" placeholder="请选择取消原因" @change="handleCancelData">-->
+<!--                  <el-option label="时间冲突" value="时间冲突" />-->
+<!--                  <el-option label="服务范围外" value="服务范围外" />-->
+<!--                  <el-option label="技术问题无法解决" value="技术问题无法解决" />-->
+<!--                  <el-option label="客户要求过高" value="客户要求过高" />-->
+<!--                  <el-option label="其他原因" value="其他原因" />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </template>-->
 
-          <!-- 取消订单内容 - 系统取消 -->
-          <template v-if="form.jsonStatus === 12">
-            <el-col :span="24">
-              <el-form-item label="取消时间" prop="cancelTime">
-                <el-date-picker
-                  v-model="form.cancelTime"
-                  type="datetime"
-                  placeholder="选择取消时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  style="width: 100%"
-                  @change="handleCancelData"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="系统取消原因" prop="cancelReason">
-                <el-select v-model="form.cancelReason" placeholder="请选择系统取消原因" @change="handleCancelData">
-                  <el-option label="支付超时" value="支付超时" />
-                  <el-option label="订单异常" value="订单异常" />
-                  <el-option label="系统维护" value="系统维护" />
-                  <el-option label="风控拦截" value="风控拦截" />
-                  <el-option label="其他系统原因" value="其他系统原因" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </template>
+<!--          &lt;!&ndash; 取消订单内容 - 系统取消 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 12">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="取消时间" prop="cancelTime">-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.cancelTime"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="选择取消时间"-->
+<!--                  value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  style="width: 100%"-->
+<!--                  @change="handleCancelData"-->
+<!--                  clearable-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="系统取消原因" prop="cancelReason">-->
+<!--                <el-select v-model="form.cancelReason" placeholder="请选择系统取消原因" @change="handleCancelData">-->
+<!--                  <el-option label="支付超时" value="支付超时" />-->
+<!--                  <el-option label="订单异常" value="订单异常" />-->
+<!--                  <el-option label="系统维护" value="系统维护" />-->
+<!--                  <el-option label="风控拦截" value="风控拦截" />-->
+<!--                  <el-option label="其他系统原因" value="其他系统原因" />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </template>-->
 
-          <!-- 取消订单内容 - 超时取消 -->
-          <template v-if="form.jsonStatus === 13">
-            <el-col :span="24">
-              <el-form-item label="取消时间" prop="cancelTime">
-                <el-date-picker
-                  v-model="form.cancelTime"
-                  type="datetime"
-                  placeholder="选择取消时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  style="width: 100%"
-                  @change="handleCancelData"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="超时类型" prop="cancelReason">
-                <el-select v-model="form.cancelReason" placeholder="请选择超时类型" @change="handleCancelData">
-                  <el-option label="接单超时" value="接单超时" />
-                  <el-option label="服务超时" value="服务超时" />
-                  <el-option label="支付超时" value="支付超时" />
-                  <el-option label="响应超时" value="响应超时" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="超时时长" prop="timeoutDuration">
-                <el-input v-model="form.timeoutDuration" placeholder="请输入超时时长(分钟)" type="number" @change="handleCancelData">
-                  <template slot="append">分钟</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </template>
+<!--          &lt;!&ndash; 取消订单内容 - 超时取消 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 13">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="取消时间" prop="cancelTime">-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.cancelTime"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="选择取消时间"-->
+<!--                  value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  style="width: 100%"-->
+<!--                  @change="handleCancelData"-->
+<!--                  clearable-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="超时类型" prop="cancelReason">-->
+<!--                <el-select v-model="form.cancelReason" placeholder="请选择超时类型" @change="handleCancelData">-->
+<!--                  <el-option label="接单超时" value="接单超时" />-->
+<!--                  <el-option label="服务超时" value="服务超时" />-->
+<!--                  <el-option label="支付超时" value="支付超时" />-->
+<!--                  <el-option label="响应超时" value="响应超时" />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="超时时长" prop="timeoutDuration">-->
+<!--                <el-input v-model="form.timeoutDuration" placeholder="请输入超时时长(分钟)" type="number" @change="handleCancelData">-->
+<!--                  <template slot="append">分钟</template>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </template>-->
+
+<!--          &lt;!&ndash; 取消订单内容 - 其他原因 &ndash;&gt;-->
+<!--          <template v-if="form.jsonStatus === 14">-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="取消时间" prop="cancelTime">-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.cancelTime"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="选择取消时间"-->
+<!--                  value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  style="width: 100%"-->
+<!--                  @change="handleCancelData"-->
+<!--                  clearable-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="24">-->
+<!--              <el-form-item label="详细原因" prop="cancelReason">-->
+<!--                <el-input-->
+<!--                  v-model="form.cancelReason"-->
+<!--                  type="textarea"-->
+<!--                  placeholder="请输入具体的取消原因"-->
+<!--                  :rows="3"-->
+<!--                  @change="handleCancelData"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </template>-->
 
-          <!-- 取消订单内容 - 其他原因 -->
-          <template v-if="form.jsonStatus === 14">
-            <el-col :span="24">
-              <el-form-item label="取消时间" prop="cancelTime">
-                <el-date-picker
-                  v-model="form.cancelTime"
-                  type="datetime"
-                  placeholder="选择取消时间"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  style="width: 100%"
-                  @change="handleCancelData"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="详细原因" prop="cancelReason">
-                <el-input
-                  v-model="form.cancelReason"
-                  type="textarea"
-                  placeholder="请输入具体的取消原因"
-                  :rows="3"
-                  @change="handleCancelData"
-                />
-              </el-form-item>
-            </el-col>
-          </template>
-          <el-col :span="24">
-              <el-form-item label="备注" prop="mark">
-                <el-input
-                  v-model="form.mark"
-                  type="textarea"
-                  placeholder="请输入备注"
-                />
-              </el-form-item>
-            </el-col>
           <el-col :span="24">
               <el-form-item label="预约时间" prop="makeTime">
                 <el-date-picker
@@ -1044,25 +1055,26 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <el-col :span="24">
+            <el-form-item label="备注" prop="mark">
+              <el-input
+                v-model="form.mark"
+                type="textarea"
+                placeholder="请输入备注"
+              />
+            </el-form-item>
+          </el-col>
           <!-- 附件上传 -->
           <el-col :span="24">
             <el-form-item label="附件" prop="fileData">
-              <el-upload
-                ref="upload"
-                action="/api/public/upload/file"
-                :file-list="fileList"
-                :on-preview="handleFilePreview"
-                :on-remove="handleFileRemove"
-                :on-success="handleFileSuccess"
-                :before-upload="beforeFileUpload"
-                :on-exceed="handleFileExceed"
-                multiple
+              <image-upload
+                v-model="form.fileData"
+                :multiple="true"
                 :limit="9"
-                list-type="picture-card"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
+                :file-size="10"
+                :file-type="['png', 'jpg', 'jpeg', 'gif', 'bmp', 'webp', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'txt', 'mp4', 'avi', 'mov', 'wmv', 'flv']"
+                :is-show-tip="true"
+              />
             </el-form-item>
           </el-col>
 
@@ -1074,19 +1086,7 @@
       </el-form>
     </el-drawer>
 
-    <!-- 图片预览弹窗 -->
-    <el-dialog :visible.sync="previewVisible" append-to-body>
-      <img width="100%" :src="previewUrl" alt="">
-    </el-dialog>
 
-    <!-- 视频预览弹窗 -->
-    <el-dialog :visible.sync="videoPreviewVisible" width="800px" append-to-body>
-      <video
-        :src="videoPreviewUrl"
-        controls
-        style="width: 100%; max-height: 600px;"
-      ></video>
-    </el-dialog>
 
     <!-- 通话记录弹窗 -->
     <call-record
@@ -1139,24 +1139,24 @@
       width="600px"
       append-to-body
     >
-      <div v-if="fileList.length === 0" style="text-align:center;color:#bbb;">暂无附件</div>
+      <div v-if="viewFilesList.length === 0" style="text-align:center;color:#bbb;">暂无附件</div>
       <div v-else class="file-preview-list" style="display:flex;flex-wrap:wrap;gap:16px;">
-        <div v-for="(url, idx) in fileList" :key="idx" style="width:260px;">
-          <template v-if="isImage(url)">
+        <div v-for="(file, idx) in viewFilesList" :key="idx" style="width:260px;">
+          <template v-if="isImage(file.url)">
             <el-image
-              :src="url"
-              :preview-src-list="imageListOnly"
-              :initial-index="imageListOnly.indexOf(url)"
+              :src="file.url"
+              :preview-src-list="imageUrlList"
+              :initial-index="imageUrlList.indexOf(file.url)"
               style="width: 240px; height: 160px; object-fit:contain; border:1px solid #eee;"
             />
             <div style="text-align:center;font-size:12px;color:#888;">图片</div>
           </template>
-          <template v-else-if="isVideo(url)">
-            <video :src="url" controls style="width: 240px; height: 160px; background:#000;" preload="metadata" />
+          <template v-else-if="isVideo(file.url)">
+            <video :src="file.url" controls style="width: 240px; height: 160px; background:#000;" preload="metadata" />
             <div style="text-align:center;font-size:12px;color:#888;">视频</div>
           </template>
           <template v-else>
-            <a :href="url" target="_blank">未知类型，点击打开</a>
+            <a :href="file.url" target="_blank">未知类型，点击打开</a>
           </template>
         </div>
       </div>
@@ -1396,7 +1396,7 @@
                             v-if="record.type === 1.1"
                             type="warning"
                             size="small"
-                            @click="handleChangeWorker(record)"
+                            @click="handleChangeWorkerFromTimeline(record)"
                             style="margin-right: 8px;"
                           >
                             <i class="el-icon-refresh"></i>
@@ -1664,6 +1664,196 @@
       </div>
     </el-dialog>
 
+    <!-- 更换师傅弹窗 -->
+    <el-dialog
+      title="更换师傅"
+      :visible.sync="changeWorkerDialogVisible"
+      width="800px"
+      append-to-body
+      @open="onChangeWorkerDialogOpen"
+    >
+      <!-- 调试信息 -->
+      <div style="background: #f0f9ff; padding: 10px; margin-bottom: 15px; border-radius: 4px;">
+        <p><strong>调试信息:</strong></p>
+        <p>弹窗可见性: {{ changeWorkerDialogVisible }}</p>
+        <p>订单ID: {{ changeWorkerForm.orderId }}</p>
+        <p>客户姓名: {{ changeWorkerForm.name }}</p>
+        <p>当前师傅: {{ changeWorkerForm.currentWorkerName }}</p>
+      </div>
+
+      <!-- 当前师傅信息 -->
+      <div v-if="changeWorkerForm.currentWorkerName" class="current-worker-banner">
+        <el-alert
+          :title="`当前师傅: ${changeWorkerForm.currentWorkerName}`"
+          type="info"
+          :closable="false"
+          show-icon
+        />
+      </div>
+
+      <!-- 已选择新师傅提示 -->
+      <div v-if="changeWorkerForm.newWorkerName" class="selected-worker-banner">
+        <el-alert
+          :title="`已选择新师傅: ${changeWorkerForm.newWorkerName}`"
+          type="success"
+          :closable="false"
+          show-icon
+        />
+      </div>
+
+      <div class="change-worker-content">
+        <!-- 订单信息 -->
+        <div class="order-info-section">
+          <h4>订单信息</h4>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <div class="info-item">
+                <label>订单号：</label>
+                <span>{{ changeWorkerForm.orderId }}</span>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="info-item">
+                <label>客户姓名：</label>
+                <span>{{ changeWorkerForm.name }}</span>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="info-item">
+                <label>联系电话：</label>
+                <span>{{ changeWorkerForm.phone }}</span>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="info-item">
+                <label>服务地址：</label>
+                <span>{{ changeWorkerForm.address }}</span>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="info-item">
+                <label>服务项目：</label>
+                <span>{{ changeWorkerForm.productName }}</span>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="info-item">
+                <label>订单金额：</label>
+                <span class="amount-highlight">￥{{ (changeWorkerForm.payPrice || 0).toFixed(2) }}</span>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+
+        <!-- 选择新师傅 -->
+        <div class="worker-selection-section">
+          <h4>选择新师傅</h4>
+
+          <!-- 搜索条件 -->
+          <el-form :model="changeWorkerQueryParams" :inline="true" style="margin-bottom: 15px;">
+            <el-form-item label="昵称">
+              <el-input
+                v-model="changeWorkerQueryParams.name"
+                placeholder="请输入师傅昵称"
+                clearable
+                style="width: 150px"
+              />
+            </el-form-item>
+            <el-form-item label="电话">
+              <el-input
+                v-model="changeWorkerQueryParams.phone"
+                placeholder="请输入联系电话"
+                clearable
+                style="width: 150px"
+              />
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-select
+                v-model="changeWorkerQueryParams.status"
+                placeholder="请选择状态"
+                clearable
+                style="width: 150px"
+              >
+                <el-option label="启用" :value="1" />
+                <el-option label="禁用" :value="0" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="searchChangeWorkers">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="small" @click="resetChangeWorkerSearch">重置</el-button>
+            </el-form-item>
+          </el-form>
+
+          <!-- 师傅列表 -->
+          <el-table
+            v-loading="changeWorkerLoading"
+            :data="changeWorkerList"
+            border
+            stripe
+            style="width: 100%"
+            height="300"
+            @row-click="selectChangeWorker"
+            highlight-current-row
+          >
+            <el-table-column label="序号" type="index" align="center" width="50" />
+            <el-table-column label="ID" align="center" prop="id" width="60" />
+            <el-table-column label="昵称" align="center" prop="name" width="120" />
+            <el-table-column label="电话" align="center" prop="phone" width="130" />
+            <el-table-column label="头像" align="center" width="80">
+              <template slot-scope="scope">
+                <el-avatar
+                  :size="40"
+                  :src="scope.row.avatar"
+                  icon="el-icon-user"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" align="center" prop="status" width="80">
+              <template slot-scope="scope">
+                <el-tag :type="scope.row.status === 1 ? 'success' : 'info'" size="small">
+                  {{ scope.row.status === 1 ? '启用' : '禁用' }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="120">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="100" fixed="right">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  @click.stop="selectChangeWorker(scope.row)"
+                  :loading="changeWorkerLoading"
+                >选择</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="changeWorkerTotal > 0"
+            :total="changeWorkerTotal"
+            :page.sync="changeWorkerQueryParams.pageNum"
+            :limit.sync="changeWorkerQueryParams.pageSize"
+            @pagination="getChangeWorkerList"
+            style="margin-top: 10px;"
+          />
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="changeWorkerDialogVisible = false">关闭</el-button>
+        <el-button
+          type="primary"
+          @click="confirmChangeWorker"
+          :loading="changeWorkerLoading"
+          :disabled="!changeWorkerForm.newWorkerId"
+        >确认更换</el-button>
+      </div>
+    </el-dialog>
+
     <!-- 查看附件弹窗 -->
     <el-dialog
       title="附件列表"
@@ -1872,11 +2062,25 @@
       @refresh-logs="handleRefreshOrderLogs"
       @export-logs="handleExportOrderLogs"
       @dispatch-order="handleDispatchFromDetail"
+      @change-worker="handleChangeWorkerFromDetail"
       @accept-order="handleAcceptFromDetail"
+      @departure="handleDepartureFromDetail"
+      @confirm-arrival="handleConfirmArrivalFromDetail"
+      @end-order="handleEndOrderFromDetail"
       @start-service="handleStartFromDetail"
+      @project-quote="handleProjectQuoteFromDetail"
       @complete-service="handleCompleteFromDetail"
     />
 
+    <!-- 项目报价弹窗 -->
+    <ProjectQuoteDialog
+      :visible.sync="projectQuoteVisible"
+      :orderId="currentOrderDetail.orderId"
+      :workerId="currentOrderDetail.workerId"
+      :goodId="currentOrderDetail.productId"
+      @submit="handleProjectQuoteSubmit"
+    />
+
     <!-- 退款弹窗 -->
     <el-dialog
       title="退款申请"
@@ -2090,6 +2294,7 @@
 <script>
 import request from "@/utils/request"
 
+
 import {
   listOrder,
   getOrder,
@@ -2124,6 +2329,7 @@ import EditInfo from './components/EditInfo'
 import Pagination from '@/components/Pagination'
 import UnifiedRefundDialog from '../GoodsOrder/UnifiedRefundDialog'
 import OrderDetailDialog from './components/OrderDetailDialog'
+import ProjectQuoteDialog from './components/ProjectQuoteDialog'
 
 export default {
   name: "Order",
@@ -2137,7 +2343,8 @@ export default {
     EditInfo,
     Pagination,
     UnifiedRefundDialog,
-    OrderDetailDialog
+    OrderDetailDialog,
+    ProjectQuoteDialog
   },
   data() {
     return {
@@ -2208,6 +2415,40 @@ export default {
       workerLoading: false,
       // 派单加载状态
       dispatchLoading: false,
+
+      // 更换师傅弹窗可见性
+      changeWorkerDialogVisible: false,
+      // 更换师傅表单数据
+      changeWorkerForm: {
+        id: null,
+        orderId: null,
+        name: null,
+        phone: null,
+        address: null,
+        productName: null,
+        payPrice: null,
+        currentWorkerId: null,
+        currentWorkerName: '',
+        newWorkerId: null,
+        newWorkerName: ''
+      },
+      // 更换师傅查询参数
+      changeWorkerQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: '',
+        phone: '',
+        status: ''
+      },
+      // 更换师傅列表
+      changeWorkerList: [],
+      // 更换师傅总数
+      changeWorkerTotal: 0,
+      // 更换师傅加载状态
+      changeWorkerLoading: false,
+      
+      // 项目报价弹窗
+      projectQuoteVisible: false,
       // 当前编辑的行
       currentEditRow: null,
       currentPhoneEditRow: null,
@@ -2284,6 +2525,7 @@ export default {
         },
         fileData: null, // 添加文件数据字段
       },
+
       // 订单处理表单
       orderProcessForm: {
         id: null,
@@ -2481,11 +2723,8 @@ export default {
       daterangePayTime: [],
       daterangeCreatedAt: [],
       fileDialogVisible: false,
-      fileList: [],
-      previewVisible: false, // 预览弹窗可见性
-      previewUrl: '', // 预览图片URL
-      videoPreviewVisible: false, // 视频预览弹窗可见性
-      videoPreviewUrl: '', // 预览视频URL
+
+
       viewFilesVisible: false, // 查看附件弹窗可见性
       viewFilesList: [], // 查看的文件列表
       imageUrlList: [], // 图片预览列表
@@ -2583,6 +2822,8 @@ export default {
     this.getQuoteCraftList()
     this.getQuoteMaterialList()
 
+
+
     // 初始化完成
   },
   methods: {
@@ -2652,16 +2893,14 @@ export default {
         cancelTime: null, // 重置取消时间
         cancelReason: null, // 重置取消原因
         timeoutDuration: null, // 重置超时时长
-        fileData: null, // 重置文件数据
+        fileData: [], // 重置文件数据为空数组
       }
       // 重置地址列表
       this.addressList = []
       this.addressLoading = false
       this.resetForm("form")
-      if (this.$refs.upload) {
-        this.$refs.upload.clearFiles();
-      }
-      this.fileList = []
+
+
     },
     /** 订单处理按钮操作 */
     handleOrderProcess(row) {
@@ -2700,6 +2939,7 @@ export default {
         userName: row.uname || row.name,
         userPhone: row.phone || row.userPhone,
         productName: row.productName,
+        productId: row.productId,
         num: row.num,
         appointmentTime: row.makeTime ? this.formatAppointmentTime(row.makeTime, row.makeHour) : '未设置',
         appointmentAddress: row.address,
@@ -3283,6 +3523,7 @@ export default {
     handleAdd() {
       this.generateCode()
       this.reset()
+
       // 初始化必要的数组
       this.form.serviceItems = []
       this.form.materials = []
@@ -3295,6 +3536,7 @@ export default {
       this.form.cancelTime = null // 初始化取消时间
       this.form.cancelReason = null // 初始化取消原因
       this.form.timeoutDuration = null // 初始化超时时长
+      this.form.fileData = null // 确保文件数据被重置
       this.form.orderLog = {
         workerId: 1,
         workerName: null,
@@ -3303,6 +3545,9 @@ export default {
         content: "",
         remark: null
       }
+
+
+
       this.open = true
       this.title = "添加服务订单"
     },
@@ -3366,11 +3611,32 @@ export default {
 
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log('编辑按钮被点击，订单ID:', row.id, '订单号:', row.orderId)
       this.reset();
       const id = row.id || this.ids;
       getOrder(id).then(response => {
         this.form = response.data;
 
+        // 处理文件数据：如果 fileData 是字符串，转换为数组格式供 ImageUpload 组件使用
+        if (this.form.fileData && typeof this.form.fileData === 'string') {
+          try {
+            // 尝试解析JSON格式
+            const parsed = JSON.parse(this.form.fileData);
+            if (Array.isArray(parsed)) {
+              this.form.fileData = parsed;
+            } else {
+              // 如果不是数组，按逗号分割
+              this.form.fileData = this.form.fileData.split(',').filter(Boolean);
+            }
+          } catch (e) {
+            // 如果解析失败，按逗号分割
+            this.form.fileData = this.form.fileData.split(',').filter(Boolean);
+          }
+        } else if (!this.form.fileData) {
+          // 如果没有文件数据，初始化为空数组
+          this.form.fileData = [];
+        }
+
         // 确保所有日期字段都有有效值，避免ElDatePicker错误
         const dateFields = [
           'nextServiceTime', 'cancelTime', 'pauseTime', 'departureTime',
@@ -3383,62 +3649,13 @@ export default {
           }
         });
 
-        // 处理文件数据回显
-        if (this.form.fileData) {
-          try {
-            let files;
-            if (typeof this.form.fileData === 'string') {
-              try {
-                files = JSON.parse(this.form.fileData);
-              } catch (e) {
-                files = this.form.fileData.split(',').filter(Boolean);
-              }
-            } else if (Array.isArray(this.form.fileData)) {
-              files = this.form.fileData;
-            } else {
-              files = [];
-            }
 
-            this.fileList = files.map((file, index) => {
-              const url = typeof file === 'string' ? file : file.url;
-              return {
-                name: `附件${index + 1}`,
-                url: url,
-                uid: Date.now() + index,
-              };
-            });
-          } catch (e) {
-            console.error('解析文件数据失败:', e);
-            this.fileList = [];
-          }
-        } else {
-          this.fileList = [];
-              }
         this.open = true;
         this.title = "修改订单";
       });
     },
 
-    // 上传文件后的回显处理
-    handleUploadSuccess(response) {
-      const { url } = response.data;
-      this.fileList.push({ name: url.split('/').pop(), url, uid: Date.now() });
-      this.$message.success('文件上传成功');
-    },
 
-    // 删除文件
-    handleRemove(file) {
-      this.fileList = this.fileList.filter(item => item.uid !== file.uid);
-      this.$message.success('文件已删除');
-    },
-
-    // 提交表单
-    handleSubmit() {
-      const fileData = this.fileList.map(file => file.url).join(',');
-      this.form.fileData = fileData;
-      // 其他表单提交逻辑
-      this.submitForm(this.form);
-    },
 
     /** 提交按钮 */
     submitForm() {
@@ -3467,6 +3684,11 @@ export default {
           // 创建提交数据的副本
           const submitData = { ...this.form }
 
+          // 处理文件数据：如果 fileData 是数组，转换为逗号分隔的字符串
+          if (Array.isArray(submitData.fileData)) {
+            submitData.fileData = submitData.fileData.join(',')
+          }
+
           // 将预约时间转换为时间戳
           if (submitData.makeTime) {
             submitData.makeTime = this.dateToTimestamp(submitData.makeTime)
@@ -4225,7 +4447,6 @@ export default {
       } else if (Array.isArray(row.fileData)) {
         files = row.fileData;
       }
-      this.fileList = files;
       this.fileDialogVisible = true;
     },
     isImage(url) {
@@ -4234,63 +4455,11 @@ export default {
     isVideo(url) {
       return /\.(mp4|avi|mov|wmv|flv|m4v|3gp|rmvb|mkv)$/i.test(url);
     },
-    // 文件上传前的验证
-    beforeFileUpload(file) {
-      // 验证文件类型
-      const isImage = /\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i.test(file.name);
-      const isVideo = /\.(mp4|avi|mov|wmv|flv|m4v|3gp|rmvb|mkv)$/i.test(file.name);
-      if (!isImage && !isVideo) {
-        this.$message.error('只能上传图片或视频文件！');
-        return false;
-      }
-      // 验证文件大小（10MB）
-      const isLt10M = file.size / 1024 / 1024 < 10;
-      if (!isLt10M) {
-        this.$message.error('文件大小不能超过 10MB!');
-        return false;
-      }
-      return true;
-    },
-    // 文件上传成功
-    handleFileSuccess(response, file, fileList) {
-      if (response.code === 200) {
-        this.fileList = fileList;
-        // 更新表单数据
-        this.form.fileData = this.fileList.map(file => file.url || file.response.url).join(',');
-        this.$message.success('上传成功');
-      } else {
-        this.$message.error(response.msg || '上传失败');
-        // 从文件列表中移除上传失败的文件
-        this.fileList = fileList.filter(f => f !== file);
-      }
-    },
-    // 文件删除
-    handleFileRemove(file) {
-      this.fileList = this.fileList.filter(f => f.uid !== file.uid);
-      // 更新表单数据
-      this.form.fileData = this.fileList.map(file => file.url || file.response.url).join(',');
-    },
-    // 文件预览
-    handleFilePreview(file) {
-      const url = file.url || (file.response && file.response.url);
-      if (!url) return;
 
-      // 判断文件类型
-      const isImage = /\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i.test(url);
-      const isVideo = /\.(mp4|avi|mov|wmv|flv|m4v|3gp|rmvb|mkv)$/i.test(url);
 
-      if (isImage) {
-        this.previewUrl = url;
-        this.previewVisible = true;
-      } else if (isVideo) {
-        this.videoPreviewUrl = url;
-        this.videoPreviewVisible = true;
-      }
-    },
-    // 超出文件数量限制
-    handleFileExceed() {
-      this.$message.warning('最多只能上传9个文件！');
-    },
+
+
+
     // 处理查看附件
     handleViewFiles(row) {
       if (!row.fileData) return;
@@ -4636,6 +4805,58 @@ export default {
       });
     },
 
+    // 处理更换师傅
+    handleChangeWorker(row) {
+      console.log('handleChangeWorker 被调用，参数:', row);
+      this.changeWorkerForm = {
+        id: row.id,
+        orderId: row.orderId,
+        name: row.name,
+        phone: row.phone,
+        address: row.address,
+        productName: row.productName,
+        payPrice: row.payPrice,
+        currentWorkerId: row.workerId,
+        currentWorkerName: row.workerName || '未分配',
+        newWorkerId: null,
+        newWorkerName: ''
+      };
+      console.log('设置 changeWorkerForm:', this.changeWorkerForm);
+      this.changeWorkerDialogVisible = true;
+      console.log('设置 changeWorkerDialogVisible:', this.changeWorkerDialogVisible);
+      // 自动加载师傅列表
+      this.getChangeWorkerList();
+    },
+
+    // 从时间轴处理更换师傅
+    handleChangeWorkerFromTimeline(record) {
+      // 从订单详情中获取订单信息
+      const orderInfo = this.orderProcessForm;
+      this.changeWorkerForm = {
+        id: orderInfo.id,
+        orderId: orderInfo.orderId,
+        name: orderInfo.userName,
+        phone: orderInfo.userPhone,
+        address: orderInfo.appointmentAddress,
+        productName: orderInfo.productName,
+        payPrice: orderInfo.payPrice,
+        currentWorkerId: orderInfo.workerId,
+        currentWorkerName: orderInfo.workerName || '未分配',
+        newWorkerId: null,
+        newWorkerName: ''
+      };
+      this.changeWorkerDialogVisible = true;
+      // 自动加载师傅列表
+      this.getChangeWorkerList();
+    },
+
+    // 更换师傅弹窗打开时的回调
+    onChangeWorkerDialogOpen() {
+      console.log('更换师傅弹窗已打开');
+      console.log('changeWorkerForm:', this.changeWorkerForm);
+      console.log('changeWorkerDialogVisible:', this.changeWorkerDialogVisible);
+    },
+
 
 
     // 获取工人列表
@@ -4654,6 +4875,22 @@ export default {
       });
     },
 
+    // 获取更换师傅列表
+    getChangeWorkerList() {
+      this.changeWorkerLoading = true;
+      getCanDoWorkerList(this.changeWorkerQueryParams).then(response => {
+        this.changeWorkerList = response.rows || [];
+        this.changeWorkerTotal = response.total || 0;
+        this.changeWorkerLoading = false;
+      }).catch(error => {
+        console.error('获取师傅列表失败:', error);
+        this.$modal.msgError('获取师傅列表失败');
+        this.changeWorkerList = [];
+        this.changeWorkerTotal = 0;
+        this.changeWorkerLoading = false;
+      });
+    },
+
     // 搜索工人
     searchWorkers() {
       this.workerQueryParams.pageNum = 1;
@@ -4672,6 +4909,24 @@ export default {
       this.getWorkerList();
     },
 
+    // 搜索更换师傅
+    searchChangeWorkers() {
+      this.changeWorkerQueryParams.pageNum = 1;
+      this.getChangeWorkerList();
+    },
+
+    // 重置更换师傅搜索
+    resetChangeWorkerSearch() {
+      this.changeWorkerQueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        name: '',
+        phone: '',
+        status: ''
+      };
+      this.getChangeWorkerList();
+    },
+
 
 
 
@@ -4685,6 +4940,12 @@ export default {
       this.processDispatch(worker);
     },
 
+    // 选择更换师傅
+    selectChangeWorker(worker) {
+      this.changeWorkerForm.newWorkerId = worker.id;
+      this.changeWorkerForm.newWorkerName = worker.name;
+    },
+
 
 
     // 调用派单接口
@@ -4715,8 +4976,52 @@ export default {
       });
     },
 
+    // 确认更换师傅
+    confirmChangeWorker() {
+      if (!this.changeWorkerForm.newWorkerId) {
+        this.$message.error('请先选择新师傅');
+        return;
+      }
+
+      if (this.changeWorkerForm.currentWorkerId === this.changeWorkerForm.newWorkerId) {
+        this.$message.error('新师傅不能与当前师傅相同');
+        return;
+      }
+
+      this.changeWorkerLoading = true;
+
+      // 调用后端更换师傅接口
+      // 这里需要您实现具体的业务逻辑
+      this.processChangeWorker();
+    },
+
+    // 处理更换师傅的业务逻辑
+    processChangeWorker() {
+      // 这个方法需要您根据具体业务需求来实现
+      // 示例参数结构：
+      const params = {
+        orderId: this.changeWorkerForm.id,
+        currentWorkerId: this.changeWorkerForm.currentWorkerId,
+        newWorkerId: this.changeWorkerForm.newWorkerId,
+        changeReason: '后台手动更换师傅', // 可以根据需要添加更换原因
+        changeTime: new Date().toISOString()
+      };
+
+      // 这里调用您的后端接口
+      // 例如：changeOrderWorker(params).then(...)
+
+      // 模拟成功响应
+      setTimeout(() => {
+        this.$modal.msgSuccess(`更换师傅成功！新师傅：${this.changeWorkerForm.newWorkerName}`);
+        this.changeWorkerDialogVisible = false;
+        this.getList(); // 刷新订单列表
+        this.changeWorkerLoading = false;
+      }, 1000);
+    },
+
     /** 查看订单详情 */
     handleViewOrderDetail(row) {
+      console.log('查看详情按钮被点击，订单ID:', row.id, '订单号:', row.orderId)
       this.orderProcessForm = {
         id: row.id,
         orderId: row.orderId,
@@ -4846,21 +5151,7 @@ export default {
       });
     },
 
-    /** 更换师傅操作 */
-    handleChangeWorker(record) {
-      this.$modal.confirm('确认更换师傅吗？').then(() => {
-        // 调用更换师傅接口
-        this.changeWorker(this.orderProcessForm.orderId).then(response => {
-          this.$modal.msgSuccess('更换师傅成功');
-          // 刷新接单记录
-          this.loadReceiveRecords(this.orderProcessForm.orderId);
-        }).catch(error => {
-          this.$modal.msgError('更换师傅失败：' + (error.message || '未知错误'));
-        });
-      }).catch(() => {
-        // 用户取消
-      });
-    },
+
 
     /** 出发上门操作 */
     handleDeparture(record) {
@@ -4960,33 +5251,120 @@ export default {
     },
 
     /** 从订单详情处理派单 */
-    handleDispatchFromDetail() {
+    handleDispatchFromDetail(record) {
       // 关闭订单详情对话框
       this.orderDetailVisible = false
       // 打开派单对话框
       this.handleDispatch(this.currentOrderDetail)
     },
 
+    /** 从订单详情处理更换师傅 */
+    handleChangeWorkerFromDetail(record) {
+      this.$message.success('更换师傅操作已触发')
+      // 这里可以调用更换师傅API
+    },
+
     /** 从订单详情处理接单 */
-    handleAcceptFromDetail() {
-      this.$message.success('接单操作成功')
+    handleAcceptFromDetail(record) {
+      this.$message.success('接单操作已触发')
       // 这里可以调用接单API
     },
 
+    /** 从订单详情处理出发上门 */
+    async handleDepartureFromDetail(record) {
+      try {
+        this.$modal.confirm('确认要执行出发上门操作吗？').then(async () => {
+          // 调用出发上门API
+          const response = await request.post('/system/Order/departure', {
+            orderId: this.currentOrderDetail.orderId
+          })
+
+          if (response.code === 200) {
+            this.$message.success('出发上门成功！')
+            // 刷新订单详情
+            this.refreshOrderDetail()
+            // 刷新订单列表
+            this.getList()
+          } else {
+            this.$message.error('出发上门失败：' + response.msg)
+          }
+        }).catch(() => {
+          // 用户取消操作
+        })
+      } catch (error) {
+        console.error('出发上门失败:', error)
+        this.$message.error('出发上门失败：' + (error.message || '未知错误'))
+      }
+    },
+
+    /** 从订单详情处理确认到达 */
+    async handleConfirmArrivalFromDetail(record) {
+      try {
+        this.$modal.confirm('确认要执行确认到达操作吗？').then(async () => {
+          // 调用确认到达API
+          const response = await request.post('/system/Order/confirm-arrival', {
+            orderId: this.currentOrderDetail.orderId
+          })
+
+          if (response.code === 200) {
+            this.$message.success('确认到达成功！')
+            // 刷新订单详情
+            this.refreshOrderDetail()
+            // 刷新订单列表
+            this.getList()
+          } else {
+            this.$message.error('确认到达失败：' + response.msg)
+          }
+        }).catch(() => {
+          // 用户取消操作
+        })
+      } catch (error) {
+        console.error('确认到达失败:', error)
+        this.$message.error('确认到达失败：' + (error.message || '未知错误'))
+      }
+    },
+
+    /** 从订单详情处理结束订单 */
+    handleEndOrderFromDetail(record) {
+      this.$message.success('结束订单操作已触发')
+      // 这里可以调用结束订单API
+    },
+
     /** 从订单详情处理开始服务 */
-    handleStartFromDetail() {
-      this.$message.success('开始服务操作成功')
+    handleStartFromDetail(record) {
+      this.$message.success('开始服务操作已触发')
       // 这里可以调用开始服务API
     },
 
+    /** 从订单详情处理项目报价 */
+    handleProjectQuoteFromDetail(record) {
+      this.projectQuoteVisible = true
+    },
+    
+    /** 提交项目报价（弹窗返回） */
+    async handleProjectQuoteSubmit(payload) {
+      try {
+        // 这里后续替换为真实接口调用
+        // await request.post('/system/Order/project-quote', payload)
+        this.$message.success('报价已生成（待接入接口）')
+        // 刷新订单详情与列表
+        this.refreshOrderDetail()
+        this.getList()
+      } catch (e) {
+        console.error('提交报价失败:', e)
+        this.$message.error('提交报价失败')
+      }
+    },
+
     /** 从订单详情处理完成服务 */
-    handleCompleteFromDetail() {
-      this.$message.success('完成服务操作成功')
+    handleCompleteFromDetail(record) {
+      this.$message.success('完成服务操作已触发')
       // 这里可以调用完成服务API
     },
 
     /** 查看订单明细 */
     handleOrderDetail(row) {
+      console.log('订单明细按钮被点击，订单ID:', row.id, '订单号:', row.orderId)
       // 设置订单详情数据
       this.currentOrderDetail = {
         id: row.id,
@@ -4994,6 +5372,19 @@ export default {
         status: row.status,
         jsonStatus: row.jsonStatus,
         workerId: row.workerId,
+        departureTime: row.departureTime,
+        arrivalTime: row.arrivalTime,
+        startTime: row.startTime,
+        pauseTime: row.pauseTime,
+        pauseReason: row.pauseReason,
+        completeTime: row.completeTime,
+        nextServiceTime: row.nextServiceTime,
+        cancelTime: row.cancelTime,
+        cancelReason: row.cancelReason,
+        mark: row.mark,
+        fileData: row.fileData,
+        servicePhotos: row.servicePhotos || [],
+        // 订单基本信息
         userName: row.uname || row.name,
         userPhone: row.phone || row.userPhone,
         productName: row.productName,
@@ -5002,34 +5393,121 @@ export default {
         appointmentAddress: row.address,
         totalPrice: row.totalPrice,
         payPrice: row.payPrice,
-        deduction: row.deduction || 0,
+        deduction: row.deduction,
         createdAt: this.formatCreatedTime(row.createdAt),
-        payTime: row.payTime ? this.formatCreatedTime(row.payTime) : '未设置',
-        mark: row.mark,
-        fileData: row.fileData,
-        // 模拟日志数据（实际项目中应该从后端获取）
-        logs: [
-          {
-            id: 1,
-            type: 'create',
-            title: '订单创建',
-            content: '用户创建订单',
-            createdAt: row.createdAt ? new Date(row.createdAt).toISOString() : new Date().toISOString(),
-            images: []
-          },
-          {
-            id: 2,
-            type: 'pay',
-            title: '支付成功',
-            content: '订单支付完成',
-            createdAt: row.payTime ? new Date(row.payTime).toISOString() : new Date().toISOString(),
-            images: []
-          }
-        ]
+        payTime: row.payTime ? this.parseTime(row.payTime, '{y}-{m}-{d} {h}:{i}') : '未设置',
+        // 接单记录
+        receiveRecords: [],
+        // 师傅信息
+        workerName: row.workerName || '未分配',
+        workerPhone: row.workerPhone || '未设置',
+        workerLevel: row.workerLevel || '未设置',
+        workerArea: row.workerArea || '未设置',
+        workerSkills: row.workerSkills || [],
+        workerAvatar: row.workerAvatar || '',
+        acceptTime: row.acceptTime || '未接单',
+        dispatchTime: row.dispatchTime || '未派单',
+        // 预约信息
+        serviceType: row.serviceType || '未设置',
+        serviceRequirement: row.serviceRequirement || '无特殊要求',
+        urgency: row.urgency || 1,
+        estimatedDuration: row.estimatedDuration || '未设置',
+        specialNote: row.specialNote || '无',
+        confirmTime: row.confirmTime || '未确认'
       }
-      
-      // 打开订单详情对话框
       this.orderDetailVisible = true
+      // 加载接单记录
+      this.loadReceiveRecordsForDetail(row.orderId)
+    },
+
+    /** 为订单明细加载接单记录 */
+    loadReceiveRecordsForDetail(orderId) {
+      console.log('为订单明细加载接单记录，订单号:', orderId)
+
+      // 检查订单号是否有效
+      if (!orderId) {
+        console.error('订单号为空，无法加载接单记录')
+        return
+      }
+
+      request.get(`/system/Order/receive-records/${orderId}`).then(response => {
+        console.log('订单明细接单记录API响应:', response)
+
+        // 根据实际API响应结构调整判断逻辑
+        let records = []
+        if (response.code === 200) {
+          // 如果response.code是200，直接使用response.data
+          records = response.data || []
+        } else if (response.data && response.data.code === 200) {
+          // 如果response.data.code是200，使用response.data.data
+          records = response.data.data || []
+        } else if (Array.isArray(response.data)) {
+          // 如果response.data直接是数组，直接使用
+          records = response.data
+        } else {
+          console.error('接单记录API返回错误，无法解析数据结构:', response)
+          this.currentOrderDetail.receiveRecords = []
+          return
+        }
+
+        // 处理接单记录数据
+        if (Array.isArray(records) && records.length > 0) {
+          const processedRecords = records.map(record => {
+            // 解析content字段（JSON字符串）
+            let contentName = '未知操作'
+            let contentImage = []
+
+            if (record.content) {
+              try {
+                const contentData = JSON.parse(record.content)
+                if (Array.isArray(contentData)) {
+                  // 如果content是数组，取第一个元素
+                  contentName = contentData[0]?.name || '未知操作'
+                  contentImage = contentData[0]?.image || []
+                } else if (typeof contentData === 'object') {
+                  // 如果content是对象
+                  contentName = contentData.name || '未知操作'
+                  contentImage = contentData.image || []
+                }
+              } catch (e) {
+                // 如果解析失败，直接使用原始内容
+                contentName = record.content
+              }
+            }
+
+            return {
+              ...record,
+              title: record.title || '未知操作',
+              contentName: contentName,
+              contentImage: contentImage,
+              workerName: record.workerName || '系统',
+              price: record.price || 0,
+              deposit: record.deposit || 0,
+              createdAt: record.createdAt || record.createTime || new Date().toISOString()
+            }
+          })
+
+          console.log('处理后的订单明细接单记录:', processedRecords)
+          this.$set(this.currentOrderDetail, 'receiveRecords', processedRecords)
+        } else {
+          console.warn('接单记录为空或格式不正确')
+          this.currentOrderDetail.receiveRecords = []
+        }
+      }).catch(error => {
+        console.error('获取订单明细接单记录失败:', error)
+        this.currentOrderDetail.receiveRecords = []
+      })
+    },
+
+    /** 刷新订单详情 */
+    refreshOrderDetail() {
+      if (this.currentOrderDetail && this.currentOrderDetail.orderId) {
+        // 重新加载接单记录
+        this.loadReceiveRecordsForDetail(this.currentOrderDetail.orderId)
+
+        // 这里可以添加其他需要刷新的数据
+        // 比如重新获取订单基本信息等
+      }
     },
 
     /** 获取文件列表 */
@@ -5109,9 +5587,7 @@ export default {
     },
   },
   computed: {
-    imageListOnly() {
-      return this.fileList.filter(url => this.isImage(url));
-    },
+
     // 计算应付总额（所有支付记录的总金额）
     totalPayableAmount() {
       return this.paymentDetailsList.reduce((total, item) => {
@@ -5205,22 +5681,37 @@ export default {
   display: flex;
   justify-content: space-around;
   align-items: center;
-  padding: 0 5px;
-  min-width: 250px;
+  padding: 0 8px;
+  min-width: 280px;
   flex-wrap: wrap;
-  gap: 5px;
+  gap: 8px;
+  position: relative;
+}
+
+.button-group::before {
+  content: '';
+  position: absolute;
+  top: -2px;
+  left: -2px;
+  right: -2px;
+  bottom: -2px;
+  background: transparent;
+  pointer-events: none;
 }
 
 .button-group .el-button {
   padding: 6px;
-  margin: 0 3px;
+  margin: 0 6px;
   border-radius: 50%;
-  width: 28px;
-  height: 28px;
+  width: 32px;
+  height: 32px;
   line-height: 1;
   display: flex;
   align-items: center;
   justify-content: center;
+  transition: all 0.2s ease;
+  position: relative;
+  z-index: 1;
 }
 
 .button-group .el-button:not([circle]) {
@@ -5234,6 +5725,16 @@ export default {
   margin-left: 5px;
 }
 
+.button-group .el-button:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
+
+.button-group .el-button:active {
+  transform: translateY(0);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+}
+
 .button-group .el-dropdown {
   margin: 0 3px;
   height: 28px;
diff --git a/ruoyi-ui/src/views/system/UsersWorker/index.vue b/ruoyi-ui/src/views/system/UsersWorker/index.vue
index 07e243f..565e72b 100644
--- a/ruoyi-ui/src/views/system/UsersWorker/index.vue
+++ b/ruoyi-ui/src/views/system/UsersWorker/index.vue
@@ -381,6 +381,7 @@
     </el-dialog>
 
     <WorkerLevelSelectDialog
+      v-if="workerLevelDialogVisible && workerLevelUserId != null"
       :visible.sync="workerLevelDialogVisible"
       :user-id="workerLevelUserId"
       :user-name="workerLevelUserName"