diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 1c4b8a34..62ab9bf9 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -267,6 +267,16 @@ public class OrderDetailController extends BaseController {
             if (fc != null) {
                 detail.setChangeMoney(fc.getChangeMoney());
             }
+            // 完单图片
+            GoodsImgs param = new GoodsImgs();
+            param.setRemark(String.valueOf(detail.getId()));
+            param.setImgType(ImgType.FINISH_IMG.getId());
+            List<GoodsImgs> imgsList = goodsImgsService.qryGoodsImgs(param);
+            StringBuilder stringBuilder = new StringBuilder();
+            imgsList.forEach(model->{
+                stringBuilder.append("<a target='_blank' href='").append(model.getImgUrl()).append("' >查看图片<a/>");
+            });
+            detail.setOrderImgs(stringBuilder.toString());
         }
 
         return getDataTable(orderDetails);
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 703c97b7..3a059fa2 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -1293,6 +1293,23 @@ public class OrderMasterController extends BaseController {
             if(master.getExpectTimeStart() != null && master.getExpectTimeEnd() != null){
                 master.setMixExpectTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",master.getExpectTimeStart()) +"-"+ DateUtils.parseDateToStr("HH:mm",master.getExpectTimeEnd()));
             }
+            if("01".equals(master.getConsultMode())){
+                master.setOrderMode("05");
+            } else if (StringUtils.isEmpty(master.getOrderMode())) {
+                master.setOrderMode("01");
+            }
+            List<OrderDetail> details = orderDetailService.selectByOrderMasterId(master.getId());
+            StringBuilder stringBuilder = new StringBuilder();
+            details.forEach(model->{
+                GoodsImgs param = new GoodsImgs();
+                param.setRemark(String.valueOf(model.getId()));
+                param.setImgType(ImgType.FINISH_IMG.getId());
+                List<GoodsImgs> imgsList = goodsImgsService.qryGoodsImgs(param);
+                imgsList.forEach(imgs->{
+                    stringBuilder.append("<a target='_blank' href='").append(imgs.getImgUrl()).append("' >查看图片<a/>");
+                });
+            });
+            master.setOrderImgs(stringBuilder.toString());
         }
         return getDataTable(orderMasterList);
     }
diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
index 3503f118..4d8d4d06 100644
--- a/ghy-admin/src/main/resources/templates/order/master.html
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -698,7 +698,12 @@
                     field: 'changeMoney',
                     title: '商家追加金额',
                     align: 'center'
-                },{
+                },
+                {
+                    field: 'orderImgs',
+                    title: '完单图片'
+                },
+                {
                     field: 'orderType',
                     title: '订单类型',
                     align: 'center',
diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html
index ce80a38c..0a5a7aa8 100644
--- a/ghy-admin/src/main/resources/templates/order/orderManager.html
+++ b/ghy-admin/src/main/resources/templates/order/orderManager.html
@@ -733,6 +733,11 @@
                     title: '商家追加金额',
                     align: 'center'
                 },
+                {
+                    field: 'orderImgs',
+                    title: '完单图片',
+                    align: 'center'
+                },
                 {
                     field: 'payMode',
                     title: '商家付费模式',
diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html
index fc65018b..a6dd23b3 100644
--- a/ghy-admin/src/main/resources/templates/order/pc-master.html
+++ b/ghy-admin/src/main/resources/templates/order/pc-master.html
@@ -148,7 +148,7 @@
                         </div>
                         <div class="flex-board-no-wrap m-t">
                             <label class="form-control-label">订单查询：</label>
-                            <input type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
+                            <input name="keywords" id="keywords" type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
                         </div>
                         <div class="m-t">
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -488,6 +488,10 @@
                     align: 'center',
                     visible: false
                 },
+                {
+                    field: 'orderImgs',
+                    title: '完单图片'
+                },
                 {
                     field: 'payMode',
                     title: '商家付费模式',
diff --git a/ghy-admin/src/main/resources/templates/order/pcOrderWorker.html b/ghy-admin/src/main/resources/templates/order/pcOrderWorker.html
index 08bca70f..5ef03f3a 100644
--- a/ghy-admin/src/main/resources/templates/order/pcOrderWorker.html
+++ b/ghy-admin/src/main/resources/templates/order/pcOrderWorker.html
@@ -147,7 +147,12 @@
                     checkbox: true
                 }, {
                     field: 'name',
-                    title: '人员名称',
+                    title: '昵称',
+                    align: "left"
+                },
+                {
+                    field: 'realName',
+                    title: '真实姓名',
                     align: "left"
                 }, {
                     field: 'phone',
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index 36b296e7..fc4f76b1 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -70,6 +70,9 @@ public class OrderDetail extends BaseEntity {
 
     // 接单师傅
     private Worker worker;
+
+    private String orderImgs;
+
     // 商品归属师傅
     private Worker goodsWorker;
     // 接单师傅
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
index a93f5dda..aaa9e0a1 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
@@ -157,6 +157,8 @@ public class OrderMaster extends BaseEntity {
 
     private String orderMode;
 
+    private String orderImgs;
+
     private String payMode;
 
     private String isCharge;
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index df98d9a9..30666fbd 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -108,6 +108,8 @@
                 om.code LIKE concat('%', #{keyWords}, '%')
                 or ca.name LIKE concat('%', #{keyWords}, '%')
                 or ca.phone LIKE concat('%', #{keyWords}, '%')
+                or ca.address like concat('%', #{keyWords}, '%')
+                or g.goods_name like concat('%', #{keyWords}, '%')
                 )
             </if>
             <if test="deptId != null and deptId != ''">
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 9b32e514..390c12ff 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -104,7 +104,8 @@
                om.is_call,
                fm.server_money,
                om.goods_brand,
-               om.goods_specification
+               om.goods_specification,
+               om.consult_mode
         FROM order_master om
         LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
         LEFT JOIN goods g ON g.goods_id = om.goods_id
@@ -121,6 +122,8 @@
                 om.code LIKE concat('%', #{keywords}, '%')
                     or ca.name LIKE concat('%', #{keywords}, '%')
                     or ca.phone LIKE concat('%', #{keywords}, '%')
+                    or ca.address like  concat('%', #{keywords}, '%')
+                    or g.goods_name like concat('%', #{keywords}, '%')
                 )
             </if>
             <if test="workerName != null and workerName != ''">
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
index 13a947a5..aaec7f47 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
@@ -62,6 +62,7 @@
             SELECT w.worker_id FROM worker w
             LEFT JOIN worker_area wa ON wa.worker_id = w.worker_id
             LEFT JOIN worker_goods_category wgc ON wgc.worker_id = w.worker_id
+            LEFT JOIN worker_certification wc on w.worker_id = wc.worker_id
             <where>
                 <if test="deptId != null and deptId != ''">
                     AND dept_id = #{deptId}
@@ -77,7 +78,8 @@
                 </if>
                 <if test="keyWords != null and keyWords != ''">
                     AND (w.name LIKE '%${keyWords}%'
-                    OR w.phone LIKE '%${keyWords}%')
+                    OR w.phone LIKE '%${keyWords}%'
+                    OR concat(wc.surname,'', wc.name) like '%${keyWords}%')
                 </if>
                 <if test="name != null and name != ''">
                     AND w.name LIKE '%${name}%'