From 6e248597a56ab9eaed4fb0c030cabbf85bb3d862 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 30 Jun 2020 19:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E4=BF=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ownerRepairDetail/ownerRepairDetail.html  | 16 +++++-----
 .../ownerRepairDetail/ownerRepairDetail.js    | 31 +++++++++++++++++--
 .../repairTypeUser/repairTypeUser.html        |  3 ++
 .../property/repairTypeUser/repairTypeUser.js |  3 ++
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/public/pages/property/ownerRepairDetail/ownerRepairDetail.html b/public/pages/property/ownerRepairDetail/ownerRepairDetail.html
index e76d0c9c6..2fb5748c6 100644
--- a/public/pages/property/ownerRepairDetail/ownerRepairDetail.html
+++ b/public/pages/property/ownerRepairDetail/ownerRepairDetail.html
@@ -5,7 +5,9 @@
                 <div class="ibox-title">
                     <h5>工单详情</h5>
                     <div class="ibox-tools" style="top:10px;">
-
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
+                            返回
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
@@ -56,13 +58,13 @@
                             <div class="row">
                                 <div class="col-sm-4">
                                     <div class="form-group">
-                                        <label class="col-form-label">状态</label>
+                                        <label class="col-form-label">状态:</label>
                                         <label class="">{{ownerRepairDetailInfo.stateName}}</label>
                                     </div>
                                 </div>
                                 <div class="col-sm-8">
                                     <div class="form-group">
-                                        <label class="col-form-label">报修内容</label>
+                                        <label class="col-form-label">报修内容:</label>
                                         <label class="">{{ownerRepairDetailInfo.context}}</label>
                                     </div>
                                 </div>
@@ -78,7 +80,7 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>处理过程</h5>
+                    <h5>工单流转</h5>
                     <div class="ibox-tools" style="top:10px;">
 
                     </div>
@@ -98,11 +100,11 @@
                         <tbody>
                             <tr v-for="(item,index) in ownerRepairDetailInfo.repairUsers">
                                 <th scope="row">{{index+1}}</th>
-                                <td>{{item.auditName}}</td>
+                                <td>{{item.staffName}}</td>
                                 <td>{{item.stateName}}</td>
-                                <td>{{item.auditTime}}</td>
+                                <td>{{item.endTime}}</td>
                                 <td>{{item.duration}}</td>
-                                <td>{{item.message}}</td>
+                                <td>{{item.context}}</td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/public/pages/property/ownerRepairDetail/ownerRepairDetail.js b/public/pages/property/ownerRepairDetail/ownerRepairDetail.js
index 397dac788..374a64d1e 100644
--- a/public/pages/property/ownerRepairDetail/ownerRepairDetail.js
+++ b/public/pages/property/ownerRepairDetail/ownerRepairDetail.js
@@ -16,7 +16,7 @@
                 roomId: '',
                 userId: '',
                 userName: '',
-                repairUsers:[]
+                repairUsers: []
 
 
             }
@@ -30,7 +30,7 @@
                 return;
             }
             $that._listRepairPools()
-           
+
         },
         _initEvent: function () {
 
@@ -99,11 +99,38 @@
                         //查询房屋信息
                         vc.component._getRoom();
 
+                        //查询处理轨迹
+                        $that._loadRepairUser();
+
                     }, function (errInfo, error) {
                         console.log('请求失败处理');
                     }
                 );
             },
+            _loadRepairUser: function () {
+                var param = {
+                    params: {
+                        page: 1,
+                        row: 100,
+                        communityId: vc.getCurrentCommunity().communityId,
+                        repairId: $that.ownerRepairDetailInfo.repairId
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('ownerRepair.listRepairStaffs',
+                    param,
+                    function (json, res) {
+                        var _repairPoolManageInfo = JSON.parse(json);
+                        let _repairs = _repairPoolManageInfo.data;
+                        $that.ownerRepairDetailInfo.repairUsers = _repairs;
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _goBack:function(){
+                vc.goBack()
+            }
         }
     });
 
diff --git a/public/pages/property/repairTypeUser/repairTypeUser.html b/public/pages/property/repairTypeUser/repairTypeUser.html
index 4f6a3ab70..ded0cecdc 100644
--- a/public/pages/property/repairTypeUser/repairTypeUser.html
+++ b/public/pages/property/repairTypeUser/repairTypeUser.html
@@ -5,6 +5,9 @@
                 <div class="ibox-title">
                     <h5>报修师傅</h5>
                     <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_goBack()">
+                            返回
+                        </button>
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddRepairTypeUserModal()">
                             <i class="glyphicon glyphicon-plus"></i>
                             添加
diff --git a/public/pages/property/repairTypeUser/repairTypeUser.js b/public/pages/property/repairTypeUser/repairTypeUser.js
index 4d03fb009..a7b824bb3 100644
--- a/public/pages/property/repairTypeUser/repairTypeUser.js
+++ b/public/pages/property/repairTypeUser/repairTypeUser.js
@@ -81,6 +81,9 @@
             _openDeleteTypeUserModel: function (_repairTypeUser) {
                 vc.emit('deleteRepairTypeUser', 'openDeleteRepairTypeUserModal', _repairTypeUser);
             },
+            _goBack:function(){
+                vc.goBack()
+            },
             saveRepairTypeUserInfo: function (_staff) {
 
                 let param = {