需求

application/admin/controller/Orders.php

@@ -512,7 +512,10 @@ class Orders extends Auth {
                     $map[] = ['a.id', '=', -1];
                 }
             }
-
+            $deviceId = input('device_id',0);
+            if($deviceId){
+                $map[] = ['b.device_id','=',$deviceId];
+            }
             $map = empty($map) ? true : $map;
 
             //数据查询
@@ -626,6 +629,8 @@ class Orders extends Auth {
             }
             else {
                 if ($mode == 3) {
+                    $order_device = (new \app\common\model\ConveyDevice())->getList();
+                    $this->assign('order_device', $order_device);
                     return $this->fetch('index3');
                 }else if (in_array($mode,[0,-1])) {
                     return $this->fetch('index0');
@@ -2371,7 +2376,10 @@ class Orders extends Auth {
                     $map[] = ['a.id', '=', -1];
                 }
             }
-
+            $deviceId = input('device_id',0);
+            if($deviceId){
+                $map[] = ['b.device_id','=',$deviceId];
+            }
             $map = empty($map) ? true : $map;
             //数据查询
             if($mode==3){

application/admin/view/orders/index3.html

@@ -18,7 +18,7 @@
                 {/if}
                  
             </div>
-            <div class="col-xs-11" style="text-align: right;">
+            <div class="col-xs-11" style="text-align: right;" id="app">
                 <form class="form-inline" id="form-search" action="{:url('index')}?mode={$mode}">
                     <div class="input-group">
                         <input type="text" class="form-control" name="sn" placeholder="订单编号">
@@ -36,12 +36,15 @@
                         <input class="form-control" style="width: 155px !important;" id="end" readonly placeholder="申请结束时间" name="end" >
                     </div>
                     <div class="input-group">
-                        <select name="dep_id" class="form-control">
-                            <option value="">所在科室/部门</option>
-                            {foreach $dep_list as $k=>$v}
-                            <option value="{$v['id']}">{$v['title']}</option>
-                            {/foreach}
-                        </select>
+                        <input type="hidden" name="dep_id" id="dep_id">
+                        <el-select clearable  filterable v-model="dep_id" placeholder="所在科室/部门" size="small" >
+                            <el-option
+                                    v-for="item in deps"
+                                    :key="item.id"
+                                    :label="item.title"
+                                    :value="item.id.toString()">
+                            </el-option>
+                        </el-select>
                     </div>
 
                     <div class="input-group">
@@ -68,20 +71,28 @@
                     </div>
 
                     <div class="input-group">
-                        <select name="saddr" class="form-control">
-                            <option value="">开始地点</option>
-                            {foreach $addrList as $k=>$v}
-                            <option value="{$v['id']}">{$v['title']}</option>
-                            {/foreach}
-                        </select>
+                        <input type="hidden" name="saddr" id="saddr">
+                        <el-select clearable  filterable v-model="saddr" placeholder="开始地点" size="small" style="width: 100%">
+                            <el-option
+                                    v-for="item in addrs"
+                                    :key="item.id"
+                                    :label="item.title"
+                                    :value="item.id.toString()">
+                            </el-option>
+                        </el-select>
                     </div>
+
+
                     <div class="input-group">
-                        <select name="eaddr" class="form-control">
-                            <option value="">结束地点</option>
-                            {foreach $addrList as $k=>$v}
-                            <option value="{$v['id']}">{$v['title']}</option>
-                            {/foreach}
-                        </select>
+                        <input type="hidden" name="eaddr" id="eaddr">
+                        <el-select clearable  filterable v-model="eaddr" placeholder="结束地点" size="small" style="width: 100%">
+                            <el-option
+                                    v-for="item in addrs"
+                                    :key="item.id"
+                                    :label="item.title"
+                                    :value="item.id.toString()">
+                            </el-option>
+                        </el-select>
                     </div>
                     <div class="input-group">
 <!--                        <input type="text" class="form-control" name="typeName" placeholder="运送类型">-->
@@ -100,6 +111,17 @@
                             {/foreach}
                         </select>
                     </div>
+                    <div class="input-group">
+                        <input type="hidden" name="device_id" id="device_id">
+                        <el-select clearable  filterable v-model="device_id" placeholder="运送设备" size="small" style="width: 100%">
+                            <el-option
+                                    v-for="item in devices"
+                                    :key="item.id"
+                                    :label="item.title"
+                                    :value="item.id.toString()">
+                            </el-option>
+                        </el-select>
+                    </div>
 <!--                    <div class="input-group">-->
 <!--                        <select name="dep_cate" class="form-control">-->
 <!--                            <option value="">部门分类</option>-->
@@ -110,10 +132,10 @@
 <!--                    </div>-->
                     <div class="input-group">
                         <span class="input-group-btn">
-                        <button class="btn-sm btn-primary" type="button" id ="search-btn" ><i class="fa fa-search"></i></button>
+                        <button class="btn-sm btn-primary" type="button"  @click="search" ><i class="fa fa-search"></i></button>
                     </span> &nbsp;
                         <span class="input-group-btn">
-                        <button class="btn-sm btn-warning" type="button" id="search-clear"><i class="fa fa-undo"></i></button>
+                        <button class="btn-sm btn-warning" type="button" @click="clearBtn"><i class="fa fa-undo"></i></button>
                     </span>
                         &nbsp;
                         <span class="input-group-btn">
@@ -136,6 +158,75 @@
 <script src="/static/layDate-v5.0.9/laydate.js"></script>
 
 <script>
+
+    new Vue({
+        el: '#app',
+        data: function() {
+            return {
+            addrs: {:json_encode($addrList)},
+            saddr:"",
+            eaddr:"",
+            deps:{:json_encode($dep_list)},
+            dep_id:"",
+            devices:{:json_encode($order_device)},
+            device_id:"",
+        }
+        },
+        watch: {
+            saddr: function (newVal, oldVal) {
+                console.log('开始地点变了：'+ $('#saddr').val());
+                $('#saddr').val(newVal);
+            },
+            eaddr: function (newVal, oldVal) {
+                $('#eaddr').val(newVal);
+            },
+            dep_id: function (newVal, oldVal) {
+                $('#dep_id').val(newVal);
+            },
+            device_id: function (newVal, oldVal) {
+                $('#device_id').val(newVal);
+            }
+        },
+        methods: {
+            search(){
+                var self = $("#form-search");
+                var url = self.attr('action');
+                if(url){
+                    var pdata = self.serializeObject();
+                    $("#table").jqGrid('setGridParam', {
+                        url: url,
+                        postData:pdata,
+                        page: 1
+                    }).trigger("reloadGrid");
+                }
+            },
+            clearBtn(){
+                this.saddr = "";
+                this.eaddr = "";
+                this.dep_id = "";
+                this.device_id = "";
+                $("#form-search")[0].reset();
+
+                this.$nextTick(() => {
+                    var url = $("#form-search").attr('action');
+                    var pdata = $("#form-search").serializeObject();
+
+                    // 可选：防止 jqGrid 缓存
+                    $("#table").jqGrid('setGridParam', { postData: {} });
+
+                    $("#table").jqGrid('setGridParam', {
+                        url: url,
+                        postData: pdata,
+                        page: 1
+                    }).trigger("reloadGrid");
+                });
+            },
+
+        }
+    })
+
+
+
     //导出
     function excel_download(_self){
         var url = $(_self).attr('data-url');