From 6acded56d6839a0690058fcc36c87a3b5020840f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 25 Apr 2020 23:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8A=95=E8=AF=89=E5=92=8C?=
 =?UTF-8?q?=20=E6=88=91=E7=9A=84=E6=8A=95=E8=AF=89=E5=8D=95=E9=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/complaintDetail/complaintDetail.html   | 6 +++---
 public/components/complaintDetail/complaintDetail.js     | 6 +++++-
 .../components/myAuditComplaints/myAuditComplaints.html  | 9 ++++++++-
 public/components/myAuditComplaints/myAuditComplaints.js | 3 +++
 .../myAuditHistoryComplaints.html                        | 9 +++++----
 .../myAuditHistoryComplaints/myAuditHistoryComplaints.js | 3 +++
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/public/components/complaintDetail/complaintDetail.html b/public/components/complaintDetail/complaintDetail.html
index 5155a3af5..b966f3389 100644
--- a/public/components/complaintDetail/complaintDetail.html
+++ b/public/components/complaintDetail/complaintDetail.html
@@ -51,21 +51,21 @@
                                         placeholder="必填，请填写投诉电话" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row">
+                            <div class="form-group row" v-if="complaintDetailInfo.showCurrentUser">
                                 <label class="col-sm-2 col-form-label">处理人</label>
                                 <div class="col-sm-10">
                                     <input v-model="complaintDetailInfo.currentUserName" type="text" readonly
                                         placeholder="必填，请填写投诉电话" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row">
+                            <div class="form-group row" v-if="complaintDetailInfo.showCurrentUser">
                                 <label class="col-sm-2 col-form-label">处理人电话</label>
                                 <div class="col-sm-10">
                                     <input v-model="complaintDetailInfo.currentUserTel" type="text" readonly
                                         placeholder="必填，请填写投诉电话" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row">
+                            <div class="form-group row" v-if="complaintDetailInfo.showCurrentUser">
                                 <label class="col-sm-2 col-form-label">处理人编号</label>
                                 <div class="col-sm-10">
                                     <input v-model="complaintDetailInfo.currentUserId" type="text" readonly
diff --git a/public/components/complaintDetail/complaintDetail.js b/public/components/complaintDetail/complaintDetail.js
index 39f97dfdc..e34ed901c 100644
--- a/public/components/complaintDetail/complaintDetail.js
+++ b/public/components/complaintDetail/complaintDetail.js
@@ -14,6 +14,7 @@
                 currentUserName: '',
                 currentUserTel: '',
                 currentUserId: '',
+                showCurrentUser: true
             }
         },
         _initMethod: function () {
@@ -26,6 +27,9 @@
                 let _roomName = _params.floorNum + '号楼' + _params.unitNum + '单元' + _params.roomNum + '室';
                 vc.copyObject(_params, vc.component.complaintDetailInfo);
                 $that.complaintDetailInfo.roomName = _roomName;
+                if(!_params.hasOwnProperty('currentUserName')){
+                    $that.complaintDetailInfo.showCurrentUser = false;
+                }
                 $that.complaintDetailInfo.currentUserName = _params.currentUserName == '' ? '无':_params.currentUserName;
                 $that.complaintDetailInfo.currentUserTel = _params.currentUserTel == '' ? '无':_params.currentUserTel;
                 $that.complaintDetailInfo.currentUserId = _params.currentUserId == '' ? '无':_params.currentUserId;
@@ -46,7 +50,7 @@
                     currentUserName: '',
                     currentUserTel: '',
                     currentUserId: '',
-
+                    showCurrentUser: true
                 }
             }
         }
diff --git a/public/components/myAuditComplaints/myAuditComplaints.html b/public/components/myAuditComplaints/myAuditComplaints.html
index 5e320d33c..5f103ef78 100644
--- a/public/components/myAuditComplaints/myAuditComplaints.html
+++ b/public/components/myAuditComplaints/myAuditComplaints.html
@@ -34,12 +34,17 @@
                             <td class="text-center">{{complaint.complaintName}}</td>
                             <td class="text-center">{{complaint.tel}}</td>
                             <td class="text-center">{{complaint.stateName}}</td>
-                            <td class="text-center">
+                            <td class="text-right">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openAuditComplaintModel(complaint)">审核
                                     </button>
                                 </div>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openComplaintDetailModel(complaint)">详情
+                                    </button>
+                                </div>
                             </td>
 
                         </tr>
@@ -64,4 +69,6 @@
                >
 
     </vc:create>
+    
+    <vc:create name="complaintDetail"></vc:create>
 </div>
diff --git a/public/components/myAuditComplaints/myAuditComplaints.js b/public/components/myAuditComplaints/myAuditComplaints.js
index 01e4efd37..3d64dfaf7 100644
--- a/public/components/myAuditComplaints/myAuditComplaints.js
+++ b/public/components/myAuditComplaints/myAuditComplaints.js
@@ -95,6 +95,9 @@
                 } else {
                     vc.component.AuditOrdersManageInfo.moreCondition = true;
                 }
+            },
+            _openComplaintDetailModel:function(_complaint){
+                vc.emit('complaintDetail', 'openComplaintDetailModal', _complaint);
             }
 
 
diff --git a/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.html b/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.html
index b16542a3b..edb3d2bd7 100644
--- a/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.html
+++ b/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.html
@@ -21,7 +21,7 @@
                             <th class="text-center">投诉人</th>
                             <th class="text-center">投诉电话</th>
                             <th class="text-center">投诉状态</th>
-                           <!-- <th class="text-center">操作</th>-->
+                           <th class="text-right">操作</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -34,13 +34,13 @@
                             <td class="text-center">{{complaint.complaintName}}</td>
                             <td class="text-center">{{complaint.tel}}</td>
                             <td class="text-center">{{complaint.stateName}}</td>
-                            <!--<td class="text-center">
+                            <td class="text-right">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
-                                            v-on:click="_openAuditComplaintModel(complaint)">审核
+                                            v-on:click="_openComplaintDetailModel(complaint)">详情
                                     </button>
                                 </div>
-                            </td>-->
+                            </td>
 
                         </tr>
                         </tbody>
@@ -58,4 +58,5 @@
             </div>
         </div>
     </div>
+    <vc:create name="complaintDetail"></vc:create>
 </div>
diff --git a/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.js b/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.js
index 9fb594f27..64cc326d5 100644
--- a/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.js
+++ b/public/components/myAuditHistoryComplaints/myAuditHistoryComplaints.js
@@ -70,6 +70,9 @@
                 } else {
                     vc.component.AuditOrdersManageInfo.moreCondition = true;
                 }
+            },
+            _openComplaintDetailModel:function(_complaint){
+                vc.emit('complaintDetail', 'openComplaintDetailModal', _complaint);
             }