From f5a205de498a1f9174d273fc22b3c56792f38fed Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 24 Apr 2021 00:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simplifyContract/simplifyContract.html    | 10 +++-------
 .../simplifyContract/simplifyContract.js      |  3 +++
 .../pages/admin/addContract/addContract.html  | 20 ++++++++++---------
 public/pages/admin/addContract/addContract.js | 10 ++++++++++
 .../admin/contractManage/contractManage.html  |  6 +++---
 .../admin/contractManage/contractManage.js    |  6 +++++-
 .../simplifyAcceptance.html                   |  2 +-
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/public/components/property/simplifyContract/simplifyContract.html b/public/components/property/simplifyContract/simplifyContract.html
index 233ff85e7..ae8a016a5 100644
--- a/public/components/property/simplifyContract/simplifyContract.html
+++ b/public/components/property/simplifyContract/simplifyContract.html
@@ -17,8 +17,6 @@
                     <th class="text-center">合同编号</th>
                     <th class="text-center">父合同编号</th>
                     <th class="text-center">合同类型</th>
-                    <th class="text-center">关联房屋</th>
-                    <th class="text-center">关联业主</th>
                     <th class="text-center">开始时间</th>
                     <th class="text-center">结束时间</th>
                     <th class="text-center">状态</th>
@@ -32,16 +30,14 @@
                     <td class="text-center">
                         {{contract.parentContractCode?contract.parentContractCode:'-'}}</td>
                     <td class="text-center">{{contract.contractTypeName}}</td>
-                    <td class="text-center">{{contract.objName}}</td>
-                    <td class="text-center">{{contract.objPersonName}}</td>
                     <td class="text-center">{{contract.startTime}}</td>
                     <td class="text-center">{{contract.endTime}}</td>
                     <td class="text-center">{{contract.stateName}}</td>
                     <td class="text-center">
-                        <!-- <div class="btn-group">
+                        <div class="btn-group">
                             <button class="btn-white btn btn-xs"
-                                v-on:click="_openEditContractModel(contract)">修改</button>
-                        </div> -->
+                                v-on:click="_openContractFee(contract)">费用</button>
+                        </div>
                         <button class="btn-white btn btn-xs"
                                 v-on:click="_viewContract(contract)">查看
                         </button>
diff --git a/public/components/property/simplifyContract/simplifyContract.js b/public/components/property/simplifyContract/simplifyContract.js
index e01562289..95a20f71d 100644
--- a/public/components/property/simplifyContract/simplifyContract.js
+++ b/public/components/property/simplifyContract/simplifyContract.js
@@ -98,6 +98,9 @@
                     }
                 }
             },
+            _openContractFee: function (_contract) {
+                vc.jumpToPage("/admin.html#/pages/property/listContractFee?contractId=" + _contract.contractId + "&contractCode=" + _contract.contractCode);
+            },
 
 
         }
diff --git a/public/pages/admin/addContract/addContract.html b/public/pages/admin/addContract/addContract.html
index 24d128284..74763270a 100644
--- a/public/pages/admin/addContract/addContract.html
+++ b/public/pages/admin/addContract/addContract.html
@@ -81,8 +81,8 @@
                 <div class="col-sm-9 padding-lr-xs">
                   <select class="custom-select" v-model="addContractInfo.partyA" @change="_changeContractPartyA()">
                     <option selected disabled value="">必填，请选择甲方</option>
-                    <option v-for="(item,index) in addContractInfo.contractPartyAs" :key="index"
-                      :value="item.partyA">{{item.partyA}}</option>
+                    <option v-for="(item,index) in addContractInfo.contractPartyAs" :key="index" :value="item.partyA">
+                      {{item.partyA}}</option>
                   </select>
                 </div>
               </div>
@@ -108,9 +108,14 @@
             <div class="col-sm-4">
               <div class="form-group row">
                 <label class="col-sm-3 col-form-label padding-lr-sm text-right">乙方</label>
-                <div class="col-sm-9 padding-lr-xs">
+                <div class="col-sm-7 padding-lr-xs">
                   <input v-model="addContractInfo.partyB" type="text" placeholder="必填，请填写乙方" class="form-control">
                 </div>
+                <div class="col-sm-2 padding-lr-xs">
+                  <button type="button" class="btn btn-link btn-sm" v-on:click="_searchOwner()">
+                    选择
+                  </button>
+                </div>
               </div>
             </div>
             <div class="col-sm-4">
@@ -238,7 +243,7 @@
           </div>
         </div>
         <div class="ibox-content">
-        <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
+          <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
             <thead>
               <tr>
                 <!-- <th>房屋ID</th> -->
@@ -290,9 +295,6 @@
         class="fa fa-check"></i>&nbsp;提交</button>
   </div>
 </div>
-<vc:create path="property/searchRoom"
-               emitChooseRoom="addContract"
-               emitLoadData="addContract"
-               roomFlag=""
-    ></vc:create>
+<vc:create path="property/searchRoom" emitChooseRoom="addContract" emitLoadData="addContract" roomFlag=""></vc:create>
+<vc:create path="property/searchOwner" emitChooseOwner="addContract" emitLoadData="addContract"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/admin/addContract/addContract.js b/public/pages/admin/addContract/addContract.js
index c41aee6b0..3ec6bd441 100755
--- a/public/pages/admin/addContract/addContract.js
+++ b/public/pages/admin/addContract/addContract.js
@@ -74,6 +74,13 @@
             vc.on('addContract', 'chooseRoom', function (param) {
                 $that.addContractInfo.rooms.push(param);
             })
+
+            vc.on('addContract', 'chooseOwner', function (param) {
+                $that.addContractInfo.partyB = param.name;
+                $that.addContractInfo.bContacts = param.name;
+                $that.addContractInfo.bLink = param.link;
+                $that.addContractInfo.objId = param.ownerId;
+            })
         },
         methods: {
             addContractValidate() {
@@ -481,6 +488,9 @@
 
                     }
                 })
+            },
+            _searchOwner:function(){
+                vc.emit('searchOwner', 'openSearchOwnerModel',{});
             }
         }
     });
diff --git a/public/pages/admin/contractManage/contractManage.html b/public/pages/admin/contractManage/contractManage.html
index 742672fef..593e59549 100755
--- a/public/pages/admin/contractManage/contractManage.html
+++ b/public/pages/admin/contractManage/contractManage.html
@@ -79,10 +79,10 @@
                                 <td class="text-center">{{contract.endTime}}</td>
                                 <td class="text-center">{{contract.stateName}}</td>
                                 <td class="text-center">
-                                    <!-- <div class="btn-group">
+                                    <div class="btn-group">
                                         <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditContractModel(contract)">修改</button>
-                                    </div> -->
+                                            v-on:click="_openContractFee(contract)">费用</button>
+                                    </div>
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_viewContract(contract)">查看
                                     </button>
diff --git a/public/pages/admin/contractManage/contractManage.js b/public/pages/admin/contractManage/contractManage.js
index c0a5a6931..25e77c5e8 100755
--- a/public/pages/admin/contractManage/contractManage.js
+++ b/public/pages/admin/contractManage/contractManage.js
@@ -84,7 +84,11 @@
             _viewContract:function(_contract){
                vc.jumpToPage("/admin.html#/pages/common/contractApplyDetail?contractId="+_contract.contractId);
 
-            }
+            },
+        
+            _openContractFee: function (_contract) {
+                vc.jumpToPage("/admin.html#/pages/property/listContractFee?contractId=" + _contract.contractId + "&contractCode=" + _contract.contractCode);
+            },
         }
     });
 })(window.vc);
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
index 334d463e2..3ccc437cb 100755
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
@@ -190,7 +190,7 @@
                 <li class="nav-item">
                     <a class="nav-link"
                        v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 'simplifyContract'}"
-                       v-on:click="changeTab('simplifyContract')">关联合同</a>
+                       v-on:click="changeTab('simplifyContract')">业主合同</a>
                 </li>