后台

application/admin/controller/Maintainbaojia.php

@@ -51,7 +51,7 @@ class Maintainbaojia extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['maintain','company','user','admin','admin'])
+                    ->with(['maintain','company','user','admina','adminb'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -61,8 +61,8 @@ class Maintainbaojia extends Backend
                 $row->getRelation('maintain')->visible(['orderno']);
 				$row->getRelation('company')->visible(['companyname']);
 				$row->getRelation('user')->visible(['nickname','mobile']);
-				$row->getRelation('admin')->visible(['username','nickname','mobile']);
-				$row->getRelation('admin')->visible(['username','nickname','mobile']);
+				$row->getRelation('admina')->visible(['username','nickname','mobile']);
+				$row->getRelation('adminb')->visible(['username','nickname','mobile']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

application/admin/lang/zh-cn/maintainbaojia.php

@@ -5,7 +5,7 @@ return [
     'Order_id'                => '订单ID',
     'Company_id'              => '维保公司ID',
     'User_id'                 => '用户ID',
-    'Baojia_staffid'          => '报价人ID',
+    'Baojia_staffid'          => '报价管理员ID',
     'Baojia_time'             => '报价时间',
     'Baojia_filename'         => '报价excel文件名',
     'Baojia_file'             => '报价excel',
@@ -18,20 +18,20 @@ return [
     'Set status to 30'        => '设为用户待确认',
     'Status 40'               => '用户已确认',
     'Set status to 40'        => '设为用户已确认',
-    'Baojia_audit_staffid'    => '初步审核人',
+    'Baojia_audit_staffid'    => '初步审核人ID',
     'Baojia_audit_time'       => '初步审核时间',
     'Baojia_audit_reason'     => '初步审核未通过原因',
     'Updatetime'              => '更新时间',
     'Baojia_useraudit_time'   => '用户确认时间',
     'Baojia_useraudit_reason' => '用户审核未通过原因(废弃)',
     'Maintain.orderno'        => '订单号',
-    'Company.companyname'     => '公司名',
+    'Company.companyname'     => '维保公司名',
     'User.nickname'           => '商户名',
-    'User.mobile'             => '手机号',
-    'Admin.username'          => '用户名',
-    'Admin.nickname'          => '昵称',
-    'Admin.mobile'            => '手机号码',
-    'Admin.username'          => '用户名',
-    'Admin.nickname'          => '昵称',
-    'Admin.mobile'            => '手机号码'
+    'User.mobile'             => '商户手机号',
+    'Admina.username'          => '报价管理员用户名',
+    'Admina.nickname'          => '报价管理员昵称',
+    'Admina.mobile'            => '报价管理员手机号码',
+    'Adminb.username'          => '审核管理员用户名',
+    'Adminb.nickname'          => '审核管理员昵称',
+    'Adminb.mobile'            => '审核管理员手机号码'
 ];

application/admin/model/Maintainbaojia.php

@@ -101,13 +101,13 @@ class Maintainbaojia extends Model
     }
 
 
-    public function admin()
+    public function admina()
     {
         return $this->belongsTo('app\admin\model\pc\Admin', 'baojia_staffid', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 
-    public function admin()
+    public function adminb()
     {
         return $this->belongsTo('app\admin\model\pc\Admin', 'baojia_audit_staffid', 'id', [], 'LEFT')->setEagerlyType(0);
     }

application/admin/view/maintainbaojia/index.html

@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintainbaojia/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintainbaojia/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('maintainbaojia/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('maintainbaojia/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

application/admin/view/maintaincailiao/index.html

@@ -7,10 +7,10 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintaincailiao/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                       <!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintaincailiao/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('maintaincailiao/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('maintaincailiao/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+                        -->
 
                         
 

application/admin/view/maintainjindu/index.html

@@ -7,10 +7,10 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintainjindu/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintainjindu/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('maintainjindu/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('maintainjindu/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+                        -->
 
                         
 

application/api/controller/Maintain.php

@@ -22,18 +22,26 @@ class Maintain extends Api
         $address  = input('address','');
 
         //视频类型追加缩略图
-        $filedata = json_decode($filedata,true);
-        foreach($filedata as $key => $file){
-            if($file['type'] == 'video'){
-                $file_url = explode('.', $file['url']);
-                unset($file_url[count($file_url) - 1]);
-                $file['images_thumb'] = implode('.', $file_url) . '_0.jpg';
+        if(!empty($filedata)){
+            $filedata = json_decode($filedata,true);
+            if(is_array($filedata) && !empty($filedata)){
+                foreach($filedata as $key => $file){
+                    if($file['type'] == 'video'){
+                        $file_url = explode('.', $file['url']);
+                        unset($file_url[count($file_url) - 1]);
+                        $file['images_thumb'] = implode('.', $file_url) . '_0.jpg';
+                    }else{
+                        $file['images_thumb'] = $file['url'];
+                    }
+                    $filedata[$key] = $file;
+                }
+                $filedata = json_encode($filedata);
             }else{
-                $file['images_thumb'] = $file['url'];
+                $filedata = '';
             }
-            $filedata[$key] = $file;
+        }else{
+            $filedata = '';
         }
-        $filedata = json_encode($filedata);
 
         $nowtime = time();
 

public/assets/js/backend/maintainbaojia.js

@@ -29,14 +29,28 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'order_id', title: __('Order_id')},
-                        {field: 'company_id', title: __('Company_id')},
-                        {field: 'user_id', title: __('User_id')},
+//                        {field: 'company_id', title: __('Company_id')},
+//                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
+
+//                        {field: 'user_id', title: __('User_id')},
+//                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+//                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
+
                         {field: 'baojia_staffid', title: __('Baojia_staffid')},
+                        {field: 'admina.username', title: __('Admina.username'), operate: 'LIKE'},
+                        {field: 'admina.nickname', title: __('Admina.nickname'), operate: 'LIKE'},
+                        {field: 'admina.mobile', title: __('Admina.mobile'), operate: 'LIKE'},
+
                         {field: 'baojia_time', title: __('Baojia_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'baojia_filename', title: __('Baojia_filename'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'baojia_file', title: __('Baojia_file'), operate: false, formatter: Table.api.formatter.file},
                         {field: 'status', title: __('Status'), searchList: {"20":__('Status 20'),"22":__('Status 22'),"30":__('Status 30'),"40":__('Status 40')}, formatter: Table.api.formatter.status},
+
                         {field: 'baojia_audit_staffid', title: __('Baojia_audit_staffid')},
+                        {field: 'adminb.username', title: __('Adminb.username'), operate: 'LIKE'},
+                        {field: 'adminb.nickname', title: __('Adminb.nickname'), operate: 'LIKE'},
+                        {field: 'adminb.mobile', title: __('Adminb.mobile'), operate: 'LIKE'},
+
                         {field: 'baojia_audit_time', title: __('Baojia_audit_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'baojia_audit_reason', title: __('Baojia_audit_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
@@ -44,15 +58,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'baojia_useraudit_reason', title: __('Baojia_useraudit_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'maintain.orderno', title: __('Maintain.orderno'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
-                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
-                        {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'},
-                        {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
-                        {field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'},
-                        {field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'},
-                        {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
-                        {field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+
+
+
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });

public/assets/js/backend/maintaincailiao.js

@@ -29,16 +29,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'order_id', title: __('Order_id')},
-                        {field: 'company_id', title: __('Company_id')},
-                        {field: 'user_id', title: __('User_id')},
-                        {field: 'worker_id', title: __('Worker_id')},
+                        {field: 'maintain.orderno', title: __('Maintain.orderno'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+//                        {field: 'company_id', title: __('Company_id')},
+//                        {field: 'user_id', title: __('User_id')},
+//                        {field: 'worker_id', title: __('Worker_id')},
                         {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'number', title: __('Number')},
                         {field: 'danwei', title: __('Danwei'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'maintain.orderno', title: __('Maintain.orderno'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });

public/assets/js/backend/maintainjindu.js

@@ -29,16 +29,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'order_id', title: __('Order_id')},
-                        {field: 'company_id', title: __('Company_id')},
-                        {field: 'user_id', title: __('User_id')},
-                        {field: 'worker_id', title: __('Worker_id')},
+                        {field: 'maintain.orderno', title: __('Maintain.orderno'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+//                        {field: 'company_id', title: __('Company_id')},
+//                        {field: 'user_id', title: __('User_id')},
+//                        {field: 'worker_id', title: __('Worker_id')},
                         {field: 'weixiu_times', title: __('Weixiu_times')},
-                        {field: 'weixiu_id', title: __('Weixiu_id')},
+//                        {field: 'weixiu_id', title: __('Weixiu_id')},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'maintain.orderno', title: __('Maintain.orderno'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });