From d91e3e202638495205254da0a5cfdf5efb9106cf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 30 Dec 2020 11:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8F=97=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E5=8A=A0=E5=85=A5=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/vc-ui.css                               |  8 ++++++++
 .../simplifyAcceptance/simplifyAcceptance.html     | 14 +++++++++++---
 .../simplifyAcceptance/simplifyAcceptance.js       |  9 ++++++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/public/css/vc-ui.css b/public/css/vc-ui.css
index adea420b6..a1f9f3ff5 100644
--- a/public/css/vc-ui.css
+++ b/public/css/vc-ui.css
@@ -2025,4 +2025,12 @@ a:hover {
 
 .vc-table-border tr th{
   border: 1px solid #000000;
+}
+
+.fix-width{
+    width: 60%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    vertical-align: bottom;
 }
\ No newline at end of file
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
index f59ebd447..a457917cb 100644
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
@@ -73,7 +73,10 @@
                             </div>
                         </div>
                         <div class="col-sm-6">
-
+                            <div class="form-group">
+                                <label class="col-form-label">业主备注：</label>
+                                <label class="fix-width"  :title="simplifyAcceptanceInfo.ownerRemark">{{simplifyAcceptanceInfo.ownerRemark}}</label>
+                            </div>
                         </div>
                     </div>
 
@@ -81,8 +84,7 @@
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <label class="col-form-label">房屋编号：</label>
-                                <label
-                                    class="">{{simplifyAcceptanceInfo.floorNum}}-{{simplifyAcceptanceInfo.unitNum}}-{{simplifyAcceptanceInfo.roomNum}}</label>
+                                <label>{{simplifyAcceptanceInfo.floorNum}}-{{simplifyAcceptanceInfo.unitNum}}-{{simplifyAcceptanceInfo.roomNum}}</label>
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -117,6 +119,12 @@
                                 <label class="">{{simplifyAcceptanceInfo.roomId}}</label>
                             </div>
                         </div>
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label class="col-form-label">房屋备注：</label>
+                                <label class="fix-width"  :title="simplifyAcceptanceInfo.roomRemark">{{simplifyAcceptanceInfo.roomRemark }}</label>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
index e5e26db7a..3c25fc0cb 100644
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.js
@@ -15,6 +15,8 @@
                 _currentTab: 'simplifyRoomFee',
                 roomId: '',
                 ownerId: '',
+                ownerRemark: '',
+                roomRemark: '',
                 name: '',
                 idCard: '',
                 link: '',
@@ -52,6 +54,7 @@
         _initEvent: function () {
             vc.on('simplifyAcceptance', 'chooseRoom', function (_room) {
                 vc.copyObject(_room, $that.simplifyAcceptanceInfo);
+                $that.simplifyAcceptanceInfo.roomRemark = _room.remark;
                 $that.simplifyAcceptanceInfo.roomName = _room.floorNum + '栋' + _room.unitNum + '单元' + _room.roomNum;
                 vc.emit('simplifyRoomFee', 'switch', $that.simplifyAcceptanceInfo)
             });
@@ -114,6 +117,7 @@
                         $that.saveTempSearchData();
                         let _owner = _ownerJson.data;
                         vc.copyObject(_owner, $that.simplifyAcceptanceInfo);
+                        $that.simplifyAcceptanceInfo.ownerRemark = _owner.remark;
                         if (!_owner.hasOwnProperty('rooms')) {
                             return;
                         }
@@ -123,6 +127,7 @@
                             return;
                         }
                         vc.copyObject(_rooms[0], $that.simplifyAcceptanceInfo);
+                        $that.simplifyAcceptanceInfo.roomRemark = _rooms[0].remark;
                         $that.simplifyAcceptanceInfo.roomName = _rooms[0].floorNum + '栋' + _rooms[0].unitNum + '单元' + _rooms[0].roomNum;
                         vc.emit('simplifyRoomFee', 'switch', $that.simplifyAcceptanceInfo);
 
@@ -181,7 +186,9 @@
                     feeCoefficient: '',
                     stateName: '',
                     roomName: '',
-                    sex: 0
+                    sex: 0,
+                    ownerRemark: '',
+                    roomRemark: ''
                 }
             }