From 3dfd2d499a67555ef53303534dd4a6fe864bd93a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 28 Mar 2023 02:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=9A=E4=B8=BB=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/owner/ownerDetail/ownerDetail.html  |  6 +++-
 public/pages/owner/ownerDetail/ownerDetail.js |  2 ++
 public/pages/property/listOwner/listOwner.js  |  2 +-
 .../property/listOwnerCar/listOwnerCar.html   |  5 ++-
 public/pages/property/room/room.html          |  9 +++---
 .../property/roomCreateFee/roomCreateFee.html |  5 +++
 .../property/roomCreateFee/roomCreateFee.js   | 31 +++++++------------
 public/pages/property/shops/shops.html        |  9 ++++--
 8 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/public/pages/owner/ownerDetail/ownerDetail.html b/public/pages/owner/ownerDetail/ownerDetail.html
index c976c307a..1c02a89fd 100644
--- a/public/pages/owner/ownerDetail/ownerDetail.html
+++ b/public/pages/owner/ownerDetail/ownerDetail.html
@@ -4,6 +4,10 @@
             业主信息
         </div>
         <div>
+            <button type="button" class="btn btn-white btn-sm" style="margin-left:10px" v-if="ownerDetailInfo.needBack"
+                v-on:click="vc.goBack()">
+                返回
+            </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                 v-on:click="_openEditOwnerModel()">
                 修改
@@ -19,7 +23,7 @@
         <div class="text-center vc-float-left" style="width: 150px;" v-else>
             <image width="120px" height="140px" class="border-radius" src="/img/noPhoto.jpg" />
         </div>
-        <div class="row">
+        <div class="row" style="min-height: 160px;">
             <div class="col-sm-12">
                 <div class="row">
                     <div class="col-sm-3">
diff --git a/public/pages/owner/ownerDetail/ownerDetail.js b/public/pages/owner/ownerDetail/ownerDetail.js
index 44cc019ee..7b304823c 100644
--- a/public/pages/owner/ownerDetail/ownerDetail.js
+++ b/public/pages/owner/ownerDetail/ownerDetail.js
@@ -19,10 +19,12 @@
                 attrs: [],
                 url: '',
                 _currentTab: 'ownerDetailRoom',
+                needBack:false,
             }
         },
         _initMethod: function () {
             $that.ownerDetailInfo.ownerId = vc.getParam('ownerId');
+            $that.ownerDetailInfo.needBack = vc.getParam('needBack');
             if (!vc.notNull($that.ownerDetailInfo.ownerId)) {
                 return;
             }
diff --git a/public/pages/property/listOwner/listOwner.js b/public/pages/property/listOwner/listOwner.js
index 095ad2f6c..6346130b7 100755
--- a/public/pages/property/listOwner/listOwner.js
+++ b/public/pages/property/listOwner/listOwner.js
@@ -137,7 +137,7 @@
                 vc.jumpToPage("/#/pages/property/sellParkingSpace?ownerId=" + _owner.ownerId);
             },
             _openOwnerDetailModel: function (_owner) {
-                vc.jumpToPage("/#/pages/property/ownerDetail?ownerId=" + _owner.ownerId + "&ownerName=" + _owner.name);
+                vc.jumpToPage("/#/pages/owner/ownerDetail?ownerId=" + _owner.ownerId + "&ownerName=" + _owner.name+"&needBack=true");
             },
             _openDeleteOwnerRoom: function (_owner) {
                 vc.jumpToPage("/#/pages/property/deleteOwnerRoom?ownerId=" + _owner.ownerId);
diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html
index cbbb489ed..5b061b026 100755
--- a/public/pages/property/listOwnerCar/listOwnerCar.html
+++ b/public/pages/property/listOwnerCar/listOwnerCar.html
@@ -213,10 +213,9 @@
                                         <td class="text-center">
                                             {{car.carColor || '-'}}
                                         </td>
-                                        <td class="text-center hand" @click="_viewOwner(car)">
+                                        <td class="text-center hand" >
                                             <div class="">
-                                                {{car.ownerName}}({{car.link}})
-                                                <span class="fa fa-info-circle"></span>
+                                                <a target="_blank" :href="'/#/pages/owner/ownerDetail?ownerId='+car.ownerId">{{car.ownerName}}({{car.link}})</a>
                                             </div>
                                         </td>
                                         <td v-if="car.areaNum && car.state == '1001'" class="text-center">
diff --git a/public/pages/property/room/room.html b/public/pages/property/room/room.html
index 3e5a462dc..8513f4979 100755
--- a/public/pages/property/room/room.html
+++ b/public/pages/property/room/room.html
@@ -215,15 +215,14 @@
                                             </span>
                                         </div>
                                     </td>
-                                    <td class="text-center hand" v-if="room.ownerName" @click="_viewOwner(room)">
+                                    <td class="text-center hand" v-if="room.ownerName" >
                                         <div class="hc-td">
-                                            {{room.ownerName}}({{room.link}})
-                                            <span class="fa fa-info-circle"></span>
+                                           <a target="_blank" :href="'/#/pages/owner/ownerDetail?ownerId='+room.ownerId">{{room.ownerName}}({{room.link}})</a> 
                                         </div>
                                     </td>
-                                    <td class="text-center hand" v-else @click="_viewOwner(room)">
+                                    <td class="text-center" v-else>
                                         <div class="hc-td textAuto">
-                                            {{room.ownerName}}
+                                            -
                                         </div>
                                     </td>
                                     <td class="text-center">
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html
index 44b2aa92b..bff8b8a21 100755
--- a/public/pages/property/roomCreateFee/roomCreateFee.html
+++ b/public/pages/property/roomCreateFee/roomCreateFee.html
@@ -83,6 +83,11 @@
                                 <span><vc:i18n name="费用" namespace="listRoomFee"></vc:i18n></span>
                             </h5>
                             <div class="ibox-tools" style="top:10px;">
+                                <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                                        v-on:click="_toSimplifyAcceptance()"
+                                        v-if="roomCreateFeeInfo.ownerName">
+                                    业务受理
+                                </button>
                                 <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                                         v-on:click="_openProxyFeeModal()"
                                         v-if="roomCreateFeeInfo.hireOwnerFee == '0' && vc.hasPrivilege('502022073049300004')">
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js
index afca282f3..24e0bbb7a 100755
--- a/public/pages/property/roomCreateFee/roomCreateFee.js
+++ b/public/pages/property/roomCreateFee/roomCreateFee.js
@@ -59,6 +59,7 @@
         },
         _initEvent: function () {
             vc.on('roomCreateFee', 'selectRoom', function (_param) {
+                $that.roomCreateFeeInfo.ownerName = '';
                 if (vc.isBack()) {
                     return;
                 }
@@ -252,7 +253,6 @@
             },
             _editFee: function (_fee) {
                 // 计费结束时间
-                //_fee.maxEndTime = $that._getDeadlineTime(_fee);
                 _fee.maxEndTime = $that._getAttrValue(_fee.feeAttrs, '390010');
                 vc.emit('editFee', 'openEditFeeModal', _fee);
             },
@@ -261,12 +261,6 @@
                 vc.jumpToPage('/#/pages/property/propertyFee?' + vc.objToGetParam(_fee));
             },
             _deleteFee: function (_fee) {
-                // var dateA = new Date(_fee.startTime);
-                // var dateB = new Date();
-                // if(dateA.setHours(0, 0, 0, 0) != dateB.setHours(0, 0, 0, 0)){
-                //     vc.toast("只能取消当天添加的费用");
-                //     return;
-                // }
                 vc.emit('deleteFee', 'openDeleteFeeModal', {
                     communityId: vc.getCurrentCommunity().communityId,
                     feeId: _fee.feeId
@@ -326,17 +320,6 @@
                     ownerName: $that.roomCreateFeeInfo.ownerName
                 });
             },
-            /*_inputRoom: function () {
-                if ($that.roomCreateFeeInfo.timer) {
-                    clearTimeout($that.roomCreateFeeInfo.timer)
-                }
-                $that.roomCreateFeeInfo.timer = setTimeout(() => {
-                    vc.emit('inputSearchRoomInfo', 'searchRoom', {
-                        callComponent: 'roomCreateFee',
-                        roomName: $that.roomCreateFeeInfo.conditions.roomNum
-                    });
-                }, 1500)
-            },*/
             _inputRoomByOwner: function () {
                 if ($that.roomCreateFeeInfo.timer) {
                     clearTimeout($that.roomCreateFeeInfo.timer)
@@ -434,7 +417,17 @@
                 vc.emit('viewRoomData', 'showData', {
                     roomId: $that.roomCreateFeeInfo.roomId
                 })
-            }
+            },
+            _toSimplifyAcceptance: function (_room) {
+                let _date = new Date();
+                vc.saveData("JAVA110_IS_BACK", _date.getTime());
+                vc.saveData('simplifyAcceptanceSearch', {
+                    searchType: '1',
+                    searchValue: $that.roomCreateFeeInfo.floorNum + "-" + $that.roomCreateFeeInfo.unitNum + "-" + $that.roomCreateFeeInfo.roomNum,
+                    searchPlaceholder: '请输入房屋编号 楼栋-单元-房屋 如1-1-1',
+                })
+                vc.jumpToPage('/#/pages/property/simplifyAcceptance?tab=业务受理');
+            },
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/pages/property/shops/shops.html b/public/pages/property/shops/shops.html
index 57bf09343..f2438b52b 100755
--- a/public/pages/property/shops/shops.html
+++ b/public/pages/property/shops/shops.html
@@ -125,11 +125,14 @@
                                 {{shops.layer}}
                                 <span><vc:i18n name="层" namespace="shops"></vc:i18n></span>
                             </td>
-                            <td class="text-center">
-                                {{shops.ownerName}}
+                            <td class="text-center" v-if="shops.ownerName">
+                                <a target="_blank" :href="'/#/pages/owner/ownerDetail?ownerId='+shops.ownerId">{{shops.ownerName}}</a> 
+                            </td>
+                            <td class="text-center" v-else>
+                                -
                             </td>
                             <td class="text-center">
-                                {{shops.link}}
+                                {{shops.link?shops.link:'-'}}
                             </td>
                             <td class="text-center">
                                 {{shops.builtUpArea}}