11

application/admin/controller/Address.php

@@ -5,7 +5,6 @@ use think\Db;
 
 class Address extends Auth
 {
-
     public function index(){
         if(request()->isAjax()){
             //分页参数

application/admin/controller/Index.php

@@ -11,10 +11,18 @@ class Index extends Auth
 //        $menus = model('Menu')->getMenuTree($this->rolesId,$this->orgId);
 //        $this->assign('menus',$menus);
 
+        $bd = Db::name('org')->where('id',$this->orgId)->value('bd_auth');
+
+        $dbAuth = $bd?explode(',',$bd):[];
+
         $mapMenu[] = ['enable','=',1];
         $mapMenu[] = ['del','=',0];
         $mapMenu[] = ['is_btn','=',0];
-        $mapMenu[] = ['id','in',[148,149,150,151,236,257]];
+        if($dbAuth){
+            $mapMenu[] = ['id','in',$dbAuth];
+        }else{
+            $mapMenu[] = ['id','in',[148,149,150,151,257]];
+        }
 
         $lists = Db::name('menu')
             ->where($mapMenu)
@@ -29,8 +37,11 @@ class Index extends Auth
             $arr[] = $v;
         }
 
+        $curUrl = !empty($lists)?$lists[0]['url']:'';
+
         $this->assign('menus',$arr);
 
+        $this->assign('curUrl',$curUrl);
 
         $userInfo = Db::name('user')
             ->where('id',$this->userId)

application/admin/view/index/index.html

@@ -235,7 +235,7 @@
 
 
 <div class="main-box main-box-h2" id="main-iframe">
-    <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="{:url('Orders/selfIndex?mode=0')}" frameborder="0" data-id="index_v1.html" seamless></iframe>
+    <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="{:url($curUrl)}" frameborder="0" data-id="index_v1.html" seamless></iframe>
 
     <!--</div>-->
 

application/admin/view/orders/selfIndex.html

@@ -57,6 +57,8 @@
                 {label:'编号',name:'sn',index:'sn', width:80,sortable: false},
                 {label:'申请时间',name:'create_time',index:'create_time',width:50,sortable: true},
                 {label:'内容',name:'content',index:'content',width:60,sortable: true},
+                {label:'来源',name:'source_type_text',index:'source_type_text',width:60,sortable: true},
+                {label:'联系方式',name:'mobile',index:'mobile',width:60,sortable: true},
                 {label:'状态',name:'order_mode_text',index:'order_mode_text',width:60,sortable: true,formatter:function (a, b, c) {
 
                       return  '<span style="color: '+c.order_mode_color+'">'+a+'</span>'

application/admin/view/orders/selfIndex1.html

@@ -58,7 +58,17 @@
                 {label:'申请时间',name:'create_time',index:'create_time',width:50,sortable: true},
                 {label:'内容',name:'content',index:'content',width:60,sortable: true},
                 {label:'报修类型',name:'order_type',index:'order_type',width:60,sortable: true},
+                {label:'报修地点',name:'address_title',index:'address_title',width:60,sortable: true},
                 {label:'紧急程度',name:'repair_priority',index:'repair_priority',width:60,sortable: true},
+                {label:'优先级',name:'repair_priority',index:'repair_priority',width:60,editable: false,sortable: false,formatter: function (a, b, c) {
+                        if(a=='紧急'){
+                            return "<span class='label' style='color: red'>"+a+"</span></span><img src='/admin/img/jj.png' style='width: 20px !important;height: 20px !important;' alt=''>";
+                        }else {
+                            return a;
+                        }
+                    }},
+                {label:'来源',name:'source_type_text',index:'source_type_text',width:60,sortable: true},
+                {label:'联系方式',name:'mobile',index:'mobile',width:60,sortable: true},
                 {label:'状态',name:'order_mode_text',index:'order_mode_text',width:60,sortable: true,formatter:function (a, b, c) {
 
                         return  '<span style="color: '+c.order_mode_color+'">'+a+'</span>'

application/admin/view/orders/selfIndex3.html

@@ -57,7 +57,12 @@
                 {label:'编号',name:'sn',index:'sn', width:80,sortable: false},
                 {label:'申请时间',name:'create_time',index:'create_time',width:50,sortable: true},
                 {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},
+                {label:'运送设备',name:'device_name',index:'device_name',width:40,sortable: true},
                 {label:'内容',name:'content',index:'content',width:60,sortable: true},
+                {label:'来源',name:'source_type_text',index:'source_type_text',width:60,sortable: true},
+                {label:'联系方式',name:'mobile',index:'mobile',width:60,sortable: true},
                 {label:'状态',name:'order_mode_text',index:'order_mode_text',width:60,sortable: true,formatter:function (a, b, c) {
 
                         return  '<span style="color: '+c.order_mode_color+'">'+a+'</span>'