0
0
zgg 16 часов назад
Родитель
Сommit
508162d584

+ 1 - 1
application/admin/controller/Orders.php

@@ -55,7 +55,7 @@ class Orders extends Auth {
                 ->alias('a')
                 ->leftJoin('order_convey b','a.id=b.order_id')
                 ->where($map)
-                ->field('a.*,b.priority')
+                ->field('a.*,b.priority,b.is_vip')
                 ->limit($start, $length)
                 ->order($order)
                 ->select();

+ 7 - 0
application/admin/view/orders/detail.html

@@ -130,6 +130,13 @@
                             {if $info['oc']['priority'] == 4}预约{/if}
                         </td>
                     </tr>
+                    <tr>
+                        <th>是否VIP</th>
+                        <td>
+                            {if $info['oc']['is_vip'] == 1}是{/if}
+                            {if $info['oc']['is_vip'] == 0}否{/if}
+                        </td>
+                    </tr>
                     {if !empty($info['oc']['device_name'])}
                     <tr>
                         <th>运送设备</th><td><div>{$info['oc']['device_name']}</div></td>

+ 8 - 0
application/admin/view/orders/selfIndex3.html

@@ -61,6 +61,14 @@
             colModel:[
                 {label:'编号',name:'sn',index:'sn', width:80,sortable: false},
                 {label:'申请时间',name:'create_time',index:'create_time',width:50,sortable: true},
+                {label:'优先级',name:'priority',index:'priority',width:50,sortable: true,formatter:function (a,b,c) {
+                        var str = a;
+                        if (c.is_vip == 1){
+                            str += " ";
+                            str +="<img src='/admin/img/vip.png' style='width: 20px !important;height: 20px !important;' alt=''>";
+                        }
+                        return str;
+                }},
                 {label:'开始地点',name:'start_name',index:'start_name',width:40,sortable: true},
                 {label:'结束地点',name:'end_name',index:'end_name',width:40,sortable: true},
                 {label:'运送类型',name:'type_name',index:'type_name',width:40,sortable: true},

+ 16 - 1
application/admin/view/orders/self_add3.html

@@ -36,7 +36,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-12">
+                    <div class="col-sm-6">
                         <div class="form-group">
                             <label class="control-label">优  &nbsp;先 &nbsp;级</label></br>
                             <input type="hidden" name="priority" value="" id="priority">
@@ -47,6 +47,17 @@
 
                         </div>
                     </div>
+                    <div class="col-sm-6">
+                        <div class="form-group">
+                            <label class="control-label">是否VIP</label></br>
+                            <input type="hidden" name="is_vip" value="0" id="is_vip" >
+                            <div style="padding-right: 10px">
+                                <el-radio v-model="is_vip" label="1">是</el-radio>
+                                <el-radio v-model="is_vip" label="0">否</el-radio>
+                            </div>
+
+                        </div>
+                    </div>
                     <div id="patient">
                         <div class="col-sm-6">
                             <div class="form-group">
@@ -254,6 +265,7 @@
             type: '',
                 prioritys:{:json_encode($priority)},
             priority: "",
+                is_vip: "0",
                 devices: {:json_encode($order_device)},
             device: '',
                 xq_time: '',
@@ -328,6 +340,9 @@
             priority: function (newtype, oldtype) {
                 $('#priority').val(newtype);
             },
+            is_vip: function (newtype, oldtype) {
+                $('#is_vip').val(newtype);
+            },
             device: function (newtype, oldtype) {
                 $('#device').val(newtype);
             },

+ 2 - 1
application/common/model/Orders.php

@@ -255,7 +255,8 @@ class Orders extends Base {
                     'phone' => isset($data['phone'])?$data['phone']:"",
                     'device_id' => isset($data['device_id']) ? (int)$data['device_id'] : 0,
                     'priority' => empty($data['priority']) ? 0 : $data['priority'],
-                    'score'=>$conveyCate['score']
+                    'score'=>$conveyCate['score'],
+                    'is_vip'=>(int)$data['is_vip']
                 );
                 if(empty($ysData['xq_time'])){
                     unset($ysData['xq_time']);

BIN
public/admin/img/vip.png