pc端，维保流程

application/company/controller/Maintain.php

@@ -151,6 +151,8 @@ class Maintain extends Apic
         $maintain_model = new Maintainmodel();
         $info['status_text'] = $maintain_model->status_data($info['status']);
 
+        $info['filedata'] = json_decode($info['filedata'],true);
+
         //追加报价历史
         $baojia = Db::name('maintain_baojia')->alias('bj')
             ->field('bj.*,admin.nickname as baojia_nickname,audit.nickname as baojia_audit_nickname')
@@ -158,8 +160,35 @@ class Maintain extends Apic
             ->join('pc_admin audit','bj.baojia_audit_staffid = audit.id','LEFT')
             ->where('order_id',$id)->order('id desc')->select();
         $info['baojia_list'] = $baojia;
+
         //追加材料列表
+        $info['cailiao_list'] = Db::name('maintain_cailiao')->field('id,name,number,danwei,images')->where('order_id',$id)->order('id desc')->select();
+
         //追加多次维修+对应进度历史
+        $last_jindulist = [];
+        $new_jindulist = [];
+        $jindu_list = Db::name('maintain_jindu')->alias('jd')
+            ->join('worker','jd.worker_id = worker.id','LEFT')
+            ->field('jd.id,jd.worker_id,jd.weixiu_times,jd.title,jd.images,jd.createtime,worker.avatar,worker.truename')
+            ->where('jd.order_id',$id)
+            ->order('jd.id desc')->select();
+        if(!empty($jindu_list)){
+            for($i=$jindu_list[0]['weixiu_times'];$i>=1;$i--){
+                foreach($jindu_list as $key => $val){
+                    if($i == $val['weixiu_times']){
+                        $new_jindulist[$i][] = $val;
+                    }
+                }
+            }
+            foreach($new_jindulist as $key => $val){
+                $last_jindulist[] = [
+                    'title' => '第'.$val[0]['weixiu_times'].'次',
+                    'child' => $val
+                ];
+            }
+        }
+        $info['jindu'] = $last_jindulist;
+
 
         $this->success(1,$info);
     }